Merge lp:~sylvain-legal/openupgrade-addons/7.0_l10n_fr_2 into lp:openupgrade-addons

[Sylvain LE GAL (GRAP)]

New merge proposal replacing : https://code.launchpad.net/~sylvain-legal/openupgrade-addons/7.0_l10n_fr/+merge/183876

According to Holger's comment :
-> Deleting void post-migration.py script

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

Thanks! My point here [1] was: an OpenERP migration does not have to take care of any record from an account template or a tax template because it does not affect the chart of accounts installed. So it seems to me that the migration script is not necessary.

[1] https://code.launchpad.net/~sylvain-legal/openupgrade-addons/7.0_l10n_fr/+merge/183876/comments/417847

review: Needs Fixing

[Sylvain LE GAL (GRAP) (sylvain-legal)]

Hi.

regarding Stefan's comment :
My point of view is :
- in most cases, migrate or not migrate template object will not change nothing because it's not possible by interface to change template values ;

- As stefan said, if we create tax for a company before migration, the migration script will not change tax object. (only tax.template)

- Maybe in a specific case, if a developper did a change in the database in a tax.template record (or by specific module), the result will not be se same during migration ;

- It's "more right" to migrate template (i.e : change xml_id instead of delete and recreate) because this is the same object. It's conceptually the same that base.user_admin renamed by base.user_root or other ;

- It's really not important for me. If OpenUpgrade commiters prefere not to migrate template, I'll change my code.

My 2 cents.

Thanks for your reviews and your helpfull comments.

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

Agreed. It does not hurt to migrate the existing entries and it might even help some of the less likely setups that you mention.

review: Approve

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

I had to merge this manually, because the branch undoes some of your earlier changes that were merged before. I think you reverted manually when these changes showed up in this proposal too. Not a big problem though.

=== added file 'l10n_fr/migrations/7.0.1.1/openupgrade_analysis_work.txt'
--- l10n_fr/migrations/7.0.1.1/openupgrade_analysis_work.txt	1970-01-01 00:00:00 +0000
+++ l10n_fr/migrations/7.0.1.1/openupgrade_analysis_work.txt	2013-09-10 11:13:45 +0000
@@ -0,0 +1,32 @@
+---Fields in module 'l10n_fr'---
+# New fields for company. Nothing to do.
+l10n_fr      / res.company              / ape (char)                    : NEW 
+l10n_fr      / res.company              / siret (char)                  : NEW 
+
+---XML records in module 'l10n_fr'---
+# 'tva_acq_normale_inclue' renamed by 'tva_acq_normale_TTC'. OK
+DEL account.tax.template: l10n_fr.tva_acq_normale_inclue
+NEW account.tax.template: l10n_fr.tva_acq_normale_TTC
+
+# 'tva_acq_specifique_inclue' renamed by 'tva_acq_specifique_TTC'. OK
+DEL account.tax.template: l10n_fr.tva_acq_specifique_inclue
+NEW account.tax.template: l10n_fr.tva_acq_specifique_TTC
+
+# 'tva_acq_specifique_1_inclue' renamed by 'tva_acq_specifique_1_TTC'. OK
+DEL account.tax.template: l10n_fr.tva_acq_specifique_1_inclue
+NEW account.tax.template: l10n_fr.tva_acq_specifique_1_TTC
+
+# 'tva_acq_reduite_inclue' renamed by 'tva_acq_reduite_TTC'. OK
+DEL account.tax.template: l10n_fr.tva_acq_reduite_inclue
+NEW account.tax.template: l10n_fr.tva_acq_reduite_TTC
+
+# 'tva_acq_super_reduite_inclue' renamed by 'tva_acq_super_reduite_TTC'. OK
+DEL account.tax.template: l10n_fr.tva_acq_super_reduite_inclue
+NEW account.tax.template: l10n_fr.tva_acq_super_reduite_TTC
+
+# New action.todo from 'account' module replacing the old actions.todo from 'l10n_fr' module. Nothing to do.
+DEL ir.actions.todo: l10n_fr.config_call_account_template_fr
+NEW ir.actions.todo: account.action_wizard_multi_chart_todo
+
+# New herited view for adding ape and siret field. OK.
+NEW ir.ui.view: l10n_fr.res_company_form_l10n_fr

=== added file 'l10n_fr/migrations/7.0.1.1/pre-migration.py'
--- l10n_fr/migrations/7.0.1.1/pre-migration.py	1970-01-01 00:00:00 +0000
+++ l10n_fr/migrations/7.0.1.1/pre-migration.py	2013-09-10 11:13:45 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Sylvain LE GAL
+#
+#    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/>.
+#
+##############################################################################
+
+from openerp.openupgrade import openupgrade
+
+xmlid_renames = [
+    ('l10n_fr.tva_acq_normale_inclue', 'l10n_fr.tva_acq_normale_TTC'),
+    ('l10n_fr.tva_acq_specifique_inclue', 'l10n_fr.tva_acq_specifique_TTC'),
+    ('l10n_fr.tva_acq_specifique_1_inclue', 'l10n_fr.tva_acq_specifique_1_TTC'),
+    ('l10n_fr.tva_acq_reduite_inclue', 'l10n_fr.tva_acq_reduite_TTC'),
+    ('l10n_fr.tva_acq_super_reduite_inclue', 'l10n_fr.tva_acq_super_reduite_TTC'),
+]
+
[e-mail]()
+def migrate(cr, version):
+    openupgrade.rename_xmlids(cr, xmlid_renames)