From ac999ede8a60097341bab7b8c5ed8babd1d97d4b Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 11 Oct 2012 15:11:07 +0530
Subject: [PATCH 1/4] [IMP] forgot to add a supplier first add to suppier after
 add an item

bzr revid: pja@tinyerp.com-20121011094107-smwclaybgo7uenyo
---
 addons/purchase/purchase.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c0516d09de3..d1fa271b1b1 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -875,7 +875,12 @@ class purchase_order_line(osv.osv):
         """
         if context is None:
             context = {}
-
+        
+        # - check for the presence of partner_id and pricelist_id
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+        if not partner_id:
+            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
@@ -888,11 +893,7 @@ class purchase_order_line(osv.osv):
         account_fiscal_position = self.pool.get('account.fiscal.position')
         account_tax = self.pool.get('account.tax')
 
-        # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
-        if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang

From 4e088306d1df4e181aa22ab14746ce6a485538ae Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 12 Oct 2012 11:58:46 +0530
Subject: [PATCH 2/4] [IMP]interchange sequence of buttons in Purchase order
 form like: [Receive Products] [Receive Invoice]

bzr revid: pja@tinyerp.com-20121012062846-27zef8nxmwiaz5wz
---
 addons/purchase/purchase.py       | 6 +++---
 addons/purchase/purchase_view.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d1fa271b1b1..2cabe6e8559 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -114,7 +114,7 @@ class purchase_order(osv.osv):
             if state=='done':
                 res[oid][0] += nbr or 0.0
                 res[oid][1] += nbr or 0.0
-            else:
+            else:L878
                 res[oid][1] += nbr or 0.0
         for r in res:
             if not res[r][1]:
@@ -877,10 +877,10 @@ class purchase_order_line(osv.osv):
             context = {}
         
         # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         if not partner_id:
             raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 446c17578cb..85dde22e3e2 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -205,8 +205,8 @@
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>

From 7c3b223618e5ac5d9fe3d3b9fe1162621f2e7802 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Fri, 12 Oct 2012 12:09:25 +0530
Subject: [PATCH 3/4] [IMP] remove unnecessary code

bzr revid: pja@tinyerp.com-20121012063925-eerqul5b3rl83ds0
---
 addons/purchase/purchase.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2cabe6e8559..a98a5f926bd 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -114,7 +114,7 @@ class purchase_order(osv.osv):
             if state=='done':
                 res[oid][0] += nbr or 0.0
                 res[oid][1] += nbr or 0.0
-            else:L878
+            else:
                 res[oid][1] += nbr or 0.0
         for r in res:
             if not res[r][1]:

From 988cb0df1a0a1bdc8666a30d3a47209c6b805f1c Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 18 Oct 2012 12:40:57 +0530
Subject: [PATCH 4/4] [IMP] onchange_product_id method code

bzr revid: pja@tinyerp.com-20121018071057-y6zzeth9b1b6unxx
---
 addons/purchase/purchase.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d93aa823b3e..db6ed8b80be 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -875,12 +875,7 @@ class purchase_order_line(osv.osv):
         """
         if context is None:
             context = {}
-        
-        # - check for the presence of partner_id and pricelist_id
-        if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+
         res = {'value': {'price_unit': price_unit or 0.0, 'name': name or '', 'product_uom' : uom_id or False}}
         if not product_id:
             return res
@@ -893,7 +888,11 @@ class purchase_order_line(osv.osv):
         account_fiscal_position = self.pool.get('account.fiscal.position')
         account_tax = self.pool.get('account.tax')
 
-        
+        # - check for the presence of partner_id and pricelist_id
+        if not pricelist_id:
+            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
+        if not partner_id:
+            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
 
         # - determine name and notes based on product in partner lang.
         lang = res_partner.browse(cr, uid, partner_id).lang