[IMP] l10n_in: Improve Usability and link account with tax
bzr revid: jap@tinyerp.com-20120605060441-52p0hoksc2hr3ey6
This commit is contained in:
Jagdish Panchal (Open ERP)
parent
a7bfa42417
commit
088e65bd0b
|
|
@ -1,8 +1,8 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# Author: Nicolas Bessi. Copyright Camptocamp SA
|
||||
# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
|
||||
# OpenERP, Open Source Business Applications
|
||||
# Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
|
|
@ -24,7 +24,8 @@ from os.path import join as opj
|
|||
import tools
|
||||
|
||||
class account_multi_charts_wizard(osv.osv_memory):
|
||||
_inherit ='wizard.multi.charts.accounts'
|
||||
_name = 'wizard.multi.charts.accounts'
|
||||
_inherit = 'wizard.multi.charts.accounts'
|
||||
_columns = {
|
||||
'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'),
|
||||
|
|
@ -45,57 +46,72 @@ class account_multi_charts_wizard(osv.osv_memory):
|
|||
elif data.name == 'India - Chart of Accounts for Partnership/Private Firm':
|
||||
res['value'].update({'sales_tax': True,'vat':True})
|
||||
return res
|
||||
|
||||
|
||||
def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
|
||||
res = super(account_multi_charts_wizard, self)._load_template(cr, uid, template_id, company_id, code_digits, obj_wizard, account_ref, taxes_ref, tax_code_ref, context=context)
|
||||
template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
|
||||
obj_tax_code_template = self.pool.get('account.tax.code.template')
|
||||
obj_tax_temp = self.pool.get('account.tax.template')
|
||||
obj_tax = self.pool.get('account.tax')
|
||||
tax_code_ref.update(obj_tax_code_template.generate_tax_code(cr, uid, template.tax_code_root_id.id, company_id, context=context))
|
||||
if obj_wizard.sales_tax == False and obj_wizard.excise_duty == False and obj_wizard.vat == False and obj_wizard.service_tax == False:
|
||||
raise osv.except_osv(_('Error !'), _('Select Tax to Install'))
|
||||
# Unlink the Tax for current company
|
||||
tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context)
|
||||
obj_tax.unlink(cr, uid, tax_ids, context=context)
|
||||
#Create new Tax as per selected from wizard
|
||||
if obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Public Firm':
|
||||
# Unlink the Tax for current company
|
||||
tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context)
|
||||
obj_tax.unlink(cr, uid, tax_ids, context=context)
|
||||
#Create new Tax as per selected from wizard
|
||||
if obj_wizard.sales_tax:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.vat:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.service_tax:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax','Service Tax - %2','Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.excise_duty:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty','Excise Duty - %2','Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
elif obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm':
|
||||
# Unlink the Tax for current company
|
||||
tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context)
|
||||
obj_tax.unlink(cr, uid, tax_ids, context=context)
|
||||
#Create new Tax as per selected from wizard
|
||||
if obj_wizard.sales_tax:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.vat:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.service_tax:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
if obj_wizard.excise_duty:
|
||||
tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)
|
||||
tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context)
|
||||
self._tax_account(cr, uid, account_ref, taxes_ref, context=context)
|
||||
return account_ref, taxes_ref, tax_code_ref
|
||||
|
||||
|
||||
def _tax_account(self, cr, uid, account_ref, taxes_ref, context=None):
|
||||
obj_tax = self.pool.get('account.tax')
|
||||
for key,value in taxes_ref['account_dict'].items():
|
||||
obj_tax.write(cr, uid, [key], { 'account_collected_id': account_ref.get(value['account_collected_id'], False), 'account_paid_id': account_ref.get(value['account_paid_id'], False),})
|
||||
return True
|
||||
|
||||
account_multi_charts_wizard()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -9,12 +9,11 @@
|
|||
<field name="arch" type="xml">
|
||||
<field name="seq_journal" position="after">
|
||||
<field name="is_indian_chart" invisible="1"/>
|
||||
<group colspan="4">
|
||||
<field name="sales_tax" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="service_tax" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="vat" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="excise_duty" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
</group>
|
||||
<newline/>
|
||||
<field name="sales_tax" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="service_tax" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="vat" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
<field name="excise_duty" attrs="{'invisible': [('is_indian_chart','=', False)]}"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class l10n_installer(osv.osv_memory):
|
|||
_columns = {
|
||||
'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'),
|
||||
('public_company', 'Public Firm')], 'Company Type', required=True,
|
||||
help='Select your company Type according to your need to install Chart Of Account'),
|
||||
help='Company Type is used to install Indian chart of accounts as per your type of business.'),
|
||||
}
|
||||
_defaults = {
|
||||
'company_type': 'public_company',
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<data noupdate="1">
|
||||
|
||||
<!-- Tax Account -->
|
||||
<record model="account.account.template" id="216">
|
||||
<record model="account.account.template" id="sales_tax_payable">
|
||||
<field name="name">Sales Tax Payable</field>
|
||||
<field name="code">216</field>
|
||||
<field name="type">payable</field>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<field name="parent_id" ref="liabilities"/>
|
||||
</record>
|
||||
|
||||
<record model="account.account.template" id="217">
|
||||
<record model="account.account.template" id="vat_payable">
|
||||
<field name="name">VAT Payable</field>
|
||||
<field name="code">217</field>
|
||||
<field name="type">payable</field>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<field name="parent_id" ref="liabilities"/>
|
||||
</record>
|
||||
|
||||
<record model="account.account.template" id="218">
|
||||
<record model="account.account.template" id="service_tax_payable">
|
||||
<field name="name">Service Tax Payable</field>
|
||||
<field name="code">218</field>
|
||||
<field name="type">payable</field>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<field name="parent_id" ref="liabilities"/>
|
||||
</record>
|
||||
|
||||
<record model="account.account.template" id="219">
|
||||
<record model="account.account.template" id="exice_duty_payable">
|
||||
<field name="name">Exice Duty Payable</field>
|
||||
<field name="code">219</field>
|
||||
<field name="type">payable</field>
|
||||
|
|
@ -50,8 +50,8 @@
|
|||
<field name="amount">0.15</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="216"/>
|
||||
<field name="account_paid_id" ref="216"/>
|
||||
<field name="account_collected_id" ref="sales_tax_payable"/>
|
||||
<field name="account_paid_id" ref="sales_tax_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
<field name="amount">0.12</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="216"/>
|
||||
<field name="account_paid_id" ref="216"/>
|
||||
<field name="account_collected_id" ref="sales_tax_payable"/>
|
||||
<field name="account_paid_id" ref="sales_tax_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
|
||||
|
|
@ -86,8 +86,8 @@
|
|||
<field name="amount">0.05</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">all</field>
|
||||
<field name="account_collected_id" ref="217"/>
|
||||
<field name="account_paid_id" ref="217"/>
|
||||
<field name="account_collected_id" ref="vat_payable"/>
|
||||
<field name="account_paid_id" ref="vat_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="base_sign">1</field>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
|
|
@ -107,8 +107,8 @@
|
|||
<field name="amount">0.15</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">all</field>
|
||||
<field name="account_collected_id" ref="217"/>
|
||||
<field name="account_paid_id" ref="217"/>
|
||||
<field name="account_collected_id" ref="vat_payable"/>
|
||||
<field name="account_paid_id" ref="vat_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="base_sign">1</field>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
|
|
@ -128,8 +128,8 @@
|
|||
<field name="amount">0.8</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">all</field>
|
||||
<field name="account_collected_id" ref="217"/>
|
||||
<field name="account_paid_id" ref="217"/>
|
||||
<field name="account_collected_id" ref="vat_payable"/>
|
||||
<field name="account_paid_id" ref="vat_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
|
||||
|
|
@ -147,8 +147,8 @@
|
|||
<field name="amount">0.10</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="219"/>
|
||||
<field name="account_paid_id" ref="219"/>
|
||||
<field name="account_collected_id" ref="exice_duty_payable"/>
|
||||
<field name="account_paid_id" ref="exice_duty_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="base_sign">1</field>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
|
|
@ -190,8 +190,8 @@
|
|||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="amount">0.12</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="218"/>
|
||||
<field name="account_paid_id" ref="218"/>
|
||||
<field name="account_collected_id" ref="service_tax_payable"/>
|
||||
<field name="account_paid_id" ref="service_tax_payable"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue