[MERGE] trunk

bzr revid: sle@openerp.com-20140429170245-y02h8z7elx7pu5km

3 files changed, 1 insertions, 69 deletions

diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index 48569fa76c4..275cfdba88a 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -26,7 +26,7 @@
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com',
     'category' : 'Hidden/Dependency',
-    'depends' : ['base','process', 'product', 'stock'],
+    'depends' : ['base', 'product', 'stock'],
     'description': """
 This is the module for computing Procurements.
 ==============================================
@@ -53,9 +53,7 @@ depending on the product's configuration.
         'wizard/schedulers_all_view.xml',
         'procurement_view.xml',
         'procurement_workflow.xml',
-        'process/procurement_process.xml',
         'company_view.xml',
-        'board_mrp_procurement_view.xml',
     ],
     'demo': ['stock_orderpoint.xml','procurement_demo.xml'],
     'test': ['test/procurement.yml'],
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
deleted file mode 100644
index bb1b5e62d82..00000000000
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="procurement_action_board" model="ir.actions.act_window">
-            <field name="name">Procurement Exceptions</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">procurement.order</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','=','exception')]</field>
-            <field name="view_id" ref="procurement.procurement_tree_view_board"/>
-        </record>
-        <record id="board_mrp_procurement_form" model="ir.ui.view">
-            <field name="name">board.mrp.procurement.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="stock.board_warehouse_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//column" position="inside">
-                    <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/procurement/process/procurement_process.xml b/addons/procurement/process/procurement_process.xml
deleted file mode 100644
index b2a33cf80e6..00000000000
--- a/addons/procurement/process/procurement_process.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-        <!--
-           Process Node from where the Procurement flow starts
-        -->
-
-        <record id="process_process_procurementprocess0" model="process.process">
-            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
-            <field name="model_id" ref="procurement.model_procurement_order"/>
-            <field eval="1" name="active"/>
-        </record>
-        <record id="process_node_procureproducts0" model="process.node">
-            <field name="menu_id" ref="menu_stock_procurement_action"/>
-            <field name="model_id" ref="procurement.model_procurement_order"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;The way to procurement depends on the product type.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-        
-        <record id="process_process_serviceproductprocess0" model="process.process">
-            <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
-            <field name="model_id" ref="procurement.model_procurement_order"/>
-            <field eval="1" name="active"/>
-        </record>        
-          <record id="process_node_serviceonorder0" model="process.node">
-            <field name="menu_id" ref="menu_stock_procurement_action"/>
-            <field name="model_id" ref="procurement.model_procurement_order"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Assignment from Production or Purchase Order.&quot;&quot;&quot;" name="note"/>
-            <field eval="&quot;&quot;&quot;Make to Order&quot;&quot;&quot;" name="name"/>
-            <field name="process_id" ref="procurement.process_process_serviceproductprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-        
-    </data>
-</openerp>