Merge lp:~openerp-dev/openobject-addons/7.0-opw-600767-han into lp:openobject-addons/7.0

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue of price difference calculation is incorrect when validating supplier invoice.

Steps to reproduce:

create and validate purchase order for part with cost $13
receive part into inventory from incoming shipment
Debit Inventory Value: $13
Credit Goods Received: $13

New average part price (standard_price) = $8
create supplier invoice from incoming shipment
part cost = $14
validate supplier invoice

RESULT:
Credit Accounts Payable: $14
Debit Price Difference:$6
Debit Goods Received:$8

EXPECTED
Credit Accounts Payable: $14
Debit Price Difference:$1
Debit Goods Received:$13

Unmerged revisions

9732. By Hardik Ansodariya (OpenERP) on 2014-01-06

[FIXED] anglo_saxon: stock anglo - wrong calculation of price difference(Maintenance case:600767)

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2013-01-25 06:32:13 +0000
+++ account_anglo_saxon/invoice.py	2014-01-06 05:20:14 +0000
@@ -115,11 +115,18 @@
                         diff_res = []
                         # calculate and write down the possible price difference between invoice price and product price
                         for line in res:
-                            if a == line['account_id'] and i_line.product_id.id == line['product_id']:
+                            if a == line['account_id'] and i_line.product_id.id == line['product_id'] and acc:
                                 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)
+                                price_diff = i_line.price_unit - standard_price
+                                purchase_id = self.pool.get('purchase.order').search(cr, uid, [('invoice_ids.id', '=', invoice_id)], context=context)
+                                if purchase_id:
+                                    purchase = self.pool.get('purchase.order').browse(cr, uid, purchase_id[0], context=context)
+                                    for purchase_line in purchase.order_line:
+                                        if i_line.id == [linee.id for linee in purchase_line.invoice_lines][0]:
+                                            standard_price = purchase_line.price_unit
+                                            price_diff = i_line.price_unit - standard_price
                                 if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
-                                    price_diff = i_line.price_unit - standard_price
                                     line.update({'price':standard_price * line['quantity']})
                                     diff_res.append({
                                         'type':'src',