[Merge]: Merged with parent branch

bzr revid: uco@tinyerp.co.in-20091124091156-o1sppqxu9qhii79h

1 files changed, 33 insertions, 33 deletions

diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml
index aacb501d37a..97a963ae5bc 100755
--- a/addons/purchase/process/purchase_process.xml
+++ b/addons/purchase/process/purchase_process.xml
@@ -9,7 +9,7 @@
         <record id="process_process_purchaseprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
-            <field eval="&quot;&quot;&quot;Purchase Process&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Purchase&quot;&quot;&quot;" name="name"/>
         </record>
         
         <!--        
@@ -20,8 +20,8 @@
             <field name="menu_id" ref="stock.menu_action_picking_tree"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Out Packing&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Invoice based on deliveries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Outgoing Products&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Outgoing products to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -32,7 +32,7 @@
             <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;Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When controlling invoice from orders&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmed purchase order to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field name="subflow_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -44,7 +44,7 @@
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Request for quotation is proposed by the system.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Request for Quotations.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -55,7 +55,7 @@
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;RFQ&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encoded manually by the user.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Request for Quotations.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -65,8 +65,8 @@
             <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Confirmed Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Purchase order is confirmed by the user.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmed&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;State of the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -76,8 +76,8 @@
             <field name="menu_id" ref="purchase.menu_purchase_form_action"/>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Approved Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Purchase order is approved by supplier.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Approved&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;State of the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='approved'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -88,7 +88,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Pre-generated supplier invoice to control based on order&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;To be reviewed by the accountant.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field name="subflow_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -100,7 +100,7 @@
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Packing is created for the products reception control.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;List of ordered products.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='assigned'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -111,7 +111,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Supplier Invoice pre-generated on receptions for control&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;To be reviewed by the accountant.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_purchaseprocess0"/>
             <field name="subflow_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -122,8 +122,8 @@
             <field name="menu_id" ref="stock.menu_action_picking_tree"/>
             <field name="model_id" ref="stock.model_stock_picking"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Product Receipt&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Control invoices on receptions&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Incoming Products&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Incoming products to control&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_purchaseprocess0"/>
             <field name="process_id" ref="account.process_process_supplierinvoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
@@ -167,8 +167,8 @@
         <record id="process_transition_productrecept0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Product recept invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Create invoice from product recept&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_productrecept0"/>
         </record>
@@ -176,8 +176,8 @@
         <record id="process_transition_confirmingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirming Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm Purchase order from Request for quotation&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_draft_confirmed')])]" name="transition_ids"/>
@@ -186,8 +186,8 @@
         <record id="process_transition_confirmingpurchaseorder1" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirming Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm Purchase order from Request for quotation without origin&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirmation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;In case there is no supplier for this product, the buyer can fill the form manually and confirm it. The RFQ becomes a confirmed Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_confirmpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftpurchaseorder1"/>
         </record>
@@ -195,8 +195,8 @@
         <record id="process_transition_approvingpurchaseorder0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Approving Purchase Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Approve Purchase order after Confirming&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Approbation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The supplier approves the Purchase Order.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_approvepurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_confirmpurchaseorder0" />
         </record>
@@ -204,8 +204,8 @@
         <record id="process_transition_invoicefrompurchase0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice from Purchase&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;After approved purchase order , it comes into the supplier invoice&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoicecontrol0"/>
             <field model="process.node" name="source_node_id" ref="process_node_approvepurchaseorder0"/>
             <field eval="[(6,0,[ref('purchase.trans_router_invoice')])]" name="transition_ids"/>
@@ -214,8 +214,8 @@
         <record id="process_transition_createpackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Packing list&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;When purchase order is approved , it creates its packing list.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Pick list generated&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A pick list is generated to track the incoming products.&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_approvepurchaseorder0"/>
         </record>
@@ -223,8 +223,8 @@
         <record id="process_transition_invoicefrompackinglist0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Invoice from Packing list&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Creates invoice from packin list&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the Invoice control of the purchase order is 'On picking'. The invoice can also be generated manually by the accountant (Invoice control = Manual).&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterpacking0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
@@ -232,8 +232,8 @@
         <record id="process_transition_purchaseinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Purchase Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;After Purchase order , Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a purchase order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_supplierdraftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_purchaseorder0"/>
         </record>
@@ -241,8 +241,8 @@
         <record id="process_transition_packinginvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Packing Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From Packing list, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From a Pick list&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A Pick list generates an invoice. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinginvoice0"/>
         </record>