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

[Amit Dodiya (OpenERP)]

Hello,

"[FIX]:sale_margin: cost price calculation in sale order line goes wrong while using multicompany & multicurrency"

Issue:
While using multicurrency with sale margin the cost(purchse_price) price calculation for sale order line goes wrong.
For e.g: We have 2 companies(A,B), the price(cost/sales) on the product form is in EUR. The company B is in the currency USD, defined with the sales price list and purchase price list in USD too.
When a user logins to the company B to create a SO with price list in USD you will see on sale order line the cost price is same as defined in product form(which is defined on the product form and in “EUR” ), the cost price on the SO with USD should be converted from EUR to USD value like price unit.

Steps:
1). Install sale,sale margin with demo data
2). Now create a new company with currency USD and configured necessary shop,warehouse and locations, now assigned this to a user who has rights as admin have(Now you have 2 company A for admin ,B for demo)
3). Create a new product with sale price = 10, cost price = 5 (which is in EUR becuase you login with admin for company A)
4). Create new pricelist for USD which will be used for company B in sale order
5). Now login with the new user of company B which has currency USD, create a new sale order with USD pricelist and select the newly created product in sale order line, you will see in sale order line price unit = 12.83, cost price = 5.0

Regards,
Amit

Unmerged revisions

7205. By Amit Dodiya (OpenERP) on 2013-04-26

[FIX]:sale_margin: the cost price calculation in sale order line goes wrong while using multicompany & multicurrency

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2012-09-25 14:48:26 +0000
+++ sale_margin/sale_margin.py	2013-05-13 06:33:27 +0000
@@ -19,9 +19,43 @@
 ##############################################################################
 
 from osv import fields, osv
+import time
 
 class sale_order_line(osv.osv):
     _inherit = "sale.order.line"
+    
+    def get_pricelist_base(self, cr, uid, pricelist_ids, qty, product, context=None):
+        if context is None:
+            context = {}
+        date = time.strftime('%Y-%m-%d')
+        if 'date' in context:
+            date = context['date']
+
+        # product.pricelist.version:
+        if not pricelist_ids:
+            pricelist_ids = self.pool.get('product.pricelist').search(cr, uid, [], context=context)
+
+        pricelist_version_ids = self.pool.get('product.pricelist.version').search(cr, uid, [
+                                                        ('pricelist_id', 'in', pricelist_ids),
+                                                        '|',
+                                                        ('date_start', '=', False),
+                                                        ('date_start', '<=', date),
+                                                        '|',
+                                                        ('date_end', '=', False),
+                                                        ('date_end', '>=', date),
+                                                    ])
+        if len(pricelist_ids) != len(pricelist_version_ids):
+            raise osv.except_osv(_('Warning!'), _("At least one pricelist has no active version !\nPlease create or activate one."))
+
+        for pricelist_id in pricelist_ids:
+            cr.execute(
+                'SELECT i.base FROM product_pricelist_item AS i, '
+                    'product_pricelist_version AS v, product_pricelist AS pl '
+                'WHERE (price_version_id = %s) '
+                    'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
+                'ORDER BY sequence', (pricelist_version_ids[0],))
+            res = cr.dictfetchall()
+        return res
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
             uom=False, qty_uos=0, uos=False, name='', partner_id=False,
@@ -31,14 +65,21 @@
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
         if not pricelist:
             return res
+        
+        price_type_obj = self.pool.get('product.price.type')
         frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
         to_cur = self.pool.get('product.pricelist').browse(cr, uid, [pricelist])[0].currency_id.id
+        
         if product:
+            base_data = self.get_pricelist_base(cr, uid, pricelist_ids=[pricelist], qty=qty, product=product, context=context)
+            base_id = [ base.get('base') for base in base_data ]
+            if base_id:  
+                frm_cur = price_type_obj.browse(cr, uid, base_id)[0].currency_id.id
             purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
             price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False)
             res['value'].update({'purchase_price': price})
         return res
-
+        
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):