Merge lp:~openerp-dev/openobject-addons/7.0-opw-592116-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello sir,

Set the pricelist in quotations as customer's pricelist , while creating quotations from customer form.

Thanks
dhr

[Thibault Delavallée (OpenERP) (tde-openerp)]

What if you use the updated code without updating the views (aka, run the server with the updated code but without -u argument) ? Won't that code crash because no default value is defined on partner_id ?

review: Needs Information

[Naresh(OpenERP) (nch-openerp)]

needs improvement as per above comment.

[Dharti Ratani(OpenERP) (dhr-openerp)]

Hello Sir,

Added the default value for partner_id as per your suggestion.

Thanks
dhr

review: Needs Resubmitting

Unmerged revisions

9094. By Dharti Ratani(OpenERP) on 2013-10-21

[IMP]Added default value for partner id in onchange_shop_id

9093. By Dharti Ratani(OpenERP) on 2013-05-03

[IMP]Improved code

9092. By Dharti Ratani(OpenERP) on 2013-05-03

[IMP]Changed the signature for onchange_shop in sale analytic plans

9091. By Dharti Ratani(OpenERP) on 2013-05-02

[FIX]Incorrect sales pricelist while opening quotations/sale order from a button in a customer form

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-06-26 05:36:42 +0000
+++ sale/sale.py	2013-10-21 09:09:21 +0000
@@ -56,14 +56,17 @@
         },
     }
 
-    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+    def onchange_shop_id(self, cr, uid, ids, shop_id, partner_id=False, context=None):
         v = {}
+        customer_pricelist = False
+        if partner_id:
+            customer  = self.pool.get('res.partner').browse(cr, uid, partner_id, context)
+            customer_pricelist = customer and customer.property_product_pricelist and customer.property_product_pricelist.id or False
         if shop_id:
             shop = self.pool.get('sale.shop').browse(cr, uid, shop_id, context=context)
             if shop.project_id.id:
                 v['project_id'] = shop.project_id.id
-            if shop.pricelist_id.id:
-                v['pricelist_id'] = shop.pricelist_id.id
+            v['pricelist_id'] = customer_pricelist or shop.pricelist_id and shop.pricelist_id.id or False
         return {'value': v}
 
     def copy(self, cr, uid, id, default=None, context=None):
 
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2013-09-13 12:57:48 +0000
+++ sale/sale_view.xml	2013-10-21 09:09:21 +0000
@@ -160,7 +160,7 @@
                         </group>
                         <group>
                             <field name="date_order"/>
-                            <field name="shop_id" groups="base.group_no_one" on_change="onchange_shop_id(shop_id, context)" widget="selection"/>
+                            <field name="shop_id" groups="base.group_no_one" on_change="onchange_shop_id(shop_id, partner_id, context)" widget="selection"/>
                             <field name="client_order_ref"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="currency_id" invisible="1"/>
 
=== modified file 'sale_analytic_plans/sale_analytic_plans.py'
--- sale_analytic_plans/sale_analytic_plans.py	2012-12-06 14:56:32 +0000
+++ sale_analytic_plans/sale_analytic_plans.py	2013-10-21 09:09:21 +0000
@@ -42,9 +42,9 @@
 class sale_order(osv.osv):
     _inherit = "sale.order"
 
-    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+    def onchange_shop_id(self, cr, uid, ids, shop_id, partner_id=False, context=None):
         # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
-        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
+        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, partner_id, context=context)
         if res.get('value',{}).get('project_id'):
             del(res['value']['project_id'])
         return res
 
=== modified file 'sale_stock/sale_stock_view.xml'
--- sale_stock/sale_stock_view.xml	2013-03-04 18:44:31 +0000
+++ sale_stock/sale_stock_view.xml	2013-10-21 09:09:21 +0000
@@ -49,7 +49,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </field>
                    <field name="shop_id" position="replace">
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id, partner_id)" widget="selection" groups="stock.group_locations"/>
                    </field>
                    <field name="product_id" position="replace">
                        <field name="product_id"