improve

[odoo/odoo.git] / addons / sale / process / sale_process.xml

diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index ef003b2..8cc0344 100644 (file)
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -43,36 +43,19 @@
         <record id="process_node_quotation0" model="process.node">
             <field name="menu_id" ref="sale.menu_action_order_tree10"/>
             <field name="model_id" ref="sale.model_sale_order"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Quotation (A sale order in draft state)&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'state'" name="kind"/>
             <field eval="'Quotation'" name="name"/>
             <field eval="'Quotations are sales order in draft state.'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-=======
             <field name="model_states">object.state=='draft'</field>
             <field eval="1" name="flow_start"/>
->>>>>>> MERGE-SOURCE
         </record>
 
         <record id="process_node_saleorder0" model="process.node">
             <field name="menu_id" ref="sale.menu_action_order_tree9"/>
             <field name="model_id" ref="sale.model_sale_order"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Ok&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'Sale Order'" name="name"/>
             <field eval="'Confirmed by the customer.'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field name="model_states">object.state in ('waiting_date','manual','progress')</field>
         </record>
@@ -91,14 +74,8 @@
         <record id="process_node_packinglist0" model="process.node">
             <field name="menu_id" ref="stock.menu_picking_waiting"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Packing OUT is created for stockable products.&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'Packing List'" name="name"/>
             <field eval="'The worker have to pack the requested products.'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field name="model_states">object.state in ('assigned', 'confirmed')</field>
         </record>
@@ -106,15 +83,9 @@
         <record id="process_node_deliveryorder0" model="process.node">
             <field name="menu_id" ref="stock.menu_picking_waiting_delivery"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Delivery, from the warehouse to the customer.&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'state'" name="kind"/>
             <field eval="'Delivery Order'" name="name"/>
             <field eval="'The delivery order document, when boxes leaves the warehouse.'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field name="model_states">object.state in ('done')</field>
         </record>
@@ -122,15 +93,9 @@
         <record id="process_node_invoice0" model="process.node">
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Draft customer invoice, to be reviewed by accountant.&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'subflow'" name="kind"/>
             <field eval="'Invoice'" name="name"/>
             <field eval="'Invoice based on the sale order.'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
         </record>
@@ -138,15 +103,9 @@
         <record id="process_node_invoiceafterdelivery0" model="process.node">
             <field name="menu_id" ref="account.menu_invoice_draft"/>
             <field name="model_id" ref="account.model_account_invoice"/>
-<<<<<<< TREE
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on packing lists&quot;&quot;&quot;" name="note"/>
-=======
             <field eval="'subflow'" name="kind"/>
             <field eval="'Invoice on Packing'" name="name"/>
             <field eval="'In case you invoice based on packings'" name="note"/>
->>>>>>> MERGE-SOURCE
             <field name="process_id" ref="process_process_salesworkflow0"/>
             <field name="subflow_id" ref="account.process_process_invoiceworkflow0"/>
             <field eval="0" name="flow_start"/>