Merge lp:~vauxoo/openobject-addons/6.1_anglosaxon-fix_multicurrency-dev-moy into lp:openobject-addons/6.1

[Moisés López - http://www.vauxoo.com]

multi currency compute

Unmerged revisions

6925. By Moisés López - http://www.vauxoo.com on 2012-07-30

[FIX] [account_anglo_saxon] Fix in calculate the price difference between invoice price and product price with multi-currency

=== 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-07-30 23:37:19 +0000
@@ -118,6 +118,10 @@
                             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)
+                                #calculate standard_price in company currency VS invoice currency
+                                cur_obj = self.pool.get('res.currency')
+                                if inv.currency_id.id != company_currency:
+                                    standard_price = cur_obj.compute(cr, uid, company_currency, inv.currency_id.id, standard_price, context={'date': inv.date_invoice})
                                 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']})