From 4d8dab977ca4df419da0c5cc90aabfcd35f9c1e8 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Aug 2011 11:09:33 +0530 Subject: [PATCH 1/5] [ADD]: account: l10n fullness and inheritancy: 1)Add set_tax_complete field in account.chart.template, 2)Add default sale and purchase rates float field in wizard.multi.charts.accounts, 3)If set_tax_complete boolean is False, then instead of the 2 many2one for default sale and purchase taxes, we display the default sale and purchase rates in in the wizard that generate Chart of Accounts from templates 4)Add tracking field only for tracking purpose bzr revid: ron@tinyerp.com-20110801053933-g1quvlsozm34zc20 --- addons/account/account.py | 8 ++++++++ addons/account/account_view.xml | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index ffdb75010b5..ddb3a305842 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2477,6 +2477,7 @@ class account_chart_template(osv.osv): 'name': fields.char('Name', size=64, required=True), 'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'), 'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."), + 'set_tax_complete': fields.boolean('Complete Set Of Tax', help="Set this False, then instead of the 2 many2one for default sale and purchase taxes, we display the default sale and purchase rates float field in the wizard"), 'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]), 'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]), 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'), @@ -2635,12 +2636,19 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), + 'sale_tax_rate': fields.float('Sale Tax(%)'), + 'purchase_tax_rate': fields.float('Purchase Tax(%)'), + 'tracking': fields.boolean('Tracking'), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} res['value'] = {} + res['value']["tracking"] = False res['value']["sale_tax"] = False res['value']["purchase_tax"] = False + for template in self.pool.get('account.chart.template').browse(cr, uid, [chart_template_id], context=context): + if template.set_tax_complete: + res['value']["tracking"] = True if chart_template_id: # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 7bf22cd1d1c..038cd1550ce 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2146,6 +2146,7 @@ + @@ -2399,8 +2400,11 @@ - - + + + + +
From 997528cc9a39ff273e3aba2c2e0bb44cd5066bac Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Aug 2011 11:13:18 +0530 Subject: [PATCH 2/5] [IMP]: account: l10n fullness and inheritancy: Improved help of field set_tax_complete bzr revid: ron@tinyerp.com-20110801054318-9svmdxc6l27cubq6 --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index ddb3a305842..0d141d2a68b 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2477,7 +2477,7 @@ class account_chart_template(osv.osv): 'name': fields.char('Name', size=64, required=True), 'parent_id': fields.many2one('account.chart.template', 'Parent Chart Template'), 'visible': fields.boolean('Can be Visible?', help="Set this to False if you don't want this template to be used actively in the wizard that generate Chart of Accounts from templates, this is useful when you want to generate accounts of this template only when loading its child template."), - 'set_tax_complete': fields.boolean('Complete Set Of Tax', help="Set this False, then instead of the 2 many2one for default sale and purchase taxes, we display the default sale and purchase rates float field in the wizard"), + 'set_tax_complete': fields.boolean('Complete Set Of Tax', help="Set this False, then instead of the 2 many2one for default sale and purchase taxes, we display the default sale and purchase rates float field in the wizard that generate Chart of Accounts from templates"), 'account_root_id': fields.many2one('account.account.template', 'Root Account', domain=[('parent_id','=',False)]), 'tax_code_root_id': fields.many2one('account.tax.code.template', 'Root Tax Code', domain=[('parent_id','=',False)]), 'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'), From 14aceeae6bb424f01ec13b68857022005a87fc97 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Aug 2011 15:34:40 +0530 Subject: [PATCH 3/5] [IMP]: account: l10n fullness and inheritancy: Changed field name tracking to complete_tax optimize the code for inconsistent use of quotes in dict bzr revid: ron@tinyerp.com-20110801100440-bjcjzvz47b7o63mp --- addons/account/account.py | 9 +++------ addons/account/account_view.xml | 10 +++++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 0d141d2a68b..ba893a7a497 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2638,17 +2638,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), 'sale_tax_rate': fields.float('Sale Tax(%)'), 'purchase_tax_rate': fields.float('Purchase Tax(%)'), - 'tracking': fields.boolean('Tracking'), + 'complete_tax': fields.boolean('Complete Tax'), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} - res['value'] = {} - res['value']["tracking"] = False - res['value']["sale_tax"] = False - res['value']["purchase_tax"] = False + res['value'] = {'complete_tax': False, 'sale_tax': False, 'purchase_tax': False} for template in self.pool.get('account.chart.template').browse(cr, uid, [chart_template_id], context=context): if template.set_tax_complete: - res['value']["tracking"] = True + res['value']["complete_tax"] = True if chart_template_id: # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 038cd1550ce..70d59c569e9 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2400,11 +2400,11 @@ - - - - - + + + + + From 9e95b2ac77b41fab0cb90cbdec13b2f4cc1c7500 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 1 Aug 2011 17:13:40 +0530 Subject: [PATCH 4/5] [IMP]: account: l10n fullness and inheritancy: optimize the code for inconsistent use of dict on onchange_chart_template_id bzr revid: ron@tinyerp.com-20110801114340-uibvfh42bff44i3l --- addons/account/account.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index ba893a7a497..0f688c2dffe 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2642,19 +2642,16 @@ class wizard_multi_charts_accounts(osv.osv_memory): } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} + tax_templ_obj = self.pool.get('account.tax.template') res['value'] = {'complete_tax': False, 'sale_tax': False, 'purchase_tax': False} - for template in self.pool.get('account.chart.template').browse(cr, uid, [chart_template_id], context=context): - if template.set_tax_complete: - res['value']["complete_tax"] = True if chart_template_id: + complete_tax = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context).set_tax_complete # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account - sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc") - purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc") - - res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False - res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False + res['value'] = {'complete_tax': complete_tax, 'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False} return res From 9c32b8cc6afa8312b092a46f735593798447130c Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Tue, 2 Aug 2011 11:46:56 +0530 Subject: [PATCH 5/5] [IMP]: account: l10n fullness and inheritancy: Value false default sale and purchase taxes if we don not have to use/display those fields in the wizard bzr revid: ron@tinyerp.com-20110802061656-jqacqub4hmw1dlya --- addons/account/account.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 0f688c2dffe..9a8854aac76 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2646,12 +2646,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value'] = {'complete_tax': False, 'sale_tax': False, 'purchase_tax': False} if chart_template_id: complete_tax = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context).set_tax_complete + if complete_tax: # default tax is given by the lowesst sequence. For same sequence we will take the latest created as it will be the case for tax created while isntalling the generic chart of account - sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" - , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc") - purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" - , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc") - res['value'] = {'complete_tax': complete_tax, 'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False} + sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc") + purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc") + res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False}) + res['value'].update({'complete_tax': complete_tax}) return res