Merge lp:~therp-nl/banking-addons/ba70-fix_migration into lp:banking-addons

[Stefan Rijnhart (Opener)]

[Holger Brunn (Therp) (hbrunn)]

The migrations from the branches you renamed never ran then, right?

review: Approve (code review)

[Stefan Rijnhart (Opener) (stefan-opener)]

No, they run at every migration, that is the problem ;-)

=== renamed directory 'account_banking/migrations/0.1.81' => 'account_banking/migrations/6.1.0.1.81'
=== added directory 'account_banking/migrations/7.0.0.1'
=== added file 'account_banking/migrations/7.0.0.1/pre-migration.py'
--- account_banking/migrations/7.0.0.1/pre-migration.py	1970-01-01 00:00:00 +0000
+++ account_banking/migrations/7.0.0.1/pre-migration.py	2013-07-24 14:53:33 +0000
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+
+    # workflow state moved to another, new module
+    cr.execute(
+        """
+        UPDATE ir_model_data 
+        SET module = 'account_banking_payment'
+        WHERE name = 'trans_done_sent'
+        AND module = 'account_direct_debit'
+        """)
 
=== renamed directory 'account_banking_nl_clieop/migrations/0.63' => 'account_banking_nl_clieop/migrations/6.1.0.63'
=== renamed directory 'account_banking_nl_clieop/migrations/0.64' => 'account_banking_nl_clieop/migrations/6.1.0.64'
=== added file 'account_direct_debit/migrations/7.0.2/post-migration.py'
--- account_direct_debit/migrations/7.0.2/post-migration.py	1970-01-01 00:00:00 +0000
+++ account_direct_debit/migrations/7.0.2/post-migration.py	2013-07-24 14:53:33 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Therp BV (<http://therp.nl>).
+#            
+#    All other contributions are (C) by their respective contributors
+#
+#    All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+def migrate(cr, version):
+    if not version:
+        return
+    cr.execute(
+        """
+        UPDATE payment_line
+        SET transit_move_line_id = banking_addons_61_debit_move_line_id
+        """)
+    cr.execute(
+        """
+        ALTER TABLE "payment_line"
+        DROP COLUMN "banking_addons_61_debit_move_line_id"
+        """
+        )
 
=== modified file 'account_direct_debit/migrations/7.0.2/pre-migration.py'
--- account_direct_debit/migrations/7.0.2/pre-migration.py	2013-05-28 14:17:56 +0000
+++ account_direct_debit/migrations/7.0.2/pre-migration.py	2013-07-24 14:53:33 +0000
@@ -22,6 +22,9 @@
 #
 ##############################################################################
 
+import logging
+logger = logging.getLogger()
+
 def rename_columns(cr, column_spec):
     """
     Rename table columns. Taken from OpenUpgrade.
@@ -41,17 +44,8 @@
     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'
-        """)
-
     # rename field debit_move_line_id
     rename_columns(cr, {
             'payment_line': [
-                ('debit_move_line_id', 'transit_move_line_id'),
+                ('debit_move_line_id', 'banking_addons_61_debit_move_line_id'),
                 ]})