[IMP] English Improvement resolved conflicts
authorkum (Open ERP) <kum@tinyerp.co.in>
Thu, 26 Nov 2009 08:42:52 +0000 (14:12 +0530)
committerkum (Open ERP) <kum@tinyerp.co.in>
Thu, 26 Nov 2009 08:42:52 +0000 (14:12 +0530)
bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f

28 files changed:
1  2 
addons/account/account.py
addons/account/account_bank_statement.py
addons/account/account_invoice_view.xml
addons/account/account_move_line.py
addons/account/account_view.xml
addons/account/invoice.py
addons/account/process/statement_process.xml
addons/account/project/project_view.xml
addons/delivery/delivery_view.xml
addons/hr_expense/hr_expense.py
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/mrp/mrp_wizard.xml
addons/mrp/process/procurement_process.xml
addons/mrp/process/service_product_process.xml
addons/mrp/process/stockable_product_process.xml
addons/mrp_operations/mrp_operations.py
addons/mrp_repair/mrp_repair.py
addons/product/product.py
addons/product/product_view.xml
addons/purchase/purchase.py
addons/sale/process/sale_process.xml
addons/sale/sale.py
addons/sale/sale_view.xml
addons/sale_journal/picking_journal_view.xml
addons/sale_journal/sale_journal_view.xml
addons/stock/stock.py
addons/stock/stock_view.xml

Simple merge
Simple merge
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="domain">[('state','=','draft')]</field>
 -            <field name="filter" eval="True"/>            
 +            <field name="filter" eval="True"/>
          </record>
-         <menuitem action="action_bank_statement_draft_tree" id="menu_bank_statement_draft_tree" parent="account.menu_bank_statement_tree" groups="base.group_useability_extended"/>
  
          <record id="action_bank_statement_tree2" model="ir.actions.act_window">
              <field name="name">New Statement</field>
                      <field name="code" select="1"/>
                      <field name="sequence"/>
                      <field name="sign"/>
 -            
                      <field name="close_method"/>
                      <field name="partner_account"/>
                  </form>
                  </form>
              </field>
          </record>
 -        
 +
-               <record id="view_account_move_line_filter" model="ir.ui.view">
+         <record id="view_account_move_line_filter" model="ir.ui.view">
              <field name="name">account.move.line.select</field>
              <field name="model">account.move.line</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
 -                <search string="Search Move Lines">
 +                <search string="Search Entry Lines">
-                       <group col='10' colspan='4'>
-                               <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
-                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
-                                               <separator orientation="vertical"/>
-                                               <field name="date" select='1'/>
-                                               <field name="account_id" select='1'/>
-                                               <field name="partner_id" select='1'/>
-                                               <field name="balance" string="Debit/Credit" select='1'/>
-                       </group>
+                     <group col='10' colspan='4'>
+                         <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
+                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
+                         <separator orientation="vertical"/>
+                         <field name="date" select='1'/>
+                         <field name="account_id" select='1'/>
+                         <field name="partner_id" select='1'/>
+                         <field name="balance" string="Debit/Credit" select='1'/>
+                     </group>
                  </search>
              </field>
          </record>
  
                              <field name="debit" select="1"/>
                              <field name="credit" select="1"/>
-                                                       <field name="date" select="1"/>
+                             <field name="date" select="1"/>
 -                            
 +
                              <separator colspan="4" string="Optional Information"/>
                              <field name="currency_id"/>
                              <field name="amount_currency"/>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="domain">[('state','=','running')]</field>
 -            <field name="filter" eval="True"/>            
 +            <field name="filter" eval="True"/>
          </record>
-         <menuitem action="action_subscription_form_running" id="menu_action_subscription_form_running" parent="menu_action_subscription_form" groups="base.group_useability_extended"/>
  
          <record id="action_subscription_form_new" model="ir.actions.act_window">
              <field name="name">New Subscription</field>
Simple merge
@@@ -9,9 -9,9 +9,9 @@@
          <record id="process_process_statementprocess0" model="process.process">
              <field eval="1" name="active"/>
              <field name="model_id" ref="account.model_account_bank_statement"/>
