Merge lp:~openerp-dev/openobject-addons/trunk-opw-578981-port-mma into lp:openobject-addons

[Mayur Maheshwari(OpenERP)]

Hello,

==> journal entry is incorrect due to loop is executed twice if we have same product in two lines of supplier invoice"

Steps:
==>. Install account_Anglo_Saxon, select any product and set Inventory Valuation = "Real-time Automated", set price difference account & input account & output account, set a cost price = 330 on above product.

==>. Now make a supplier invoice with 2 line for same product with 1 quantity of 400(70 price difference) and validate the invoice.
You will see the residual amount is changed to 940 due to two extra move is created(of 70) for price difference so the residual is 940 instead of 800.

code is forward port from 6.1

Thanks,
Mayur

Unmerged revisions

8086. By Amit Dodiya (OpenERP) on 2012-11-21

[FIX]account: journal entry is incorrect due to loop is executed twice if we have same product in two lines of supplier invoice

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-11-20 11:36:00 +0000
+++ account/account_invoice.py	2012-11-21 06:31:19 +0000
@@ -1556,6 +1556,7 @@
 
     def move_line_get_item(self, cr, uid, line, context=None):
         return {
+            'id': line.id,
             'type':'src',
             'name': line.name.split('\n')[0][:64],
             'price_unit':line.price_unit,

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2012-11-15 12:38:51 +0000
+++ account_anglo_saxon/invoice.py	2012-11-21 06:31:19 +0000
@@ -28,6 +28,7 @@
 
     def move_line_get(self, cr, uid, invoice_id, context=None):
         res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
+        move_line_res = dict(map(lambda x: (x['id'], x), res))
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         company_currency = inv.company_id.currency_id.id
         def get_price(cr, uid, inv, company_currency,i_line):
@@ -114,7 +115,8 @@
                             a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                         diff_res = []
                         # calculate and write down the possible price difference between invoice price and product price
-                        for line in res:
+                        line = move_line_res.get(i_line.id, False)
+                        if line:
                             if a == line['account_id'] and i_line.product_id.id == line['product_id']:
                                 uom = i_line.product_id.uos_id or i_line.product_id.uom_id
                                 standard_price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, i_line.product_id.standard_price, i_line.uos_id.id)