Merge lp:~openerp-dev/openobject-addons/trunk-bug-977574-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello

point_of_sale: [FIX] Point of Sale Not Using Pricelist.

Thank you,
ara

[Selami Demir (sdemir)]

Hi,

after change code, I see a error that "No handler found."

thank you.

review: Disapprove

[Amit Parik (amit-parik)]

Hello Selami,

This code this working fine for pos backend , I have applied the code and pricelist working fine with the posorder(pos backend).

You have faced this error due to your end problem, please clear your browser's history (cache memory)then try it will works.

And yes if you want this for "POS touch-screen" then you have to post another bug repost because this bug consider only pos order's issue.

And please *don't disapprove* MP by your hand If you are not 100% sure for the MP becasue it will creates a problem and some good MP will not check/merge for trunk.

@Ashvin: Nice fix and it works for me.

Thanks for the fix!

review: Approve

Unmerged revisions

6779. By Ashvin Rathod (OpenERP) on 2012-05-08

[FIX] point_of_sale: Point of Sale Not Using Pricelist

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2012-03-30 08:27:51 +0000
+++ point_of_sale/point_of_sale.py	2012-05-08 06:22:19 +0000
@@ -657,11 +657,11 @@
        price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
                product_id, qty or 1.0, partner_id)[pricelist]
 
-       result = self.onchange_qty(cr, uid, ids, product_id, 0.0, qty, price, context=context)
+       result = self.onchange_qty(cr, uid, ids, product_id, 0.0, qty, price, pricelist, partner_id, context=context)
        result['value']['price_unit'] = price
        return result
 
-    def onchange_qty(self, cr, uid, ids, product, discount, qty, price_unit, context=None):
+    def onchange_qty(self, cr, uid, ids, product, discount, qty, price_unit, pricelist, partner_id=False, context=None):
         result = {}
         if not product:
             return result
@@ -669,11 +669,17 @@
         cur_obj = self.pool.get('res.currency')
 
         prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
-
         taxes = prod.taxes_id
-        price = price_unit * (1 - (discount or 0.0) / 100.0)
-        taxes = account_tax_obj.compute_all(cr, uid, prod.taxes_id, price, qty, product=prod, partner=False)
-
+
+        price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
+               product, qty or 1.0, partner_id)[pricelist]
+        if not price:
+            raise osv.except_osv(_('Configuration Error !'),_("No valid pricelist line found ! :Couldn't find a pricelist line matching this product and quantity.\nYou have to change either the product, the quantity or the pricelist."))
+        
+        price_discount = price * (1 - (discount or 0.0) / 100.0)
+        taxes = account_tax_obj.compute_all(cr, uid, prod.taxes_id, price_discount, qty, product=prod, partner=False)
+
+        result['price_unit'] = price
         result['price_subtotal'] = taxes['total']
         result['price_subtotal_incl'] = taxes['total_included']
         return {'value': result}

=== modified file 'point_of_sale/point_of_sale_view.xml'
--- point_of_sale/point_of_sale_view.xml	2012-04-25 14:46:11 +0000
+++ point_of_sale/point_of_sale_view.xml	2012-05-08 06:22:19 +0000
@@ -28,17 +28,17 @@
                             <field name="lines" colspan="4" nolabel="1">
                                 <tree string="Order lines" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
+                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
+                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
                                     <field name="price_subtotal"/>
                                     <field name="price_subtotal_incl"/>
                                 </tree>
                                 <form string="Order lines">
                                     <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,qty,parent.partner_id)"/>
-                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
-                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, context)"/>
+                                    <field name="qty" on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
+                                    <field name="discount"  on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
+                                    <field name="price_unit" on_change="onchange_qty(product_id, discount, qty, price_unit, parent.pricelist_id,parent.partner_id,context)"/>
                                     <field name="price_subtotal" invisible="1"/>
                                     <field name="price_subtotal_incl" invisible="1"/>
                                     <field name="notice"/>