-             <field eval="&quot;&quot;&quot;Statement Process&quot;&quot;&quot;" name="name"/>
+             <field eval="&quot;&quot;&quot;Statement&quot;&quot;&quot;" name="name"/>
          </record>
 -        
 +
      <!--
          Process Node
      -->
@@@ -76,8 -76,8 +76,9 @@@
          <record id="process_transition_invoicemanually0" model="process.transition">
              <field eval="[(6,0,[])]" name="role_ids"/>
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Manually statement&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement&quot;&quot;&quot;" name="note"/>
+             <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;Encode the statement manually in the system.&quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
++
              <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
              <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
          </record>
              <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
              <field name="filter" eval="True"/>
              <field name="context">{'contact_display': 'partner'}</field>
 -            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>            
 +            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
          </record>
-         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_useability_extended"/>
+         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended"/>
  
      </data>
  </openerp>
Simple merge
@@@ -434,9 -434,11 +434,10 @@@ class mrp_production(osv.osv)
          'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
          'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
          'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
--
-         'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'Status', readonly=True),
 -        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
++        'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\
+                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
 -        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),    
 +        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
          'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
  
          'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
@@@ -4,11 -4,11 +4,11 @@@
  
          <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
              groups="group_mrp_user,group_mrp_manager"/>
 -        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
 +        <menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/>
  
          <!--
-     Property / Property Group
-     -->
+         Property / Property Group
+         -->
  
          <record id="mrp_property_group_form_view" model="ir.ui.view">
              <field name="name">mrp.property.group.form</field>
              <field name="model">mrp.procurement</field>
              <field name="type">search</field>
              <field name="arch" type="xml">
 -                <search string="Search Procurement">
 +                <search string="Search Requisition">
-                       <group col='8' colspan='4'>
-                        <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
+                        <group col='8' colspan='4'>
 -                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
++                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/>
                         <separator orientation="vertical"/>
                         <field name="name" select='1'/>
-                                          <field name="product_id" select='1'/>
-                                          <field name="date_planned" select='1'/>
+                        <field name="product_id" select='1'/>
+                        <field name="date_planned" select='1'/>
                         <field name="state" select='1'/>
-                                       </group>
-                               </search>
+                     </group>
+                 </search>
              </field>
          </record>
          <record id="mrp_procurement_action" model="ir.actions.act_window">
              <field name="view_id" eval="False"/>
              <field name="search_view_id" ref="view_mrp_procurement_filter"/>
          </record>
-         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root" groups="base.group_extended" />
+         <menuitem action="mrp_procurement_action" id="menu_mrp_procurement_action" parent="mrp.menu_mrp_root"
+                   sequence="-40" />
  
          <record id="mrp_procurement_action3" model="ir.actions.act_window">
 -            <field name="name">Unscheduled procurements</field>
 +            <field name="name">Unscheduled Requisitions</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">mrp.procurement</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="domain">[('state','=','confirmed')]</field>
          </record>
-         <menuitem action="mrp_procurement_action3" id="menu_mrp_procurement_action3" parent="mrp.menu_mrp_procurement_action" groups="base.group_useability_extended"/>
  
          <record id="mrp_procurement_action5" model="ir.actions.act_window">
 -            <field name="name">Exceptions Procurements</field>
 +            <field name="name">Requisition Exceptions</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">mrp.procurement</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="domain">[('state','=','exception')]</field>
          </record>
-         <menuitem action="mrp_procurement_action5" id="menu_mrp_procurement_action5" parent="menu_mrp_reordering" groups="base.group_useability_extended"/>
  
          <record id="mrp_procurement_action4" model="ir.actions.act_window">
 -            <field name="name">Exceptions Procurements to Fix</field>
 +            <field name="name">Requisition Exceptions to Fix</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">mrp.procurement</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','exception'), ('message', '&lt;&gt;', '')]</field>
              <field name="filter" eval="True"/>
          </record>
-         <menuitem action="mrp_procurement_action4" id="menu_mrp_procurement_action4" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
  
          <record id="mrp_procurement_action11" model="ir.actions.act_window">
 -            <field name="name">Temporary Procurement Exceptions</field>
 +            <field name="name">Temporary Requisition Exceptions</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">mrp.procurement</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form</field>
              <field name="domain">[('state','=','exception'), ('message', '=', '')]</field>
          </record>
