Merge lp:~therp-nl/openobject-addons/trunk-lp1174160 into lp:openobject-addons

[Holger Brunn (Therp)]

Unmerged revisions

9269. By Holger Brunn (Therp) on 2014-03-31

[FIX] for pricelists based on a supplier, we need to fill in the supplier

=== modified file 'product/report/product_pricelist.py'
--- product/report/product_pricelist.py	2013-10-27 12:31:04 +0000
+++ product/report/product_pricelist.py	2014-03-31 10:05:44 +0000
@@ -79,6 +79,7 @@
         cat_ids=[]
         res=[]
         self.pricelist = form['price_list']
+        self.partner_id = form['partner_id']
         self._set_quantity(form)
         pro_ids=[]
         for product in products:
@@ -103,16 +104,16 @@
                     if qty == 0:
                         val['qty'+str(i)] = 0.0
                     else:
-                        val['qty'+str(i)]=self._get_price(self.pricelist, product['id'], qty)
+                        val['qty'+str(i)]=self._get_price(self.pricelist, product['id'], qty, partner_id=self.partner_id)
                     i += 1
                 products.append(val)
             res.append({'name':cat[1],'products': products})
         return res
 
-    def _get_price(self, pricelist_id, product_id, qty):
+    def _get_price(self, pricelist_id, product_id, qty, partner_id=None):
         sale_price_digits = self.get_digits(dp='Product Price')
         pricelist = self.pool.get('product.pricelist').browse(self.cr, self.uid, [pricelist_id], context=self.localcontext)[0]
-        price_dict = self.pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
+        price_dict = self.pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, partner=partner_id, context=self.localcontext)
         if price_dict[pricelist_id]:
             price = self.formatLang(price_dict[pricelist_id], digits=sale_price_digits, currency_obj=pricelist.currency_id)
         else:

=== modified file 'product/wizard/product_price.py'
--- product/wizard/product_price.py	2013-10-27 12:31:04 +0000
+++ product/wizard/product_price.py	2014-03-31 10:05:44 +0000
@@ -28,6 +28,9 @@
     _description = 'Price List'
 
     _columns = {
+        'partner_id': fields.many2one('res.partner', 'Supplier',
+            help='For price lists based on the supplier price, fill in the '
+            'supplier in question here'),
         'price_list': fields.many2one('product.pricelist', 'PriceList', required=True),
         'qty1': fields.integer('Quantity-1'),
         'qty2': fields.integer('Quantity-2'),
@@ -51,9 +54,10 @@
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context=context)
+        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5', 'partner_id'], context=context)
         res = res and res[0] or {}
         res['price_list'] = res['price_list'][0]
+        res['partner_id'] = res['partner_id'] and res['partner_id'][0]
         datas['form'] = res
         return {
             'type': 'ir.actions.report.xml',

=== modified file 'product/wizard/product_price_view.xml'
--- product/wizard/product_price_view.xml	2012-11-29 22:26:45 +0000
+++ product/wizard/product_price_view.xml	2014-03-31 10:05:44 +0000
@@ -16,6 +16,7 @@
                         <field name="qty3"/>
                         <field name="qty4"/>
                         <field name="qty5"/>
+                        <field name="partner_id" />
                     </group>
                     <footer>
                         <button name="print_report" string="Print"  type="object" class="oe_highlight"  />