merge
authorPriyesh <solanki.priyesh@gmail.com>
Fri, 7 Nov 2008 06:34:21 +0000 (12:04 +0530)
committerPriyesh <solanki.priyesh@gmail.com>
Fri, 7 Nov 2008 06:34:21 +0000 (12:04 +0530)
bzr revid: solanki.priyesh@gmail.com-20081107063421-rzxx6fzyodmryum6

1  2 
addons/account/__terp__.py
addons/base_contact/__terp__.py
addons/base_contact/base_contact_view.xml
addons/crm_configuration/process/crm_configuration_process.xml
addons/document/__terp__.py
addons/hr/process/hr_process.xml
addons/hr_expense/__terp__.py
addons/membership/__terp__.py
addons/sale/process/sale_process.xml
addons/stock/__terp__.py

Simple merge
  
      Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
      """,
 -    "depends" : ["base"],
 +    "depends" : ["base", "process"],
      "init_xml" : [],
-     "demo_xml" : ["base_contact_demo.xml"],
+     "demo_xml" : [
+         "base_contact_demo.xml"
+     ],
      "update_xml" : [
          "security/ir.model.access.csv",
 -        'base_contact_view.xml'
 +        'base_contact_view.xml',
 +        "process/base_contact_process.xml"
      ],
      "active": False,
      "installable": True
                          <field name="website"/>
                          <field name="lang_id"/>
                          <field name="active"/>
++<<<<<<< TREE
 +                        <separator string="Functions" colspan="4"/>
 +                        <field name="job_ids" colspan="4" nolabel="1" mode="tree, form">
 +                            <form string="Functions">
++=======
+                         <field name="partner_id" invisible="1" select="2"/>
+                         <field name="function_id" invisible="1" select="2"/>
+                         <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
+                             <form string="Functions and Addresses">
++>>>>>>> MERGE-SOURCE
                                  <field name="function_id"/>
                                  <field name="address_id"/>
                                  <field name="name"/>
                                  <field name="date_stop" />
                                  <field name="state" />
                              </form>
++<<<<<<< TREE
 +                            <tree string="Functions">
++=======
+                             <tree string="Functions and Addresses">
++>>>>>>> MERGE-SOURCE
                                  <field name="sequence_contact" string="Seq."/>
                                  <field name="function_id"/>
                                  <field name="name"/>
                                  <field name="email"/>
                              </tree>
                              <form string="Contacts">
++<<<<<<< TREE
++=======
+                                 <field name="name"/>
++>>>>>>> MERGE-SOURCE
                                  <field name="sequence_partner"/>
                                  <field name="contact_id"/>
                                  <field name="function_id"/>
                          <field name="function_id" select="1"/>
                          <field name="email" select="2"/>
                          <field name="phone" select="2"/>
++<<<<<<< TREE
 +                        <field name="sequence_contact" select="2"/>
 +                        <field name="sequence_partner" select="2"/>
 +                        <field name="date_start" />
 +                        <field name="date_stop" />
++=======
+                         <field name="sequence_contact" select="2" groups="base.group_user"/>
+                         <field name="sequence_partner" select="2" groups="base.group_user"/>
+                         <field name="date_start" groups="base.group_user"/>
+                         <field name="date_stop" groups="base.group_user"/>
++>>>>>>> MERGE-SOURCE
                          <field name="state" select="2" />
                      </page>
                  </notebook>
  
      <!-- Menuitem for res.partner.job -->
      <record model="ir.actions.act_window" id="action_res_partner_job">
++<<<<<<< TREE
 +        <field name="name">Functions</field>
++=======
+         <field name="name">Contact's Jobs</field>
++>>>>>>> MERGE-SOURCE
          <field name="type">ir.actions.act_window</field>
          <field name="res_model">res.partner.job</field>
          <field name="view_type">form</field>
      </record>
++<<<<<<< TREE
 +    <menuitem name="Partners/Functions" action="action_res_partner_job" id="menu_action_res_partner_job"/>
++=======
+     <menuitem
+         name="Partners/Contact's Jobs" 
+         action="action_res_partner_job" 
+         id="menu_action_res_partner_job"
+         groups="base.group_extended"/>
++>>>>>>> MERGE-SOURCE
      <!-- Act window defining a shorcut on partners to open all his contacts -->
++<<<<<<< TREE
 +    <act_window name="Open all Partner's Function"
++=======
+     <act_window name="Partner Contacts"
++>>>>>>> MERGE-SOURCE
          domain="[('name', '=', active_id)]"
          res_model="res.partner.job"
          src_model="res.partner"
  <?xml version="1.0" ?>
  <openerp>
-       <data>
-               
-               <!--    
-                       Process
-               -->
-               
+     <data>
+         
+         <!--    
+             Process
+         -->
+         
          <record id="process_process_contractworkflow0" model="process.process">
++<<<<<<< TREE
 +                      <field eval="&quot;&quot;&quot;Contracts flow for services companies.&quot;&quot;&quot;" name="note"/>
 +                      <field eval="1" name="active"/>
 +                      <field eval="&quot;&quot;&quot;Contract Workflow&quot;&quot;&quot;" name="name"/>
 +              </record>
 +              
 +              <!--    
 +                      Process Node
 +              -->
 +              
 +              <record id="process_node_leads0" model="process.node">
 +                      <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_leads_all"/>
 +                      <field name="model_id" ref="crm.model_crm_case"/>
 +                      <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Leads&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Very first contact with new prospect&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
 +                      <field eval="1" name="flow_start"/>
 +              </record>
 +              
 +              <record id="process_node_partner0" model="process.node">
 +                      <field name="menu_id" ref="base.menu_partner_form"/>
 +                      <field name="model_id" ref="base.model_res_partner"/>
 +                      <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Partner&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Convert to prospect to business partner&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="0" name="flow_start"/>
 +              </record>
 +      
 +              <record id="process_node_opportunities0" model="process.node">
 +                      <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act_oppor11"/>
 +                      <field name="model_id" ref="crm.model_crm_case"/>
 +                      <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Opportunities&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;When a real project/opportunity is detected&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
 +                      <field eval="0" name="flow_start"/>
 +              </record>
 +              
 +              <record id="process_node_meeting0" model="process.node">
 +                      <field name="menu_id" ref="crm_configuration.menu_crm_case_category_act_meetings"/>
 +                      <field name="model_id" ref="crm.model_crm_case"/>
 +                      <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Meeting&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Schedule a normal or phone meeting&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
 +                      <field eval="0" name="flow_start"/>
 +              </record>
 +      
 +              <record id="process_node_contractanalytic0" model="process.node">
 +                      <field name="menu_id" ref="account.account_analytic_def_account"/>
 +                      <field name="model_id" ref="account.model_account_analytic_account"/>
 +                      <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Analytic account&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Reflect the contract made with customer&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="0" name="flow_start"/>
 +              </record>
 +      
 +              <record id="process_node_contractpricelist0" model="process.node">
 +                      <field name="menu_id" ref="product.menu_product_pricelist_action2"/>
 +                      <field name="model_id" ref="product.model_product_pricelist"/>
 +                      <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 +                      <field eval="&quot;&quot;&quot;Contract Pricelist&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Contract Volume (pricelist)&quot;&quot;&quot;" name="note"/>
 +                      <field name="process_id" ref="process_process_contractworkflow0"/>
 +                      <field eval="0" name="flow_start"/>
 +              </record>
 +              
 +              <!--    
 +                      Process Transition
 +              -->
 +      
 +              <record id="process_transition_leadopportunity0" model="process.transition">
 +                      <field eval="[(6,0,[])]" name="role_ids"/>
 +                      <field eval="[(6,0,[])]" name="transition_ids"/>
 +                      <field eval="&quot;&quot;&quot;Lead Opportunity&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Creating business opportunities from leads&quot;&quot;&quot;" name="note"/>
 +                      <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
 +                      <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
 +              </record>
 +      
 +              <record id="process_transition_leadpartner0" model="process.transition">
 +                      <field eval="[(6,0,[])]" name="role_ids"/>
 +                      <field eval="[(6,0,[])]" name="transition_ids"/>
 +                      <field eval="&quot;&quot;&quot;Lead Partner&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Prospect is converting to business partner&quot;&quot;&quot;" name="note"/>
 +                      <field model="process.node" name="target_node_id" ref="process_node_partner0"/>
 +                      <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
 +              </record>
 +              
 +              <record id="process_transition_opportunitymeeting0" model="process.transition">
 +                      <field eval="[(6,0,[])]" name="role_ids"/>
 +                      <field eval="[(6,0,[])]" name="transition_ids"/>
 +                      <field eval="&quot;&quot;&quot;Opportunity Meeting&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Normal or phone meeting for opportunity&quot;&quot;&quot;" name="note"/>
 +                      <field model="process.node" name="target_node_id" ref="process_node_meeting0"/>
 +                      <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
 +              </record>
 +              
 +              <record id="process_transition_opportunitypricelist0" model="process.transition">
 +                      <field eval="[(6,0,[])]" name="role_ids"/>
 +                      <field eval="[(6,0,[])]" name="transition_ids"/>
 +                      <field eval="&quot;&quot;&quot;Opportunity Pricelist&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Opporunity convert to the Pricelist&quot;&quot;&quot;" name="note"/>
 +                      <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
 +                      <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
 +              </record>
 +              
 +              <record id="process_transition_opportunityanalytic0" model="process.transition">
 +                      <field eval="[(6,0,[])]" name="role_ids"/>
 +                      <field eval="[(6,0,[])]" name="transition_ids"/>
 +                      <field eval="&quot;&quot;&quot;Opportunity Analytic&quot;&quot;&quot;" name="name"/>
 +                      <field eval="&quot;&quot;&quot;Analytic Account&quot;&quot;&quot;" name="note"/>
 +                      <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
 +                      <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
 +              </record>
++=======
+             <field eval="&quot;&quot;&quot;Contracts flow for services companies.&quot;&quot;&quot;" name="note"/>
+             <field eval="1" name="active"/>
+             <field eval="&quot;&quot;&quot;Contract Workflow&quot;&quot;&quot;" name="name"/>
+         </record>
+         
+         <!--    
+             Process Node
+         -->
+         
+         <record id="process_node_leads0" model="process.node">
+             <field name="model_id" ref="crm.model_crm_case"/>
+             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+             <field eval="&quot;&quot;&quot;Leads&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Premier Contact Leads&quot;&quot;&quot;" name="note"/>
+             <field name="process_id" ref="process_process_contractworkflow0"/>
+             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
+             <field eval="1" name="flow_start"/>
+         </record>
+     
+         <record id="process_node_opportunities0" model="process.node">
+             <field name="model_id" ref="crm.model_crm_case"/>
+             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+             <field eval="&quot;&quot;&quot;Opportunities&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Business Opportunities&quot;&quot;&quot;" name="note"/>
+             <field name="process_id" ref="process_process_contractworkflow0"/>
+             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
+             <field eval="0" name="flow_start"/>
+         </record>
+     
+         <record id="process_node_accord0" model="process.node">
+             <field name="model_id" ref="crm.model_crm_case"/>
+             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+             <field eval="&quot;&quot;&quot;Accord&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Accord Client Contract&quot;&quot;&quot;" name="note"/>
+             <field name="process_id" ref="process_process_contractworkflow0"/>
+             <field eval="&quot;&quot;&quot;object.state=='done'&quot;&quot;&quot;" name="model_states"/>
+             <field eval="0" name="flow_start"/>
+         </record>
+     
+         <record id="process_node_contractanalytic0" model="process.node">
+             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+             <field eval="&quot;&quot;&quot;Contract Analytic&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Analytic Accounts&quot;&quot;&quot;" name="note"/>
+             <field name="process_id" ref="process_process_contractworkflow0"/>
+             <field eval="0" name="flow_start"/>
+         </record>
+     
+         <record id="process_node_contractpricelist0" model="process.node">
+             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+             <field eval="&quot;&quot;&quot;Contract Pricelist&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Contract Volume (pricelist)&quot;&quot;&quot;" name="note"/>
+             <field name="process_id" ref="process_process_contractworkflow0"/>
+             <field eval="0" name="flow_start"/>
+         </record>
+         
+         <!--    
+             Process Transition
+         -->
+     
+         <record id="process_transition_leadopportunity0" model="process.transition">
+             <field eval="[(6,0,[])]" name="role_ids"/>
+             <field eval="[(6,0,[])]" name="transition_ids"/>
+             <field eval="&quot;&quot;&quot;Lead Opportunity&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Creating business opportunities from leads&quot;&quot;&quot;" name="note"/>
+             <field model="process.node" name="target_node_id" ref="process_node_opportunities0"/>
+             <field model="process.node" name="source_node_id" ref="process_node_leads0"/>
+         </record>
+     
+         <record id="process_transition_opportunitiesaccord0" model="process.transition">
+             <field eval="[(6,0,[])]" name="role_ids"/>
+             <field eval="[(6,0,[])]" name="transition_ids"/>
+             <field eval="&quot;&quot;&quot;Opportunities Accord&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;When leads are confirmed&quot;&quot;&quot;" name="note"/>
+             <field model="process.node" name="target_node_id" ref="process_node_accord0"/>
+             <field model="process.node" name="source_node_id" ref="process_node_opportunities0"/>
+         </record>
+         
+         <record id="process_transition_accordanalytic0" model="process.transition">
+             <field eval="[(6,0,[])]" name="role_ids"/>
+             <field eval="[(6,0,[])]" name="transition_ids"/>
+             <field eval="&quot;&quot;&quot;Accord Analytic&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Goes into the Analytic&quot;&quot;&quot;" name="note"/>
+             <field model="process.node" name="target_node_id" ref="process_node_contractanalytic0"/>
+             <field model="process.node" name="source_node_id" ref="process_node_accord0"/>
+         </record>
+     
+         <record id="process_transition_accordpricelist0" model="process.transition">
+             <field eval="[(6,0,[])]" name="role_ids"/>
+             <field eval="[(6,0,[])]" name="transition_ids"/>
+             <field eval="&quot;&quot;&quot;Accord Pricelist&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Goes into the Pricelist&quot;&quot;&quot;" name="note"/>
+             <field model="process.node" name="target_node_id" ref="process_node_contractpricelist0"/>
+             <field model="process.node" name="source_node_id" ref="process_node_accord0"/>
+         </record>
++>>>>>>> MERGE-SOURCE
  
-       </data>
- </openerp>
+     </data>
+ </openerp>
@@@ -1,25 -1,47 +1,60 @@@
+ # -*- encoding: utf-8 -*-
+ ##############################################################################
  #
- # Use the custom module to put your specific code in a separate module.
+ #    OpenERP, Open Source Management Solution 
+ #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+ #    $Id$
  #
+ #    This program is free software: you can redistribute it and/or modify
+ #    it under the terms of the GNU General Public License as published by
+ #    the Free Software Foundation, either version 3 of the License, or
+ #    (at your option) any later version.
+ #
+ #    This program is distributed in the hope that it will be useful,
+ #    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #    GNU General Public License for more details.
+ #
+ #    You should have received a copy of the GNU General Public License
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ ##############################################################################
  {
-       "name" : "Integrated Document Management System",
-       "version" : "1.0",
-       "author" : "Tiny",
-       "category" : "Generic Modules/Others",
-       "website": "http://www.tinyerp.com",
-       "description": """This is a complete document management system:
-       * FTP Interface
-       * User Authentification
-       * Document Indexation
+     "name" : "Integrated Document Management System",
+     "version" : "1.0",
+     "author" : "Tiny",
+     "category" : "Generic Modules/Others",
+     "website": "http://www.tinyerp.com",
+     "description": """This is a complete document management system:
+     * FTP Interface
+     * User Authentification
+     * Document Indexation
  """,
