Merge lp:~openerp-dev/openobject-addons/trunk-improve-sale-order-sgo into lp:openobject-addons

[Sanjay Gohel (Open ERP)]

Hello,
         I have improved following things,
1. Set default = 0 sale price on product.
2. If sale price is 0 than no on change on price of product in SO and PO.

Thank You.
Sanjay Gohel(SGO)

[lp:~openerp-dev/openobject-addons/trunk-improve-sale-order-sgo]

8549. By Sanjay Gohel (Open ERP) on 2013-02-13

[IMP]improve code

Unmerged revisions

8549. By Sanjay Gohel (Open ERP) on 2013-02-13

[IMP]improve code

8548. By Sanjay Gohel (Open ERP) on 2013-02-13

[MERGE]sync with trunk

8547. By Sanjay Gohel (Open ERP) on 2013-02-12

[IMP]in purchase if product list price is 0 set price unit as per before

8546. By Sanjay Gohel (Open ERP) on 2013-02-12

[IMP]set product default sale price as 0 and changed in product on change in sale order

=== modified file 'product/product.py'
--- product/product.py	2012-12-18 22:06:17 +0000
+++ product/product.py	2013-02-13 05:59:22 +0000
@@ -363,7 +363,7 @@
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
-        'list_price': 1,
+        'list_price': 0,
         'cost_method': 'standard',
         'standard_price': 0.0,
         'sale_ok': 1,
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2012-12-21 16:48:08 +0000
+++ purchase/purchase.py	2013-02-13 05:59:22 +0000
@@ -975,6 +975,10 @@
         taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
         taxes_ids = account_fiscal_position.map_tax(cr, uid, fpos, taxes)
+
+        if product.list_price == 0:
+            price = price_unit
+
         res['value'].update({'price_unit': price, 'taxes_id': taxes_ids})
 
         return res
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2013-01-31 18:43:56 +0000
+++ sale/sale.py	2013-02-13 05:59:22 +0000
@@ -960,6 +960,11 @@
                        'title': _('Configuration Error!'),
                        'message' : warning_msgs
                     }
+
+        record = self.browse(cr, uid, ids, context=context)
+        if record and product_obj.list_price == 0:
+            result.update({'price_unit': record[0].price_unit})
+
         return {'value': result, 'domain': domain, 'warning': warning}
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,