-         <menuitem action="mrp_procurement_action11" id="menu_mrp_procurement_action11" parent="mrp.menu_mrp_procurement_action5" groups="base.group_useability_extended"/>
  
           <record id="mrp_procurement_new" model="ir.actions.act_window">
 -            <field name="name">New Procurement</field>
 +            <field name="name">New Requisition</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">mrp.procurement</field>
              <field name="view_type">form</field>
@@@ -2,9 -2,9 +2,8 @@@
  <openerp>
      <data>
          <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
-         <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="100"/>
+         <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/>
 -
 -        <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
 +        <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute    Requisitions Only" name="mrp.procurement.compute"/>
          <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
  
          <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
@@@ -5,9 -5,9 +5,9 @@@
                <!--
                        Process
                -->
 -      
 +
                <record id="process_process_procurementprocess0" model="process.process">
-                       <field eval="&quot;&quot;&quot; Requisition Process&quot;&quot;&quot;" name="name"/>
 -                      <field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
++                      <field eval="&quot;&quot;&quot;Requisition&quot;&quot;&quot;" name="name"/>
                        <field name="model_id" ref="mrp.model_mrp_procurement"/>
                        <field eval="1" name="active"/>
                </record>
@@@ -44,7 -44,7 +44,7 @@@
                        <field name="menu_id" ref="mrp.menu_mrp_production_action"/>
                        <field name="model_id" ref="mrp.model_mrp_production"/>
                        <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-                       <field eval="&quot;&quot;&quot; Requisition for raw materials.&quot;&quot;&quot;" name="note"/>
 -                      <field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
++                      <field eval="&quot;&quot;&quot;Drives the requisition orders for raw material.&quot;&quot;&quot;" name="note"/>
                        <field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
                        <field name="process_id" ref="process_process_procurementprocess0"/>
                        <field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
@@@ -65,7 -65,7 +65,7 @@@
                        <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;Central document to      Requisition of products&quot;&quot;&quot;" name="note"/>
 -                      <field eval="&quot;&quot;&quot;The way to procure depends on the product type.&quot;&quot;&quot;" name="note"/>
++                      <field eval="&quot;&quot;&quot;The way to requisition 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="process_process_procurementprocess0"/>
                        <field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
                <record id="process_transition_productionprocureproducts0" model="process.transition">
                        <field eval="[(6,0,[])]" name="role_ids"/>
                        <field eval="[(6,0,[])]" name="transition_ids"/>
-                       <field eval="&quot;&quot;&quot;Production Requisition Products&quot;&quot;&quot;" name="name"/>
-                       <field eval="&quot;&quot;&quot;When any procuere products, it comes into the prpcurement orders&quot;&quot;&quot;" name="note"/>
 -                      <field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
 -                      <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
++                      <field eval="&quot;&quot;&quot;Requisition of raw material&quot;&quot;&quot;" name="name"/>
++                      <field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
                        <field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
                        <field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
                </record>
                <record id="process_transition_procureserviceproduct0" model="process.transition">
                        <field eval="[(6,0,[])]" name="role_ids"/>
                        <field eval="[(6,0,[])]" name="transition_ids"/>
-                       <field eval="&quot;&quot;&quot;Procure Service&quot;&quot;&quot;" name="name"/>
-                       <field eval="&quot;&quot;&quot;In procurement order, if product type is service&quot;&quot;&quot;" name="note"/>
 -                      <field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
 -                      <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
++                      <field eval="&quot;&quot;&quot;Requisition of services&quot;&quot;&quot;" name="name"/>
++                      <field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
                        <field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
                        <field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
                </record>
@@@ -5,9 -5,9 +5,9 @@@
                <!--
                        Process
                -->
 -      
 +
                <record id="process_process_serviceproductprocess0" model="process.process">
-                       <field eval="&quot;&quot;&quot;Service Process&quot;&quot;&quot;" name="name"/>
 -                      <field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
