Merge lp:~openerp-dev/openobject-addons/trunk-bug-1102592-nco into lp:openobject-addons

[Nimesh Contractor(Open ERP)]

Hello,

 Fix multi-currency computation by date.

Thanks,
Nimesh.

Unmerged revisions

8705. By Nimesh Contractor(Open ERP) on 2013-05-16

[IMP] improve code.

8704. By Ishwar Malvi(OpenERP) on 2013-05-16

[FIX] multi-currency computation by date.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-04-22 15:34:49 +0000
+++ account/account_invoice.py	2013-05-16 08:43:14 +0000
@@ -1416,7 +1416,7 @@
             res['arch'] = etree.tostring(doc)
         return res
 
-    def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+    def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None, date_invoice=None):
         if context is None:
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
@@ -1475,11 +1475,19 @@
 
         company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
         currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
+        currency_rate_obj = self.pool.get('res.currency.rate')
+        if date_invoice:
+            currency_id = currency_rate_obj.search(cr, uid, [('currency_id','=',currency_id),('name','<=',date_invoice)], limit=1, order='name desc')
+            currency_rate = currency_rate_obj.read(cr, uid, currency_id[0], ['currency_id','rate'])
+            if currency_rate:
+                rate = currency_rate['rate'];
+        else:
+            rate = currency.rate
 
         if company.currency_id.id != currency.id:
             if type in ('in_invoice', 'in_refund'):
                 res_final['value']['price_unit'] = res.standard_price
-            new_price = res_final['value']['price_unit'] * currency.rate
+            new_price = res_final['value']['price_unit'] * rate
             res_final['value']['price_unit'] = new_price
 
         if result['uos_id'] and result['uos_id'] != res.uom_id.id:
@@ -1488,14 +1496,14 @@
             res_final['value']['price_unit'] = new_price
         return res_final
 
-    def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None):
+    def uos_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None, date_invoice=None):
         if context is None:
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
         context = dict(context)
         context.update({'company_id': company_id})
         warning = {}
-        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context)
+        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context, date_invoice=date_invoice)
         if not uom:
             res['value']['price_unit'] = 0.0
         if product and uom:

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-04-22 15:34:49 +0000
+++ account/account_invoice_view.xml	2013-05-16 08:43:14 +0000
@@ -48,7 +48,7 @@
                 <form string="Invoice Line" version="7.0">
                     <group>
                         <group>
-                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                            <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id, parent.date_invoice)"/>
                             <label for="quantity"/>
                             <div>
                                 <field name="quantity" class="oe_inline"/>
@@ -203,7 +203,7 @@
                                         domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
-                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id, parent.date_invoice)"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
@@ -349,7 +349,7 @@
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
                                     <field name="product_id"
-                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id, parent.date_invoice)"/>
                                     <field name="name"/>
                                     <field name="company_id" invisible="1"/>
                                     <field name="account_id" groups="account.group_account_user"
@@ -359,7 +359,7 @@
                                         domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
-                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id, parent.date_invoice)"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"