From 94bb6fd374802ce9da8ae0888eb843e5708b3cba Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 4 Feb 2010 11:27:44 +0530
Subject: [PATCH] [Fix] : Removed unused dependancy from base_contact and
 changes related to purhcase module

bzr revid: vir@tinyerp.com-20100204055744-paui2msnr2xqcbyo
---
 addons/base_contact/__terp__.py                |  2 +-
 addons/base_contact/base_contact_view.xml      |  6 ++++--
 addons/purchase/purchase_view.xml              | 18 +++++++++---------
 .../purchase_manual/purchase_manual_view.xml   |  2 +-
 .../purchase_tender/purchase_tender_view.xml   |  2 +-
 .../report_purchase/report_purchase_view.xml   |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index 60c8d5f8fc3..af632e532b5 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -40,7 +40,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base','process','sale'],
+    'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 6123e7ed938..7f69d89661d 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -419,7 +419,9 @@
         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"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
+    <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+            parent="base.menu_purchase_root" sequence="3"/>
+    <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
 </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4b6f184ebe2..6e9b06e040d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,24 +1,24 @@
 <?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="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
-       <menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user"/>
 	   <menuitem id="menu_procurement_management" name="Procurement Management"
-            parent="menu_purchase_root" sequence="1"/>
+            parent="base.menu_purchase_root" sequence="1"/>
 
      <!--supplier menu-->
-     <menuitem id="menu_procurement_management_supplier" name="Suppliers"
-            parent="menu_purchase_root" sequence="3"/>
+     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+            parent="base.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" />
+            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
 
 
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
-            parent="menu_purchase_root" sequence="4"/>
+            parent="base.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"
@@ -26,13 +26,13 @@
 
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
-            parent="menu_purchase_root" sequence="6"/>
+            parent="base.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"/>
+            parent="base.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"/>
 
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
index 60460f30546..4e698dcac53 100644
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -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="base.menu_purchase_root"/>-->
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Purchase Order Lines</field>
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_tender/purchase_tender_view.xml
index a91c36a7201..d76de0bee9f 100644
--- a/addons/purchase_tender/purchase_tender_view.xml
+++ b/addons/purchase_tender/purchase_tender_view.xml
@@ -68,7 +68,7 @@
             <field name="res_model">purchase.tender</field>
             <field name="view_type">form</field>
         </record>
-<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="purchase.menu_purchase_root"/>-->
+<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="base.menu_purchase_root"/>-->
 <!--        <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
 		<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
         <record model="ir.actions.act_window" id="action_purchase_tender_draft">
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index fdfd860461a..e2559b2c539 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -79,7 +79,7 @@
             <field name="search_view_id" ref="view_order_product_search"/>
         </record>
 
-        <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
+        <menuitem id="next_id_73" name="Reporting" parent="base.menu_purchase_root"/>
         <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
         	name="PO by Products" parent="next_id_73"/>