++                      <field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
                        <field name="model_id" ref="mrp.model_mrp_procurement"/>
                        <field eval="1" name="active"/>
                </record>
@@@ -5,9 -5,9 +5,9 @@@
                <!--
                        Process
                -->
 -      
 +
                <record id="process_process_stockableproductprocess0" model="process.process">
-                       <field eval="&quot;&quot;&quot;Stockable Product Process&quot;&quot;&quot;" name="name"/>
+                       <field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
                        <field name="model_id" ref="mrp.model_mrp_procurement"/>
                        <field eval="1" name="active"/>
                </record>
                        <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_node_rfq0" model="process.node">
-                       <field name="menu_id" ref="purchase.menu_purchase_order_draft"/>
+                       <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
                        <field name="model_id" ref="purchase.model_purchase_order"/>
                        <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-                       <field eval="&quot;&quot;&quot;A Request for Quotation is created and sent to the supplier.&quot;&quot;&quot;" name="note"/>
+                       <field eval="&quot;&quot;&quot;Request for Quotation.&quot;&quot;&quot;" name="note"/>
                        <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
                        <field name="subflow_id" ref="purchase.process_process_purchaseprocess0"/>
                        <field name="process_id" ref="process_process_stockableproductprocess0"/>
@@@ -82,6 -82,6 +82,6 @@@
                        <field model="process.node" name="target_node_id" ref="process_node_production0"/>
                        <field model="process.node" name="source_node_id" ref="process_node_stock0"/>
                </record>
 -      
 +
        </data>
- </openerp>
+ </openerp>
Simple merge
Simple merge
              <field name="view_id" ref="product_template_tree_view"/>
          </record>
  
-         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_products_products" sequence="2"/>
+         <menuitem action="product_template_action_tree" id="menu_templates" parent="product.menu_main_product" sequence="2"
+                   groups="product.group_product_variant" />
+         <record id="company_wise_cost_price_form_view" model="ir.ui.view">
+             <field name="name">company.wise.cost.price.form</field>
+             <field name="model">company.wise.cost.price</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="Company Wise Cost Prices">
+                     <field name="company_id" on_change="company_cost_onchange(company_id)" groups="base.group_multi_company"/>
+                     <field name="standard_price"/>
+                     <field name="currency_id"/>
+                 </form>
+             </field>
+         </record>
 -        
++
+         <record id="company_wise_cost_price_tree_view" model="ir.ui.view">
+             <field name="name">company.wise.cost.price.tree</field>
+             <field name="model">company.wise.cost.price</field>
+             <field name="type">tree</field>
+             <field name="arch" type="xml">
+                 <tree string="Company Wise Cost Prices">
+                     <field name="company_id" groups="base.group_multi_company"/>
+                     <field name="standard_price"/>
+                     <field name="currency_id"/>
+                 </tree>
+             </field>
+         </record>
 -        
++
+         <record id="company_wise_sale_price_form_view" model="ir.ui.view">
+             <field name="name">company.wise.sale.price.form</field>
+             <field name="model">company.wise.sale.price</field>
+             <field name="type">form</field>
+             <field name="arch" type="xml">
+                 <form string="Company Wise Sale Prices">
+                     <field name="company_id" on_change="company_sale_onchange(company_id)" groups="base.group_multi_company"/>
+                     <field name="list_price"/>
+                     <field name="currency_id"/>
+                 </form>
+             </field>
+         </record>
 -        
++
+         <record id="company_wise_sale_price_tree_view" model="ir.ui.view">
+             <field name="name">company.wise.sale.price.tree</field>
+             <field name="model">company.wise.sale.price</field>
+             <field name="type">tree</field>
+             <field name="arch" type="xml">
+                 <tree string="Company Wise Sale Prices">
+                     <field name="company_id" groups="base.group_multi_company"/>
+                     <field name="list_price"/>
+                     <field name="currency_id"/>
+                 </tree>
+             </field>
+         </record>
 -       
 +
      </data>
  </openerp>
@@@ -194,7 -194,8 +194,8 @@@ class purchase_order(osv.osv)
              }, multi="sums"),
          'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
          'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
 -        'create_uid':  fields.many2one('res.users', 'Responsible'),    
 -        'company_id': fields.many2one('res.company','Company',required=True),    
 +        'create_uid':  fields.many2one('res.users', 'Responsible'),
