From fe8457dced0491b302b65e3777922ec3ab37bc87 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Thu, 27 Nov 2014 10:18:59 +0100 Subject: [PATCH 1/6] [PORT] Move account_chart_update out of unported --- .../account_chart_update => account_chart_update}/__init__.py | 0 .../account_chart_update => account_chart_update}/__openerp__.py | 0 .../i18n/account_chart_update.pot | 0 .../account_chart_update => account_chart_update}/i18n/ca.po | 0 .../account_chart_update => account_chart_update}/i18n/ca_ES.po | 0 .../account_chart_update => account_chart_update}/i18n/es.po | 0 .../account_chart_update => account_chart_update}/i18n/es_ES.po | 0 .../account_chart_update => account_chart_update}/i18n/fr.po | 0 .../account_chart_update => account_chart_update}/i18n/pt.po | 0 .../account_chart_update => account_chart_update}/i18n/pt_BR.po | 0 .../account_chart_update => account_chart_update}/i18n/sv.po | 0 .../wizard/__init__.py | 0 .../wizard/wizard_chart_update.py | 0 .../wizard/wizard_chart_update_view.xml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename {__unported__/account_chart_update => account_chart_update}/__init__.py (100%) rename {__unported__/account_chart_update => account_chart_update}/__openerp__.py (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/account_chart_update.pot (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/ca.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/ca_ES.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/es.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/es_ES.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/fr.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/pt.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/pt_BR.po (100%) rename {__unported__/account_chart_update => account_chart_update}/i18n/sv.po (100%) rename {__unported__/account_chart_update => account_chart_update}/wizard/__init__.py (100%) rename {__unported__/account_chart_update => account_chart_update}/wizard/wizard_chart_update.py (100%) rename {__unported__/account_chart_update => account_chart_update}/wizard/wizard_chart_update_view.xml (100%) diff --git a/__unported__/account_chart_update/__init__.py b/account_chart_update/__init__.py similarity index 100% rename from __unported__/account_chart_update/__init__.py rename to account_chart_update/__init__.py diff --git a/__unported__/account_chart_update/__openerp__.py b/account_chart_update/__openerp__.py similarity index 100% rename from __unported__/account_chart_update/__openerp__.py rename to account_chart_update/__openerp__.py diff --git a/__unported__/account_chart_update/i18n/account_chart_update.pot b/account_chart_update/i18n/account_chart_update.pot similarity index 100% rename from __unported__/account_chart_update/i18n/account_chart_update.pot rename to account_chart_update/i18n/account_chart_update.pot diff --git a/__unported__/account_chart_update/i18n/ca.po b/account_chart_update/i18n/ca.po similarity index 100% rename from __unported__/account_chart_update/i18n/ca.po rename to account_chart_update/i18n/ca.po diff --git a/__unported__/account_chart_update/i18n/ca_ES.po b/account_chart_update/i18n/ca_ES.po similarity index 100% rename from __unported__/account_chart_update/i18n/ca_ES.po rename to account_chart_update/i18n/ca_ES.po diff --git a/__unported__/account_chart_update/i18n/es.po b/account_chart_update/i18n/es.po similarity index 100% rename from __unported__/account_chart_update/i18n/es.po rename to account_chart_update/i18n/es.po diff --git a/__unported__/account_chart_update/i18n/es_ES.po b/account_chart_update/i18n/es_ES.po similarity index 100% rename from __unported__/account_chart_update/i18n/es_ES.po rename to account_chart_update/i18n/es_ES.po diff --git a/__unported__/account_chart_update/i18n/fr.po b/account_chart_update/i18n/fr.po similarity index 100% rename from __unported__/account_chart_update/i18n/fr.po rename to account_chart_update/i18n/fr.po diff --git a/__unported__/account_chart_update/i18n/pt.po b/account_chart_update/i18n/pt.po similarity index 100% rename from __unported__/account_chart_update/i18n/pt.po rename to account_chart_update/i18n/pt.po diff --git a/__unported__/account_chart_update/i18n/pt_BR.po b/account_chart_update/i18n/pt_BR.po similarity index 100% rename from __unported__/account_chart_update/i18n/pt_BR.po rename to account_chart_update/i18n/pt_BR.po diff --git a/__unported__/account_chart_update/i18n/sv.po b/account_chart_update/i18n/sv.po similarity index 100% rename from __unported__/account_chart_update/i18n/sv.po rename to account_chart_update/i18n/sv.po diff --git a/__unported__/account_chart_update/wizard/__init__.py b/account_chart_update/wizard/__init__.py similarity index 100% rename from __unported__/account_chart_update/wizard/__init__.py rename to account_chart_update/wizard/__init__.py diff --git a/__unported__/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py similarity index 100% rename from __unported__/account_chart_update/wizard/wizard_chart_update.py rename to account_chart_update/wizard/wizard_chart_update.py diff --git a/__unported__/account_chart_update/wizard/wizard_chart_update_view.xml b/account_chart_update/wizard/wizard_chart_update_view.xml similarity index 100% rename from __unported__/account_chart_update/wizard/wizard_chart_update_view.xml rename to account_chart_update/wizard/wizard_chart_update_view.xml From b741d431692db21dde8cc64b5506d41080f29e41 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Thu, 27 Nov 2014 10:20:57 +0100 Subject: [PATCH 2/6] [PORT] Set account_chart_update installable --- account_chart_update/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_chart_update/__openerp__.py b/account_chart_update/__openerp__.py index 8d49d9c85..e1f10c21b 100644 --- a/account_chart_update/__openerp__.py +++ b/account_chart_update/__openerp__.py @@ -72,5 +72,5 @@ Any problem found while updating will be shown on the last step. 'wizard/wizard_chart_update_view.xml', ], "active": False, - 'installable': False + 'installable': True } From 89a1bc710ac191777f48d331986d88383d98dd67 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Thu, 27 Nov 2014 10:40:33 +0100 Subject: [PATCH 3/6] [PORT] value_reference of ir.property is a char --- account_chart_update/wizard/wizard_chart_update.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py index 57bb20fac..ad53536be 100644 --- a/account_chart_update/wizard/wizard_chart_update.py +++ b/account_chart_update/wizard/wizard_chart_update.py @@ -272,7 +272,8 @@ class wizard_update_charts_accounts(orm.TransientModel): if property_ids: prop = property_obj.browse( cr, uid, property_ids[0], context=context) - account_id = prop.value_reference.id + account_id = len(prop.value_reference.split(',')) == 2 and\ + int(prop.value_reference.split(',')[1]) or False if account_id: code = account_obj.read( cr, uid, account_id, ['code'], context)['code'] From 69dd10dea9c32e20677e13123c7f4ac8633161ed Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Fri, 28 Nov 2014 09:06:54 +0100 Subject: [PATCH 4/6] [IMP] Use get_by_record method of ir.property --- account_chart_update/wizard/wizard_chart_update.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py index ad53536be..7064e22e9 100644 --- a/account_chart_update/wizard/wizard_chart_update.py +++ b/account_chart_update/wizard/wizard_chart_update.py @@ -272,12 +272,10 @@ class wizard_update_charts_accounts(orm.TransientModel): if property_ids: prop = property_obj.browse( cr, uid, property_ids[0], context=context) - account_id = len(prop.value_reference.split(',')) == 2 and\ - int(prop.value_reference.split(',')[1]) or False - if account_id: - code = account_obj.read( - cr, uid, account_id, ['code'], context)['code'] - number_digits = len(code) + account = property_obj.get_by_record(cr, uid, prop, + context=context) + if account: + number_digits = len(account.code) return number_digits _defaults = { From f0a6c9f559c4450aea00bf38f535df6d987d823a Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Fri, 28 Nov 2014 09:09:32 +0100 Subject: [PATCH 5/6] [FIX] number digits is returned before assignment in case of property exist but account not --- account_chart_update/wizard/wizard_chart_update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py index 7064e22e9..d358e36f0 100644 --- a/account_chart_update/wizard/wizard_chart_update.py +++ b/account_chart_update/wizard/wizard_chart_update.py @@ -261,6 +261,7 @@ class wizard_update_charts_accounts(orm.TransientModel): ('res_id', '=', False), ('value_reference', '!=', False) ]) + number_digits = 6 if not property_ids: # Try to get a generic (no-company) property property_ids = property_obj.search(cr, uid, [ @@ -268,7 +269,6 @@ class wizard_update_charts_accounts(orm.TransientModel): ('res_id', '=', False), ('value_reference', '!=', False) ]) - number_digits = 6 if property_ids: prop = property_obj.browse( cr, uid, property_ids[0], context=context) From d2eef7d86c930c08fbbc3f2153f9e680f5a57a15 Mon Sep 17 00:00:00 2001 From: Adrien Peiffer Date: Fri, 28 Nov 2014 09:16:01 +0100 Subject: [PATCH 6/6] [DEL] product_obj isn't used --- account_chart_update/wizard/wizard_chart_update.py | 1 - 1 file changed, 1 deletion(-) diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py index d358e36f0..891faf0db 100644 --- a/account_chart_update/wizard/wizard_chart_update.py +++ b/account_chart_update/wizard/wizard_chart_update.py @@ -251,7 +251,6 @@ class wizard_update_charts_accounts(orm.TransientModel): if context is None: context = {} property_obj = self.pool.get('ir.property') - account_obj = self.pool.get('account.account') if not company_id: user = self.pool.get('res.users').browse(cr, uid, uid, context) company_id = user.company_id.id