[Merge]: Merged with parent branch

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

1 files changed, 31 insertions, 31 deletions

diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 29506429486..117b7723c68 100755
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -9,7 +9,7 @@
         <record id="process_process_invoiceprocess0" model="process.process">
             <field eval="1" name="active"/>
              <field name="model_id" ref="account.model_account_invoice"/>
-            <field eval="&quot;&quot;&quot;Customer Invoice Process&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
         </record>
         
         <!--    
@@ -20,8 +20,8 @@
             <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;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Analytic&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Analytic costs to reinvoice purchases, timesheets, ...&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Analytic Costs&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs to invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'open', 'pending', 'close')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
@@ -31,8 +31,8 @@
             <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Draft Invoices&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Proposed invoice to be checked, validated and printed&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Draft Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft state of an invoice&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -43,7 +43,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Have a number and entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Open&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -53,8 +53,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
             <field name="model_id" ref="account.model_account_move"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Accounting Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Validated accounting entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries.&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
@@ -64,7 +64,7 @@
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Statement encoding produces payment entries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Registered payment&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field name="subflow_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
@@ -75,8 +75,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_form"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Payment Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Can be draft or validated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -87,7 +87,7 @@
             <field name="model_id" ref="account.model_account_move_reconcile"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Reconciliation&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconciliation of entries from invoice(s) and payment(s)&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Comparison between accounting and payment entries&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='valid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -98,7 +98,7 @@
             <field name="model_id" ref="account.model_account_invoice"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Paid invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Invoice's state is Done&quot;&quot;&quot;" name="note"/>
             <field name="process_id" ref="process_process_invoiceprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='paid'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
@@ -108,8 +108,8 @@
             <field name="menu_id" ref="account.menu_action_move_line_search"/>
             <field name="model_id" ref="account.model_account_move_line"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Accounting Statement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Accounting entries at statement's confirmation&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Bank Statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Bank statement&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
             <field name="process_id" ref="process_process_statementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
@@ -132,8 +132,8 @@
         <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Confirm statement from draft&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Confirm statement with/without reconciliation from draft statement&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Confirm statement&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The accountant confirms the statement.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_accountingstatemententries0"/>
             <field model="process.node" name="source_node_id" ref="account.process_node_draftstatement0"/>
         </record>
@@ -141,8 +141,8 @@
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;analytic Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From analytic accounts, Create invoice.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;From analytic accounts&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Analytic costs (timesheets, some purchased products, ...) come from analytic accounts. These generate draft invoices.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_analytic0"/>
         </record>
@@ -150,8 +150,8 @@
         <record id="process_transition_customerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Customer Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Number of entries are generated&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
             <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
@@ -160,8 +160,8 @@
         <record id="process_transition_validentries0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Valid Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Valid entries from invoice&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accountant validates the accounting entries coming from the invoice.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_accountingentries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_invoiceinvoice0"/>
         </record>
@@ -169,8 +169,8 @@
         <record id="process_transition_entriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Entries Reconcile&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcile Entries.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Accounting entries are the first input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_accountingentries0"/>
         </record>
@@ -178,8 +178,8 @@
         <record id="process_transition_statemententries0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Statement Entries&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;From statement, create entries&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Manual or automatic creation of payment entries according to the statements&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_paymententries0"/>
             <field model="process.node" name="source_node_id" ref="process_node_bankstatement0"/>
         </record>
@@ -187,8 +187,8 @@
         <record id="process_transition_paymentreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Payment Reconcile&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Reconcilate the entries from payment&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Payment entries are the second input of the reconciliation.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_reconciliation0"/>
             <field model="process.node" name="source_node_id" ref="process_node_paymententries0"/>
         </record>
@@ -196,8 +196,8 @@
         <record id="process_transition_reconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Reconcile Paid&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Paid invoice when reconciled.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Payment&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice can be paid.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_paidinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_reconciliation0"/>
         </record>