From 8531184a9295da42eebf5b7ad2a7a2d997427fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dami=C3=A1nSoriano?= <> Date: Mon, 9 Jul 2012 15:08:11 +0530 Subject: [PATCH 1/3] [FIX] Fixes problem of adding product in supplier invoice when product_visible_discount installed lp bug: https://launchpad.net/bugs/1021436 fixed bzr revid: jir@jir-desktop-20120709093811-ojp32jo3g19v2kf5 --- addons/product_visible_discount/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index d957c6d87ed..5a3b3518220 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -33,7 +33,7 @@ Example: If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225 If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225 """, - "depends": ["sale"], + "depends": ["sale","purchase"], "demo_xml": [], "update_xml": ['product_visible_discount_view.xml'], "auto_install": False, From 52f7a1ad337d52000a3b9e587f73067ef01001bd Mon Sep 17 00:00:00 2001 From: "Jignesh Rathod (Open ERP)" Date: Thu, 23 Aug 2012 12:23:11 +0530 Subject: [PATCH 2/3] [MERGE]: Merge with lp:openobject-addons bzr revid: jir@tinyerp.com-20120823065311-tjswqib61lqaro6c --- addons/product_visible_discount/__openerp__.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index da09820b068..ff0372814d9 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -35,21 +35,12 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225. """, -<<<<<<< TREE "depends": ["sale","purchase"], "demo_xml": [], "update_xml": ['product_visible_discount_view.xml'], "auto_install": False, "installable": True, "certificate" : "001144718884654279901", -======= - 'depends': ['sale'], - 'demo': [], - 'data': ['product_visible_discount_view.xml'], - 'auto_install': False, - 'installable': True, - 'certificate' : '001144718884654279901', ->>>>>>> MERGE-SOURCE 'images': ['images/pricelists_visible_discount.jpeg'], } From f746c2a8a59342060d404944a586b11e1f46df5a Mon Sep 17 00:00:00 2001 From: "Jignesh Rathod (Open ERP)" Date: Thu, 23 Aug 2012 12:55:09 +0530 Subject: [PATCH 3/3] [MERGE]: Merge with lp:openobject-addons bzr revid: jir@tinyerp.com-20120823072509-mbsihk199ape908o --- addons/product_visible_discount/__openerp__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index ff0372814d9..5619fe2c0b5 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -35,12 +35,12 @@ To this end, a new check box named 'Visible Discount' is added to the pricelist If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225. """, - "depends": ["sale","purchase"], - "demo_xml": [], - "update_xml": ['product_visible_discount_view.xml'], - "auto_install": False, - "installable": True, - "certificate" : "001144718884654279901", + 'depends': ["sale","purchase"], + 'demo': [], + 'data': ['product_visible_discount_view.xml'], + 'auto_install': False, + 'installable': True, + 'certificate' : "001144718884654279901", 'images': ['images/pricelists_visible_discount.jpeg'], }