++        'company_id': fields.many2one('res.company','Company',required=True),
      }
      _defaults = {
          'date_order': lambda *a: time.strftime('%Y-%m-%d'),
@@@ -32,8 -32,8 +32,8 @@@
              <field name="menu_id" ref="sale.menu_sale_order"/>
              <field name="model_id" ref="sale.model_sale_order"/>
              <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
 -            <field eval="&quot;&quot;&quot;Sale Order Procurement&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
 +            <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;Requisition for each line&quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;Drives requisition orders for every sale order line.&quot;&quot;&quot;" name="note"/>
              <field name="subflow_id" ref="process_process_salesprocess0"/>
              <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
              <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@@ -66,8 -66,8 +66,8 @@@
              <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
              <field name="model_id" ref="mrp.model_mrp_procurement"/>
              <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-             <field eval="&quot;&quot;&quot;Requisition&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;One requisition for each product.&quot;&quot;&quot;" name="note"/>
 -            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;One procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;Requisition Order&quot;&quot;&quot;" name="name"/>
++            <field eval="&quot;&quot;&quot;One requisition order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
              <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
              <field name="process_id" ref="process_process_salesprocess0"/>
              <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
  
          <record id="process_transition_saleprocurement0" model="process.transition">
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Sale Requisition&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;Requisition is created after confirmation of sale order.&quot;&quot;&quot;" name="note"/>
 -            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;Create Requisition Order&quot;&quot;&quot;" name="name"/>
++            <field eval="&quot;&quot;&quot;A requisition order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
              <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
              <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
          </record>
  
          <record id="process_transition_packing0" model="process.transition">
              <field eval="[(6,0,[])]" name="transition_ids"/>
-             <field eval="&quot;&quot;&quot;Picking&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;Picking list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to picking list.&quot;&quot;&quot;" name="note"/>
+             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the requisition order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" 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_saleprocurement0"/>
          </record>
          <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 Requisition&quot;&quot;&quot;" name="name"/>
-             <field eval="&quot;&quot;&quot;In sale order ,    requisition for each line and it comes into the requisition order&quot;&quot;&quot;" name="note"/>
 -            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
 -            <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
++            <field eval="&quot;&quot;&quot;Requisition of sold material&quot;&quot;&quot;" name="name"/>
++            <field eval="&quot;&quot;&quot;For every sale order line, a requisition order is created to supply the sold product.&quot;&quot;&quot;" 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
Simple merge
                <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
                <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
 -        <field name="filter" eval="True"/>            
 +        <field name="filter" eval="True"/>
        </record>
 -      
 +
-       <menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_useability_extended"/>
+       <menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_extended"/>
 -      
 +
        <record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
 -              <field name="name">Packing by journal</field>
 +              <field name="name">Picking by journal</field>
                <field name="res_model">sale_journal.picking.journal</field>
                <field name="view_type">form</field>
                <field name="view_mode">tree,form</field>
                <field name="domain">[('state','=','open')]</field>
 -        <field name="filter" eval="True"/>            
 +        <field name="filter" eval="True"/>
        </record>
 -      
 +
-       <menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_useability_extended"/>
+       <menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_extended"/>
  
        <record model="ir.actions.act_window" id="action_invoice_type_tree">
 -              <field name="name">Packing by invoice_method</field>
 +              <field name="name">Picking by invoice_method</field>
                <field name="name">sale_journal.invoice.type.tree</field>
                <field name="res_model">sale_journal.invoice.type</field>
                <field name="type">ir.actions.act_window</field>
@@@ -453,9 -453,13 +453,13 @@@ class stock_picking(osv.osv)
              ('assigned', 'Available'),
              ('done', 'Done'),
              ('cancel', 'Cancelled'),
-             ], 'Status', readonly=True, select=True),
+             ], 'State', readonly=True, select=True,
+             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed picking. \
+             \n* The \'Confirmed\' state is used for stock movement to do with unavailable products. \
+             \n* The \'Available\' state is set automatically when the products are ready to be moved.\
+             \n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
          'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
 -                 method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
 +                 method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Picking. Default it takes current date"),
          'date': fields.datetime('Date Order', help="Date of Order"),
          'date_done': fields.datetime('Date Done', help="Date of completion"),
          'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
              <field name="res_model">stock.inventory</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','draft')]</field>
 -            <field name="filter" eval="True"/>            
 +            <field name="filter" eval="True"/>
          </record>
