diff --git a/addons/account/installer.py b/addons/account/installer.py index 25d57d56214..86d3c3d64e8 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -35,9 +35,9 @@ class account_installer(osv.osv_memory): _inherit = 'res.config.installer' def _get_default_accounts(self, cr, uid, context=None): - accounts = [{'acc_name':'Current', 'account_type':'bank'}, - {'acc_name':'Deposit', 'account_type':'bank'}, - {'acc_name':'Cash', 'account_type':'cash'}] + accounts = [{'acc_name': 'Current', 'account_type': 'bank'}, + {'acc_name': 'Deposit', 'account_type': 'bank'}, + {'acc_name': 'Cash', 'account_type': 'cash'}] return accounts def _get_charts(self, cr, uid, context=None): @@ -47,7 +47,7 @@ class account_installer(osv.osv_memory): sorted(((m.name, m.shortdesc) for m in modules.browse(cr, uid, ids)), key=itemgetter(1))) - charts.insert(0, ('configurable','Generic Chart Of Account')) + charts.insert(0, ('configurable', 'Generic Chart Of Account')) return charts _columns = { @@ -112,14 +112,20 @@ class account_installer(osv.osv_memory): obj_acc = self.pool.get('account.account') obj_acc_tax = self.pool.get('account.tax') obj_journal = self.pool.get('account.journal') + obj_acc_tax_code = self.pool.get('account.tax.code') obj_acc_template = self.pool.get('account.account.template') obj_acc_tax_template = self.pool.get('account.tax.code.template') obj_fiscal_position_template = self.pool.get('account.fiscal.position.template') obj_fiscal_position = self.pool.get('account.fiscal.position') analytic_journal_obj = self.pool.get('account.analytic.journal') obj_acc_chart_template = self.pool.get('account.chart.template') + obj_acc_journal_view = self.pool.get('account.journal.view') mod_obj = self.pool.get('ir.model.data') obj_sequence = self.pool.get('ir.sequence') + property_obj = self.pool.get('ir.property') + fields_obj = self.pool.get('ir.model.fields') + obj_tax_fp = self.pool.get('account.fiscal.position.tax') + obj_ac_fp = self.pool.get('account.fiscal.position.account') result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template') @@ -130,7 +136,7 @@ class account_installer(osv.osv_memory): if context is None: context = {} - company_id = self.browse(cr, uid, ids, context)[0].company_id + company_id = self.browse(cr, uid, ids, context=context)[0].company_id seq_journal = True # Creating Account @@ -146,8 +152,8 @@ class account_installer(osv.osv_memory): #create all the tax code children_tax_code_template = obj_acc_tax_template.search(cr, uid, [('parent_id', 'child_of', [tax_code_root_id])], order='id') children_tax_code_template.sort() - for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template): - vals={ + for tax_code_template in obj_acc_tax_template.browse(cr, uid, children_tax_code_template, context=context): + vals = { 'name': (tax_code_root_id == tax_code_template.id) and company_id.name or tax_code_template.name, 'code': tax_code_template.code, 'info': tax_code_template.info, @@ -155,7 +161,7 @@ class account_installer(osv.osv_memory): 'company_id': company_id.id, 'sign': tax_code_template.sign, } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals) + new_tax_code = obj_acc_tax_code.create(cr, uid, vals, context=context) #recording the new tax code to do the mapping tax_code_template_ref[tax_code_template.id] = new_tax_code @@ -163,7 +169,7 @@ class account_installer(osv.osv_memory): for tax in obj_multi.tax_template_ids: #create it vals_tax = { - 'name':tax.name, + 'name': tax.name, 'sequence': tax.sequence, 'amount': tax.amount, 'type': tax.type, @@ -183,11 +189,11 @@ class account_installer(osv.osv_memory): 'ref_base_sign': tax.ref_base_sign, 'ref_tax_sign': tax.ref_tax_sign, 'include_base_amount': tax.include_base_amount, - 'description':tax.description, + 'description': tax.description, 'company_id': company_id.id, 'type_tax_use': tax.type_tax_use } - new_tax = obj_acc_tax.create(cr, uid, vals_tax) + new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context) #as the accounts have not been created yet, we have to wait before filling these fields todo_dict[new_tax] = { 'account_collected_id': tax.account_collected_id and tax.account_collected_id.id or False, @@ -198,9 +204,9 @@ class account_installer(osv.osv_memory): #deactivate the parent_store functionnality on account_account for rapidity purpose self.pool._init = True - children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)]) + children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context) children_acc_template.sort() - for account_template in obj_acc_template.browse(cr, uid, children_acc_template): + for account_template in obj_acc_template.browse(cr, uid, children_acc_template, context=context): tax_ids = [] for tax in account_template.tax_ids: tax_ids.append(tax_template_ref[tax.id]) @@ -209,9 +215,9 @@ class account_installer(osv.osv_memory): dig = 6 code_main = account_template.code and len(account_template.code) or 0 code_acc = account_template.code or '' - if code_main>0 and code_main<=dig and account_template.type != 'view': - code_acc=str(code_acc) + (str('0'*(dig-code_main))) - vals={ + if code_main > 0 and code_main <= dig and account_template.type != 'view': + code_acc = str(code_acc) + (str('0'*(dig-code_main))) + vals = { 'name': (obj_acc_root.id == account_template.id) and company_id.name or account_template.name, #'sign': account_template.sign, 'currency_id': account_template.currency_id and account_template.currency_id.id or False, @@ -225,10 +231,10 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6, 0, tax_ids)], 'company_id': company_id.id, } - new_account = obj_acc.create(cr, uid, vals) + new_account = obj_acc.create(cr, uid, vals, context=context) acc_template_ref[account_template.id] = new_account if account_template.name == 'Bank Current Account': - b_vals={ + b_vals = { 'name': 'Bank Accounts', 'code': '110500', 'type': 'view', @@ -239,47 +245,52 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6,0,tax_ids)], 'company_id': company_id.id, } - bank_account = obj_acc.create(cr, uid, b_vals) + bank_account = obj_acc.create(cr, uid, b_vals, context=context) - view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal View')])[0] #why fixed name here? - view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here? + view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here? + view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here? cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash') - cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'])[0]['res_id'] + cash_type_id = mod_obj.read(cr, uid, [cash_result], ['res_id'], context=context)[0]['res_id'] bank_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_bnk') - bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'])[0]['res_id'] + bank_type_id = mod_obj.read(cr, uid, [bank_result], ['res_id'], context=context)[0]['res_id'] check_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_chk') - check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'])[0]['res_id'] + check_type_id = mod_obj.read(cr, uid, [check_result], ['res_id'], context=context)[0]['res_id'] # record = self.browse(cr, uid, ids, context=context)[0] code_cnt = 1 vals_seq = { - 'name': _('Bank Journal '), - 'code': 'account.journal', - 'prefix': 'BNK/%(year)s/', - 'padding': 5 - } - seq_id = obj_sequence.create(cr, uid, vals_seq) + 'name': _('Bank Journal '), + 'code': 'account.journal', + 'prefix': 'BNK/%(year)s/', + 'padding': 5 + } + seq_id = obj_sequence.create(cr, uid, vals_seq, context=context) #create the bank journals - analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type','=','situation')]) + analitical_bank_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'situation')], context=context) analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False - vals_journal = {} - vals_journal['name'] = _('Bank Journal ') - vals_journal['code'] = _('BNK') - vals_journal['sequence_id'] = seq_id - vals_journal['type'] = 'bank' - vals_journal['analytic_journal_id'] = analitical_journal_bank + vals_journal = { + 'name': _('Bank Journal '), + 'code': _('BNK'), + 'sequence_id': seq_id, + 'type': 'bank', + 'analytic_journal_id': analitical_journal_bank + } if vals.get('currency_id', False): - vals_journal['view_id'] = view_id_cur - vals_journal['currency'] = vals.get('currency_id', False) + vals_journal.update({ + 'view_id': view_id_cur, + 'currency': vals.get('currency_id', False) + }) else: - vals_journal['view_id'] = view_id_cash - vals_journal['default_credit_account_id'] = new_account - vals_journal['default_debit_account_id'] = new_account - obj_journal.create(cr, uid, vals_journal) + vals_journal.update({'view_id': view_id_cash}) + vals_journal.update({ + 'default_credit_account_id': new_account, + 'default_debit_account_id': new_account, + }) + obj_journal.create(cr, uid, vals_journal, context=context) for val in record.bank_accounts_id: seq_padding = 5 @@ -293,44 +304,52 @@ class account_installer(osv.osv_memory): type = check_type_id seq_padding = None - vals_bnk = {'name': val.acc_name or '', + vals_bnk = { + 'name': val.acc_name or '', 'currency_id': val.currency_id.id or False, 'code': str(110500 + code_cnt), 'type': 'liquidity', 'user_type': type, - 'parent_id':bank_account, - 'company_id': company_id.id } - child_bnk_acc = obj_acc.create(cr, uid, vals_bnk) + 'parent_id': bank_account, + 'company_id': company_id.id + } + child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context) vals_seq_child = { 'name': _(vals_bnk['name'] + ' ' + 'Journal'), 'code': 'account.journal', 'prefix': _((vals_bnk['name'][:3].upper()) + '/%(year)s/'), 'padding': seq_padding - } - seq_id = obj_sequence.create(cr, uid, vals_seq_child) + } + seq_id = obj_sequence.create(cr, uid, vals_seq_child, context=context) #create the bank journal vals_journal = {} - vals_journal['name'] = vals_bnk['name'] + ' Journal' - vals_journal['code'] = _(vals_bnk['name'][:3]).upper() - vals_journal['sequence_id'] = seq_id - vals_journal['type'] = 'cash' + vals_journal = { + 'name': vals_bnk['name'] + ' Journal', + 'code': _(vals_bnk['name'][:3]).upper(), + 'sequence_id': seq_id, + 'type': 'cash', + } if vals.get('currency_id', False): - vals_journal['view_id'] = view_id_cur - vals_journal['currency'] = vals_bnk.get('currency_id', False) + vals_journal.update({ + 'view_id': view_id_cur, + 'currency': vals_bnk.get('currency_id', False), + }) else: - vals_journal['view_id'] = view_id_cash - vals_journal['default_credit_account_id'] = child_bnk_acc - vals_journal['default_debit_account_id'] = child_bnk_acc - vals_journal['analytic_journal_id'] = analitical_journal_bank - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({'view_id': view_id_cash}) + vals_journal.update({ + 'default_credit_account_id': child_bnk_acc, + 'default_debit_account_id': child_bnk_acc, + 'analytic_journal_id': analitical_journal_bank + }) + obj_journal.create(cr, uid, vals_journal, context=context) code_cnt += 1 #reactivate the parent_store functionality on account_account self.pool._init = False - self.pool.get('account.account')._parent_store_compute(cr) + obj_acc._parent_store_compute(cr) - for key,value in todo_dict.items(): + for key, value in todo_dict.items(): if value['account_collected_id'] or value['account_paid_id']: obj_acc_tax.write(cr, uid, [key], { 'account_collected_id': acc_template_ref[value['account_collected_id']], @@ -338,42 +357,41 @@ class account_installer(osv.osv_memory): }) # Creating Journals Sales and Purchase - vals_journal={} - data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')]) - data = mod_obj.browse(cr, uid, data_id[0]) + vals_journal = {} + data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_journal_view')], context=context) + data = mod_obj.browse(cr, uid, data_id[0], context=context) view_id = data.res_id - - seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0] + seq_id = obj_sequence.search(cr,uid,[('name', '=', 'Account Journal')], context=context)[0] if seq_journal: seq_sale = { - 'name': 'Sale Journal', - 'code': 'account.journal', - 'prefix': 'SAJ/%(year)s/', - 'padding': 3 - } - seq_id_sale = obj_sequence.create(cr, uid, seq_sale) + 'name': 'Sale Journal', + 'code': 'account.journal', + 'prefix': 'SAJ/%(year)s/', + 'padding': 3 + } + seq_id_sale = obj_sequence.create(cr, uid, seq_sale, context=context) seq_purchase = { - 'name': 'Purchase Journal', - 'code': 'account.journal', - 'prefix': 'EXJ/%(year)s/', - 'padding': 3 - } - seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase) + 'name': 'Purchase Journal', + 'code': 'account.journal', + 'prefix': 'EXJ/%(year)s/', + 'padding': 3 + } + seq_id_purchase = obj_sequence.create(cr, uid, seq_purchase, context=context) seq_refund_sale = { - 'name': 'Sales Refund Journal', - 'code': 'account.journal', - 'prefix': 'SCNJ/%(year)s/', - 'padding': 3 - } - seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale) + 'name': 'Sales Refund Journal', + 'code': 'account.journal', + 'prefix': 'SCNJ/%(year)s/', + 'padding': 3 + } + seq_id_sale_refund = obj_sequence.create(cr, uid, seq_refund_sale, context=context) seq_refund_purchase = { - 'name': 'Purchase Refund Journal', - 'code': 'account.journal', - 'prefix': 'ECNJ/%(year)s/', - 'padding': 3 - } - seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase) + 'name': 'Purchase Refund Journal', + 'code': 'account.journal', + 'prefix': 'ECNJ/%(year)s/', + 'padding': 3 + } + seq_id_purchase_refund = obj_sequence.create(cr, uid, seq_refund_purchase, context=context) else: seq_id_sale = seq_id seq_id_purchase = seq_id @@ -383,83 +401,89 @@ class account_installer(osv.osv_memory): vals_journal['view_id'] = view_id #Sales Journal - analitical_sale_ids = analytic_journal_obj.search(cr,uid,[('type','=','sale')]) + analitical_sale_ids = analytic_journal_obj.search(cr, uid, [('type','=','sale')], context=context) analitical_journal_sale = analitical_sale_ids and analitical_sale_ids[0] or False - vals_journal['name'] = _('Sales Journal') - vals_journal['type'] = 'sale' - vals_journal['code'] = _('SAJ') - vals_journal['sequence_id'] = seq_id_sale - vals_journal['analytic_journal_id'] = analitical_journal_sale - + vals_journal = { + 'name': _('Sales Journal'), + 'type': 'sale', + 'code': _('SAJ'), + 'sequence_id': seq_id_sale, + 'analytic_journal_id': analitical_journal_sale + } if obj_multi.property_account_receivable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Purchase Journal - analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type','=','purchase')]) + analitical_purchase_ids = analytic_journal_obj.search(cr, uid, [('type', '=', 'purchase')], context=context) analitical_journal_purchase = analitical_purchase_ids and analitical_purchase_ids[0] or False - vals_journal['name'] = _('Purchase Journal') - vals_journal['type'] = 'purchase' - vals_journal['code'] = _('EXJ') - vals_journal['sequence_id'] = seq_id_purchase - vals_journal['analytic_journal_id'] = analitical_journal_purchase + vals_journal = { + 'name': _('Purchase Journal'), + 'type': 'purchase', + 'code': _('EXJ'), + 'sequence_id': seq_id_purchase, + 'analytic_journal_id': analitical_journal_purchase + } if obj_multi.property_account_payable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - - obj_journal.create(cr,uid,vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id] + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Creating Journals Sales Refund and Purchase Refund - vals_journal={} - data_id = mod_obj.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_refund_journal_view')]) - data = mod_obj.browse(cr, uid, data_id[0]) + vals_journal = {} + data_id = mod_obj.search(cr, uid, [('model', '=', 'account.journal.view'), ('name', '=', 'account_sp_refund_journal_view')], context=context) + data = mod_obj.browse(cr, uid, data_id[0], context=context) view_id = data.res_id - vals_journal['view_id'] = view_id - #Sales Refund Journal - vals_journal['name'] = _('Sales Refund Journal') - vals_journal['type'] = 'sale_refund' - vals_journal['refund_journal'] = True - vals_journal['code'] = _('SCNJ') - vals_journal['sequence_id'] = seq_id_sale_refund - vals_journal['analytic_journal_id'] = analitical_journal_sale - + vals_journal = { + 'view_id': view_id, + 'name': _('Sales Refund Journal'), + 'type': 'sale_refund', + 'refund_journal': True, + 'code': _('SCNJ'), + 'sequence_id': seq_id_sale_refund, + 'analytic_journal_id': analitical_journal_sale + } if obj_multi.property_account_receivable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_income_categ.id] + }) - obj_journal.create(cr,uid,vals_journal) + obj_journal.create(cr, uid, vals_journal, context=context) # Purchase Refund Journal - vals_journal['name'] = _('Purchase Refund Journal') - vals_journal['type'] = 'purchase_refund' - vals_journal['refund_journal'] = True - vals_journal['code'] = _('ECNJ') - vals_journal['sequence_id'] = seq_id_purchase_refund - vals_journal['analytic_journal_id'] = analitical_journal_purchase + vals_journal = { + 'name': _('Purchase Refund Journal'), + 'type': 'purchase_refund', + 'refund_journal': True, + 'code': _('ECNJ'), + 'sequence_id': seq_id_purchase_refund, + 'analytic_journal_id': analitical_journal_purchase + } if obj_multi.property_account_payable: - vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - vals_journal['default_debit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] - - obj_journal.create(cr, uid, vals_journal) + vals_journal.update({ + 'default_credit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id], + 'default_debit_account_id': acc_template_ref[obj_multi.property_account_expense_categ.id] + }) + obj_journal.create(cr, uid, vals_journal, context=context) # Bank Journals - view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ? - view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name? - + view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #TOFIX: Why put fixed name ? + view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #TOFIX: why put fixed name? #create the properties - property_obj = self.pool.get('ir.property') - fields_obj = self.pool.get('ir.model.fields') - todo_list = [ ('property_account_receivable', 'res.partner', 'account.account'), ('property_account_payable', 'res.partner', 'account.account'), @@ -472,52 +496,45 @@ class account_installer(osv.osv_memory): for record in todo_list: r = [] - r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)]) + r = property_obj.search(cr, uid, [('name', '=', record[0]), ('company_id', '=', company_id.id)], context=context) account = getattr(obj_multi, record[0]) - field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])]) + field = fields_obj.search(cr, uid, [('name', '=', record[0]), ('model', '=', record[1]), ('relation', '=', record[2])], context=context) vals = { 'name': record[0], 'company_id': company_id.id, 'fields_id': field[0], - 'value': account and 'account.account,'+str(acc_template_ref[account.id]) or False, + 'value': account and 'account.account, '+str(acc_template_ref[account.id]) or False, } - if r: #the property exist: modify it - property_obj.write(cr, uid, r, vals) + property_obj.write(cr, uid, r, vals, context=context) else: #create the property - property_obj.create(cr, uid, vals) - - fp_ids = obj_fiscal_position_template.search(cr, uid,[('chart_template_id', '=', obj_multi.id)]) + property_obj.create(cr, uid, vals, context=context) + fp_ids = obj_fiscal_position_template.search(cr, uid, [('chart_template_id', '=', obj_multi.id)], context=context) if fp_ids: - for position in obj_fiscal_position_template.browse(cr, uid, fp_ids): - + for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context): vals_fp = { - 'company_id': company_id.id, - 'name': position.name, - } - new_fp = obj_fiscal_position.create(cr, uid, vals_fp) - - obj_tax_fp = self.pool.get('account.fiscal.position.tax') - obj_ac_fp = self.pool.get('account.fiscal.position.account') - + 'company_id': company_id.id, + 'name': position.name, + } + new_fp = obj_fiscal_position.create(cr, uid, vals_fp, context=context) for tax in position.tax_ids: vals_tax = { - 'tax_src_id': tax_template_ref[tax.tax_src_id.id], - 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False, - 'position_id': new_fp, - } - obj_tax_fp.create(cr, uid, vals_tax) + 'tax_src_id': tax_template_ref[tax.tax_src_id.id], + 'tax_dest_id': tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False, + 'position_id': new_fp, + } + obj_tax_fp.create(cr, uid, vals_tax, context=context) for acc in position.account_ids: vals_acc = { - 'account_src_id': acc_template_ref[acc.account_src_id.id], - 'account_dest_id': acc_template_ref[acc.account_dest_id.id], - 'position_id': new_fp, - } - obj_ac_fp.create(cr, uid, vals_acc) + 'account_src_id': acc_template_ref[acc.account_src_id.id], + 'account_dest_id': acc_template_ref[acc.account_dest_id.id], + 'position_id': new_fp, + } + obj_ac_fp.create(cr, uid, vals_acc, context=context) def execute(self, cr, uid, ids, context=None): if context is None: @@ -527,58 +544,58 @@ class account_installer(osv.osv_memory): obj_acc = self.pool.get('account.account') obj_tax_code = self.pool.get('account.tax.code') obj_temp_tax_code = self.pool.get('account.tax.code.template') + obj_tax = self.pool.get('account.tax') + obj_product = self.pool.get('product.product') + ir_values = self.pool.get('ir.values') super(account_installer, self).execute(cr, uid, ids, context=context) record = self.browse(cr, uid, ids, context=context)[0] company_id = record.company_id - for res in self.read(cr, uid, ids): + for res in self.read(cr, uid, ids, context=context): if record.charts == 'configurable': - fp = tools.file_open(opj('account','configurable_account_chart.xml')) - tools.convert_xml_import(cr, 'account', fp, {}, 'init',True, None) + fp = tools.file_open(opj('account', 'configurable_account_chart.xml')) + tools.convert_xml_import(cr, 'account', fp, {}, 'init', True, None) fp.close() self.generate_configurable_chart(cr, uid, ids, context=context) - obj_tax = self.pool.get('account.tax') - obj_product = self.pool.get('product.product') - ir_values = self.pool.get('ir.values') s_tax = (res.get('sale_tax', 0.0))/100 p_tax = (res.get('purchase_tax', 0.0))/100 tax_val = {} default_tax = [] pur_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_purchases') - pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'])[0]['res_id'] - pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name']) + pur_temp_tax_id = mod_obj.read(cr, uid, [pur_temp_tax], ['res_id'], context=context)[0]['res_id'] + pur_temp_tax_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_id], ['name'], context=context) pur_tax_parent_name = pur_temp_tax_names and pur_temp_tax_names[0]['name'] or False - pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)]) + pur_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_parent_name)], context=context) if pur_taxcode_parent_id: pur_taxcode_parent_id = pur_taxcode_parent_id[0] else: pur_taxcode_parent_id = False pur_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_input') - pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'])[0]['res_id'] - pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name']) + pur_temp_tax_paid_id = mod_obj.read(cr, uid, [pur_temp_tax_paid], ['res_id'], context=context)[0]['res_id'] + pur_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [pur_temp_tax_paid_id], ['name'], context=context) pur_tax_paid_parent_name = pur_temp_tax_names and pur_temp_tax_paid_names[0]['name'] or False - pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)]) + pur_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', pur_tax_paid_parent_name)], context=context) if pur_taxcode_paid_parent_id: pur_taxcode_paid_parent_id = pur_taxcode_paid_parent_id[0] else: pur_taxcode_paid_parent_id = False sale_temp_tax = mod_obj._get_id(cr, uid, 'account', 'tax_code_base_sales') - sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'])[0]['res_id'] - sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name']) + sale_temp_tax_id = mod_obj.read(cr, uid, [sale_temp_tax], ['res_id'], context=context)[0]['res_id'] + sale_temp_tax_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_id], ['name'], context=context) sale_tax_parent_name = sale_temp_tax_names and sale_temp_tax_names[0]['name'] or False - sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)]) + sale_taxcode_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_parent_name)], context=context) if sale_taxcode_parent_id: sale_taxcode_parent_id = sale_taxcode_parent_id[0] else: sale_taxcode_parent_id = False sale_temp_tax_paid = mod_obj._get_id(cr, uid, 'account', 'tax_code_output') - sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'])[0]['res_id'] - sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name']) + sale_temp_tax_paid_id = mod_obj.read(cr, uid, [sale_temp_tax_paid], ['res_id'], context=context)[0]['res_id'] + sale_temp_tax_paid_names = obj_temp_tax_code.read(cr, uid, [sale_temp_tax_paid_id], ['name'], context=context) sale_tax_paid_parent_name = sale_temp_tax_paid_names and sale_temp_tax_paid_names[0]['name'] or False - sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)]) + sale_taxcode_paid_parent_id = obj_tax_code.search(cr, uid, [('name', 'ilike', sale_tax_paid_parent_name)], context=context) if sale_taxcode_paid_parent_id: sale_taxcode_paid_parent_id = sale_taxcode_paid_parent_id[0] else: @@ -593,8 +610,8 @@ class account_installer(osv.osv_memory): 'company_id': company_id.id, 'sign': 1, 'parent_id': sale_taxcode_parent_id - } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) + } + new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context) vals_paid_tax_code = { 'name': 'TAX Received %s%%'%(s_tax*100), @@ -603,20 +620,20 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': sale_taxcode_paid_parent_id } - new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) + new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context) sales_tax = obj_tax.create(cr, uid, - {'name':'TAX %s%%'%(s_tax*100), - 'amount':s_tax, - 'base_code_id':new_tax_code, - 'tax_code_id':new_paid_tax_code, - 'type_tax_use':'sale', - 'account_collected_id':sales_tax_account_id, - 'account_paid_id':sales_tax_account_id - }) - default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')],context=context) + {'name': 'TAX %s%%'%(s_tax*100), + 'amount': s_tax, + 'base_code_id': new_tax_code, + 'tax_code_id': new_paid_tax_code, + 'type_tax_use': 'sale', + 'account_collected_id': sales_tax_account_id, + 'account_paid_id': sales_tax_account_id + }, context=context) + default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Product Sales')], context=context) if default_account_ids: - obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}) + obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [sales_tax])]}, context=context) tax_val.update({'taxes_id': [(6, 0, [sales_tax])]}) default_tax.append(('taxes_id', sales_tax)) if p_tax*100 > 0.0: @@ -629,8 +646,7 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': pur_taxcode_parent_id } - new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) - + new_tax_code = obj_tax_code.create(cr, uid, vals_tax_code, context=context) vals_paid_tax_code = { 'name': 'TAX Paid %s%%'%(p_tax*100), 'code': 'TAX Paid %s%%'%(p_tax*100), @@ -638,7 +654,7 @@ class account_installer(osv.osv_memory): 'sign': 1, 'parent_id': pur_taxcode_paid_parent_id } - new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) + new_paid_tax_code = obj_tax_code.create(cr, uid, vals_paid_tax_code, context=context) purchase_tax = obj_tax.create(cr, uid, {'name': 'TAX%s%%'%(p_tax*100), @@ -649,32 +665,33 @@ class account_installer(osv.osv_memory): 'type_tax_use': 'purchase', 'account_collected_id': purchase_tax_account_id, 'account_paid_id': purchase_tax_account_id - }) + }, context=context) default_account_ids = obj_acc.search(cr, uid, [('name', '=', 'Expenses')], context=context) if default_account_ids: - obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}) + obj_acc.write(cr, uid, default_account_ids, {'tax_ids': [(6, 0, [purchase_tax])]}, context=context) tax_val.update({'supplier_taxes_id': [(6 ,0, [purchase_tax])]}) default_tax.append(('supplier_taxes_id', purchase_tax)) if tax_val: - product_ids = obj_product.search(cr, uid, []) - for product in obj_product.browse(cr, uid, product_ids): - obj_product.write(cr, uid, product.id, tax_val) + product_ids = obj_product.search(cr, uid, [], context=context) + for product in obj_product.browse(cr, uid, product_ids, context=context): + obj_product.write(cr, uid, product.id, tax_val, context=context) for name, value in default_tax: - ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product',False)], value=[value]) + ir_values.set(cr, uid, key='default', key2=False, name=name, models =[('product.product', False)], value=[value]) if 'date_start' in res and 'date_stop' in res: - f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])]) + f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'])], context=context) if not f_ids: name = code = res['date_start'][:4] if int(name) != int(res['date_stop'][:4]): name = res['date_start'][:4] +'-'+ res['date_stop'][:4] code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] - vals = {'name': name, - 'code': code, - 'date_start': res['date_start'], - 'date_stop': res['date_stop'], - 'company_id': res['company_id'] - } + vals = { + 'name': name, + 'code': code, + 'date_start': res['date_start'], + 'date_stop': res['date_stop'], + 'company_id': res['company_id'] + } fiscal_id = fy_obj.create(cr, uid, vals, context=context) if res['period'] == 'month': fy_obj.create_period(cr, uid, [fiscal_id]) @@ -701,7 +718,7 @@ class account_bank_accounts_wizard(osv.osv_memory): 'acc_name': fields.char('Account Name.', size=64, required=True), 'bank_account_id': fields.many2one('account.installer', 'Bank Account', required=True), 'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."), - 'account_type': fields.selection([('cash','Cash'),('check','Check'),('bank','Bank')], 'Account Type', size=32), + 'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32), } # _defaults = { # 'currency_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.currency_id.id,