++<<<<<<< TREE
 +      "depends" : ["base"],
 +      "init_xml" : ["document_data.xml"],
 +      "update_xml" : [
 +              "document_view.xml",
 +              "security/document_security.xml",
 +              "security/ir.model.access.csv",
 +      ],
 +      "demo_xml" : ["document_demo.xml"],
 +      "active": False,
 +      "installable": True
++=======
+     "depends" : ["base","process"],
+     "init_xml" : [
+         "document_data.xml",
+         "document_demo.xml"
+     ],
+     "update_xml" : [
+         "document_view.xml",
+         "document_data.xml",
+         "security/document_security.xml",
+         "security/ir.model.access.csv",
+     ],
+     "demo_xml" : [],
+     "active": False,
+     "installable": True
++>>>>>>> MERGE-SOURCE
  }
                -->
        
                <record id="process_node_jobshiring0" model="process.node">
-                       <field name="menu_id" ref="crm_configuration.menu_crm_case_categ0_act11"/>
-                       <field name="model_id" ref="crm.model_crm_case"/>
                        <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
                        <field eval="&quot;&quot;&quot;Jobs hiring&quot;&quot;&quot;" name="name"/>
 -                      <field eval="&quot;&quot;&quot;Jobs hiring to new employees&quot;&quot;&quot;" name="note"/>
 +                      <field eval="&quot;&quot;&quot;Process to search, interview and evaluate new candidates&quot;&quot;&quot;" name="note"/>
                        <field name="process_id" ref="process_process_employeecontractworkflow0"/>
                        <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
                        <field eval="1" name="flow_start"/>
