OpenUpgrade Addons

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

  1. 7.0_l10n_fr
  2. Merge into 7.0
Proposed by Sylvain LE GAL (GRAP)
Status: Rejected
Rejected by: Sylvain LE GAL (GRAP)
Proposed branch: lp:~sylvain-legal/openupgrade-addons/7.0_l10n_fr
Merge into: lp:openupgrade-addons
Diff against target: 161 lines (+73/-43)
5 files modified
account/migrations/7.0.1.1/openupgrade_analysis_work.txt (+7/-22)
account/migrations/7.0.1.1/pre-migration.py (+0/-6)
account_accountant/migrations/7.0.1.1/openupgrade_analysis_work.txt (+0/-15)
l10n_fr/migrations/7.0.1.1/openupgrade_analysis_work.txt (+32/-0)
l10n_fr/migrations/7.0.1.1/pre-migration.py (+34/-0)
To merge this branch: bzr merge lp:~sylvain-legal/openupgrade-addons/7.0_l10n_fr
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Needs Fixing
Stefan Rijnhart (Opener) Needs Information
Review via email: mp+183876@code.launchpad.net

Description of the change

[ADD] analysis and script migration for 'l10n_fr' module.

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

(reviewing only the l10n_fr module)

Account templates are a special case, I think. They are only used at the moment that a company's financial settings are configured. If the xml_id of a tax template changes, that should not influence an already configured account chart, nor should it influence the configuration of a company after the upgrade. So it seems to me that this module is a 'nothing to do'. What do you think?

review: Needs Information
Revision history for this message
Sylvain LE GAL (GRAP) (sylvain-legal) wrote :

I changed incorrect commit.

I think you're right about the special case of templates.

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

could you delete post-migration.py as it does nothing?

review: Needs Fixing
Revision history for this message
Sylvain LE GAL (GRAP) (sylvain-legal) wrote :

Sorry I lost me with bazaar command's.

I dit a new branch with merge proposal available here :
https://code.launchpad.net/~sylvain-legal/openupgrade-addons/7.0_l10n_fr_2/+merge/184754

So I reject my own merge proposal.

