From 74cbfc7b0bd81bbd6f73c83d29d740e99246f5a9 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Tue, 12 Jan 2010 15:38:25 +0530
Subject: [PATCH] [MOD] Modification for the New Menu Structure, Procurement
 Management

bzr revid: vir@tinyerp.com-20100112100825-elb3dlwjavyfyjyh
---
 addons/account/account_invoice_view.xml       | 12 +++++++
 addons/base_contact/base_contact_view.xml     |  3 +-
 addons/mrp/mrp_view.xml                       | 17 ++++++++-
 addons/product/product_view.xml               | 10 ++++++
 addons/purchase/__terp__.py                   |  4 +--
 addons/purchase/purchase_view.xml             | 36 +++++++++++++++++--
 .../purchase_manual/purchase_manual_view.xml  |  8 ++---
 .../report_document/report_document_view.xml  |  8 ++---
 .../report_purchase/report_purchase_view.xml  |  6 ++--
 addons/sale_journal/picking_journal_view.xml  |  4 +--
 addons/stock/stock_view.xml                   |  4 +--
 11 files changed, 92 insertions(+), 20 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 9ca09af6c4f..8c3742d7f8d 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -349,6 +349,18 @@
             <field name="context">{'type':'out_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
+
+        <record id="action_invoice_tree_panding_invoice" model="ir.actions.act_window">
+            <field name="name">Panding Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_id" ref="invoice_tree"/>
+            <field name="context">{'type':'out_invoice'}</field>
+            <field name="domain">[('state','=','draft')]</field>
+           <!-- <field name="search_view_id" ref="view_account_invoice_filter"/>-->
+        </record>
+
         <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 9dd387c0664..f8b50233877 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -420,6 +420,7 @@
         res_model="res.partner.job"
         src_model="res.partner"
         />
-
+        <menuitem name="Contacts" id="menu_procurement_mgt_partner_contact_form" action="action_partner_contact_form"
+      parent="purchase.menu_procurement_management_supplier"/>
 </data>
 </openerp>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9218cf99d9f..fadc0443e0d 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -769,7 +769,7 @@
                   sequence="2" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Unscheduled Procurements</field>
+            <field name="name">Requisitions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -777,6 +777,21 @@
             <field name="domain">[('state','=','confirmed')]</field>
         </record>
 
+      <menuitem action="mrp_procurement_action3" id="menu_procurement_requisitions" parent="purchase.menu_procurement_management"
+                  name="Requisitions" sequence="5" />
+		<record id="mrp_procurement_action_quotation" model="ir.actions.act_window">
+            <field name="name">Quotation Request</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.procurement</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+	    <menuitem action="mrp_procurement_action_quotation" id="menu_procurement_request_quotation" parent="purchase.menu_procurement_management"
+                  name="Request for Quotations" sequence="6" />
+
+
+
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
             <field name="name">Procurement Exceptions</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f472e40fe36..9f606226a4b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -190,6 +190,16 @@
 
         <menuitem action="product_normal_action" id="menu_products" parent="product.menu_main_product" sequence="1"/>
 
+        <record id="product_normal_action_puchased" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('purchase_ok','=',1)]</field>
+            <field name="view_id" ref="product_product_tree_view"/>
+            <field name="search_view_id" ref="product_search_form_view"/>
+        </record>
+
         <record id="product_category_form_view" model="ir.ui.view">
             <field name="name">product.category.form</field>
             <field name="model">product.category</field>
diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py
index 018a961983e..f7eeb98be28 100644
--- a/addons/purchase/__terp__.py
+++ b/addons/purchase/__terp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 966c331a95e..01f2ff22e84 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,8 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+        <!--<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+            groups="group_purchase_user"/>-->
+       <menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user"/>
+	   <menuitem id="menu_procurement_management" name="Procurement Management"
+            parent="menu_purchase_root" sequence="1"/>
+
+     <!--supplier menu-->
+     <menuitem id="menu_procurement_management_supplier" name="Suppliers"
+            parent="menu_purchase_root" sequence="3"/>
+     <menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
+            parent="menu_procurement_management_supplier" action="base.action_partner_supplier_form" />
+
+
+
+          <!--Inventory control-->
+      <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
+            parent="menu_purchase_root" sequence="4"/>
+      <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
+      		name="Incoming shipments" sequence="9"/>
+        <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
+      		name="Incoming Products" parent="menu_procurement_management_nventory" sequence="10"/>
+
+     <!--Invoice control-->
+      <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
+            parent="menu_purchase_root" sequence="6"/>
+      <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
+      parent="menu_procurement_management_invoice"/>
+
+      <!--product menu-->
+      <menuitem id="menu_procurement_management_product" name="Product"
+            parent="menu_purchase_root" sequence="8"/>
+      <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
+      parent="menu_procurement_management_product"/>
 
        <record model="ir.ui.view" id="purchase_order_calendar">
             <field name="name">purchase.order.calendar</field>
@@ -140,7 +172,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
         </record>
-        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="purchase.menu_purchase_root"/>
+        <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management"/>
 
         <record id="purchase_form_action4" model="ir.actions.act_window">
             <field name="name">Purchase Orders in Progress</field>
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
index de424bb17f6..60460f30546 100644
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -5,7 +5,7 @@
         #
         # Define PO Line Views
         #
-        
+
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>
             <field name="model">purchase.order</field>
@@ -54,7 +54,7 @@
             </field>
         </record>
 
- 
+
         #
         # Inherit PO view to get buttons
         #
@@ -77,7 +77,7 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action"/>
         </record>
-        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>
+<!--        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>-->
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Purchase Order Lines</field>
@@ -99,7 +99,7 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action2"/>
         </record>
-         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>
+<!--         <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_purchase_line_form_action"/>-->
 
     </data>
 </openerp>
diff --git a/addons/report_document/report_document_view.xml b/addons/report_document/report_document_view.xml
index 423e02395d5..b8bee399f82 100644
--- a/addons/report_document/report_document_view.xml
+++ b/addons/report_document/report_document_view.xml
@@ -57,8 +57,8 @@
             </field>
         </record>
 
-        <menuitem name="Document Management" id="menu_action_view_my_document"/>
-        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>
+     <!--   <menuitem name="Document Management" id="menu_action_view_my_document"/>
+        <menuitem name="Reporting" id="menu_action_view_my_document_report" parent="menu_action_view_my_document"/>-->
 
         <record model="ir.actions.act_window" id="action_view_all_document_tree1">
             <field name="name">All Users files</field>
@@ -68,7 +68,7 @@
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
-        <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>
+      <!--  <menuitem name="All Users files" id="menu_action_view_my_document_report_all_userfile" parent="menu_action_view_my_document_report" action="action_view_all_document_tree1"/>-->
 
 <!--        -->
         <record model="ir.ui.view" id="view_document_wall_form">
@@ -107,7 +107,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>
+        <!--<menuitem name="Wall of Shame" id="menu_action_view_my_document_report_shame" parent="menu_action_view_my_document_report" action="action_view_wall"/>-->
 
 <!--***************************************************************************************-->
 
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index 9fd52a77a91..fdfd860461a 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -80,7 +80,8 @@
         </record>
 
         <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
-        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_73"/>
+        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
+        	name="PO by Products" parent="next_id_73"/>
 
         <!-- Purchases by category by month -->
 
@@ -159,7 +160,8 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_order_category_search"/>
         </record>
-        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_purchase.next_id_73"/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all"
+        	name="PO by Products Category" parent="report_purchase.next_id_73"/>
 
         <act_window domain="[('product_id', '=', active_id)]" id="act_product_product_2_report_purchases_order_product" name="Monthly purchases" res_model="report.purchase.order.product" src_model="product.product"/>
 
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index ac6160d9c3d..c164f50a787 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -87,8 +87,8 @@
 	</record>
 
 
-	<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
-	<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
+	<!--<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>-->
+	<!--<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>-->
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
 		<field name="name">Picking to invoice</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c7f64a48b81..ea535930cf0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1064,7 +1064,7 @@
 
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Incoming Products</field>
+            <field name="name">Incoming shipments</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1310,7 +1310,7 @@
         </record>
 
 	<record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Reception Picking Stock Moves</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>