@@@ -87,6 -76,7 +85,6 @@@
                        <field model="process.node" name="target_node_id" ref="process_node_employeecontact0"/>
                        <field model="process.node" name="source_node_id" ref="process_node_employee0"/>
                </record>
 -      
                
        </data>
- </openerp>
+ </openerp>
Simple merge
Simple merge
          <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 eval="&quot;&quot;&quot;object.state=='manual'&quot;&quot;&quot;" name="model_states"/>
-             <field eval="0" name="flow_start"/>
+             <field name="model_states">object.state in ('waiting_date','manual','progress')</field>
          </record>
 +        
 +        <record id="process_node_saleprocurement0" model="process.node">
 +            <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 +            <field name="model_id" ref="mrp.model_mrp_procurement"/>
 +            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
 +            <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
 +            <field eval="&quot;&quot;&quot;One procurement for each product.&quot;&quot;&quot;" name="note"/>
 +            <field name="process_id" ref="process_process_salesworkflow0"/>
 +            <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
 +            <field eval="1" name="flow_start"/>
 +        </record>
  
          <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 eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
-             <field eval="0" name="flow_start"/>
+             <field name="model_states">object.state in ('assigned', 'confirmed')</field>
          </record>
  
          <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 eval="&quot;&quot;&quot;object.state in ('done', 'assigned')&quot;&quot;&quot;" name="model_states"/>
