[MERGE] Merge JAP branch
bzr revid: mra@tinyerp.com-20120612085654-42zrkujg49tdpp2p
This commit is contained in:
Mustufa Rangwala (OpenERP)
commit
5bb30849d4
|
|
@ -28,6 +28,5 @@
|
|||
##############################################################################
|
||||
|
||||
import installer
|
||||
import account_multi_chart_wizard
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ Indian accounting chart and localization.
|
|||
"demo_xml": [],
|
||||
"update_xml": [
|
||||
"account_tax_code_template.xml",
|
||||
"account_multi_chart_wizard_view.xml",
|
||||
"l10n_in_wizard.xml",
|
||||
"installer_view.xml",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,117 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# 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
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
from tools.translate import _
|
||||
from osv import fields, osv
|
||||
from os.path import join as opj
|
||||
import tools
|
||||
|
||||
class account_multi_charts_wizard(osv.osv_memory):
|
||||
_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'),
|
||||
'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=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'):
|
||||
res['value'].update({'is_indian_chart': True})
|
||||
else:
|
||||
res['value'].update({'is_indian_chart': False})
|
||||
if data.name == 'India - Chart of Accounts for Public Firm':
|
||||
res['value'].update({'sales_tax': True,'vat':True, 'service_tax':True, 'excise_duty': True})
|
||||
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_temp = self.pool.get('account.tax.template')
|
||||
obj_tax = self.pool.get('account.tax')
|
||||
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'))
|
||||
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)
|
||||
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)
|
||||
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:
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="view_wizard_multi_chart_india" model="ir.ui.view">
|
||||
<field name="name">Generate Chart of Accounts from a Chart Template</field>
|
||||
<field name="model">wizard.multi.charts.accounts</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="account.view_wizard_multi_chart"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="seq_journal" position="after">
|
||||
<field name="is_indian_chart" invisible="1"/>
|
||||
<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>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
@ -26,20 +26,23 @@ import tools
|
|||
class l10n_installer(osv.osv_memory):
|
||||
_inherit = 'account.installer'
|
||||
_columns = {
|
||||
'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'),
|
||||
('public_company', 'Public Firm')], 'Company Type', required=True,
|
||||
help='Company Type is used to install Indian chart of accounts as per your type of business.'),
|
||||
'company_type': fields.selection([('public_company', 'Public Firm'),
|
||||
('partnership_private_company', 'Partnership/Private Firm')
|
||||
], 'Company Type', required=True,
|
||||
help='Company Type is used to install Indian chart of accounts as per need of business.'),
|
||||
}
|
||||
_defaults = {
|
||||
'company_type': 'public_company',
|
||||
}
|
||||
|
||||
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 = {}
|
||||
for res in self.read(cr, uid, ids, context=context):
|
||||
if res['charts'] =='l10n_in' and res['company_type']=='public_company':
|
||||
|
||||
res = super(l10n_installer, self).execute_simple(cr, uid, ids, context=context)
|
||||
|
||||
for chart in self.read(cr, uid, ids, context=context):
|
||||
if chart['charts'] =='l10n_in' and chart['company_type']=='public_company':
|
||||
acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml'))
|
||||
tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None)
|
||||
acc_file_path.close()
|
||||
|
|
@ -48,14 +51,15 @@ class l10n_installer(osv.osv_memory):
|
|||
tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None)
|
||||
tax_file_path.close()
|
||||
|
||||
elif res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company':
|
||||
elif chart['charts'] =='l10n_in' and chart['company_type']=='partnership_private_company':
|
||||
acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml'))
|
||||
tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None)
|
||||
acc_file_path.close()
|
||||
|
||||
tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_firm_tax_template.xml'))
|
||||
tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None)
|
||||
tax_file_path.close()
|
||||
tax_file_path.close()
|
||||
|
||||
return res
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
@ -76,7 +76,27 @@
|
|||
<field name="child_depend" eval="0"/>
|
||||
<field name="chart_template_id" ref="indian_chart_template_private"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- Purchase tax -->
|
||||
|
||||
<record id="purchase_tax_public" model="account.tax.template">
|
||||
<field name="description">Purchase Tax - 15%</field>
|
||||
<field name="name">Purchase Tax - 15%</field>
|
||||
<field name="account_collected_id" ref="sales_tax_payable"/>
|
||||
<field name="account_paid_id" ref="sales_tax_payable"/>
|
||||
<field name="price_include" eval="0"/>
|
||||
<field name="amount">0.15</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<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"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
<field name="chart_template_id" ref="indian_chart_template_private"/>
|
||||
</record>
|
||||
|
||||
<!-- -->
|
||||
|
||||
<!-- vat -->
|
||||
|
||||
<record id="vat_private_main" model="account.tax.template">
|
||||
|
|
|
|||
|
|
@ -75,6 +75,26 @@
|
|||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
<field name="chart_template_id" ref="indian_chart_template_public"/>
|
||||
</record>
|
||||
|
||||
<!-- Purchase tax -->
|
||||
|
||||
<record id="purchase_tax_public" model="account.tax.template">
|
||||
<field name="description">Purchase Tax - 15%</field>
|
||||
<field name="name">Purchase Tax - 15%</field>
|
||||
<field name="account_collected_id" ref="a24600"/>
|
||||
<field name="account_paid_id" ref="a24600"/>
|
||||
<field name="price_include" eval="0"/>
|
||||
<field name="amount">0.15</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<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"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
<field name="chart_template_id" ref="indian_chart_template_public"/>
|
||||
</record>
|
||||
|
||||
<!-- -->
|
||||
|
||||
<!-- VAT -->
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue