# HG changeset patch
# User alorimier <anael.lorimier@xcg-consulting.fr>
# Date 1370428262 -7200
# Wed Jun 05 12:31:02 2013 +0200
# Node ID c92ff5a333f5534532dd2e5b761b16ade2dfbc34
# Parent 8770f5339bc6438d4ea79aba63a548ca418573c3
Pep8
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -16,4 +16,4 @@
.idea
.pydevproject
*.db
-
+.ropeproject/*
diff --git a/__openerp__.py b/__openerp__.py
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -3,16 +3,21 @@
#
##############################################################################
{
- "name" : "Account Streamline",
- "version" : "0.1",
- "author" : "XCG Consulting",
+ "name": "Account Streamline",
+ "version": "0.1",
+ "author": "XCG Consulting",
"category": 'Accounting',
"description": """Enhancements to the account module to streamline its
usage.
""",
'website': 'http://www.openerp-experts.com',
'init_xml': [],
- "depends" : ['base', 'account_accountant', 'account_voucher', 'account_sequence', 'analytic_structure'],
+ "depends": [
+ 'base',
+ 'account_accountant',
+ 'account_voucher',
+ 'account_sequence',
+ 'analytic_structure'],
"data": [
'data/partner_data.xml',
'wizard/account_reconcile_view.xml',
diff --git a/account.py b/account.py
--- a/account.py
+++ b/account.py
@@ -20,39 +20,54 @@
##############################################################################
from openerp.osv import fields, osv
-from openerp.tools.translate import _
from lxml import etree
+
class account_analytic_structure(osv.Model):
_name = 'account.account'
_inherit = 'account.account'
_columns = dict(
a1_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_account'),
- ('nd_id.ns_id.ordering', '=', '1')]),
+ domain=[('nd_id.ns_id.model_name',
+ '=', 'account_account'),
+ ('nd_id.ns_id.ordering', '=', '1')]),
a2_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_account'),
- ('nd_id.ns_id.ordering', '=', '2')]),
+ domain=[('nd_id.ns_id.model_name',
+ '=', 'account_account'),
+ ('nd_id.ns_id.ordering', '=', '2')]),
a3_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_account'),
- ('nd_id.ns_id.ordering', '=', '3')]),
+ domain=[('nd_id.ns_id.model_name',
+ '=', 'account_account'),
+ ('nd_id.ns_id.ordering', '=', '3')]),
a4_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_account'),
- ('nd_id.ns_id.ordering', '=', '4')]),
+ domain=[('nd_id.ns_id.model_name',
+ '=', 'account_account'),
+ ('nd_id.ns_id.ordering', '=', '4')]),
a5_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_account'),
- ('nd_id.ns_id.ordering', '=', '5')]),
+ domain=[('nd_id.ns_id.model_name',
+ '=', 'account_account'),
+ ('nd_id.ns_id.ordering', '=', '5')]),
)
- def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- if context is None:context = {}
- res = super(account_analytic_structure, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ def fields_view_get(self, cr, uid, view_id=None, view_type='form',
+ context=None, toolbar=False, submenu=False):
+ if context is None:
+ context = {}
+ res = super(account_analytic_structure,
+ self).fields_view_get(cr, uid, view_id=view_id,
+ view_type=view_type,
+ context=context,
+ toolbar=toolbar,
+ submenu=False)
ans_obj = self.pool.get('analytic.structure')
- #display analysis codes only when present on a related structure, with dimension name as label
- ans_ids = ans_obj.search(cr, uid, [('model_name', '=', 'account_account')], context=context)
- ans_br = ans_obj.browse(cr, uid, ans_ids,context=context)
+ #display analysis codes only when present on a related structure,
+ #with dimension name as label
+ ans_ids = ans_obj.search(cr, uid,
+ [('model_name', '=', 'account_account')],
+ context=context)
+ ans_br = ans_obj.browse(cr, uid, ans_ids, context=context)
ans_dict = dict()
for ans in ans_br:
ans_dict[ans.ordering] = ans.nd_id.name
diff --git a/account_move_line.py b/account_move_line.py
--- a/account_move_line.py
+++ b/account_move_line.py
@@ -24,7 +24,6 @@
from openerp.tools.translate import _
from openerp import netsvc
import time
-from datetime import datetime
from lxml import etree
# fields that are considered as forbidden once the move_id has been posted
@@ -42,40 +41,39 @@
_columns = dict(
currency_id=fields.many2one('res.currency', 'Currency', help="The mandatory currency code"),
-
move_state=fields.related("move_id", "state",
type="char", string="status", readonly=True),
-
debit_curr=fields.float('Debit T', digits_compute=dp.get_precision('Account'),
help="This is the debit amount in transaction currency"),
credit_curr=fields.float('Credit T', digits_compute=dp.get_precision('Account'),
- help="This is the credit amount in transaction currency"),
+ help="This is the credit amount in transaction currency"),
currency_rate=fields.float('Used rate', digits=(12, 6)),
a1_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
- ('nd_id.ns_id.ordering', '=', '1')]),
+ domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
+ ('nd_id.ns_id.ordering', '=', '1')]),
a2_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
- ('nd_id.ns_id.ordering', '=', '2')]),
+ domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
+ ('nd_id.ns_id.ordering', '=', '2')]),
a3_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
- ('nd_id.ns_id.ordering', '=', '3')]),
+ domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
+ ('nd_id.ns_id.ordering', '=', '3')]),
a4_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
- ('nd_id.ns_id.ordering', '=', '4')]),
+ domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
+ ('nd_id.ns_id.ordering', '=', '4')]),
a5_id=fields.many2one('analytic.code', "Analysis Code 1",
- domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
- ('nd_id.ns_id.ordering', '=', '5')]),
+ domain=[('nd_id.ns_id.model_name', '=', 'account_move_line'),
+ ('nd_id.ns_id.ordering', '=', '5')]),
)
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- if context is None:context = {}
- res = super(account_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
+ if context is None:
+ context = {}
+ res = super(account_move_line, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
ans_obj = self.pool.get('analytic.structure')
#display analysis codes only when present on a related structure, with dimension name as label
ans_ids = ans_obj.search(cr, uid, [('model_name', '=', 'account_move_line')], context=context)
- ans_br = ans_obj.browse(cr, uid, ans_ids,context=context)
+ ans_br = ans_obj.browse(cr, uid, ans_ids, context=context)
ans_dict = dict()
for ans in ans_br:
ans_dict[ans.ordering] = ans.nd_id.name
@@ -85,34 +83,19 @@
for field in res['fields']:
if field == 'a1_id':
res['fields'][field]['string'] = ans_dict.get('1', 'A1')
- doc.xpath("//field[@name='a1_id']")[0].set('modifiers', '{"tree_invisible": %s}' %
- str(((not 'analytic_view' in context) and
- (not 'complete_view' in context)) or
- (not '1' in ans_dict)).lower())
+ doc.xpath("//field[@name='a1_id']")[0].set('modifiers', '{"tree_invisible": %s}' % str(((not 'analytic_view' in context) and (not 'complete_view' in context)) or (not '1' in ans_dict)).lower())
if field == 'a2_id':
res['fields'][field]['string'] = ans_dict.get('2', 'A2')
- doc.xpath("//field[@name='a2_id']")[0].set('modifiers', '{"tree_invisible": %s}' %
- str(((not 'analytic_view' in context) and
- (not 'complete_view' in context)) or
- (not '2' in ans_dict)).lower())
+ doc.xpath("//field[@name='a2_id']")[0].set('modifiers', '{"tree_invisible": %s}' % str(((not 'analytic_view' in context) and (not 'complete_view' in context)) or (not '2' in ans_dict)).lower())
if field == 'a3_id':
res['fields'][field]['string'] = ans_dict.get('3', 'A3')
- doc.xpath("//field[@name='a3_id']")[0].set('modifiers', '{"tree_invisible": %s}' %
- str(((not 'analytic_view' in context) and
- (not 'complete_view' in context)) or
- (not '3' in ans_dict)).lower())
+ doc.xpath("//field[@name='a3_id']")[0].set('modifiers', '{"tree_invisible": %s}' % str(((not 'analytic_view' in context) and (not 'complete_view' in context)) or (not '3' in ans_dict)).lower())
if field == 'a4_id':
res['fields'][field]['string'] = ans_dict.get('4', 'A4')
- doc.xpath("//field[@name='a4_id']")[0].set('modifiers', '{"tree_invisible": %s}' %
- str(((not 'analytic_view' in context) and
- (not 'complete_view' in context)) or
- (not '4' in ans_dict)).lower())
+ doc.xpath("//field[@name='a4_id']")[0].set('modifiers', '{"tree_invisible": %s}' % str(((not 'analytic_view' in context) and (not 'complete_view' in context)) or (not '4' in ans_dict)).lower())
if field == 'a5_id':
res['fields'][field]['string'] = ans_dict.get('5', 'A5')
- doc.xpath("//field[@name='a5_id']")[0].set('modifiers', '{"tree_invisible": %s}' %
- str(((not 'analytic_view' in context) and
- (not 'complete_view' in context)) or
- (not '5' in ans_dict)).lower())
+ doc.xpath("//field[@name='a5_id']")[0].set('modifiers', '{"tree_invisible": %s}' % str(((not 'analytic_view' in context) and (not 'complete_view' in context)) or (not '5' in ans_dict)).lower())
res['arch'] = etree.tostring(doc)
return res
@@ -208,9 +191,9 @@
currency_base = account_obj.browse(cr, uid, vals['account_id'], context=context).company_id.currency_id.id
if amount_trans == 0.0 and (currency_trans == currency_base or not currency_trans):
amount_trans = vals['amount_currency'] = cur_obj.compute(cr, uid, currency_base,
- currency_base,
- vals.get('debit', 0.0) - vals.get('credit', 0.0),
- context=context)
+ currency_base,
+ vals.get('debit', 0.0) - vals.get('credit', 0.0),
+ context=context)
currency_trans = vals['currency_id'] = currency_base
cur_browse = cur_obj.browse(cr, uid, currency_trans, context=context)
@@ -287,8 +270,8 @@
# if the user is trying to move an acm into an account_move
# which is posted
if target_move_id and not target_move_id == current_move_id and \
- self.is_move_posted(
- cr, uid, target_move_id, context=context):
+ self.is_move_posted(cr, uid, target_move_id,
+ context=context):
raise osv.except_osv(_('Error!'), msg_invalid_move)
# we don't allow switching from one journal_id (journal type)
@@ -353,21 +336,21 @@
for line in unrec_lines:
# these are the received lines filtered out of already reconciled lines
# we compute allocation totals in both currencies
- if line.state <> 'valid':
+ if line.state != 'valid':
raise osv.except_osv(_('Error!'),
- _('Entry "%s" is not valid !') % line.name)
+ _('Entry "%s" is not valid !') % line.name)
# control on second currency : must always be the same to authorise reconciliation on second currency
#TODO : the context key should be given by the reconciliation wizard
if context.get('reconcile_second_currency', True) and \
currency_id and not currency_id == line['currency_id']['id']:
raise osv.except_osv(_('Error!'),
- _('All entries must have the same second currency! Reconcile on company currency otherwise.'))
+ _('All entries must have the same second currency! Reconcile on company currency otherwise.'))
# control on account : reconciliation must be on one account only
# TODO : check accuracy of this control
if account_id and not account_id == line['account_id']['id']:
raise osv.except_osv(_('Error!'),
- _('All entries must have the same account to be reconciled.'))
+ _('All entries must have the same account to be reconciled.'))
credit += line['credit']
credit_curr += line['credit_curr']
@@ -470,14 +453,17 @@
exchange_diff_move_id = move_obj.create(cr, uid, {
'period_id': writeoff_period_id,
'journal_id': writeoff_journal_id,
- 'date':date,
+ 'date': date,
'state': 'draft',
'line_id': exchange_diff_lines
})
# The generated transaction needs to be added to the allocation block
exchange_diff_line_ids = self.search(cr, uid,
- [('move_id', '=', exchange_diff_move_id), ('account_id', '=', account_id)])
+ [('move_id', '=',
+ exchange_diff_move_id),
+ ('account_id', '=',
+ account_id)])
# the following case should never happen but still...
if account_id == exchange_diff_acc_id:
exchange_diff_line_ids = [exchange_diff_line_ids[1]]
@@ -520,7 +506,6 @@
# context={'date': line.date})
# amount_currency_writeoff += (line.debit > 0) and tmp_amount or -tmp_amount
-
writeoff_lines = [
(0, 0, {
'name': libelle,
@@ -548,7 +533,7 @@
writeoff_move_id = move_obj.create(cr, uid, {
'period_id': writeoff_period_id,
'journal_id': writeoff_journal_id,
- 'date':date,
+ 'date': date,
'state': 'draft',
'line_id': writeoff_lines
})
diff --git a/account_move_line_search_unreconciled.xml b/account_move_line_search_unreconciled.xml
--- a/account_move_line_search_unreconciled.xml
+++ b/account_move_line_search_unreconciled.xml
@@ -1,13 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="view_account_move_line_filter_inherit" model="ir.ui.view">
+ <record id="view_account_move_line_filter_inherit"
+ model="ir.ui.view">
<field name="name">Journal Items Inherited</field>
<field name="model">account.move.line</field>
- <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+ <field name="inherit_id"
+ ref="account.view_account_move_line_filter"/>
<field name="arch" type="xml">
- <xpath expr="//filter[@name='unreconciled']" position="before">
- <filter string="Reconciled" domain="[('reconcile_id','!=',False), ('account_id.reconcile','=',True)]" help="Reconciled Journal Items" name="reconciled"/>
+ <xpath expr="//filter[@name='unreconciled']"
+ position="before">
+ <filter string="Reconciled"
+ domain="[('reconcile_id','!=',False),
+ ('account_id.reconcile','=',True)]"
+ help="Reconciled Journal Items"
+ name="reconciled"/>
</xpath>
</field>
</record>
diff --git a/account_move_line_tree.xml b/account_move_line_tree.xml
--- a/account_move_line_tree.xml
+++ b/account_move_line_tree.xml
@@ -10,8 +10,7 @@
<xpath expr="//tree[@string='Journal Items']" position="replace">
<tree colors="red:move_state == 'draft';black:move_state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
<field name="state" invisible="1" />
- <field name="move_id" required="0"
- domain="[('state', '=', 'draft'), ('journal_id', '=', context.get('journal_id')), ('period_id', '=', context.get('period_id'))]"/>
+ <field name="move_id" required="0" domain="[('state', '=', 'draft'), ('journal_id', '=', context.get('journal_id')), ('period_id', '=', context.get('period_id'))]"/>
<field name="move_state" />
<field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
<field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
@@ -24,7 +23,6 @@
<field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
-
<field name="statement_id" invisible="1"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
<field name="reconcile" invisible="1"/>
@@ -36,7 +34,6 @@
</xpath>
</field>
</record>
-
<record id="view_move_line_tree_readonly" model="ir.ui.view">
<field name="name">account.move.line.tree.readonly</field>
<field name="model">account.move.line</field>
@@ -54,7 +51,6 @@
<field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
<field name="debit" sum="Total Debit"/>
<field name="credit" sum="Total Credit"/>
-
<field name="move_id" required="0" invisible="1"/>
<field name="statement_id" invisible="1"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
@@ -67,14 +63,12 @@
</tree>
</field>
</record>
-
<record id="action_move_line_tree_readonly" model="ir.actions.act_window">
<field name="name">Journal Items Listing</field>
<field name="res_model">account.move.line</field>
<field name="view_id" ref="view_move_line_tree_readonly"/>
<field name="view_mode">tree,form</field>
</record>
-
<record id="action_move_line_tree_payment" model="ir.actions.act_window">
<field name="name">Payments Selection</field>
<field name="res_model">account.move.line</field>
@@ -82,28 +76,21 @@
<field name="domain">[('account_id.type', '=', 'payable'), ('reconcile_id', '=', False), ('partner_id.supplier', '=', 1), ('move_id.state', '=', 'posted')]</field>
<field name="view_mode">tree</field>
</record>
-
<menuitem id="menu_payments"
name="Payments"
parent="account.menu_finance"
sequence="5"
groups="account.group_account_user,account.group_account_manager" />
-
- <menuitem
- action="action_move_line_tree_readonly"
- id="menu_action_account_move_line_readonly"
- parent="menu_payments"
- sequence="10"
- groups="account.group_account_user"
- />
+ <menuitem action="action_move_line_tree_readonly"
+ id="menu_action_account_move_line_readonly"
+ parent="menu_payments"
+ sequence="10"
+ groups="account.group_account_user" />
- <menuitem
- action="action_move_line_tree_payment"
- id="menu_action_account_move_line_payment"
- parent="menu_payments"
- sequence="11"
- groups="account.group_account_user"
- />
-
+ <menuitem action="action_move_line_tree_payment"
+ id="menu_action_account_move_line_payment"
+ parent="menu_payments"
+ sequence="11"
+ groups="account.group_account_user" />
</data>
</openerp>
diff --git a/account_move_view.xml b/account_move_view.xml
--- a/account_move_view.xml
+++ b/account_move_view.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<record id="view_move_form_streamline" model="ir.ui.view">
<field name="name">account.move.form.streamline</field>
<field name="model">account.move</field>
@@ -45,7 +44,7 @@
domain="[('journal_id','=',parent.journal_id),('company_id', '=', parent.company_id)]"/>
<field name="date_maturity"/>
<field name="currency_id" groups="base.group_multi_currency" required="1"
- on_change="onchange_currency(account_id,debit_curr,credit_curr,currency_id,parent.date)"/>
+ on_change="onchange_currency(account_id,debit_curr,credit_curr,currency_id,parent.date)"/>
<field name="currency_rate" readonly="1"/>
<field name="debit_curr" sum="Total Debit"
on_change="onchange_currency(account_id,debit_curr,credit_curr,currency_id,parent.date)"/>
@@ -68,6 +67,5 @@
</form>
</field>
</record>
-
</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/account_view.xml b/account_view.xml
--- a/account_view.xml
+++ b/account_view.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<!-- Accounts -->
<record id="view_account_form_analytic_structure" model="ir.ui.view">
<field name="name">account.account.analytic.structure.form</field>
@@ -21,6 +20,5 @@
</xpath>
</field>
</record>
-
</data>
</openerp>
diff --git a/account_voucher_line.py b/account_voucher_line.py
--- a/account_voucher_line.py
+++ b/account_voucher_line.py
@@ -20,7 +20,6 @@
##############################################################################
from openerp.osv import fields, osv
-from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
diff --git a/data/partner_data.xml b/data/partner_data.xml
--- a/data/partner_data.xml
+++ b/data/partner_data.xml
@@ -14,12 +14,10 @@
<field name="description">Check Customer Account</field>
<field eval="False" name="default"/>
</record>
-
<!-- Discussion groups -->
<record model="mail.group" id="group_account_creators">
<field name="name">Accounts</field>
<field name="description">Discussion about accounts creation</field>
</record>
-
</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/partner_view.xml b/partner_view.xml
--- a/partner_view.xml
+++ b/partner_view.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<record id="view_partner_form_account_streamline" model="ir.ui.view">
<field name="name">res.partner.form.inherit.account.streamline</field>
<field name="model">res.partner</field>
@@ -41,7 +40,6 @@
</data>
</field>
</record>
-
<record id="view_res_partner_filter_account_streamline" model="ir.ui.view">
<field name="name">res.partner.select.inherit.account.streamline</field>
<field name="model">res.partner</field>
@@ -55,6 +53,5 @@
</xpath>
</field>
</record>
-
</data>
</openerp>
diff --git a/payment_selection.py b/payment_selection.py
--- a/payment_selection.py
+++ b/payment_selection.py
@@ -93,7 +93,7 @@
msg_define_dc_on_journal % journal.name)
account_id = journal.default_credit_account_id.id or \
- journal.default_debit_account_id.id
+ journal.default_debit_account_id.id
vals['account_id'] = account_id
diff --git a/payment_selection.xml b/payment_selection.xml
--- a/payment_selection.xml
+++ b/payment_selection.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<!-- the wizard which will launch the refresh -->
<record id="view_account_move_line_goodtopay" model="ir.ui.view">
<field name="name">account.move.line.goodtopay.form</field>
@@ -20,7 +19,6 @@
</form>
</field>
</record>
-
<!-- a simple action that pops a new wizard up for payment selection -->
<record id="action_mark_as_good_to_pay" model="ir.actions.act_window">
<field name="name">Mark as good to pay</field>
@@ -30,7 +28,6 @@
<field name="view_id" ref="view_account_move_line_goodtopay"/>
<field name="target">new</field>
</record>
-
<!-- contextual menu for account.move.line to make them as good to pay -->
<record id="value_contextual_action_payment_selection" model="ir.values">
<field name="model_id" ref="model_account_move_line" />
@@ -40,6 +37,5 @@
<field name="key">action</field>
<field name="model">account.move.line</field>
</record>
-
</data>
</openerp>
diff --git a/wizard/account_reconcile.py b/wizard/account_reconcile.py
--- a/wizard/account_reconcile.py
+++ b/wizard/account_reconcile.py
@@ -20,9 +20,9 @@
##############################################################################
from openerp.osv import fields, osv
-from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
+
class account_move_line_reconcile(osv.TransientModel):
"""
Account move line reconcile wizard, with option to reconcile by base or transaction currency
@@ -31,7 +31,7 @@
_inherit = "account.move.line.reconcile"
_columns = {
- 'force_by_base' : fields.boolean('Reconcile by base currency'),
+ 'force_by_base': fields.boolean('Reconcile by base currency'),
'company_currency_id': fields.many2one('res.currency', 'Company Currency', readonly=True),
'trans_currency_id': fields.many2one('res.currency', 'Transaction Currency', readonly=True),
'credit_curr': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Account')),
@@ -63,11 +63,17 @@
force = True
else:
trans_currency_id = line.currency_id.id
- res = {'trans_nbr': count, 'account_id': account_id, 'force_by_base': force,
- 'company_currency_id': company_currency_id,
- 'trans_currency_id': trans_currency_id,
- 'credit': credit, 'debit': debit, 'writeoff': debit - credit,
- 'credit_curr': credit_curr, 'debit_curr': debit_curr, 'writeoff_curr': debit_curr - credit_curr,}
+ res = {'trans_nbr': count,
+ 'account_id': account_id,
+ 'force_by_base': force,
+ 'company_currency_id': company_currency_id,
+ 'trans_currency_id': trans_currency_id,
+ 'credit': credit,
+ 'debit': debit,
+ 'writeoff': debit - credit,
+ 'credit_curr': credit_curr,
+ 'debit_curr': debit_curr,
+ 'writeoff_curr': debit_curr - credit_curr, }
return res
def default_get(self, cr, uid, fields, context=None):
@@ -108,4 +114,3 @@
else:
context['reconcile_second_currency'] = False
return super(account_move_line_reconcile, self).trans_rec_reconcile_full(cr, uid, ids, context=context)
-
diff --git a/wizard/account_reconcile_view.xml b/wizard/account_reconcile_view.xml
--- a/wizard/account_reconcile_view.xml
+++ b/wizard/account_reconcile_view.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
-
<record id="view_account_move_line_reconcile_full_streamline" model="ir.ui.view">
<field name="name">account.move.line.reconcile.full.form.streamline</field>
<field name="model">account.move.line.reconcile</field>
@@ -11,8 +10,8 @@
<group col="4" string="Reconciliation Transactions">
<field name="trans_nbr"/>
<field name="force_by_base"/>
- <field name="company_currency_id"/>
- <field name="trans_currency_id"/>
+ <field name="company_currency_id"/>
+ <field name="trans_currency_id"/>
<newline/>
<field name="credit"/>
<field name="credit_curr"/>
@@ -36,10 +35,8 @@
</form>
</field>
</record>
-
<record id="account.action_view_account_move_line_reconcile" model="ir.actions.act_window">
<field name="view_id" ref="view_account_move_line_reconcile_full_streamline"/>
</record>
-
</data>
-</openerp>
\ No newline at end of file
+</openerp>