From cbff9fe8608f03a1fd4007a3e594d43276073537 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Thu, 23 Sep 2010 11:12:09 +0530 Subject: [PATCH] [IMP] Account: demo data account.journal should have a link with demo data account.analytic.journal bzr revid: mra@mra-laptop-20100923054209-gvotb1yzywd2bz96 --- addons/account/demo/account_minimal.xml | 4 +++ addons/account/installer.py | 34 ++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index d925dfa02ed..7cdb27a78ff 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -348,6 +348,7 @@ + @@ -359,6 +360,7 @@ + @@ -370,6 +372,7 @@ + @@ -381,6 +384,7 @@ + diff --git a/addons/account/installer.py b/addons/account/installer.py index 2f8c48ecebb..75812fb03bc 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -95,7 +95,7 @@ class account_installer(osv.osv_memory): 'sale_tax':lambda *a:0.0, 'purchase_tax':lambda *a:0.0, 'company_id': _default_company, - 'bank_accounts_id':_get_default_accounts, + 'bank_accounts_id':_get_default_accounts, 'charts': _get_default_charts } @@ -117,7 +117,6 @@ class account_installer(osv.osv_memory): obj_acc_template = self.pool.get('account.account.template') obj_fiscal_position_template = self.pool.get('account.fiscal.position.template') obj_fiscal_position = self.pool.get('account.fiscal.position') - data_pool = self.pool.get('ir.model.data') mod_obj = self.pool.get('ir.model.data') result = mod_obj._get_id(cr, uid, 'account', 'configurable_chart_template') @@ -237,7 +236,7 @@ class account_installer(osv.osv_memory): 'company_id': company_id.id, } bank_account = obj_acc.create(cr, uid, b_vals) - + 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? ref_acc_bank = obj_multi.bank_account_view_id @@ -366,10 +365,15 @@ class account_installer(osv.osv_memory): vals_journal['view_id'] = view_id #Sales Journal + result = mod_obj._get_id(cr, uid, 'account', 'cose_journal_sale') + sale_id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] + 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'] = sale_id + if obj_multi.property_account_receivable: vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] @@ -378,10 +382,14 @@ class account_installer(osv.osv_memory): obj_journal.create(cr,uid,vals_journal) # Purchase Journal + result = mod_obj._get_id(cr, uid, 'account', 'exp') + pur_id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id'] + 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'] = pur_id if obj_multi.property_account_payable: vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] @@ -406,6 +414,7 @@ class account_installer(osv.osv_memory): vals_journal['refund_journal'] = True vals_journal['code'] = _('SCNJ') vals_journal['sequence_id'] = seq_id_sale_refund + vals_journal['analytic_journal_id'] = sale_id if obj_multi.property_account_receivable: vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_income_categ.id] @@ -419,6 +428,7 @@ class account_installer(osv.osv_memory): vals_journal['refund_journal'] = True vals_journal['code'] = _('ECNJ') vals_journal['sequence_id'] = seq_id_purchase_refund + vals_journal['analytic_journal_id'] = pur_id if obj_multi.property_account_payable: vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.property_account_expense_categ.id] @@ -519,7 +529,7 @@ class account_installer(osv.osv_memory): 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']) @@ -529,7 +539,7 @@ class account_installer(osv.osv_memory): 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']) @@ -539,7 +549,7 @@ class account_installer(osv.osv_memory): 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']) @@ -549,7 +559,7 @@ class account_installer(osv.osv_memory): 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']) @@ -571,7 +581,7 @@ class account_installer(osv.osv_memory): 'parent_id': sale_taxcode_parent_id } new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) - + vals_paid_tax_code = { 'name': 'TAX Paid %s%%'%(s_tax*100), 'code': 'TAX Paid %s%%'%(s_tax*100), @@ -580,7 +590,7 @@ class account_installer(osv.osv_memory): 'parent_id': sale_taxcode_paid_parent_id } new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) - + sales_tax = obj_tax.create(cr, uid, {'name':'TAX%s%%'%(s_tax*100), 'description':'TAX%s%%'%(s_tax*100), @@ -601,13 +611,13 @@ class account_installer(osv.osv_memory): purchase_tax_account_id = tax_account_ids and tax_account_ids[0] or False vals_tax_code = { 'name': 'TAX%s%%'%(p_tax*100), - 'code': 'TAX%s%%'%(p_tax*100), + 'code': 'TAX%s%%'%(p_tax*100), 'company_id': company_id.id, 'sign': 1, 'parent_id': pur_taxcode_parent_id } new_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_tax_code) - + vals_paid_tax_code = { 'name': 'TAX Paid %s%%'%(p_tax*100), 'code': 'TAX Paid %s%%'%(p_tax*100), @@ -616,7 +626,7 @@ class account_installer(osv.osv_memory): 'parent_id': pur_taxcode_paid_parent_id } new_paid_tax_code = self.pool.get('account.tax.code').create(cr, uid, vals_paid_tax_code) - + purchase_tax = obj_tax.create(cr, uid, {'name':'TAX%s%%'%(p_tax*100), 'description':'TAX%s%%'%(p_tax*100),