Merge lp:~openerp-dev/openobject-addons/6.1-opw-582323-ado into lp:openobject-addons/6.1

[Amit Dodiya (OpenERP)]

Hello,

[FIX] anglo_saxon accounting : wrong price difference entry when multicurrency with no price difference is there

While working with multicurrency in anglo_saxon the journal entry contains the wrong entry of price difference if there is no difference in amount of currency / rate.

For reproducing the issue please refer the doc attached in bug report.

Regards,
Amit

Unmerged revisions

7092. By Amit Dodiya<email address hidden> on 2012-12-05

[FIX] anglo_saxon accounting : wrong price difference entry when multicurrency with no price difference is there

=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2012-02-15 16:06:28 +0000
+++ account_anglo_saxon/invoice.py	2012-12-13 06:50:24 +0000
@@ -118,7 +118,11 @@
                             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)
-                                if standard_price != i_line.price_unit and line['price_unit'] == i_line.price_unit and acc:
+                                if inv.currency_id.id != company_currency:
+                                    prices = self.pool.get('res.currency').compute(cr, uid, inv.currency_id.id, company_currency, i_line.price_unit, context={'date': inv.date_invoice})
+                                else:
+                                    prices = i_line.price_unit
+                                if standard_price != prices 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({