diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index 4fbe1fa2cc5..058c2a41617 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -18,28 +18,25 @@ # along with this program. If not, see . # ############################################################################## -from lxml import etree + from osv import fields, osv from os.path import join as opj import tools - class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' _columns = { - 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you use Sales Tax'), - 'vat': fields.boolean('VAT',help='If this field is true it allows you use VAT'), - 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you use Service tax'), - 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you use Excise duty'), - 'is_indian_chart': fields.boolean('Flag') + 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you install Sales Tax'), + 'vat': fields.boolean('VAT', help='If this field is true it allows install use VAT'), + 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you install Service tax'), + 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you install Excise duty'), + 'is_indian_chart': fields.boolean('Indian Chart?') } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): - res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context) - tax_templ_obj = self.pool.get('account.tax.template') - res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False} + res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context=context) data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context) - if data.name in ('India - Chart of Accounts for Public Firm','India - Chart of Accounts for Partnership/Private Firm'): + if data.name in ('India - Chart of Accounts for Public Firm', 'India - Chart of Accounts for Partnership/Private Firm'): res['value'].update({'is_indian_chart': True}) else: res['value'].update({'is_indian_chart': False}) @@ -50,42 +47,43 @@ class account_multi_charts_wizard(osv.osv_memory): return res def execute(self, cr, uid, ids, context=None): - obj_multi = self.browse(cr, uid, ids[0]) - if obj_multi.chart_template_id.name == 'India - Chart of Accounts for Public Firm': - if obj_multi.sales_tax: + multichart_data = self.browse(cr, uid, ids[0], context=context) + if multichart_data.chart_template_id.name == 'India - Chart of Accounts for Public Firm': + if multichart_data.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat: + if multichart_data.vat: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax: + if multichart_data.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty: + if multichart_data.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - elif obj_multi.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': - if obj_multi.sales_tax: + elif multichart_data.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': + if multichart_data.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat: + if multichart_data.vat: path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax: + if multichart_data.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty: + if multichart_data.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) + path.close() + res = super(account_multi_charts_wizard, self).execute(cr, uid, ids, context=context) + return res account_multi_charts_wizard() diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index 4851392748f..899d81fc65b 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -1,7 +1,6 @@ + - - Generate Chart of Accounts from a Chart Template wizard.multi.charts.accounts @@ -9,12 +8,13 @@ - - - - - + + + + + + diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml index 0677ab6dfa6..1d8e5ed3b70 100644 --- a/addons/l10n_in/account_tax_code_template.xml +++ b/addons/l10n_in/account_tax_code_template.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index b189a061da4..e9e4157a23f 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -18,9 +18,9 @@ # along with this program. If not, see . # ############################################################################## + from osv import fields, osv from os.path import join as opj -import netsvc import tools class l10n_installer(osv.osv_memory): @@ -35,9 +35,9 @@ class l10n_installer(osv.osv_memory): } def execute_simple(self, cr, uid, ids, context=None): + res = super(l10n_installer, self).execute_simple(cr, uid, ids, context=context) if context is None: context = {} - fy_obj = self.pool.get('account.fiscalyear') for res in self.read(cr, uid, ids, context=context): if res['charts'] =='l10n_in' and res['company_type']=='public_company': path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) @@ -46,25 +46,7 @@ class l10n_installer(osv.osv_memory): if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - 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'][0])], 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'][0] - } - fiscal_id = fy_obj.create(cr, uid, vals, context=context) - if res['period'] == 'month': - fy_obj.create_period(cr, uid, [fiscal_id]) - elif res['period'] == '3months': - fy_obj.create_period3(cr, uid, [fiscal_id]) + path.close() + return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/installer_view.xml b/addons/l10n_in/installer_view.xml index cfac5ed8513..63dbe44eabd 100644 --- a/addons/l10n_in/installer_view.xml +++ b/addons/l10n_in/installer_view.xml @@ -1,3 +1,4 @@ + diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml deleted file mode 100644 index d18d2b801e0..00000000000 --- a/addons/l10n_in/l10n_in_chart.xml +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - - - Indian Chart of Account - 0 - view - - - - - - Balance Sheet - IA_AC0 - view - - - - - - - Assets - IA_AC01 - view - - - - - - - Current Assets - IA_AC011 - view - - - - - - - Bank Account - IA_AC0111 - liquidity - - - - - - - Cash In Hand Account - IA_AC0112 - view - - - - - - - Cash Account - IA_AC01121 - view - - - - - - - Deposit Account - IA_AC0113 - other - - - - - - - Loan & Advance(Assets) Account - IA_AC0114 - other - - - - - - - Total Sundry Debtors Account - IA_AC0116 - view - - - - - - - Sundry Debtors Account - IA_AC01161 - receivable - - - - - - - Fixed Assets - IA_AC012 - other - - - - - - - Investment - IA_AC013 - other - - - - - - - Misc. Expenses(Asset) - IA_AC014 - other - - - - - - - Liabilities - IA_AC02 - view - - - - - - - Current Liabilities - IA_AC021 - view - - - - - - - Duties & Taxes - IA_AC0211 - other - - - - - - - Provision - IA_AC0212 - other - - - - - - - Total Sundry Creditors - IA_AC0213 - view - - - - - - - Sundry Creditors Account - IA_AC02131 - payable - - - - - - - Branch/Division - IA_AC022 - other - - - - - - - Share Holder/Owner Fund - IA_AC023 - view - - - - - - - Capital Account - IA_AC0231 - other - - - - - - - Reserve and Profit/Loss Account - IA_AC0232 - other - - - - - - - Loan(Liability) Account - IA_AC024 - view - - - - - - - Bank OD Account - IA_AC0241 - other - - - - - - - Secured Loan Account - IA_AC0242 - other - - - - - - - Unsecured Loan Account - IA_AC0243 - other - - - - - - - Suspense Account - IA_AC025 - other - - - - - - - - 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 - - - - - - Salary Expenses - IA_AC115 - 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 - - - - - OPJ - Opening Journal - situation - - - - - India - Chart of Accounts - - - - - - - - - - - - - diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index f5185d85426..6e2a764d64f 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ - + Balance Sheet 1 view @@ -24,183 +24,183 @@ - + Assets 10 view - + - + Cash 101 liquidity - + Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited. - + Accounts Receivable 120 receivable - + Amounts owed to the company for services performed or products sold but not yet paid for. - + Merchandise Inventory 140 other - + Cost of merchandise purchased but has not yet been sold. - + Supplies 150 other - + Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense. - + Prepaid Insurance 160 other - + Cost of insurance that is paid in advance and includes a future accounting period. - + Land 170 other - + Cost to acquire and prepare land for use by the company. - + Buildings 175 other - + Cost to purchase or construct buildings for use by the company. - + Accumulated Depreciation - Buildings 178 other - + Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired. - + Equipment 180 other - + Cost to acquire and prepare equipment for use by the company. - + Accumulated Depreciation - Equipment 188 other - + Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. - + Liabilities 20 view - + - + Notes Payable 210 other - + The amount of principal due on a formal written promise to pay. Loans from banks are included in this account. - + Accounts Payable 215 payable - + Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash. - + Wages Payable 220 other - + Amount owed to employees for hours worked but not yet paid. - + Interest Payable 230 other - + Amount owed for interest on Notes Payable up until the date of the balance sheet. This is computed by multiplying the amount of the note times the effective interest rate times the time period. - + Unearned Revenues 240 other - + Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases. - + Mortgage Loan Payable 250 other - + A formal loan that involves a lien on real estate until the loan is repaid. @@ -212,7 +212,7 @@ view - + - + Profit And Loss 3 view @@ -248,186 +248,186 @@ - + Income 30 view - + - + Operating Revenue Accounts 31 view - + - + Service Revenues 310 other - + Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase. - + Product Sales 311 other - + Sales of product account - + Non-Operating Revenue and Gains 80 view - + - + Interest Revenues 810 other - + Interest and dividends earned on bank accounts, investments or notes receivable. This account is increased when the interest is earned and either Cash or Interest Receivable is also increased. - + Gain on Sale of Assets 811 other - + Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value. - + Expense 50 view - + - + Operating Expense Accounts 51 view - + - + Salaries Expense 500 other - + Expenses incurred for the work performed by salaried employees during the accounting period. These employees normally receive a fixed amount on a weekly, monthly, or annual basis. - + Wages Expense 510 other - + Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay. - + Supplies Expense 540 other - + Cost of supplies used up during the accounting period. - + Rent Expense 560 other - + Cost of occupying rented facilities during the accounting period. - + Utilities Expense 570 other - + Costs for electricity, heat, water, and sewer that were used during the accounting period. - + Telephone Expense 576 other - + Cost of telephone used during the current accounting period. - + Advertising Expense 610 other - + Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries). - + Depreciation Expense 750 other - + Cost of long-term assets allocated to expense during the current accounting period. - + Non-Operating Expenses and Losses 90 view - + @@ -436,7 +436,7 @@ other - + Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value. @@ -446,12 +446,12 @@ India - Chart of Accounts for Partnership/Private Firm - - - - - - + + + + + + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index 8e84d9b8d79..9e72ec9569c 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml index 17bd975d140..19d7df181f7 100644 --- a/addons/l10n_in/l10n_in_wizard.xml +++ b/addons/l10n_in/l10n_in_wizard.xml @@ -1,3 +1,4 @@ + diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 568d480eb86..14f4636cf32 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index 1ce8cbfe74c..1a36cf4cc0f 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index d717201b577..9f917a329f0 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index dc89d3d3fee..a221ff1317b 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -9,7 +9,7 @@ payable - +