From 6a1d590d8537774cd7497b940eee1e0fc59267aa Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 30 Dec 2011 17:30:43 +0100 Subject: [PATCH] [FIX] analytic journal on journal bzr revid: fp@tinyerp.com-20111230163043-96vwqvzje444xs2g --- addons/account/account.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a300aa46b07..92e5ed313b6 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2977,7 +2977,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value'].update({'code_digits': data.code_digits}) return res - def default_get(self, cr, uid, fields, context=None): res = super(wizard_multi_charts_accounts, self).default_get(cr, uid, fields, context=context) tax_templ_obj = self.pool.get('account.tax.template') @@ -3054,14 +3053,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): def _prepare_all_journals(self, cr, uid, chart_template_id, acc_template_ref, company_id, context=None): def _get_analytic_journal(journal_type): # Get the analytic journal - analytic_journal_ids = [] + data = False if journal_type in ('sale', 'sale_refund'): - analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context) + data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale') elif journal_type in ('purchase', 'purchase_refund'): - analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')], context=context) + pass elif journal_type == 'general': - analytical_journal_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context) - return analytic_journal_ids and analytic_journal_ids[0] or False + pass + return data and data[1] or False def _get_default_account(journal_type, type='debit'): # Get the default accounts @@ -3121,7 +3120,6 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'default_credit_account_id': _get_default_account(journal_type, 'credit'), 'default_debit_account_id': _get_default_account(journal_type, 'debit'), } - print 'VALS', vals, journal_type journal_data.append(vals) return journal_data