From cb6ade257746bacf40f9e50427dd2d429105a7c8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 28 Jul 2012 22:54:52 +0530
Subject: [PATCH] [FIX]: remove depency from delivery. remove duplicate process
 from sale form.

bzr revid: atp@tinyerp.com-20120728172452-falievqp8ve97dti
---
 addons/delivery/__openerp__.py                |  2 +-
 addons/sale/process/sale_process.xml          | 22 ----------------
 .../sale_stock/process/sale_stock_process.xml | 26 +++++++++++++++++++
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 24f0b8f4bd9..092258f5e91 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -32,7 +32,7 @@ You can define your own carrier and delivery grids for prices. When creating
 invoices from picking, OpenERP is able to add and compute the shipping line.
 """,
     'author': 'OpenERP SA',
-    'depends': ['sale_stock', 'purchase', 'stock'],
+    'depends': ['sale', 'purchase', 'stock'],
     'init_xml': ['delivery_data.xml'],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 05999ff6fb8..836c6fddc04 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -62,28 +62,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-        <record id="process_node_invoiceafterdelivery0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
-            <field name="model_id" ref="account.model_account_invoice"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
-            <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-        <!--
-            Process Condition
-        -->
-
-        <record id="process_condition_conditionafterdelivery0" model="process.condition">
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
-        </record>
 
         <!--
             Process Transition
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
index cee587dca9b..5ad6399fe51 100644
--- a/addons/sale_stock/process/sale_stock_process.xml
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -51,6 +51,32 @@
             <field eval="0" name="flow_start"/>
         </record>
 
+        <record id="process_node_invoiceafterdelivery0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+
+
+        <!--
+            Process Condition
+        -->
+
+        <record id="process_condition_conditionafterdelivery0" model="process.condition">
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
+            <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
+        </record>
+
+
         <!--
             Process Transition
         -->