Sorry.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/migrations/7.0.1.1/openupgrade_analysis_work.txt'
--- account/migrations/7.0.1.1/openupgrade_analysis_work.txt 2013-09-09 20:56:30 +0000
+++ account/migrations/7.0.1.1/openupgrade_analysis_work.txt 2013-09-10 10:39:39 +0000
@@ -1,37 +1,22 @@
1---Fields in module 'account'---1---Fields in module 'account'---
2# 'opening_details_ids' replacing 'starting_details_ids' : one2many field based on account_cashbox_line.banck_statement_id (many2one) Nothing to do for the object account_banck_statement2### TODO: migrate cashbox opening and closing items
3account / account.bank.statement / starting_details_ids (one2many): DEL relation: account.cashbox.line
4account / account.bank.statement / opening_details_ids (one2many): NEW relation: account.cashbox.line
5
6# 'closing_details_ids' replacing 'ending_details_ids' : one2many field based on account_cashbox_line.banck_statement_id (many2one) Nothing to do for the object account_banck_statement
7account / account.bank.statement / ending_details_ids (one2many) : DEL relation: account.cashbox.line
8account / account.bank.statement / closing_details_ids (one2many): NEW relation: account.cashbox.line3account / account.bank.statement / closing_details_ids (one2many): NEW relation: account.cashbox.line
9
10# new field one2many based on account_cashbox_line.banck_statement_id (many2one) Nothing to do for the object account_banck_statement
11account / account.bank.statement / details_ids (one2many) : NEW relation: account.cashbox.line4account / account.bank.statement / details_ids (one2many) : NEW relation: account.cashbox.line
125account / account.bank.statement / ending_details_ids (one2many) : DEL relation: account.cashbox.line
13### The account_cashbox_line concept changes a lot. 6account / account.bank.statement / opening_details_ids (one2many): NEW relation: account.cashbox.line
14# Use case : in the cashbox : at the opening state, there is 1 '1 euro coin' and at the closing state, 3 '1 euro coin'. 7account / account.bank.statement / starting_details_ids (one2many): DEL relation: account.cashbox.line
15# in 6.1 : there is 2 lines in account_cashbox_line. One with starting_id linked to the account_bank_statement (number=1), the other with the ending_id linked to the account_bank_statement (number=3)
16# in 7.0 : there is one line with number_opening = 1 and number_closing = 3
17# -> Migration script will delete all the "ending" and merge the data to the "starting" line. (If the starting line exists)
18account / account.cashbox.line / bank_statement_id (many2one) : NEW relation: account.bank.statement8account / account.cashbox.line / bank_statement_id (many2one) : NEW relation: account.bank.statement
19account / account.cashbox.line / ending_id (many2one) : DEL relation: account.bank.statement9account / account.cashbox.line / ending_id (many2one) : DEL relation: account.bank.statement
20account / account.cashbox.line / starting_id (many2one) : DEL relation: account.bank.statement
21account / account.cashbox.line / number (integer) : DEL 10account / account.cashbox.line / number (integer) : DEL
22account / account.cashbox.line / number_closing (integer) : NEW 11account / account.cashbox.line / number_closing (integer) : NEW
23account / account.cashbox.line / number_opening (integer) : NEW 12account / account.cashbox.line / number_opening (integer) : NEW
2413account / account.cashbox.line / starting_id (many2one) : DEL relation: account.bank.statement
25### Ignore new fields
26account / account.journal / cash_control (boolean) : NEW 14account / account.journal / cash_control (boolean) : NEW
15account / account.journal / cashbox_line_ids (one2many) : NEW relation: account.journal.cashbox.line
27account / account.journal / with_last_closing_balance (boolean): NEW 16account / account.journal / with_last_closing_balance (boolean): NEW
28account / account.journal / cashbox_line_ids (one2many) : NEW relation: account.journal.cashbox.line
29account / account.journal / internal_account_id (many2one): NEW relation: account.account
30
31### Ignore new fields (new table)
32account / account.journal.cashbox.line / journal_id (many2one) : NEW relation: account.journal, required: required17account / account.journal.cashbox.line / journal_id (many2one) : NEW relation: account.journal, required: required
33account / account.journal.cashbox.line / pieces (float) : NEW 18account / account.journal.cashbox.line / pieces (float) : NEW
3419account / account.journal / internal_account_id (many2one): NEW relation: account.account
3520
36### Ignore, no existing data to push as messages21### Ignore, no existing data to push as messages
37account / account.bank.statement / message_ids (one2many) : NEW relation: mail.message22account / account.bank.statement / message_ids (one2many) : NEW relation: mail.message
3823
=== modified file 'account/migrations/7.0.1.1/pre-migration.py'
--- account/migrations/7.0.1.1/pre-migration.py 2013-09-09 20:56:30 +0000
+++ account/migrations/7.0.1.1/pre-migration.py 2013-09-10 10:39:39 +0000
@@ -32,12 +32,6 @@
32 [32 [
33 ('name', None),33 ('name', None),
34 ('note', None),34 ('note', None),
35 ],
36 'account_cashbox_line':
37 [
38 ('ending_id', None),
39 ('starting_id', None),
40 ('number', None),
41 ]35 ]
42}36}
4337
4438
=== removed file 'account_accountant/migrations/7.0.1.1/openupgrade_analysis_work.txt'
--- account_accountant/migrations/7.0.1.1/openupgrade_analysis_work.txt 2013-09-04 11:17:44 +0000
+++ account_accountant/migrations/7.0.1.1/openupgrade_analysis_work.txt 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
1---Fields in module 'account_accountant'---
2---XML records in module 'account_accountant'---
3
4### New xml_ids. OK.
5NEW ir.actions.client: account_accountant.action_client_account_menu
6NEW mail.message: account_accountant.module_install_notification
7
8### xml_id from other module. (New). OK
9NEW ir.actions.todo: base.open_menu
10NEW ir.ui.menu: account.menu_account_config
11
12### xml_id from other module. (Existing). OK
13NEW ir.ui.menu: account.menu_finance
14
15
160
=== 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 10:39:39 +0000
@@ -0,0 +1,32 @@
1---Fields in module 'l10n_fr'---
2# New fields for company. Nothing to do.
3l10n_fr / res.company / ape (char) : NEW
4l10n_fr / res.company / siret (char) : NEW
5
6---XML records in module 'l10n_fr'---
7# 'tva_acq_normale_inclue' renamed by 'tva_acq_normale_TTC'. OK
8DEL account.tax.template: l10n_fr.tva_acq_normale_inclue
9NEW account.tax.template: l10n_fr.tva_acq_normale_TTC
10
11# 'tva_acq_specifique_inclue' renamed by 'tva_acq_specifique_TTC'. OK
12DEL account.tax.template: l10n_fr.tva_acq_specifique_inclue
13NEW account.tax.template: l10n_fr.tva_acq_specifique_TTC
14
15# 'tva_acq_specifique_1_inclue' renamed by 'tva_acq_specifique_1_TTC'. OK
16DEL account.tax.template: l10n_fr.tva_acq_specifique_1_inclue
17NEW account.tax.template: l10n_fr.tva_acq_specifique_1_TTC
18
19# 'tva_acq_reduite_inclue' renamed by 'tva_acq_reduite_TTC'. OK
20DEL account.tax.template: l10n_fr.tva_acq_reduite_inclue
21NEW account.tax.template: l10n_fr.tva_acq_reduite_TTC
22
23# 'tva_acq_super_reduite_inclue' renamed by 'tva_acq_super_reduite_TTC'. OK
24DEL account.tax.template: l10n_fr.tva_acq_super_reduite_inclue
25NEW account.tax.template: l10n_fr.tva_acq_super_reduite_TTC
26
27# New action.todo from 'account' module replacing the old actions.todo from 'l10n_fr' module. Nothing to do.
28DEL ir.actions.todo: l10n_fr.config_call_account_template_fr
29NEW ir.actions.todo: account.action_wizard_multi_chart_todo
30
31# New herited view for adding ape and siret field. OK.
32NEW ir.ui.view: l10n_fr.res_company_form_l10n_fr
033
=== 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 10:39:39 +0000
@@ -0,0 +1,34 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# OpenERP, Open Source Management Solution
5# This module copyright (C) 2013 Sylvain LE GAL
6#
7# This program is free software: you can redistribute it and/or modify
8# it under the terms of the GNU Affero General Public License as
9# published by the Free Software Foundation, either version 3 of the
10# License, or (at your option) any later version.
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU Affero General Public License for more details.
16#
17# You should have received a copy of the GNU Affero General Public License
18# along with this program. If not, see <http://www.gnu.org/licenses/>.
19#
20##############################################################################
21
22from openerp.openupgrade import openupgrade
23
24xmlid_renames = [
25 ('l10n_fr.tva_acq_normale_inclue', 'l10n_fr.tva_acq_normale_TTC'),
26 ('l10n_fr.tva_acq_specifique_inclue', 'l10n_fr.tva_acq_specifique_TTC'),
27 ('l10n_fr.tva_acq_specifique_1_inclue', 'l10n_fr.tva_acq_specifique_1_TTC'),
28 ('l10n_fr.tva_acq_reduite_inclue', 'l10n_fr.tva_acq_reduite_TTC'),
29 ('l10n_fr.tva_acq_super_reduite_inclue', 'l10n_fr.tva_acq_super_reduite_TTC'),
30]
31
32@openupgrade.migrate()
33def migrate(cr, version):
34 openupgrade.rename_xmlids(cr, xmlid_renames)

Subscribers

People subscribed via source and target branches