-             <field eval="0" name="flow_start"/>
+             <field name="model_states">object.state in ('done')</field>
          </record>
  
          <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"/>
-             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-             <field eval="0" name="flow_start"/>
          </record>
  
          <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="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
              <field eval="0" name="flow_start"/>
          </record>
          
  
          <record id="process_transition_packing0" model="process.transition">
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Packing&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list.&quot;&quot;&quot;" name="note"/>
+             <field eval="'Packing'" name="name"/>
+             <field eval="'Packing list is created when the Assign button is being clicked after confirming the sale order. This transaction moves the sale order to packing list.'" name="note"/>
              <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
 -            <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
 +            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
          </record>
          
          <record id="process_transition_deliver0" model="process.transition">
  
          <record id="process_transition_invoiceafterdelivery0" model="process.transition">
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Invoice after delivery&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery.&quot;&quot;&quot;" name="note"/>
+             <field eval="'Invoice after delivery'" name="name"/>
+             <field eval="'When you select Shipping Ploicy = Automatic Invoice after delivery , it will automatic create after delivery.'" name="note"/>
              <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
 -            <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/>
 +            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
          </record>
      
 -        <record id="process_transition_saleprocurement0" model="process.transition">
 +        <record id="process_transition_saleorderprocurement0" model="process.transition">
              <field eval="[(6,0,[])]" name="role_ids"/>
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Sale Procurement&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;In sale order , procuerement for each line and it comes into the procurement order&quot;&quot;&quot;" name="note"/>
+             <field eval="'Sale Procurement'" name="name"/>
+             <field eval="'In sale order , procuerement for each line and it comes into the procurement order'" name="note"/>
              <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
              <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
          </record>
Simple merge