From 9adfec126d0e760ff1e6249d3ecc9f476b91eaa7 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Tue, 11 Sep 2012 14:01:43 +0530
Subject: [PATCH 1/4] [IMP]improve the purchase view

bzr revid: rma@tinyerp.com-20120911083143-2typsouj4apih3h4
---
 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 592bf783a64..e7ff94ac1ea 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -318,7 +318,7 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in po.picking_ids]
 
-        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_form')
         res_id = res and res[1] or False
 
         return {

From 5b175acd1e378cddf323f26709e0fc50e3ad6f6a Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 12 Sep 2012 12:22:13 +0530
Subject: [PATCH 2/4] [IMP]make changes into purchase view

bzr revid: rma@tinyerp.com-20120912065213-1kqs35ndjz7yapbz
---
 addons/purchase/purchase_view.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ab5df67f52d..f5c7b0a64aa 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -26,7 +26,9 @@
         <menuitem
             action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
             parent="menu_purchase_config_pricelist" sequence="10" />
-
+        <menuitem
+            action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
+            parent="menu_purchase_config_pricelist" sequence="60" />
         <menuitem
             id="menu_product_in_config_purchase" name="Products"
             parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
@@ -185,7 +187,7 @@
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                     <button name="purchase_approve" states="confirmed" string="Approve Order" 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="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+                    <button name="view_picking" string="Receive Products" type="object" states="confirmed,approved,sent,done" 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,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>

From 885ef0e8bac253e0294ab8498fdee61e99666c14 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 12 Sep 2012 18:50:01 +0530
Subject: [PATCH 3/4] [IMP]make changes into purchase view

bzr revid: rma@tinyerp.com-20120912132001-l52d44rvte3vgei5
---
 addons/account/res_config_view.xml  |  2 --
 addons/purchase/res_config.py       |  3 +++
 addons/purchase/res_config_view.xml | 10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index bc8ace5c262..2ff931eda62 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -240,11 +240,9 @@
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
                     <group name="analytic_account_sale" invisible="1">
                         <label for="id" string="Sale"/>
-                        <div/>
                     </group>
                     <group name="analytic_account_purchase" invisible="1">
                         <label for="id" string="Purchase"/>
-                        <div/>
                     </group>
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 3d9c858cec5..4fb34afa88d 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -62,6 +62,9 @@ class purchase_config_settings(osv.osv_memory):
             help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
             You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
+        'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
+            implied_group='purchase.group_analytic_accounting',
+            help="Allows you to specify an analytic account on purchase orders."),
     }
 
     _defaults = {
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 00e0b6108e8..824bbdfbc7a 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -77,6 +77,16 @@
                             </div>
                         </div>
                     </group>
+                    <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
+                    <group name="analytic_account_purchase" >
+                        <label for="id" string="Purchase"/>
+                        <div>
+                            <div>
+                                <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+                                <label for="group_analytic_account_for_purchases"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>

From faf895d4be86e1564908e5ab88573d2b423d51e9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Thu, 13 Sep 2012 17:19:10 +0530
Subject: [PATCH 4/4] [IMP] solve issues in purchase

bzr revid: rma@tinyerp.com-20120913114910-tz83d1m14q17h6uf
---
 addons/account/res_config_view.xml | 2 ++
 addons/purchase/purchase.py        | 2 ++
 addons/purchase/purchase_view.xml  | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 2ff931eda62..bc8ace5c262 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -240,9 +240,11 @@
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
                     <group name="analytic_account_sale" invisible="1">
                         <label for="id" string="Sale"/>
+                        <div/>
                     </group>
                     <group name="analytic_account_purchase" invisible="1">
                         <label for="id" string="Purchase"/>
+                        <div/>
                     </group>
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e7ff94ac1ea..c95ec7bf7db 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -349,6 +349,8 @@ class purchase_order(osv.osv):
         res_id = res and res[1] or False
         ctx = dict(context, active_model='purchase.order', active_id=ids[0])
         ctx.update({'mail.compose.template_id': template_id})
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order',ids[0], 'send_rfq', cr)
         return {
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 01cc1af5185..6e17807b695 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -186,11 +186,11 @@
                     <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"/>
-                    <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" states="confirmed,approved,sent,done" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" states="draft,sent" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="view_picking" string="Receive Products" type="object" states="confirmed,approved,done" 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,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done,sent" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
                     <div class="oe_title">