-         <menuitem action="action_inventory_form_draft" id="menu_action_inventory_form_draft" parent="menu_action_inventory_form" groups="base.group_useability_extended"/>
          <record id="action_inventory_form_new" model="ir.actions.act_window">
              <field name="name">New Periodical Inventory</field>
              <field name="type">ir.actions.act_window</field>
              <field name="res_model">stock.inventory</field>
              <field name="view_type">form</field>
              <field name="view_mode">form,tree</field>
 -            <field name="domain">[('state','=','draft')]</field>            
 +            <field name="domain">[('state','=','draft')]</field>
          </record>
-         <menuitem action="action_inventory_form_new" id="menu_action_inventory_form_new" parent="menu_action_inventory_form"/>
  
          =============================
          Lot
              <field name="view_mode">calendar</field>
              <field name="act_window_id" ref="action_picking_tree2"/>
          </record>
-         <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree" groups="base.group_useability_extended"/>
  
          <record id="action_picking_tree3" model="ir.actions.act_window">
 -            <field name="name">Confirmed Packing Waiting Availability</field>
 +            <field name="name">Confirmed Picking Waiting Availability</field>
              <field name="res_model">stock.picking</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>
              <field name="view_mode">calendar</field>
              <field name="act_window_id" ref="action_picking_tree5"/>
          </record>
-         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_useability_extended"/>
+         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended"/>
  
          <record id="action_picking_form" model="ir.actions.act_window">
 -            <field name="name">New Reception Packing</field>
 +            <field name="name">New Reception Picking</field>
              <field name="res_model">stock.picking</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
              <field name="context">{'contact_display': 'partner'}</field>
              <field name="filter" eval="True"/>
 -            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
 +            <field name="search_view_id" ref="view_stock_delivery_filter"/>
          </record>
-         <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
  
          <record id="action_picking_tree8" model="ir.actions.act_window">
 -            <field name="name">Confirmed Packing Waiting Availability</field>
 +            <field name="name">Confirmed Picking Waiting Availability</field>
              <field name="res_model">stock.picking</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
              <field name="context">{'contact_display': 'partner'}</field>
              <field name="filter" eval="True"/>
 -            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
 +            <field name="search_view_id" ref="view_stock_delivery_filter"/>
          </record>
-         <menuitem action="action_picking_tree8" id="menu_action_picking_tree8" parent="menu_action_picking_tree6" groups="base.group_useability_extended"/>
  
          <record id="action_picking_tree9" model="ir.actions.act_window">
 -            <field name="name">New Internal Packing</field>
 +            <field name="name">New Internal Picking</field>
              <field name="res_model">stock.picking</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','draft')]</field>
              <field name="view_id" ref="view_move_tree"/>
 -            <field name="filter" eval="True"/>            
 +            <field name="filter" eval="True"/>
          </record>
-         <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2" groups="base.group_useability_extended"/>
  
          <record id="action_move_form4" model="ir.actions.act_window">
              <field name="name">Available Moves</field>
              <field name="view_type">form</field>
              <field name="domain">[('state','=','assigned')]</field>
              <field name="view_id" ref="view_move_tree"/>
 -            <field name="filter" eval="True"/>            
 +            <field name="filter" eval="True"/>
          </record>
-         <menuitem action="action_move_form4" id="menu_action_move_form4" parent="menu_action_move_form2" groups="base.group_useability_extended"/>
  
          <record id="action_picking_all" model="ir.actions.act_window">
 -            <field name="name">Packing</field>
 +            <field name="name">Picking</field>
              <field name="res_model">stock.picking</field>
              <field name="type">ir.actions.act_window</field>
              <field name="view_type">form</field>