From 4b83f4cce49a5fe69ccd033451bfdacaf6f56974 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Thu, 20 May 2010 20:56:15 +0530 Subject: [PATCH] [IMP]: make indian accounting chart compitable with new types bzr revid: mga@tinyerp.com-20100520152615-envtjv9xy5e4tq6z --- addons/account/account.py | 13 + .../account_report_india/report/report_bs.py | 27 +- addons/l10n_in/__openerp__.py | 2 +- addons/l10n_in/account_chart.xml | 1085 +++++++++-------- 4 files changed, 583 insertions(+), 544 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a3f66530bc3..8896f8a7a69 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -171,6 +171,19 @@ class account_account(osv.osv): _description = "Account" _parent_store = True + def _get_children_and_consol(self, cr, uid, ids, context={}): + ids2=[] + temp=[] + read_data= self.read(cr, uid, ids,['id','child_id'], context) + for data in read_data: + ids2.append(data['id']) + if data['child_id']: + temp=[] + for x in data['child_id']: + temp.append(x) + ids2 += self._get_children_and_consol(cr, uid, temp, context) + return ids2 + def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): if context is None: diff --git a/addons/account_report_india/report/report_bs.py b/addons/account_report_india/report/report_bs.py index 3369ff0e222..0e5dcf26531 100644 --- a/addons/account_report_india/report/report_bs.py +++ b/addons/account_report_india/report/report_bs.py @@ -104,22 +104,22 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): else: self.res_pl['type'] = 'Net Loss' pl_dict = { - 'code' : False, - 'name' : self.res_pl['type'], - 'level': False, - 'balance':self.res_pl['balance'], - } + 'code' : False, + 'name' : self.res_pl['type'], + 'level': False, + 'balance':self.res_pl['balance'], + } for typ in types: accounts_temp = [] for account in accounts: if (account.user_type.report_type) and (account.user_type.report_type == typ): account_dict = { - 'id' : account.id, - 'code' : account.code, - 'name' : account.name, - 'level': account.level, - 'balance':account.balance, - } + 'id' : account.id, + 'code' : account.code, + 'name' : account.name, + 'level': account.level, + 'balance':account.balance, + } if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_dr += abs(account.debit - account.credit) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): @@ -138,6 +138,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): self.result[typ] = accounts_temp cal_list[typ]=self.result[typ] + print 'XXXXXXXX : ', cal_list, len(cal_list) if cal_list: temp={} for i in range(0,max(len(cal_list['liability']),len(cal_list['asset']))): @@ -164,7 +165,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): 'name1' : cal_list['asset'][i]['name'], 'level1': cal_list['asset'][i]['level'], 'balance1':cal_list['asset'][i]['balance'], - } + } self.result_temp.append(temp) if i < len(cal_list['liability']): temp={ @@ -176,7 +177,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): 'name1' : '', 'level1': False, 'balance1':False, - } + } self.result_temp.append(temp) return None diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index 1f74c5f7f8e..334b94dad59 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -34,7 +34,7 @@ "demo_xml" : [], "update_xml" : [ "account_chart.xml", - "l10n_in_wizard.xml", + "account_wizard.xml", ], "active": False, "installable": True diff --git a/addons/l10n_in/account_chart.xml b/addons/l10n_in/account_chart.xml index 8303314d8fc..5bdc5df3c50 100644 --- a/addons/l10n_in/account_chart.xml +++ b/addons/l10n_in/account_chart.xml @@ -1,535 +1,560 @@ - - - - - View - view - - - Asset - asset - - - Liability - liability - - - Expense - expense - - - Income - income - - - Closed - closed - - - - + + + + + Income View + view + income + + + Expense View + expense + expense + + + Asset View + asset + asset + + + Liability View + liability + liability + + + + View + view + + + Asset + asset + asset + + + Liability + liability + liability + + + Expense + expense + expense + + + Income + income + income + + + Closed + closed + + + + - Account Chart-India - 0 - view - - - - - + Indian Chart of Account + 0 + view + + + + + - - Balance Sheet - IA_AC0 - view - - - - + + Balance Sheet + IA_AC0 + view + + + + - - - - Assets - IA_AC01 - view - - - - - - - - - Current Assets - IA_AC011 - view - - - - - - - - - Bank Account - IA_AC0111 - receivable - - - - - - - - - Cash In Hand Account - IA_AC0112 - view - - - - - - - - - Cash Account - IA_AC01121 - receivable - - - - - - - - - Deposit Account - IA_AC0113 - receivable - - - - - - - - - Loan & Advance(Assets) Account - IA_AC0114 - receivable - - - - - - - - - - - - - - - - + + + + Assets + IA_AC01 + view + + + + + + + + + Current Assets + IA_AC011 + view + + + + + + + + + Bank Account + IA_AC0111 + receivable + + + + + + + + + Cash In Hand Account + IA_AC0112 + view + + + + + + + + + Cash Account + IA_AC01121 + receivable + + + + + + + + + Deposit Account + IA_AC0113 + receivable + + + + + + + + + Loan & Advance(Assets) Account + IA_AC0114 + receivable + + + + + + + + + + + + + + + + - - Total Sundry Debtors Account - IA_AC0116 - view - - - - - - + + Total Sundry Debtors Account + IA_AC0116 + view + + + + + + - - Sundry Debtors Account - IA_AC01161 - receivable - - - - - - - - - Fixed Assets - IA_AC012 - receivable - - - - - - + + Sundry Debtors Account + IA_AC01161 + receivable + + + + + + + + + Fixed Assets + IA_AC012 + receivable + + + + + + - - Investment - IA_AC013 - receivable - - - - - - + + Investment + IA_AC013 + receivable + + + + + + - - Misc. Expenses(Asset) - IA_AC014 - receivable - - - - - - - - - - Liabilities - IA_AC02 - view - - - - - - - - - Current Liabilities - IA_AC021 - view - - - - - - - - - Duties & Taxes - IA_AC0211 - payable - - - - - - - - - Provision - IA_AC0212 - payable - - - - - - + + Misc. Expenses(Asset) + IA_AC014 + receivable + + + + + + + + + + Liabilities + IA_AC02 + view + + + + + + + + + Current Liabilities + IA_AC021 + view + + + + + + + + + Duties & Taxes + IA_AC0211 + payable + + + + + + + + + Provision + IA_AC0212 + payable + + + + + + - - Total Sundry Creditors - IA_AC0213 - view - - - - - - - - - Sundry Creditors - IA_AC02131 - payable - - - - - - + + Total Sundry Creditors + IA_AC0213 + view + + + + + + + + + Sundry Creditors + IA_AC02131 + payable + + + + + + - - Branch/Division - IA_AC022 - payable - - - - - - - - - Share Holder/Owner Fund - IA_AC023 - view - - - - - - - - - - Capital Account - IA_AC0231 - payable - - - - - - - - - Reserve & Surplus Account - IA_AC0232 - payable - - - - - - - - - Loan(Liability) Account - IA_AC024 - view - - - - - - - - - Bank OD Account - IA_AC0241 - payable - - - - - - - - - Secured Loan Account - IA_AC0242 - payable - - - - - - - - - Unsecured Loan Account - IA_AC0243 - payable - - - - - - - - - Suspense Account - IA_AC025 - payable - - - - - - + + Branch/Division + IA_AC022 + payable + + + + + + + + + Share Holder/Owner Fund + IA_AC023 + view + + + + + + + + + + Capital Account + IA_AC0231 + payable + + + + + + + + + Reserve and Surplus Account + IA_AC0232 + payable + + + + + + + + + Loan(Liability) Account + IA_AC024 + view + + + + + + + + + Bank OD Account + IA_AC0241 + payable + + + + + + + + + Secured Loan Account + IA_AC0242 + payable + + + + + + + + + Unsecured Loan Account + IA_AC0243 + payable + + + + + + + + + Suspense Account + IA_AC025 + payable + + + + + + - - - Profit And Loss Account - IA_AC1 - view - - - - + + + Profit And Loss Account + IA_AC1 + view + + + + - - - - Expense - IA_AC11 - view - - - - - - - - - Direct Expenses - IA_AC111 - other - - - - - - - - - Indirect Expenses - IA_AC112 - other - - - - - - - - - Purchase - IA_AC113 - other - - - - - - - - Opening Stock - IA_AC114 - other - - - - - - + + + + Expense + IA_AC11 + view + + + + + + + + + Direct Expenses + IA_AC111 + other + + + + + + + + + Indirect Expenses + IA_AC112 + other + + + + + + + + + Purchase + IA_AC113 + other + + + + + + + + Opening Stock + IA_AC114 + other + + + + + + - - - Income - IA_AC12 - view - - - - - - - - - Direct Incomes - IA_AC121 - other - - - - - - - - - Indirect Incomes - IA_AC122 - other - - - - - - - - - Sales Account - IA_AC123 - other - - - - - - - - Goods Given Account - IA_AC124 - other - - - - - - + + + Income + IA_AC12 + view + + + + + + + + + Direct Incomes + IA_AC121 + other + + + + + + + + + Indirect Incomes + IA_AC122 + other + + + + + + + + + Sales Account + IA_AC123 + other + + + + + + + + Goods Given Account + IA_AC124 + other + + + + + + - - - - Tax - - - - Tax Balance to Pay - - - - - Tax Due (Tax to pay) - - - - - Tax Payable - - - - - Tax Bases - - - - - - Base of Taxed Sales - - - - - - Base of Taxed Purchases - - - - - - + + + + Tax + + + + Tax Balance to Pay + + + + + Tax Due (Tax to pay) + + + + + Tax Payable + + + + + Tax Bases + + + + + + Base of Taxed Sales + + + + + + Base of Taxed Purchases + + + + + + Opening Journal OPJ situation @@ -544,19 +569,19 @@ situation - - - - India - Chart of Accounts - - - - - - - - - + + + + India - Chart of Accounts + + + + + + + + + - +