[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099

3 files changed, 37 insertions, 37 deletions

diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml
index 8971235c1f7..e45f8080518 100644
--- a/addons/account/process/customer_invoice_process.xml
+++ b/addons/account/process/customer_invoice_process.xml
@@ -123,24 +123,24 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_accountingstatemententries0"/>
+            <field name="source_node_id" ref="account.process_node_draftstatement0"/>
         </record>
 
         <record id="process_transition_analyticinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_draftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analytic0"/>
         </record>
 
         <record id="process_transition_customerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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 name="target_node_id" ref="process_node_invoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_draftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -148,40 +148,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_accountingentries0"/>
+            <field name="source_node_id" ref="process_node_invoiceinvoice0"/>
         </record>
 
         <record id="process_transition_entriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_accountingentries0"/>
         </record>
 
         <record id="process_transition_statemententries0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_paymententries0"/>
+            <field name="source_node_id" ref="process_node_bankstatement0"/>
         </record>
 
         <record id="process_transition_paymentreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_reconciliation0"/>
+            <field name="source_node_id" ref="process_node_paymententries0"/>
         </record>
 
         <record id="process_transition_reconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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"/>
+            <field name="target_node_id" ref="process_node_paidinvoice0"/>
+            <field name="source_node_id" ref="process_node_reconciliation0"/>
         </record>
 
         <!--
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 64dd7520bc1..81b1748a6d4 100644
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -68,8 +68,8 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Automatic import of the bank statement&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from an electronic file&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_electronicfile0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_electronicfile0"/>
         </record>
 
         <record id="process_transition_invoicemanually0" model="process.transition">
@@ -77,17 +77,17 @@
             <field eval="&quot;&quot;&quot;Manual entry&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 model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_manually0"/>
         </record>
 
         <record id="process_transition_invoiceimport0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Import from invoice or payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Import of the statement in the system from a supplier or customer invoice&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_importinvoice0"/>
+            <field name="target_node_id" ref="process_node_draftstatement0"/>
+            <field name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml
index 58b98220f95..b1d9de904aa 100644
--- a/addons/account/process/supplier_invoice_process.xml
+++ b/addons/account/process/supplier_invoice_process.xml
@@ -111,16 +111,16 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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 supplier invoices.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_analyticcost0"/>
+            <field name="target_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="source_node_id" ref="process_node_analyticcost0"/>
         </record>
 
         <record id="process_transition_suppliercustomerinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
+            <field name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
             <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
 
@@ -128,40 +128,40 @@
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <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_supplieraccountingentries0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
+            <field name="target_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="source_node_id" ref="process_node_supplierinvoiceinvoice0"/>
         </record>
 
         <record id="process_transition_supplierentriesreconcile0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Accounting entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Accounting entries are an input of the reconciliation.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplieraccountingentries0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplieraccountingentries0"/>
         </record>
 
         <record id="process_transition_paymentorderbank0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Payment entries&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;The payment order is sent to the bank.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierbankstatement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierpaymentorder0"/>
+            <field name="target_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="source_node_id" ref="process_node_supplierpaymentorder0"/>
         </record>
 
         <record id="process_transition_paymentorderreconcilation0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Validation&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;Bank statements are entered in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierreconciliation0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierbankstatement0"/>
+            <field name="target_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="source_node_id" ref="process_node_supplierbankstatement0"/>
         </record>
 
         <record id="process_transition_supplierreconcilepaid0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;System payment&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;As soon as the reconciliation is done, the invoice's state turns to “done” (i.e. paid) in the system.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_supplierreconciliation0"/>
+            <field name="target_node_id" ref="process_node_supplierpaidinvoice0"/>
+            <field name="source_node_id" ref="process_node_supplierreconciliation0"/>
         </record>
 
    </data>