merge with pso branch

bzr revid: hda@tinyerp.com-20081224105543-d76dcs9q1t8t6j91

1 files changed, 5 insertions, 4 deletions

diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index 9fa1bf6becb..d0105f76e03 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -16,7 +16,7 @@
     -->
     
         <record id="process_node_electronicfile0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Electronic File&quot;&quot;&quot;" name="name"/>
@@ -27,7 +27,7 @@
         </record>
         
         <record id="process_node_manually0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Manually&quot;&quot;&quot;" name="name"/>
@@ -38,7 +38,7 @@
         </record>
     
         <record id="process_node_importinvoice0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Import invoice&quot;&quot;&quot;" name="name"/>
@@ -49,7 +49,7 @@
         </record>
     
         <record id="process_node_draftstatement0" model="process.node">
-            <field name="menu_id" ref="account.menu_bank_statement_tree2"/>
+            <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Draft statement&quot;&quot;&quot;" name="name"/>
@@ -65,6 +65,7 @@
             <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 name="subflow_id" ref="process_process_invoiceworkflow0"/>
             <field name="process_id" ref="process_process_statementworkflow0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'valid')&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>