Merge lp:~openerp-dev/openobject-addons/7.0-opw-585951-pna into lp:openobject-addons/7.0

[Pinakin Nayi (OpenERP)]

Hello,

I fixed issue in sale order line.
To Reproduce :
 - choose a product, then enter a price, then want to change the quantity, and the price is reset to the default price from the product.

Thanks,
pna

[lp:~openerp-dev/openobject-addons/7.0-opw-585951-pna]

8685. By Pinakin Nayi (OpenERP) on 2013-02-12

[MERGE]with main addons

[Naresh(OpenERP) (nch-openerp)]

Hello Pinakin,

The same improvement should be done for purchase too.

Thanks,

review: Needs Fixing

Unmerged revisions

8685. By Pinakin Nayi (OpenERP) on 2013-02-12

[MERGE]with main addons

8684. By Pinakin Nayi (OpenERP) on 2013-02-12

[FIX]sale:sale order line if change in qty then it not update price

8683. By Pinakin Nayi (OpenERP) on 2013-02-12

[REVERT]revert changes

8682. By Pinakin Nayi (OpenERP) on 2013-02-11

[FIX]sale:in sale order line select product than change in price now if change qty than it takes default price

=== modified file 'sale/sale.py'
--- sale/sale.py	2013-02-07 08:41:29 +0000
+++ sale/sale.py	2013-02-12 05:37:28 +0000
@@ -942,7 +942,7 @@
             warn_msg = _('You have to select a pricelist or a customer in the sales form !\n'
                     'Please set one before choosing a product.')
             warning_msgs += _("No Pricelist ! : ") + warn_msg +"\n\n"
-        else:
+        elif not flag:
             price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
                     product, qty or 1.0, partner_id, {
                         'uom': uom or result.get('product_uom'),