Merge lp:~openerp-dev/openobject-addons/trunk-bug-1182119-bde into lp:openobject-addons

[Bharat Devnani (Open ERP)]

Hello,

I have checked and applied patch of Lorenzo Battistini - Agile BG
which fixes the issue of foreign currency journal entry does not compute base currency amount.

Thanks & Regards,
Devnani Bharat R.

[Lorenzo Battistini (elbati)]

Why another MP although this
https://code.launchpad.net/~elbati/openobject-addons/7-bug-1182119-elbati/+merge/164756
is already there?

review: Needs Information

[Bharat Devnani (Open ERP) (bde-openerp)]

Becuase your branch https://code.launchpad.net/~elbati/openobject-addons/7-bug-1182119-elbati/+merge/164756 is for version 7.0, and this fixes the issue for trunk.

Unmerged revisions

9027. By Lorenzo Battistini - Agile BG on 2013-12-26

[FIX] : foreign currency journal entry does not compute base currency amount

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2013-12-09 10:50:31 +0000
+++ account/account_move_line.py	2013-12-26 06:19:30 +0000
@@ -246,6 +246,7 @@
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
         if context.get('journal_id'):
             total = 0.0
+            currency_total = 0.0
             #in account.move form view, it is not possible to compute total debit and credit using
             #a browse record. So we must use the context to pass the whole one2many field and compute the total
             if context.get('line_id'):
@@ -253,6 +254,7 @@
                     data['name'] = data.get('name') or move_line_dict.get('name')
                     data['partner_id'] = data.get('partner_id') or move_line_dict.get('partner_id')
                     total += move_line_dict.get('debit', 0.0) - move_line_dict.get('credit', 0.0)
+                    currency_total -= move_line_dict.get('amount_currency', 0.0)
             elif context.get('period_id'):
                 #find the date and the ID of the last unbalanced account.move encoded by the current user in that journal and period
                 move_id = False
@@ -272,6 +274,7 @@
                         data['partner_id'] = data.get('partner_id') or l.partner_id.id
                         data['ref'] = data.get('ref') or l.ref
                         total += (l.debit or 0.0) - (l.credit or 0.0)
+                        currency_total -= l.amount_currency
 
             #compute the total of current move
             data['debit'] = total < 0 and -total or 0.0
@@ -298,7 +301,14 @@
                     })
                 if data.get('date'):
                     compute_ctx.update({'date': data['date']})
-                data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
+                elif context.get('date'):
+                    compute_ctx.update({'date': context['date']})
+                if currency_total:
+                    data['amount_currency'] = currency_total
+                else:
+                    data['amount_currency'] = currency_obj.compute(cr, uid,
+                        account.company_id.currency_id.id, data['currency_id'],
+                        -total, context=compute_ctx)
         data = self._default_get_move_form_hook(cr, uid, data)
         return data
 

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2013-10-27 12:31:04 +0000
+++ account/account_view.xml	2013-12-26 06:19:30 +0000
@@ -1296,7 +1296,7 @@
                     <notebook>
                         <page string="Journal Items">
                             <field name="line_id" widget="one2many_list"
-                              context="{'line_id': line_id , 'journal_id': journal_id }">
+                              context="{'line_id': line_id , 'journal_id': journal_id, 'date': date}">
                                 <form string="Journal Item" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
@@ -1371,8 +1371,8 @@
                                     <field name="debit" sum="Total Debit"/>
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id" groups="base.group_multi_currency"/>
+                                    <field name="amount_currency" on_change="onchange_currency(account_id, amount_currency, currency_id, parent.date, parent.journal_id)"/>
+                                    <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency(account_id, amount_currency, currency_id, parent.date, parent.journal_id)"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
                                     <field name="state"/>