From 345381a8a71e8c204e9a4af4f3439aab77c8686e Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Tue, 28 May 2013 07:16:26 +0200
Subject: [PATCH] [RFR] Move workflow adaptions from debit module to payment
 module

---
 .../workflow/account_payment.xml              | 22 ++++++++++++++++
 account_direct_debit/__openerp__.py           |  7 +++---
 .../migrations/7.0.2/pre-migration.py         | 12 +++++++++
 .../workflow/account_payment.xml              | 25 -------------------
 4 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 account_direct_debit/migrations/7.0.2/pre-migration.py
 delete mode 100644 account_direct_debit/workflow/account_payment.xml

diff --git a/account_banking_payment/workflow/account_payment.xml b/account_banking_payment/workflow/account_payment.xml
index e09d697a7..fb16f0e5a 100644
--- a/account_banking_payment/workflow/account_payment.xml
+++ b/account_banking_payment/workflow/account_payment.xml
@@ -34,5 +34,27 @@ write({'state':'rejected'})</field>
             <field name="act_to" ref="account_banking.act_sent"/>
             <field name="signal">sent</field>
         </record>
+
+        <!--
+            Transition to undo the payment order and reset to
+            sent, triggered by cancelling a bank transaction
+            with which the order was reconciled.
+            For this, we need to cancel the flow stop on the done state,
+            unfortunately.
+            TODO: what is below is not enough. We need to inject
+            another state, 'sent_wait' between sent and done.
+        -->
+        <record id="account_payment.act_done" model="workflow.activity">
+            <field name="flow_stop" eval="False"/>
+        </record>
+
+        <!-- Cancel the reconciled payment order -->
+        <record id="trans_done_sent" model="workflow.transition">
+            <field name="act_from" ref="account_payment.act_done"/>
+            <field name="act_to" ref="account_banking.act_sent"/>
+            <field name="condition">test_undo_done()</field>
+            <field name="signal">undo_done</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/account_direct_debit/__openerp__.py b/account_direct_debit/__openerp__.py
index 274513c3b..da3d223c7 100644
--- a/account_direct_debit/__openerp__.py
+++ b/account_direct_debit/__openerp__.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-#    Copyright (C) 2011 Therp BV (<http://therp.nl>).
+#    Copyright (C) 2011 - 2013 Therp BV (<http://therp.nl>).
 #    Copyright (C) 2011 Smile (<http://smile.fr>).
 #    All Rights Reserved
 #
@@ -20,9 +20,9 @@
 ##############################################################################
 {
     'name': 'Direct Debit',
-    'version': '6.1.1.134',
+    'version': '7.0.2.134',
     'license': 'AGPL-3',
-    'author': 'Therp BV / Smile',
+    'author': '['Therp BV', 'Smile']',
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
     'depends': ['account_banking'],
@@ -30,7 +30,6 @@
         'view/account_payment.xml',
         'view/account_invoice.xml',
         'workflow/account_invoice.xml',
-        'workflow/account_payment.xml',
         'data/account_payment_term.xml',
     ],
     'description': '''
diff --git a/account_direct_debit/migrations/7.0.2/pre-migration.py b/account_direct_debit/migrations/7.0.2/pre-migration.py
new file mode 100644
index 000000000..29fa9d6aa
--- /dev/null
+++ b/account_direct_debit/migrations/7.0.2/pre-migration.py
@@ -0,0 +1,12 @@
+def migrate(cr, version):
+    if not version:
+        return
+    # workflow state moved to another module
+    cr.execute(
+        """
+        UPDATE ir_model_data 
+        SET module = 'account_banking_payment'
+        WHERE name = 'trans_done_sent'
+        AND module = 'account_direct_debit'
+        """)
+        
diff --git a/account_direct_debit/workflow/account_payment.xml b/account_direct_debit/workflow/account_payment.xml
deleted file mode 100644
index 7ea27c523..000000000
--- a/account_direct_debit/workflow/account_payment.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--
-            Transition to undo the payment order and reset to
-            sent, triggered by
-            cancelling a bank transaction with which the order
-            was reconciled.
-            For this, we need to cancel the flow stop on the done state,
-            unfortunately.
-            TODO: what is below is not enough. We need to inject
-            another state, 'sent_wait' between sent and done.
-        -->
-        <record id="account_payment.act_done" model="workflow.activity">
-            <field name="flow_stop" eval="False"/>
-        </record>
-
-        <record id="trans_done_sent" model="workflow.transition">
-            <field name="act_from" ref="account_payment.act_done"/>
-            <field name="act_to" ref="account_banking.act_sent"/>
-            <field name="condition">test_undo_done()</field>
-            <field name="signal">undo_done</field>
-        </record>
-    </data>
-</openerp>