diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index db9de6a9f0c..0e0b734f72d 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -305,7 +305,8 @@ class crm_lead(format_address, osv.osv): if partner_id: partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) values = { - 'partner_name': partner.name, + 'partner_name': partner.parent_id.name if partner.parent_id else partner.name, + 'contact_name': partner.name if partner.parent_id else False, 'street': partner.street, 'street2': partner.street2, 'city': partner.city, diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index 7f6309ee4f4..43df3d069bf 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -153,7 +153,7 @@ - + diff --git a/addons/hr_timesheet/__init__.py b/addons/hr_timesheet/__init__.py index 0ba28b1946c..f29aca0a003 100644 --- a/addons/hr_timesheet/__init__.py +++ b/addons/hr_timesheet/__init__.py @@ -21,6 +21,7 @@ import hr_timesheet import wizard +import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index b2e6c9f9cc1..49e65b41753 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -47,6 +47,7 @@ up a management by affair. 'security/hr_timesheet_security.xml', 'hr_timesheet_view.xml', 'wizard/hr_timesheet_sign_in_out_view.xml', + 'report/hr_timesheet_report_view.xml', 'hr_timesheet_installer.xml', 'hr_timesheet_data.xml' ], diff --git a/addons/hr_timesheet/report/__init__.py b/addons/hr_timesheet/report/__init__.py new file mode 100644 index 00000000000..8728fb520b6 --- /dev/null +++ b/addons/hr_timesheet/report/__init__.py @@ -0,0 +1 @@ +import hr_timesheet_report diff --git a/addons/hr_timesheet/report/hr_timesheet_report.py b/addons/hr_timesheet/report/hr_timesheet_report.py new file mode 100644 index 00000000000..3ed396feefa --- /dev/null +++ b/addons/hr_timesheet/report/hr_timesheet_report.py @@ -0,0 +1,76 @@ + +from openerp import tools +from openerp.osv import fields,osv +from openerp.addons.decimal_precision import decimal_precision as dp + +class hr_timesheet_report(osv.osv): + _name = "hr.timesheet.report" + _description = "Timesheet" + _auto = False + _columns = { + 'year': fields.char('Year',size=64,required=False, readonly=True), + 'day': fields.char('Day', size=128, readonly=True), + 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), + ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), + ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), + 'date': fields.date('Date', readonly=True), + 'name': fields.char('Description', size=64,readonly=True), + 'product_id' : fields.many2one('product.product', 'Product',readonly=True), + 'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True), + 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True), + 'user_id': fields.many2one('res.users', 'User',readonly=True), + 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True), + 'company_id': fields.many2one('res.company', 'Company',readonly=True), + 'cost': fields.float('#Cost',readonly=True, digits_compute=dp.get_precision('Account')), + 'quantity': fields.float('Time',readonly=True), + } + + def _select(self): + select_str = """ + SELECT min(hat.id) as id, + aal.date as date, + to_char(aal.date, 'YYYY-MM-DD') as day, + to_char(aal.date,'YYYY') as year, + to_char(aal.date,'MM') as month, + sum(aal.amount) as cost, + sum(aal.unit_amount) as quantity, + aal.account_id as account_id, + aal.journal_id as journal_id, + aal.product_id as product_id, + aal.general_account_id as general_account_id, + aal.user_id as user_id, + aal.company_id as company_id, + aal.currency_id as currency_id + """ + return select_str + + def _from(self): + from_str = """ + account_analytic_line as aal + left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) + """ + return from_str + + def _group_by(self): + group_by_str = """ + GROUP BY aal.date, + aal.account_id, + aal.product_id, + aal.general_account_id, + aal.journal_id, + aal.user_id, + aal.company_id, + aal.currency_id + """ + return group_by_str + + def init(self, cr): + # self._table = hr_timesheet_report + tools.drop_view_if_exists(cr, self._table) + cr.execute("""CREATE or REPLACE VIEW %s as ( + %s + FROM ( %s ) + %s + )""" % (self._table, self._select(), self._from(), self._group_by())) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet/report/hr_timesheet_report_view.xml new file mode 100644 index 00000000000..ec97447d7ff --- /dev/null +++ b/addons/hr_timesheet/report/hr_timesheet_report_view.xml @@ -0,0 +1,58 @@ + + + + + hr.timesheet.report.graph + hr.timesheet.report + + + + + + + + + + + + hr.timesheet.report.search + hr.timesheet.report + + + + + + + + + + + + + + + + + + + + + + + + + + + + Timesheet Analysis + hr.timesheet.report + form + graph + {'search_default_year':1,'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} + + + + + + diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index 9448c3fb7c1..7ecae95e141 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -53,7 +53,6 @@ The validation can be configured in the company: 'hr_timesheet_sheet_view.xml', 'hr_timesheet_workflow.xml', 'report/hr_timesheet_report_view.xml', - 'report/timesheet_report_view.xml', 'wizard/hr_timesheet_current_view.xml', 'hr_timesheet_sheet_data.xml', 'res_config_view.xml', diff --git a/addons/hr_timesheet_sheet/report/__init__.py b/addons/hr_timesheet_sheet/report/__init__.py index b06b0608356..9a95bc4a787 100644 --- a/addons/hr_timesheet_sheet/report/__init__.py +++ b/addons/hr_timesheet_sheet/report/__init__.py @@ -19,7 +19,7 @@ # ############################################################################## -import timesheet_report import hr_timesheet_report + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py index e15ae99ab5a..7cc59372d0a 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py @@ -21,55 +21,62 @@ from openerp import tools from openerp.osv import fields,osv -from openerp.addons.decimal_precision import decimal_precision as dp - class hr_timesheet_report(osv.osv): - _name = "hr.timesheet.report" - _description = "Timesheet" - _auto = False + _inherit = "hr.timesheet.report" _columns = { - 'date': fields.date('Date', readonly=True), - 'name': fields.char('Description', size=64,readonly=True), - 'product_id' : fields.many2one('product.product', 'Product',readonly=True), - 'journal_id' : fields.many2one('account.analytic.journal', 'Journal',readonly=True), - 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True), - 'user_id': fields.many2one('res.users', 'User',readonly=True), - 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True), - 'company_id': fields.many2one('res.company', 'Company',readonly=True), - 'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')), - 'quantity': fields.float('Time',readonly=True), - } + 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True), + 'nbr': fields.integer('#Nbr',readonly=True), + 'total_diff': fields.float('#Total Diff',readonly=True), + 'total_timesheet': fields.float('#Total Timesheet',readonly=True), + 'total_attendance': fields.float('#Total Attendance',readonly=True), + 'department_id':fields.many2one('hr.department','Department',readonly=True), + 'date_from': fields.date('Date from',readonly=True,), + 'date_to': fields.date('Date to',readonly=True), + 'date_current': fields.date('Current date', required=True), + 'state' : fields.selection([ + ('new', 'New'), + ('draft','Draft'), + ('confirm','Confirmed'), + ('done','Done')], 'Status', readonly=True), + } + + def _select(self): + return super(hr_timesheet_report, self)._select() + """, + htss.name, + htss.date_from, + htss.date_to, + count(*) as nbr, + (SELECT sum(day.total_difference) + FROM hr_timesheet_sheet_sheet AS sheet + LEFT JOIN hr_timesheet_sheet_sheet_day AS day + ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_diff, + (SELECT sum(day.total_timesheet) + FROM hr_timesheet_sheet_sheet AS sheet + LEFT JOIN hr_timesheet_sheet_sheet_day AS day + ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_timesheet, + (SELECT sum(day.total_attendance) + FROM hr_timesheet_sheet_sheet AS sheet + LEFT JOIN hr_timesheet_sheet_sheet_day AS day + ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_attendance, + aal.to_invoice, + htss.department_id, + htss.state""" + + def _from(self): + return super(hr_timesheet_report, self)._from() + "left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id)" + + def _group_by(self): + return super(hr_timesheet_report, self)._group_by() + """, + htss.date_from, + htss.date_to, + aal.unit_amount, + aal.amount, + aal.to_invoice, + htss.name, + htss.state, + htss.id, + htss.department_id""" - def init(self, cr): - tools.drop_view_if_exists(cr, 'hr_timesheet_report') - cr.execute(""" - create or replace view hr_timesheet_report as ( - select - min(t.id) as id, - l.date as date, - sum(l.amount) as cost, - sum(l.unit_amount) as quantity, - l.account_id as account_id, - l.journal_id as journal_id, - l.product_id as product_id, - l.general_account_id as general_account_id, - l.user_id as user_id, - l.company_id as company_id, - l.currency_id as currency_id - from - hr_analytic_timesheet as t - left join account_analytic_line as l ON (t.line_id=l.id) - group by - l.date, - l.account_id, - l.product_id, - l.general_account_id, - l.journal_id, - l.user_id, - l.company_id, - l.currency_id - ) - """) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index 30757a0b43e..6c735123efe 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -1,65 +1,49 @@ - - hr.timesheet.report.graph + + timesheet.report.graph hr.timesheet.report + - - - - - - - - - - hr.timesheet.report.search - hr.timesheet.report - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - Timesheet Analysis - hr.timesheet.report - form - graph - {'search_default_month':1,'search_default_group_user_id':1,'group_by_no_leaf':1,'group_by':[]} - -

- This report performs analysis on timesheets created by your - human resources in the system. It allows you to have a full - overview of entries done by your employees. You can group them - by specific selection criteria thanks to the search tool. -

+ + timesheet.report.search + hr.timesheet.report + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py deleted file mode 100644 index 6d284ac08c8..00000000000 --- a/addons/hr_timesheet_sheet/report/timesheet_report.py +++ /dev/null @@ -1,118 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# 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 . -# -############################################################################## - -from openerp import tools -from openerp.osv import fields,osv - -class timesheet_report(osv.osv): - _name = "timesheet.report" - _description = "Timesheet" - _auto = False - _columns = { - 'year': fields.char('Year',size=64,required=False, readonly=True), - 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), - ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'), - ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), - 'day': fields.char('Day', size=128, readonly=True), - 'date': fields.date('Date', readonly=True), - 'name': fields.char('Description', size=64,readonly=True), - 'product_id' : fields.many2one('product.product', 'Product'), - 'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True), - 'user_id': fields.many2one('res.users', 'User',readonly=True), - 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing',readonly=True), - 'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True), - 'nbr': fields.integer('#Nbr',readonly=True), - 'total_diff': fields.float('#Total Diff',readonly=True), - 'total_timesheet': fields.float('#Total Timesheet',readonly=True), - 'total_attendance': fields.float('#Total Attendance',readonly=True), - 'company_id': fields.many2one('res.company', 'Company',readonly=True), - 'department_id':fields.many2one('hr.department','Department',readonly=True), - 'date_from': fields.date('Date from',readonly=True,), - 'date_to': fields.date('Date to',readonly=True), - 'date_current': fields.date('Current date', required=True), - 'state' : fields.selection([ - ('new', 'New'), - ('draft','Draft'), - ('confirm','Confirmed'), - ('done','Done')], 'Status', readonly=True), - 'quantity': fields.float('Time',readonly=True), - 'cost': fields.float('#Cost',readonly=True), - } - - def init(self, cr): - tools.drop_view_if_exists(cr, 'timesheet_report') - cr.execute(""" - create or replace view timesheet_report as ( - select - min(aal.id) as id, - htss.name, - aal.date as date, - htss.date_from, - htss.date_to, - to_char(htss.date_from, 'YYYY-MM-DD') as day, - to_char(htss.date_from, 'YYYY') as year, - to_char(htss.date_from, 'MM') as month, - count(*) as nbr, - aal.unit_amount as quantity, - aal.amount as cost, - aal.account_id, - aal.product_id, - (SELECT sum(day.total_difference) - FROM hr_timesheet_sheet_sheet AS sheet - LEFT JOIN hr_timesheet_sheet_sheet_day AS day - ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_diff, - (SELECT sum(day.total_timesheet) - FROM hr_timesheet_sheet_sheet AS sheet - LEFT JOIN hr_timesheet_sheet_sheet_day AS day - ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_timesheet, - (SELECT sum(day.total_attendance) - FROM hr_timesheet_sheet_sheet AS sheet - LEFT JOIN hr_timesheet_sheet_sheet_day AS day - ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_attendance, - aal.to_invoice, - aal.general_account_id, - htss.user_id, - htss.company_id, - htss.department_id, - htss.state - from account_analytic_line as aal - left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id) - left join hr_timesheet_sheet_sheet as htss ON (hat.sheet_id=htss.id) - group by - aal.account_id, - aal.date, - htss.date_from, - htss.date_to, - aal.unit_amount, - aal.amount, - aal.to_invoice, - aal.product_id, - aal.general_account_id, - htss.name, - htss.company_id, - htss.state, - htss.id, - htss.department_id, - htss.user_id - ) - """) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml deleted file mode 100644 index 9b45229c2cc..00000000000 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - timesheet.report.graph - timesheet.report - - - - - - - - - - - - - - timesheet.report.search - timesheet.report - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Timesheet Sheet Analysis - timesheet.report - form - graph - {'search_default_year':1,'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]} - - - - - diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 3feb9cf1a92..8eef30b35c4 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv @@ -1,9 +1,8 @@ -id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1 -access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0 -access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1 -access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1 -access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0 -access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0 -access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0 -access_timesheet_report,timesheet.report,model_timesheet_report,base.group_hr_manager,1,1,0,0 +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_hr_timesheet_sheet_sheet_user,hr_timesheet_sheet.sheet.user,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,1 +access_hr_timesheet_sheet_sheet_system_employee,hr_timesheet_sheet.sheet.system.employee,model_hr_timesheet_sheet_sheet,base.group_user,1,1,1,0 +access_hr_timesheet_sheet_sheet_day,hr_timesheet_sheet.sheet.day,model_hr_timesheet_sheet_sheet_day,base.group_hr_user,1,1,1,1 +access_hr_timesheet_sheet_sheet_account,hr_timesheet_sheet.sheet.account,model_hr_timesheet_sheet_sheet_account,base.group_hr_user,1,1,1,1 +access_hr_timesheet_report,hr.timesheet.report,model_hr_timesheet_report,base.group_hr_manager,1,1,0,0 +access_hr_analytic_timesheet_system_user,hr.analytic.timesheet.system.user,model_hr_analytic_timesheet,base.group_user,1,0,0,0 +access_hr_timesheet_sheet_sheet_day,hr.timesheet.sheet.sheet.day.user,model_hr_timesheet_sheet_sheet_day,base.group_user,1,1,1,0 diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index b3dab229201..8dd815022dd 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -27,8 +27,14 @@ Indian Accounting: Chart of Account. ==================================== Indian accounting chart and localization. - """, - 'author': ['OpenERP SA', 'Axelor'], + +OpenERP allows to manage Indian Accounting by providing Two Formats Of Chart of Accounts i.e Indian Chart Of Accounts - Standard and Indian Chart Of Accounts - Schedule VI. + +Note: The Schedule VI has been revised by MCA and is applicable for all Balance Sheet made after +31st March, 2011. The Format has done away with earlier two options of format of Balance +Sheet, now only Vertical format has been permitted Which is Supported By OpenERP. + """, + 'author': ['OpenERP SA'], 'category': 'Localization/Account Charts', 'depends': [ 'account', @@ -37,10 +43,10 @@ Indian accounting chart and localization. 'demo': [], 'data': [ 'l10n_in_tax_code_template.xml', - 'l10n_in_public_chart.xml', - 'l10n_in_public_tax_template.xml', - 'l10n_in_private_chart.xml', - 'l10n_in_private_tax_template.xml', + 'l10n_in_standard_chart.xml', + 'l10n_in_standard_tax_template.xml', + 'l10n_in_schedule6_chart.xml', + 'l10n_in_schedule6_tax_template.xml', 'l10n_in_wizard.xml', ], 'auto_install': False, diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml deleted file mode 100644 index efaa9844416..00000000000 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ /dev/null @@ -1,558 +0,0 @@ - - - - - - - - Partnership/Private Firm Chart of Account - 0 - view - - - - - - Balance Sheet - 1 - view - - - - - - - - - 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. - - - - Tax Receivable - 189 - view - - - - - - Purchase Tax Receivable - 189100 - other - - - - - - - VAT Receivable - 189200 - other - - - - - - - Service Tax Receivable - 189300 - other - - - - - - - Exice Duty Receivable - 189400 - other - - - - - - - - - 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. - - - - Reserve and Surplus Account - 260 - other - - - - A Reserve and Surplus Account. - - - - - - - Tax payable - 216 - view - - - - - - - Sales Tax Payable - 2161 - other - - - - - - - VAT Payable - 2162 - other - - - - - - - Service Tax Payable - 2163 - other - - - - - - - Exice Duty Payable - 2164 - other - - - - - - - - - Owner's Equity Accounts - 29 - view - - - - - - - - - - Profit And Loss - 3 - view - - - - - - - - - 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 - - - - - - - Loss on Sale of Assets - 960 - other - - - - Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value. - - - - - - India - Chart of Accounts for Private Ltd/Partnership - - - - - - - - - - - - - diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml deleted file mode 100644 index 5cb835d950c..00000000000 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - Sales Tax 15% - Sales Tax 15% - 0.15 - percent - sale - - - - - - - - - - - - - Sales Tax 12% - Sales Tax 12% - 0.12 - percent - sale - - - - - - - - - - - - - Sales Tax 4% - Sales Tax 4% - 0.04 - percent - sale - - - - - - - - - - - - - - - Purchase Tax 15% - Purchase Tax 15% - - - 0.15 - percent - purchase - - - - - - - - - - - - - Output VAT 5% (VAT 4% + Add. VAT 1%) - Output VAT 5% - sale - percent - 0.04 - - - - - - - - - - - - - Input VAT 5% (VAT 4% + Add. VAT 1%) - Input VAT 5% - 0.05 - percent - purchase - - - - - - - - - - - - - Input VAT 15% (VAT 12.5% + Add. VAT 2.5%) - Input VAT 15% - 0.15 - percent - purchase - - - - - - - - - - - - - Output VAT 15% (VAT 12.5% + Add. VAT 2.5%) - Output VAT 15% - 0.15 - percent - sale - - - - - - - - - - - - - Input VAT 8% - Input VAT 8% - 0.08 - percent - purchase - - - - - - - - - - - - - Output VAT 8% - Output VAT 8% - 0.08 - percent - sale - - - - - - - - - - - - - Input VAT 10% - Input VAT 10% - 0.10 - percent - purchase - - - - - - - - - - - - - Output VAT 10% - Output VAT 10% - 0.10 - percent - sale - - - - - - - - - - - - - Input VAT 12.5% - Input VAT 12.5% - 0.125 - percent - purchase - - - - - - - - - - - - - Output VAT 12.5% - Output VAT 12.5% - 0.125 - percent - sale - - - - - - - - - - - - - - - Excise Duty 12% - Sales - Excise Duty 12% - Sales - sale - percent - 0.1200 - - - - - - - - - - - - - Excise Duty 2% - Sales - Excise Duty 2% - Sales - sale - percent - 0.020 - - - - - - - - - - - - - Output Excise Duty 1% - Output Excise Duty 1% - sale - percent - 0.0100 - - - - - - - - - - - - - - - Output Service Tax 12% - Output Service Tax 12% - sale - percent - 0.12 - 1 - - - - - - - - - - - - - Output Sales Service Tax 2% - Output Sales Service Tax 2% - sale - percent - 0.02 - 3 - - - - - - - - - - - Output Service Tax 1% - Output Service Tax 1% - sale - percent - 0.01 - 5 - - - - - - - - - - - Input Service Tax 12% - Input Service Tax 12% - purchase - percent - 0.1200 - 1 - - - - - - - - - - - - - Input Service Tax Edu. Cess. 2% - Input Service Tax Edu. Cess. 2% - purchase - percent - 0.0200 - 3 - - - - - - - - - - - Input Service Tax Seco. & HEC 1% - Input Service Tax Seco. & HEC 1% - purchase - percent - 0.0100 - 5 - - - - - - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml deleted file mode 100644 index 18633af054f..00000000000 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ /dev/null @@ -1,995 +0,0 @@ - - - - - - - - - Public Firm Chart of Account - 0 - view - - - - - - Balance Sheet - 1 - view - - - - - - - - Assets - 10 - view - - - - - - - Current Assets - 10000 - view - - - - - - - Cash - Regular Checking - 10100 - liquidity - - - - - - - Cash - Payroll Checking - 10200 - liquidity - - - - - - - Petty Cash Fund - 10600 - liquidity - - - - - - - Accounts Receivable - 12100 - receivable - - - - - - - Allowance for Doubtful Accounts - 12500 - other - - - - - - - Inventory - 13100 - other - - - - - - - Supplies - 14100 - other - - - - - - - Prepaid Insurance - 15300 - other - - - - - - - Tax Receivable - 15400 - view - - - - - - - - - Property, Plant, and Equipment - 17000 - view - - - - - - - Land - 17200 - other - - - - - - - Buildings - 17100 - other - - - - - - - Equipment - 17300 - other - - - - - - - Vehicles - 17800 - other - - - - - - - Accumulated Depreciation - Buildings - 18100 - other - - - - - - - Accumulated Depreciation - Equipment - 18300 - other - - - - - - - Accumulated Depreciation - Vehicles - 18800 - other - - - - - - - - - Liabilities - 20 - view - - - - - - - Current Liabilities - 20000 - view - - - - - - - Notes Payable - Credit Line #1 - 20100 - other - - - - - - - Notes Payable - Credit Line #2 - 20200 - other - - - - - - - Accounts Payable - 21000 - payable - - - - - - - Wages Payable - 22100 - other - - - - - - - Interest Payable - 23100 - other - - - - - - - Unearned Revenues - 24500 - other - - - - - - - Long-term Liabilities - 25000 - view - - - - - - - Mortgage Loan Payable - 25100 - other - - - - - - - Bonds Payable - 25600 - other - - - - - - - Discount on Bonds Payable - 25650 - other - - - - - - - Stockholders' Equity - 27000 - view - - - - - - - Common Stock, No Par - 27100 - other - - - - - - - Retained Earnings - 27500 - other - - - - - - - Treasury Stock - 29500 - other - - - - - - - Reserve and Surplus Account - 24600 - other - - - - - - - - - Tax payable - 24700 - view - - - - - - - Sales Tax Payable - 24710 - other - - - - - - - VAT Payable - 24720 - other - - - - - - - Exice Duty Payable - 24730 - other - - - - - - - Service Tax Payable - 24740 - other - - - - - - - - - Profit And Loss - 3 - view - - - - - - - - - Income - 30 - view - - - - - - - - - Operating Revenues - 30000 - view - - - - - - - Sales - Division #1, Product Line 010 - 31010 - other - - - - - - - Sales - Division #1, Product Line 022 - 31022 - other - - - - - - - Sales - Division #2, Product Line 015 - 32015 - other - - - - - - - Sales - Division #3, Product Line 110 - 33110 - other - - - - - - - Non-Operating Revenue and Gains - 90000 - view - - - - - - - Gain on Sale of Assets - 91800 - other - - - - - - - - - Expense - 40 - view - - - - - - - - - - Cost of Goods Sold - 40000 - view - - - - - - - - COGS - Division #1, Product Line 010 - 41010 - other - - - - - - - COGS - Division #1, Product Line 022 - 41022 - other - - - - - - - COGS - Division #2, Product Line 015 - 42015 - other - - - - - - - COGS - Division #3, Product Line 110 - 43110 - other - - - - - - - - - Marketing Expenses - 50000 - view - - - - - - - Marketing Dept. Salaries - 50100 - other - - - - - - - Marketing Dept. Payroll Taxes - 50150 - other - - - - - - - Marketing Dept. Supplies - 50200 - other - - - - - - - Marketing Dept. Telephone - 50600 - other - - - - - - - - - Payroll Dept. Expenses - 59000 - view - - - - - - - Payroll Dept. Salaries - 59100 - other - - - - - - - Payroll Dept. Payroll Taxes - 59150 - other - - - - - - - Payroll Dept. Supplies - 59200 - other - - - - - - - Payroll Dept. Telephone - 59600 - other - - - - - - - - - Non-Operating Expenses and Losses - 96000 - view - - - - - - - Loss on Sale of Assets - 96100 - other - - - - - - - Input CST 5% - 154001 - other - - - - - - Input Service Tax Seco. & HEC 1% - 154002 - other - - - - - - Input Credit - URD - 154003 - other - - - - - - TDS on Audit Fees - 94J - 154004 - other - - - - - - TDS on Commission Or Brokerage - 94H - 154005 - other - - - - - - Input Credit - Import Duty - 154006 - other - - - - - - Additional Duty (Imports) 4% - 154007 - other - - - - - - Input Service Tax 12% - 154008 - other - - - - - - Input Service Tax Edu. Cess. 2% - 154009 - other - - - - - - TDS on Salary - 92B - 154010 - other - - - - - - Input Excise Duty 6% - 154011 - other - - - - - - Input Excise Duty 5% - 154012 - other - - - - - - Input Excise Duty 12% - 154013 - other - - - - - - Education Cess 2% - Purchase - 154014 - other - - - - - - Seco. & Higher Edu. Cess 1% - Purchase - 154015 - other - - - - - - Excise Duty 12% - Sales - 247001 - other - - - - - - Education Cess 2% - Sales - 247010 - other - - - - - - Seco. & Higher Edu. Cess 1% - Sales - 247002 - other - - - - - - Input Sec. & HEC - Capital Goods - 154016 - other - - - - - - TDS on Contractor - 94C - 154017 - other - - - - - - TDS on Director's Interest - 154018 - other - - - - - - TDS on Director's Remuneration - 92B - 154019 - other - - - - - - TDS on Interest - 154020 - other - - - - - - TDS on Professional Fees - 94J - 154021 - other - - - - - - TDS on Rent - 94I - 154022 - other - - - - - - Input Edu. Cess - Capital Goods - 154023 - other - - - - - - Input Excise Duty 12% - Capital Goods - 154024 - other - - - - - - Input VAT 4% - 154025 - other - - - - - - Input Additional VAT 1% - 154026 - other - - - - - - Input VAT 15% - 154027 - other - - - - - - Output VAT 4% - 247003 - other - - - - - - Output Adi. VAT 1% - 247004 - other - - - - - - CST 2% on Sales - Against Form - C - 247005 - other - - - - - - CST 5% on Sales - 247006 - other - - - - - - Input VAT 12.5% - 154028 - other - - - - - - Input Additional VAT 2.5% - 154029 - other - - - - - - Input CST 2% - 154030 - other - - - - - - CST 2% on Sales - CT3 Against Form C - 247007 - other - - - - - - Output VAT 4% on Sales - CT3 - 247008 - other - - - - - - Output Adi. VAT 1% Sales CT3 - 247009 - other - - - - - - India - Chart of Accounts for Public Ltd - - - - - - - - - - - - diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml deleted file mode 100644 index 887e051121a..00000000000 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ /dev/null @@ -1,865 +0,0 @@ - - - - - - Input CST 5% - Input CST 5% - purchase - percent - 0.01 - - - - - - - - - - - - - Input Credit - URD - Input Credit - URD - purchase - percent - 0.0400 - - - - - - - - - - - - - TDS on Audit Fees - 94J - TDS on Audit Fees - 94J - purchase - percent - 0.1000 - - - - - - - - - - - - - TDS on Commission Or Brokerage- 94H - TDS on Commission Or Brokerage- 94H - purchase - percent - 0.1000 - - - - - - - - - - - - - Input Credit - Import Duty - Input Credit - Import Duty - purchase - percent - 0.0750 - 1 - - - - - - - - - - - - - Additional Duty (Imports) 4% - Additional Duty (Imports) 4% - purchase - percent - 0.0400 - 1 - - - - - - - - - - - - - Service Tax 12% - Purchase - Service Tax 12% - Purchase - purchase - percent - 0.1200 - 1 - - - - - - - - - - - - - Service Tax Edu. Cess. 2% - Purchase - Service Tax Edu. Cess. 2% - Purchase - purchase - percent - 0.0200 - 3 - - - - - - - - - - - Service Tax Seco. & HEC 1% - Purchase - Service Tax Seco. & HEC 1% - Purchase - purchase - percent - 0.0100 - 5 - - - - - - - - - - - TDS on Salary - 92B - TDS on Salary - 92B - purchase - percent - 0.3000 - - - - - - - - - - - - - Input Excise Duty 5% - Input Excise Duty 5% - purchase - percent - 0.0500 - - - - - - - - - - - - - Input Excise Duty 12% - Input Excise Duty 12% - purchase - percent - 0.1200 - - - - - - - - - - - - - - Education Cess 2% - Purchase - Education Cess 2% - Purchase - purchase - percent - 0.0200 - 21 - - - - - - - - - - - Seco. & Higher Edu. Cess 1% - Purchase - Seco. & Higher Edu. Cess 1% - Purchase - all - percent - 0.0100 - 22 - - - - - - - - - - - Excise Duty 12% - Sales - Excise Duty 12% - Sales - sale - percent - 0.1200 - - - - - - - - - - - - - - Education Cess 2% - Sales - Education Cess 2% - Sales - sale - percent - 0.0200 - 3 - - - - - - - - - - - Seco. & Higher Edu. Cess 1% - Sales - Seco. & Higher Edu. Cess 1% - Sales - sale - percent - 0.0100 - 5 - - - - - - - - - - - Input Sec. & HEC - Capital Goods - Input Sec. & HEC - Capital Goods - purchase - percent - 0.01 - - - - - - - - - - - - - TDS on Contractor - 94C - TDS on Contractor - 94C - purchase - percent - 0.0200 - - - - - - - - - - - - - TDS on Director's Interest - TDS on Director's Interest - purchase - percent - 0.1 - - - - - - - - - - - - - TDS on Director's Remuneration - 92B - TDS on Director's Remuneration - 92B - purchase - percent - 0.3 - - - - - - - - - - - - - TDS on Interest - TDS on Interest - purchase - percent - 0.1 - - - - - - - - - - - - - TDS on Professional Fees - 94J - TDS on Professional Fees - 94J - purchase - percent - 0.1 - 1 - - - - - - - - - - - - - TDS on Rent - 94I - TDS on Rent-94I - purchase - percent - 0.1 - - - - - - - - - - - - - Input Edu. Cess - Capital Goods - Input Edu. Cess - Capital Goods - purchase - percent - 0.02 - - - - - - - - - - - - - Input Excise Duty 12% - Capital Goods - Input Excise Duty 12% - Capital Goods - purchase - percent - 0.12 - - - - - - - - - - - - - Input VAT 4% - Input VAT 4% - purchase - percent - 0.04 - 4 - - - - - - - - - - - - - Input Additional VAT 1% - Input Additional VAT 1% - purchase - percent - 0.01 - 5 - - - - - - - - - - - - - Input VAT 15% - Input VAT 15% - purchase - percent - 0.15 - 7 - - - - - - - - - - - - - Output VAT 4% - Output VAT 4% - sale - percent - 0.04 - 11 - - - - - - - - - - - - - Output Adi. VAT 1% - Output Adi. VAT 1% - sale - percent - 0.01 - 12 - - - - - - - - - - - - - CST 2% on Sales - Against Form - C - CST 2% on Sales - Against Form - C - sale - percent - 0.02 - 13 - - - - - - - - - - - - - - CST 5% on Sales - CST 5% on Sales - sale - percent - 0.05 - 14 - - - - - - - - - - - - - Input VAT 12.5% - Input VAT 12.5% - purchase - percent - 0.1250 - 60 - - - - - - - - - - - - - Input Additional VAT 2.5% - Input Additional VAT 2.5% - purchase - percent - 0.0250 - 80 - - - - - - - - - - - - - Input CST 2% - Input CST 2% - purchase - percent - 0.02 - 9333 - - - - - - - - - - - - - No Tax Form H - No Tax Form H - sale - percent - 0.02 - - - - - - - - - - - CST 2% on Sales - CT3 Against Form - C - CST 2% on Sales - CT3 Against Form - C - sale - percent - 0.02 - - - - - - - - - - - - - Output VAT 4% on Sales - CT3 - Output VAT 4% on Sales - CT3 - sale - percent - 0.04 - - - - - - - - - - - - - Output Adi. VAT 1% on Sales - CT3 - Output Adi. VAT 1% on Sales - CT3 - sale - percent - 0.01 - - - - - - - - - - - - - No Tax SEZ OGS - No Tax SEZ OGS - sale - fixed - - - - - - - - - - - No Tax SEZ Gujarat - No Tax SEZ Gujarat - sale - percent - - - - - - - - - - - No Tax Form H with BED - No Tax Form H with BED - sale - percent - - - - - - - - - - - No Tax Exports - Out of Country - No Tax Exports - Out of Country - sale - percent - - - - - - - - - - - No Tax Projects - No Tax Projects - sale - percent - - - - - - - - - - - Input Excise Duty 6% - Input Excise Duty 6% - purchase - percent - 0.0600 - 1 - - - - - - - - - - - - - Education Cess 2% Purchase - Education Cess 2% Purchase - purchase - percent - 0.0200 - 21 - - - - - - - - - - - Seco. & Higher Edu. Cess 1% Purchase - Seco. & Higher Edu. Cess 1% Purchase - purchase - percent - 0.0100 - 22 - - - - - - - - - - - Service Tax 12% - Sales - Service Tax 12% - Sales - sale - percent - 0.12 - 1 - - - - - - - - - - - - - Service Tax 2% - Sales - Service Tax 2% - Sales - sale - percent - 0.02 - 3 - - - - - - - - - - - Service Tax 1% - Sales - Service Tax 1% - Sales - sale - percent - 0.01 - 5 - - - - - - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_schedule6_chart.xml b/addons/l10n_in/l10n_in_schedule6_chart.xml new file mode 100644 index 00000000000..3efc59f1161 --- /dev/null +++ b/addons/l10n_in/l10n_in_schedule6_chart.xml @@ -0,0 +1,2216 @@ + + + + + + + Indian Chart of Accounts - Schedule VI + 0 + view + + + + + + Balance Sheet + 1 + view + + + + + + + + Equity And Liabilities + 11 + view + + + + + + + Shareholder's Funds + 111 + view + + + + + + Share Capital + 1110 + view + + + + + + Authorised Share Capital + 11101 + other + + + + + + Issued, Subscribed And Paid Up Capital + 11102 + other + + + + + + Reserve And Surplus + 1111 + view + + + + + + Capital Reserve + 11110 + other + + + + + + Capital Redemption Reserve + 11111 + other + + + + + + Securities Premium Reserve + 11112 + other + + + + + + Debenture Redeemption Reserve + 11113 + other + + + + + + Revaluation Reserve + 11114 + other + + + + + + Shares Option Outstanding Account + 11115 + other + + + + + + Other Reserve + 11116 + other + + + + + + Surplus (Profit and Loss Account) + 11117 + other + + + + + + Money Received Against Share Warrants + 1112 + other + + + + + + + + Share Application Money Pending Allotment + 112 + view + + + + + + Share Application Money Pending Allotment + 1121 + other + + + + + + + Non-Current Liabilities + 113 + view + + + + + + Long Term Borrowings + 1130 + view + + + + + + Secured Loans From Bank + 11301 + view + + + + + + Bank Loan (Long Term) + 113011 + other + + + + + + Unsecured Loans + 11302 + view + + + + + + From Others + 113021 + other + + + + + + Deferred Tax Liabilities (Net) + 1131 + other + + + + + + Other Long Term Liabilities + 1132 + other + + + + + + Long Term Provisions + 1133 + other + + + + + + + Current Liabilities + 114 + view + + + + + + + Short Term Borrowings + 1140 + view + + + + + + Secured Loans From Bank + 11401 + view + + + + + + Bank Loan (Short Term) + 114011 + other + + + + + + Loans And Advances From Related Parties + 11402 + other + + + + + + Depsoits + 11403 + other + + + + + + Others + 11404 + other + + + + + + + Trade Payables + 1141 + view + + + + + + Sundry Creditors For Material/Supplies + 11411 + payable + + + + + + Sundry Creditors For Services + 11412 + payable + + + + + + + Other Current Liabilities + 1142 + view + + + + + + Duties and Taxes + 11421 + view + + + + + + Excise Duty Payable + 114211 + view + + + + + + Excise Duty Payable + 1142111 + other + + + + + + Education Cess Payable On Excise Duty + 1142112 + other + + + + + + Higher Education Cess Payable On Excise Duty + 1142113 + other + + + + + + Service Tax Payable + 114212 + view + + + + + + Service Tax Payable + 1142121 + other + + + + + + Education Cess Payable On Service Tax + 1142122 + other + + + + + + Higher Education Cess Payable On Service Tax + 1142123 + other + + + + + + TDS Paybale + 114213 + other + + + + + + Central Sales Tax Payable + 114214 + other + + + + + + VAT Payable + 114215 + other + + + + + + Out Standing Cheques for Clearance + 11422 + other + + + + + + Advance From Customers + 11423 + other + + + + + + + Short Term Provisions + 1143 + view + + + + + + Provision For Employees Benefit + 11430 + view + + + + + + EPF Payable + 114301 + other + + + + + + Unpaid Remuneration + 114302 + other + + + + + + Other Provisions + 11431 + view + + + + + + Electricity And Power Charges Payable + 114311 + other + + + + + + Employee Insurance Payable + 114312 + other + + + + + + Employee Providend Fund Payable + 114312 + other + + + + + + Internet Expenses Payable + 114313 + other + + + + + + Mobile Expenses Payable + 114314 + other + + + + + + Secueity Expenses Payable + 114315 + other + + + + + + Telephone Expenses Payable + 114316 + other + + + + + + Wages Payable + 114317 + other + + + + + + Provision For Taxation + 114318 + other + + + + + + Provision For Expenses + 114319 + other + + + + + + + + Assets + 12 + view + + + + + + + Non-Current Assets + 120 + view + + + + + + + Fixed Assets + 1201 + view + + + + + + + Tangible Assets + 12010 + view + + + + + + Land + 120101 + other + + + + + + Buildings + 120102 + other + + + + + + Plant And Equipments + 120103 + other + + + + + + Furnitures And Fixtures + 120104 + other + + + + + + Vehicles + 120105 + other + + + + + + Computer/Laptops + 120106 + other + + + + + + Office Equipments + 120107 + other + + + + + + + Intangible Assets + 12011 + view + + + + + + Goodwill + 120111 + other + + + + + + + Capital Work-In-Progress + 12012 + view + + + + + + Building Under Construction + 120120 + other + + + + + + + Intangible Assets Under Development + 12013 + other + + + + + + + Non-Current Investments + 1202 + view + + + + + + Investment In Property + 12020 + other + + + + + + Investment In Equity Instrument + 12021 + other + + + + + + Investment In Preference Shares + 12022 + other + + + + + + Investment In Government Or Trust Securities + 12023 + other + + + + + + Investment In Debentures And Bonds + 12024 + other + + + + + + Investment In Mutual Fund + 12025 + other + + + + + + Investment In Partnership Firm + 12026 + other + + + + + + Other + 12027 + view + + + + + + Gold + 120270 + other + + + + + + Fixed Deposit With Banks-Earmarked + 120271 + other + + + + + + + Deferred Tax Assets (Net) + 1203 + other + + + + + + + Long Term Loans And Advances + 1204 + view + + + + + + Capital Assets + 12041 + view + + + + + + Secured, Considered Good + 120411 + other + + + + + + Unsecured, Considered Good + 120412 + other + + + + + + Doubtful + 120413 + other + + + + + + Security Deposit + 12042 + view + + + + + + Secured, Considered Good + 120421 + view + + + + + + Earnest Money Deposit + 1204211 + other + + + + + + Other Deposit + 1204212 + other + + + + + + Unsecured, Considered Good + 120422 + other + + + + + + Doubtful + 120423 + other + + + + + + Loans And Advances To Related Parties + 12043 + other + + + + + + Other Loans And Advances + 12044 + other + + + + + + + Other Non Current Assets + 1205 + view + + + + + + Long Term Trade Recievables + 12051 + view + + + + + + Secured, Considered Good + 120511 + other + + + + + + Unsecured, Considered Good + 120512 + other + + + + + + Doubtful + 120513 + other + + + + + + Miscellaneous Exps to the Extent Not Written Off + 12052 + view + + + + + + Preliminery Expense + 120521 + other + + + + + + Software + 120522 + other + + + + + + Others + 12053 + other + + + + + + + Current Assets + 121 + view + + + + + + + Current Investment + 1211 + view + + + + + + Investment In Equity + 12110 + other + + + + + + Investment In Preference Shares + 12111 + other + + + + + + Investment In Government Securities + 12112 + other + + + + + + Investment In Debentures And Bonds + 12113 + other + + + + + + Investment In Mutual Fund + 12114 + other + + + + + + Investment In Partnership Firm + 12115 + other + + + + + + In Short Term Fixed Deposits + 12116 + other + + + + + + + Inventories + 1212 + view + + + + + + Raw Material + 12120 + other + + + + + + Work-In-Progress + 12121 + other + + + + + + Finished Goods + 12122 + other + + + + + + Stock-In-Trade + 12123 + other + + + + + + Stores And Spares + 12124 + other + + + + + + Loose Tools + 12125 + other + + + + + + Other With Job Worker + 12126 + other + + + + + + Goods-In-Transit + 12127 + other + + + + + + + Trade Recievables + 1213 + view + + + + + + Outstanding For More Than Six Months + 12131 + view + + + + + + Secured, Considered Good + 121311 + other + + + + + + Unsecured, Considered Good + 121312 + other + + + + + + Doubtful + 121313 + other + + + + + + Others + 12132 + view + + + + + + Secured, Considered Good + 121321 + other + + + + + + Unsecured, Considered Good + 121322 + other + + + + + + Doubtful + 121323 + other + + + + + + Sundry Debtors + 12133 + receivable + + + + + + + + Cash And Cash Equivalent + 1214 + view + + + + + + Cash-In-Hand + 12141 + view + + + + + + Cash Balance + 121411 + liquidity + + + + + + Petty Cash Balance + 121412 + liquidity + + + + + + Bank Balance + 12142 + view + + + + + + Balance Account + 121421 + view + + + + + + Balance Account 9876543211 + 121422 + liquidity + + + + + + Cheques On Hand + 12143 + view + + + + + + Cheque With Account + 121431 + liquidity + + + + + + + Short Terms Loans And Advances + 1215 + view + + + + + + Loans And Advances From Related Parties + 12151 + view + + + + + + Secured, Considered Good + 121511 + view + + + + + + Advance To Associate Concerns + 1215111 + other + + + + + + Other Advances Unsecured and Considered as Good + 121512 + view + + + + + + Unsecured Recoverable in Cash or in Kind or for Value to be Received + 1215121 + other + + + + + + Doubtful + 121513 + other + + + + + + Advances with Revenue Authority + 12152 + view + + + + + + Advance To Suppliers + 121521 + other + + + + + + Advance Income Tax/Refund Due + 121522 + other + + + + + + Balance With Revenue Authorities (Indirect Taxes) + 121523 + other + + + + + + Prepaid Expenses + 121524 + other + + + + + + + Other Current Assets + 1216 + view + + + + + + Duties and Taxes + 12161 + view + + + + + + Sales Tax Receivable + 121610 + other + + + + + + VAT Receivable + 121611 + other + + + + + + Excise Duty Receivable + 121612 + view + + + + + + Excise Duty Receivable + 1216121 + other + + + + + + Education Cess Receivable On Excise Duty + 1216122 + other + + + + + + Higher Education Cess Receivable On Excise Duty + 1216123 + other + + + + + + Service Tax Receivable + 121613 + view + + + + + + Service Tax Receivable + 1216131 + other + + + + + + Education Cess Receivable On Service Tax + 1216132 + other + + + + + + Higher Education Cess Receivable On Service Tax + 1216133 + other + + + + + + TDS Receivable + 121614 + other + + + + + + Miscellaneous Expense to the Extent Not Written Off + 12162 + view + + + + + + Preliminary Expense + 121621 + other + + + + + + + + Profit And Loss + 2 + view + + + + + + + + Total Revenue + 20 + view + + + + + + + Revenue From Operations + 201 + view + + + + + + Central Sales(Exclusive of Excise Duty) + 2011 + other + + + + + + Export Sales + 2012 + other + + + + + + Sales of Services + 2013 + other + + + + + + Job Work Receipts + 2014 + other + + + + + + Product Sales + 2015 + other + + + + + + Other Operating Income + 2016 + other + + + + + + + Other Income + 202 + view + + + + + + Interest + 2021 + other + + + + + + Other Financial Services + 2022 + other + + + + + + Other Non Operating Income + 2023 + other + + + + + + + Total Expenses + 21 + view + + + + + + + Cost of Materials Consumed + 210 + view + + + + + + Opening Stock + 2101 + other + + + + + + Purchases of Raw Materials And Stores + 2102 + view + + + + + + Raw Material + 21021 + other + + + + + + Stores And Consumables + 21022 + other + + + + + + Closing Stock + 2103 + other + + + + + + + Purchase of Stock-In-Trade + 211 + view + + + + + + Purchase of Stock-In-Trade + 2111 + other + + + + + + + Changes In Inventories of Finished Goods, Work-In-Progress And Stock-In-Trade + 212 + other + + + + + + + Employement Benefit Expenses + 213 + view + + + + + + Salaries, Bonus, PF And ESIC + 2131 + other + + + + + + Directors Remuneration + 2132 + other + + + + + + Directors Setting Fees + 2133 + other + + + + + + Staff Welfare Expense + 2134 + other + + + + + + Commision To M.D + 2135 + other + + + + + + Commision To Joint M.D + 2136 + other + + + + + + + Financial Cost + 214 + view + + + + + + Interest On Cash Credit Facality + 2141 + other + + + + + + Interest On Car Loan + 2142 + other + + + + + + Interest On Other Loans + 2143 + other + + + + + + Bank Charges + 2144 + other + + + + + + Bank Gurantee Charges + 2145 + other + + + + + + + Depreciation And Amortization Expense + 215 + view + + + + + + Depreciation + 2151 + other + + + + + + Preliminary Expenses + 2152 + other + + + + + + + Other Expenses + 216 + view + + + + + + Direct Expenses + 2160 + view + + + + + + Jobwork Charges + 21601 + other + + + + + + Stores and Spares + 21602 + other + + + + + + Workshop Expense + 21603 + other + + + + + + Centeral Sales Tax + 21604 + other + + + + + + Machinery Repair and Maintenance + 21605 + other + + + + + + Freight Forwarding and Octroi Expenses (Local) + 21606 + other + + + + + + Electrical Repairing Expense + 21607 + other + + + + + + Material Testing Expense + 21608 + other + + + + + + Power and Fuel Charges + 21609 + other + + + + + + Packing Material Expense + 216091 + other + + + + + + Measuring Expense + 216092 + other + + + + + + Processing Labour Charges + 216093 + other + + + + + + Administrative and Selling Expenses + 2161 + view + + + + + + Car Expenses (Including Insurance) + 21611 + other + + + + + + Travelling Expenses (Including Foreign Travelling) + 21612 + other + + + + + + Repair And Maintenance Building + 21613 + other + + + + + + Computer Maintenace + 21614 + other + + + + + + General Expenses + 21615 + other + + + + + + Internet And Website Expenses + 21616 + other + + + + + + Insurance Expenses + 21617 + other + + + + + + Telephone Expense + 21618 + other + + + + + + Labour Welfare Expenses + 21619 + other + + + + + + Legal Expenses + 216191 + other + + + + + + Postage And Telegram + 216192 + other + + + + + + Professional Charges + 216193 + other + + + + + + Security Expesnes + 216194 + other + + + + + + Stationery Expenses + 216195 + other + + + + + + Auditors Remuneration + 216196 + other + + + + + + Rent Rates And Taxes + 216197 + other + + + + + + Tender Fee And Testing Charges + 216198 + other + + + + + + Interest On Delayed Payment of Taxes + 216199 + other + + + + + + Excise/ Service Tax Expenses + 2161991 + other + + + + + + Advertisement And Publicity + 2161992 + other + + + + + + Donation + 2161993 + other + + + + + + Export Expenses + 2161994 + other + + + + + + Internal Audit Fee + 2161995 + other + + + + + + Conveyance Expense + 2161996 + other + + + + + + Packing and Forwarding Expense + 2161997 + other + + + + + + Annual Service Fees + 2161998 + other + + + + + + Loan Processing Fees + 2161999 + other + + + + + + Office Cleaning Expense + 21619991 + other + + + + + + Prelimenary Expense W/Off + 21619992 + other + + + + + + Software Expense W/Off + 21619993 + other + + + + + + Custom Duty + 21619994 + other + + + + + + Stamping Charge + 21619995 + other + + + + + + Post and Courrier Charges + 21619996 + other + + + + + + + Indian Chart of Accounts - Schedule VI + + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_schedule6_tax_template.xml b/addons/l10n_in/l10n_in_schedule6_tax_template.xml new file mode 100644 index 00000000000..306d61e77cc --- /dev/null +++ b/addons/l10n_in/l10n_in_schedule6_tax_template.xml @@ -0,0 +1,381 @@ + + + + + + Input Sales Tax @ 15% + sale + percent + 0.15 + 10 + + + + + + + + Input Sales Tax @ 12% + sale + percent + 0.12 + 10 + + + + + + + Input Sales Tax @ 4% + sale + percent + 0.04 + 10 + + + + + + + Additional Input VAT @ 1% + sale + percent + 0.01 + 15 + + + + + + + Input VAT @ 12.5% + sale + percent + 0.125 + 10 + + + + + + + Additional Input VAT @ 2.5% + sale + percent + 0.025 + 15 + + + + + + + Input VAT @ 8% + sale + percent + 0.08 + 10 + + + + + + + Input VAT @ 10% + sale + percent + 0.1 + 10 + + + + + + + Input Excise Duty @ 12.36% + sale + percent + 0.12 + 1 + True + + + + + + + Input Education Cess @ 2% On Excise Duty + sale + percent + 0.02 + 2 + + True + + + + + + Input Higher Education Cess @ 1% On Excise Duty + sale + percent + 0.01 + 3 + + + True + + + + + Input Service Tax @ 12.36% + sale + percent + 0.12 + 8 + + True + + + + + + Input Education Cess @ 2% On Service Tax + sale + percent + 0.02 + 10 + + True + + + + + + Input Higher Education Cess @ 1% On Service Tax + sale + percent + 0.01 + 10 + True + + + + + + + Input VAT @ 4% + sale + percent + 0.04 + 10 + + + + + + + + Output Purchase Tax @ 15% + purchase + percent + 0.15 + 10 + + + + + + + + + Output Purchase Tax @ 12% + purchase + percent + 0.12 + 10 + + + + + + + + + Output Purchase Tax @ 4% + purchase + percent + 0.04 + 10 + + + + + + + + + Additional Output VAT @ 1% + purchase + percent + 0.01 + 15 + + + + + + + + + Output VAT @ 12.5% + purchase + percent + 0.125 + 10 + + + + + + + + + Additional Output VAT @ 2.5% + purchase + percent + 0.025 + 15 + + + + + + + + + Output VAT @ 8% + purchase + percent + 0.08 + 10 + + + + + + + + + Output VAT @ 10% + purchase + percent + 0.1 + 10 + + + + + + + + + Output Excise Duty @ 12.36% + purchase + percent + 0.12 + True + 1 + + + + + + + + + Output Education Cess @ 2% On Excise Duty + purchase + percent + 0.02 + True + + 2 + + + + + + + + Output Higher Education Cess @ 1% On Excise Duty + purchase + percent + 0.01 + True + + 3 + + + + + + + + Output Service Tax @ 12.36% + purchase + percent + 0.12 + True + 8 + + + + + + + + + Output Education Cess @ 2% On Service Tax + purchase + percent + 0.02 + True + + 10 + + + + + + + + Output Higher Education Cess @ 1% On Service Tax + purchase + percent + 0.01 + True + + 10 + + + + + + + + Output VAT @ 4% + purchase + percent + 0.04 + 10 + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_standard_chart.xml b/addons/l10n_in/l10n_in_standard_chart.xml new file mode 100644 index 00000000000..c78467f0700 --- /dev/null +++ b/addons/l10n_in/l10n_in_standard_chart.xml @@ -0,0 +1,934 @@ + + + + + + Indian Chart of Accounts - Standard + 0 + view + + + + + + Balance Sheet + 1 + view + + + + + + + Assets + 10 + view + + + + + + + Current Assets + 100 + view + + + + + + Cash In Hand + 1001 + view + + + + + + Cash - Regular Checking + 10011 + liquidity + + + + + + Cash - Payroll Checking + 10012 + liquidity + + + + + + Petty Cash Fund + 10013 + liquidity + + + + + + Cash Account + 10014 + liquidity + + + + + + Bank Accounts + 1002 + view + + + + + + Inventories + 1003 + view + + + + + + Inventories + 10031 + other + + + + + + Accounts Receivable + 1004 + view + + + + + + Debtors + 10040 + receivable + + + + + + Tax Receivable + 1005 + view + + + + + + Sales Tax Receivable + 10050 + other + + + + + + VAT Receivable + 10051 + other + + + + + + Excise Duty Receivable + 10052 + view + + + + + + Excise Duty Receivable + 100521 + other + + + + + + Education Cess Receivable On Excise Duty + 100522 + other + + + + + + Higher Education Cess Receivable On Excise Duty + 100523 + other + + + + + + Service Tax Receivable + 10053 + view + + + + + + Service Tax Receivable + 100531 + other + + + + + + Education Cess Receivable On Service Tax + 100532 + other + + + + + + Higher Education Cess Receivable On Service Tax + 100533 + other + + + + + + TDS Receivable + 10058 + other + + + + + + Deposit Account + 1006 + view + + + + + + Deposit Account + 10061 + other + + + + + + Other Current Assets + 1007 + view + + + + + + Prepaid Insurance + 10071 + other + + + + + + + Fixed Assets + 101 + view + + + + + + Buildings + 1011 + other + + + + + + Land + 1012 + other + + + + + + Equipments + 1013 + other + + + + + + Vehicle + 1014 + other + + + + + + Computer/Laptops (Assets) + 1015 + other + + + + + + Furniture + 1016 + other + + + + + + Air Conditionar + 1017 + other + + + + + + Misc Assets + 1018 + other + + + + + + + + + Liabilities + 11 + view + + + + + + Share Holder/Owners Fund + 111 + view + + + + + + Capital Account + 1111 + other + + + + + + Reserve And Surplus Account + 1112 + other + + + + + + Current Liabilities + 112 + view + + + + + + Accounts Payable + 1121 + view + + + + + + Creditors + 11211 + payable + + + + + + Loan Liabilities + 1122 + view + + + + + + Bank OD Account + 11221 + other + + + + + + Secured Loan Account + 11222 + other + + + + + + Unsecured Loan Account + 11223 + other + + + + + + Duties And Taxes Payable + 1123 + view + + + + + + TDS Payable + 11231 + other + + + + + + VAT Payable + 11232 + other + + + + + + Excise Duty Payable + 11233 + view + + + + + + Excise Duty Payable + 112331 + other + + + + + + Education Cess Payable On Excise Duty + 112332 + other + + + + + + Higher Education Cess Payable On Excise Duty + 112333 + other + + + + + + Service Tax Payable + 11234 + view + + + + + + Service Tax Payable + 112341 + other + + + + + + Education Cess Payable On Service Tax + 112342 + other + + + + + + Higher Education Cess Payable On Service Tax + 112343 + other + + + + + + Sales Tax Payable + 11235 + other + + + + + + Others Payable + 1124 + view + + + + + + Wages Payable + 11241 + other + + + + + + Interest Payable + 11242 + other + + + + + + Notes Payable + 11243 + other + + + + + + + + Profit And Loss + 2 + view + + + + + + + + Income + 20 + view + + + + + + Operating Revenues + 200 + view + + + + + + Sales of Goods + 2001 + view + + + + + + Local Sales + 20011 + other + + + + + + Retail Sales + 20012 + other + + + + + + Export Sales + 20013 + other + + + + + + Sales of Services + 2002 + view + + + + + + Local Services + 20021 + other + + + + + + Export Services + 20022 + other + + + + + + Non Operating Revenues And Gains + 201 + view + + + + + + Interest Revenues + 2010 + other + + + + + + Gain on Sale of Assets + 2011 + other + + + + + + Write off Income + 2012 + other + + + + + + Foreign Exchange Profit + 2013 + other + + + + + + + + Expense + 21 + view + + + + + + Direct Expense + 210 + view + + + + + + Electricity Expense + 2100 + other + + + + + + Salary Expense + 2101 + other + + + + + + Office Rent + 2102 + other + + + + + + House Keeping Expense + 2103 + other + + + + + + Postage And Courier Expense + 2104 + other + + + + + + Internet Expense + 2105 + other + + + + + + Telephone Expense + 2106 + other + + + + + + Purchase Expense + 2107 + other + + + + + + Computer/Laptop Accessories + 2108 + other + + + + + + News Paper And Magazine + 2109 + other + + + + + + Indirect Expense + 211 + view + + + + + + Business Promotion + 2110 + other + + + + + + Entertainment Expense + 2111 + other + + + + + + Professional Services + 2112 + other + + + + + + Bank Charges + 2113 + other + + + + + + Diwali Bonus/Gift + 2114 + other + + + + + + Parts Purchase + 2115 + other + + + + + + Repairing Expense + 2116 + other + + + + + + Foreign Exchange Loss + 2117 + other + + + + + + Other Expense + 2118 + view + + + + + + Sales Commission Expense + 21181 + other + + + + + + Stationary Expense + 21182 + other + + + + + + Travelling Expense + 21183 + other + + + + + + Cost of Goods Sold + 212 + view + + + + + + Opening Stock + 2121 + other + + + + + + Purchase Stock + 2122 + other + + + + + + Closing Stock + 2123 + other + + + + + + Non Operating Expenses And Loss + 213 + view + + + + + + Loss on Sale of Assets + 2131 + other + + + + + + Write Off Expense + 2132 + other + + + + + + Indian Chart of Accounts - Standard + + + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_standard_tax_template.xml b/addons/l10n_in/l10n_in_standard_tax_template.xml new file mode 100644 index 00000000000..a4e91b3884a --- /dev/null +++ b/addons/l10n_in/l10n_in_standard_tax_template.xml @@ -0,0 +1,405 @@ + + + + + + Input Sales Tax @ 15% + sale + percent + 0.15 + 10 + + + + + + + Input Sales Tax @ 12% + sale + percent + 0.12 + 10 + + + + + + + Input Sales Tax @ 4% + sale + percent + 0.04 + 10 + + + + + + + Additional Input VAT @ 1% + sale + percent + 0.01 + 15 + + + + + + + Input VAT @ 12.5% + sale + percent + 0.125 + 10 + + + + + + + Additional Input VAT @ 2.5% + sale + percent + 0.025 + 15 + + + + + + + Input VAT @ 8% + sale + percent + 0.08 + 10 + + + + + + + Input VAT @ 10% + sale + percent + 0.1 + 10 + + + + + + + Input Excise Duty @ 12.36% + sale + percent + 0.12 + True + 1 + + + + + + + Input Education Cess @ 2% On Excise Duty + sale + percent + 0.02 + True + + 2 + + + + + + Input Higher Education Cess @ 1% On Excise Duty + sale + percent + 0.01 + True + + 3 + + + + + + Input Service Tax @ 12.36% + sale + percent + 0.12 + True + 8 + + + + + + + Input Education Cess @ 2% On Service Tax + sale + percent + 0.02 + True + + 10 + + + + + + Input Higher Education Cess @ 1% On Service Tax + sale + percent + 0.01 + + True + 10 + + + + + + Input Sales Tax @ 2% Against C Form + sale + percent + 0.02 + 10 + + + + + + + Input VAT @ 4% + sale + percent + 0.04 + 10 + + + + + + + + + Output Purchase Tax @ 15% + purchase + percent + 0.15 + 10 + + + + + + + + + Output Purchase Tax @ 12% + purchase + percent + 0.12 + 10 + + + + + + + + + Output Purchase Tax @ 4% + purchase + percent + 0.04 + 10 + + + + + + + + + Additional Output VAT @ 1% + purchase + percent + 0.01 + 15 + + + + + + + + + Output VAT @ 12.5% + purchase + percent + 0.125 + 10 + + + + + + + + + Additional Output VAT @ 2.5% + purchase + percent + 0.025 + 15 + + + + + + + + + Output VAT @ 8% + purchase + percent + 0.08 + 10 + + + + + + + + + Output VAT @ 10% + purchase + percent + 0.1 + 10 + + + + + + + + + Output Excise Duty @ 12.36% + purchase + percent + 0.12 + True + 1 + + + + + + + + + Output Education Cess @ 2% Excise Duty + purchase + percent + 0.02 + 2 + + + True + + + + + + + Output Higher Education Cess @ 1% Excise Duty + purchase + percent + 0.01 + + True + 3 + + + + + + + + Output Service Tax @ 12.36% + purchase + True + percent + 0.12 + 8 + + + + + + + + + Output Education Cess @ 2% On Service Tax + purchase + percent + 0.02 + True + + 10 + + + + + + + + Output Higher Education Cess @ 1% On Service Tax + purchase + percent + 0.01 + 10 + + True + + + + + + + + Output VAT @ 4% + purchase + percent + 0.04 + 10 + + + + + + + + + Output Sales Tax @ 2% Against C Form + purchase + percent + 0.02 + 10 + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml index 983d2fa4910..6568f5b774e 100644 --- a/addons/l10n_in/l10n_in_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -5,562 +5,559 @@ Tax + I - - Tax Balance to Pay + + + Tax to Pay + II - - Tax Received - + + + C Forms + + II - A - - Tax Paid - -1 - + + C Forms Tax Collected on Sale + + II - Aa - + + C Forms Tax Paid on Purchase + + II - Ab + + + + + Excise Duty + + II - B + + + + Excise Duty 12.36% + + II - Ba + + + + Excise Duty Collected on Sales + + II - BaA + + + + Education Cess 2% Excise Duty Collected on Sales + + II - BaB + + + + Higher Education Cess 1% Excise Duty Collected on Sales + + II - BaC + + + + Excise Duty Paid on Purchase + + II - BaD + + + + Education Cess 2% Excise Duty Paid on Purchase + + II - BaE + + + + Higher Education Cess 1% Excise Duty Paid on Purchase + + II - BaF + + + + + Sales Tax + + II - C + + + + Sales Tax 4% + + II - Ca + + + + Sales Tax 4% Collected on Sale + + II - CaA + + + + Sales Tax 4% Paid on Purchase + + II - Cab + + + + Sales Tax 12% + + II - Cb + + + + Sales Tax 12% Collected on Sale + + II - CbA + + + + Sales Tax 12% Paid on Purchase + + II - CbB + + + + Sales Tax 15% + + II - Cc + + + + Sales Tax 15% Collected on Sale + + II - CcA + + + + Sales Tax 15% Paid on Purchase + + II - CcB + + + + + Service Tax + + II - D + + + + Service Tax 12.36% + + II - Da + + + + Service Tax Collected on Sales of Services + + II - DaA + + + + Education Cess 2% Service Tax Collected on Sales of Services + + II - DaB + + + + Higher Education Cess 1% Service Tax Collected on Sales of Services + + II - DaC + + + + Service Tax Paid on Purchase of Services + + II - DaD + + + + Education Cess 2% Service Tax Paid on Purchase of Services + + II - DaE + + + + Higher Education Cess 1% Service Tax Paid on Purchase of Services + + II - DaF + + + + + VAT + + II - E + + + + VAT 4% + + II - Ea + + + + VAT 4% Collected on Sale + + II - EaA + + + + VAT 4% Paid on Purchase + + II - EaB + + + + VAT 8% + + II - Eb + + + + VAT 8% Collected on Sale + + II - EbA + + + + VAT 8% Paid on Purchase + + II - EbB + + + + VAT 10% + + II - Ec + + + + VAT 10% Collected on Sale + + II - EcA + + + + VAT 10% Paid on Purchase + + II - EcB + + + + VAT 12.5% + + II - Ed + + + + VAT 12.5% Collected on Sale + + II - EdA + + + + VAT 12.5% Paid on Purchase + + II - EdB + + + + Additional VAT 1% + + II - Ee + + + + Additional VAT 1% Collected on Sale + + II - EeA + + + + Additional VAT 1% Paid on Purchase + + II - EeB + + + + Additional VAT 2.5% + + II - Ef + + + + Additional VAT 2.5% Collected on Sale + + II - EfA + + + + Additional VAT 2.5% Paid on Purchase + + II - EfB + + + + Tax Bases + III - - Taxable Sale Bases - + + + Base C Forms + + III - A - - Taxable Purchase Bases - + + Base of Sale + + III - Aa - - Input CST 5% - + + Base of Purchase + + III - Ab - - Purchase CST 5% - + + + Base Excise Duty + + III - B - - Purchase Service Tax 12% - + + Base Excise Duty 12.36% + + III - Ba - - Sales Service Tax 12% - + + Base of Sale + + III - BaA - - Excise Duty 12.36% - Sales - + + Base of Purchase + + III - BaB - - Excise Duty 12% - Sales - + + + Base Sales Tax + + III - C - - Excise Duty 2% - Sales - + + Base Sales Tax 4% + + III - Ca - - Excise Duty 1% - Sales - + + Base of Sale + + III - CaA - - Excise Duty 12.36% - Purchase - + + Base of Purchase + + III - CaB - - Excise Duty 12% - Purchase - + + Base Sales Tax 12% + + III - Cb - - Education Cess 2% - Sales - + + Base of Sale + + III - CbA - - Education Cess 2% - Purchase - + + Base of Purchase + + III - CbB - - Input Credit - Import Duty - + + Base Sales Tax 15% + + III - Cc - - Input Credit On Capital Goods - Edu. Cess - + + Base of Sale + + III - CcA - - Input Excise Duty 12% - Capital Goods - + + Base of Purchase + + III - CcB - - Input Credit on Capital Goods - Seco. & HEC - + + + Base Service Tax + + III - D - - Input Service Tax 12.36% - + + Base Service Tax 12.36% + + III - Da - - Input Service Tax 12% - + + Base of Sale + + III - DaA - - Input Service Tax Edu. Cess. 2% - + + Base of Purchase + + III - DaB - - Input Service Tax Seco. & HEC 1% - + + + Base VAT + + III - E - - Seco. & Higher Edu. Cess 1% - Purchase - + + Base VAT 4% + + III - Ea - - Seco. & Higher Edu. Cess 1% - Sales - + + Base of Sale + + III - EaA - - CST 2% on Sales - + + Base of Purchase + + III - EaB - - CST 5% on Sales - + + Base VAT 8% + + III - Eb - - Input Additional VAT 1% - + + Base of Sale + + III - EbA - - Input Additional Vat 2.5% - + + Base of Purchase + + III - EbB - - Input VAT 12.5% - + + Base VAT 10% + + III - Ec - - Input VAT 15% - + + Base of Sale + + III - EcA - - Input VAT 10% - + + Base of Purchase + + III - EcB - - Input VAT 8% - + + Base VAT 12.5% + + III - Ed - - Input VAT 5% - + + Base of Sale + + III - EdA - - Input VAT 4% - + + Base of Purchase + + III - EdB - - Output VAT 15% - + + Base Additional VAT 1% + + III - Fe - - Output VAT 12.5% - + + Base of Sale + + III - EeA - - Output VAT 10% - + + Base of Purchase + + III - EeB - - Output VAT 8% - + + Base Additional VAT 2.5% + + III - Ef - - Output VAT 5% - + + Base of Sale + + III - EfA - - Output VAT 4% - - - - - Output Adi. VAT 1% - - - - - CST 2% on Purchase - - - - - Input Excise Duty 5% - - - - - Input Excise Duty 6% - - - - - Input Credit - URD - - - - - TDS on Audit Fees - 94J - - - - - TDS on Commission Or Brokerage- 94H - - - - - TDS on Contractor-94C - - - - - TDS on Director's Interest - - - - - TDS on Director's Remuneration - 92B - - - - - TDS on Interest - - - - - TDS on Professional Fees - 94J - - - - - TDS on Rent - 94I - - - - - TDS on Salary - 92B - - - - - Import Purchase - - - - - Purchase VAT 4% / VAT 12.5% / VAT 15% / CST 2% / CST 5% - - - - - Plant & Machinery - - - - - Expense Accounts - - - - - Sales Excise - - - - - Sales CST 2% - - - - - Sales CST 5% - - - - - Purchase VAT 15% - - - - - Purchase VAT 12.5% - - - - - Purchase VAT 10% - - - - - Purchase VAT 8% - - - - - Purchase VAT 5% - - - - - Purchase VAT 4% - - - - - Purchase VAT 2.5% - - - - - Sales VAT 15% - - - - - Sales VAT 12.5% - - - - - Sales VAT 10% - - - - - Sales VAT 8% - - - - - Sales VAT 5% - - - - - Sales VAT 4% - - - - - Input CST 2% - - - - - Purchase URD - - - - - Base Expenses for TDS - - - - - Additional Duty (Imports) 4% - - - - - Sales Export - Form H - With Tax - - - - - CST 2% on Sales CT3 - - - - - Sales CT3 VAT - - - - - Output VAT 4% on Sales CT3 - - - - - Output Adi. VAT 1% on Sales CT3 - - - - - Sales CT3 CST - - - - - Sales Export - Form H - With CT1 - - - - - Sales Export - SEZ - Out of Gujarat - - - - - Sales Export - SEZ - In Gujarat - - - - - No Tax SEZ OGS - - - - - No Tax SEZ Gujarat - - - - - Sales Export - Out of Country - - - - - Sales Others (Projects) - - - - - No Tax Form H with BED - - - - - No Tax Form H - - - - - No Tax Export Out of Country - - - - - No Tax Projects - - - - - Service Tax 12.36% - Sales - - - - - Service Tax 12% - Sales - - - - - Service Tax 2% - Sales - - - - - Service Tax 1% - Sales - - - - - Sales Tax 15% - - - - - Sales Tax - 15% - - - - - Sales Tax 12% - - - - - Sales Tax - 12% - - - - - Sales Tax 4% - - - - - Sales Tax - 4% - - - - - Purchase Tax 15% - - - - - Purchase Tax - 15% - + + Base of Purchase + + III - EfB diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 583196684a9..8aae0062a33 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -572,13 +572,12 @@ - + Products - product.product + product.template form kanban,tree,form {} - @@ -589,7 +588,7 @@ sequence="10"/> - + Products ir.actions.act_window - product.product + product.template form tree,form,kanban - -

Click to add a new product. @@ -185,7 +183,7 @@ diff --git a/addons/project/res_config.py b/addons/project/res_config.py index e7699a61ec8..187ad0327d8 100644 --- a/addons/project/res_config.py +++ b/addons/project/res_config.py @@ -27,11 +27,11 @@ class project_configuration(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_project_mrp': fields.boolean('Generate tasks from sale orders', + 'module_sale_service': fields.boolean('Generate tasks from sale orders', help='This feature automatically creates project tasks from service products in sale orders. ' 'More precisely, tasks are created for procurement lines with product of type \'Service\', ' 'procurement method \'Make to Order\', and supply method \'Manufacture\'.\n' - '-This installs the module project_mrp.'), + '-This installs the module sale_service.'), 'module_pad': fields.boolean("Use integrated collaborative note pads on task", help='Lets the company customize which Pad installation should be used to link to new pads ' '(for example: http://ietherpad.com/).\n' diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml index f190fba3b3a..16dce54d88b 100644 --- a/addons/project/res_config_view.xml +++ b/addons/project/res_config_view.xml @@ -33,8 +33,8 @@

- -
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 31a396369e2..f6c2321d1f9 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -137,7 +137,7 @@ class project_work(osv.osv): amount = vals_line['unit_amount'] prod_id = vals_line['product_id'] unit = False - timeline_id = timesheet_obj.create(cr, uid, vals=vals_line, context=context) + timeline_id = timesheet_obj.create(cr, uid, vals_line, context=context) # Compute based on pricetype amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, timeline_id, diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 132076440dc..5062ecc3503 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -121,12 +121,10 @@ Products ir.actions.act_window - product.product + product.template form kanban,tree,form {"search_default_filter_to_purchase":1} - -

Click to define a new product. diff --git a/addons/report/models/report.py b/addons/report/models/report.py index cbbee7fcebd..17635688063 100644 --- a/addons/report/models/report.py +++ b/addons/report/models/report.py @@ -134,14 +134,15 @@ class Report(osv.Model): website = None if request and hasattr(request, 'website'): website = request.website - values.update({ - 'time': time, - 'translate_doc': translate_doc, - 'editable': True, # Will active inherit_branding - 'user': user, - 'res_company': user.company_id, - 'website': website, - }) + values.update( + time=time, + translate_doc=translate_doc, + editable=True, # Will active inherit_branding + user=user, + res_company=user.company_id, + website=website, + editable_no_editor=True, + ) return view_obj.render(cr, uid, template, values, context=context) #-------------------------------------------------------------------------- diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 94fd74e035e..f4892598332 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -122,7 +122,7 @@ Example: 10% for retailers, promotion of 5 EUR on this product, etc."""), def onchange_task_work(self, cr, uid, ids, task_work, context=None): return {'value': { 'module_project_timesheet': task_work, - 'module_project_mrp': task_work, + 'module_sale_service': task_work, }} def onchange_timesheet(self, cr, uid, ids, timesheet, context=None): diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 45c32a33b22..964fa1584ba 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -686,7 +686,7 @@ class sale_order(osv.osv): def procurement_needed(self, cr, uid, ids, context=None): #when sale is installed only, there is no need to create procurements, that's only - #further installed modules (project_mrp, sale_stock) that will change this. + #further installed modules (sale_service, sale_stock) that will change this. sale_line_obj = self.pool.get('sale.order.line') res = [] for order in self.browse(cr, uid, ids, context=context): @@ -839,7 +839,7 @@ class sale_order_line(osv.osv): def need_procurement(self, cr, uid, ids, context=None): #when sale is installed only, there is no need to create procurements, that's only - #further installed modules (project_mrp, sale_stock) that will change this. + #further installed modules (sale_service, sale_stock) that will change this. return False def _amount_line(self, cr, uid, ids, field_name, arg, context=None): diff --git a/addons/project_mrp/__init__.py b/addons/sale_service/__init__.py similarity index 98% rename from addons/project_mrp/__init__.py rename to addons/sale_service/__init__.py index c0c3172c29f..d6bf9f9551c 100644 --- a/addons/project_mrp/__init__.py +++ b/addons/sale_service/__init__.py @@ -19,6 +19,6 @@ # ############################################################################## -import project_mrp +import models # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_mrp/__openerp__.py b/addons/sale_service/__openerp__.py similarity index 95% rename from addons/project_mrp/__openerp__.py rename to addons/sale_service/__openerp__.py index 3730ec74113..85ea8df0735 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/sale_service/__openerp__.py @@ -50,8 +50,8 @@ completed. 'website': 'http://www.openerp.com', 'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'], 'depends': ['project', 'procurement', 'sale', 'procurement_jit'], - 'data': ['project_mrp_view.xml'], #'process/project_mrp_process.xml' - 'demo': ['project_mrp_demo.xml'], + 'data': ['views/sale_service_view.xml'], + 'demo': ['demo/sale_service_demo.xml'], 'test': ['test/project_task_procurement.yml'], 'installable': True, 'auto_install': False, diff --git a/addons/project_mrp/project_mrp_demo.xml b/addons/sale_service/demo/sale_service_demo.xml similarity index 100% rename from addons/project_mrp/project_mrp_demo.xml rename to addons/sale_service/demo/sale_service_demo.xml diff --git a/addons/project_mrp/i18n/ar.po b/addons/sale_service/i18n/ar.po similarity index 100% rename from addons/project_mrp/i18n/ar.po rename to addons/sale_service/i18n/ar.po diff --git a/addons/project_mrp/i18n/bg.po b/addons/sale_service/i18n/bg.po similarity index 100% rename from addons/project_mrp/i18n/bg.po rename to addons/sale_service/i18n/bg.po diff --git a/addons/project_mrp/i18n/bs.po b/addons/sale_service/i18n/bs.po similarity index 100% rename from addons/project_mrp/i18n/bs.po rename to addons/sale_service/i18n/bs.po diff --git a/addons/project_mrp/i18n/ca.po b/addons/sale_service/i18n/ca.po similarity index 100% rename from addons/project_mrp/i18n/ca.po rename to addons/sale_service/i18n/ca.po diff --git a/addons/project_mrp/i18n/cs.po b/addons/sale_service/i18n/cs.po similarity index 100% rename from addons/project_mrp/i18n/cs.po rename to addons/sale_service/i18n/cs.po diff --git a/addons/project_mrp/i18n/da.po b/addons/sale_service/i18n/da.po similarity index 100% rename from addons/project_mrp/i18n/da.po rename to addons/sale_service/i18n/da.po diff --git a/addons/project_mrp/i18n/de.po b/addons/sale_service/i18n/de.po similarity index 100% rename from addons/project_mrp/i18n/de.po rename to addons/sale_service/i18n/de.po diff --git a/addons/project_mrp/i18n/el.po b/addons/sale_service/i18n/el.po similarity index 100% rename from addons/project_mrp/i18n/el.po rename to addons/sale_service/i18n/el.po diff --git a/addons/project_mrp/i18n/es.po b/addons/sale_service/i18n/es.po similarity index 100% rename from addons/project_mrp/i18n/es.po rename to addons/sale_service/i18n/es.po diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/sale_service/i18n/es_AR.po similarity index 100% rename from addons/project_mrp/i18n/es_AR.po rename to addons/sale_service/i18n/es_AR.po diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/sale_service/i18n/es_CR.po similarity index 100% rename from addons/project_mrp/i18n/es_CR.po rename to addons/sale_service/i18n/es_CR.po diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/sale_service/i18n/es_EC.po similarity index 100% rename from addons/project_mrp/i18n/es_EC.po rename to addons/sale_service/i18n/es_EC.po diff --git a/addons/project_mrp/i18n/es_MX.po b/addons/sale_service/i18n/es_MX.po similarity index 100% rename from addons/project_mrp/i18n/es_MX.po rename to addons/sale_service/i18n/es_MX.po diff --git a/addons/project_mrp/i18n/es_VE.po b/addons/sale_service/i18n/es_VE.po similarity index 100% rename from addons/project_mrp/i18n/es_VE.po rename to addons/sale_service/i18n/es_VE.po diff --git a/addons/project_mrp/i18n/et.po b/addons/sale_service/i18n/et.po similarity index 100% rename from addons/project_mrp/i18n/et.po rename to addons/sale_service/i18n/et.po diff --git a/addons/project_mrp/i18n/fi.po b/addons/sale_service/i18n/fi.po similarity index 100% rename from addons/project_mrp/i18n/fi.po rename to addons/sale_service/i18n/fi.po diff --git a/addons/project_mrp/i18n/fr.po b/addons/sale_service/i18n/fr.po similarity index 100% rename from addons/project_mrp/i18n/fr.po rename to addons/sale_service/i18n/fr.po diff --git a/addons/project_mrp/i18n/gl.po b/addons/sale_service/i18n/gl.po similarity index 100% rename from addons/project_mrp/i18n/gl.po rename to addons/sale_service/i18n/gl.po diff --git a/addons/project_mrp/i18n/gu.po b/addons/sale_service/i18n/gu.po similarity index 100% rename from addons/project_mrp/i18n/gu.po rename to addons/sale_service/i18n/gu.po diff --git a/addons/project_mrp/i18n/hr.po b/addons/sale_service/i18n/hr.po similarity index 100% rename from addons/project_mrp/i18n/hr.po rename to addons/sale_service/i18n/hr.po diff --git a/addons/project_mrp/i18n/hu.po b/addons/sale_service/i18n/hu.po similarity index 100% rename from addons/project_mrp/i18n/hu.po rename to addons/sale_service/i18n/hu.po diff --git a/addons/project_mrp/i18n/id.po b/addons/sale_service/i18n/id.po similarity index 100% rename from addons/project_mrp/i18n/id.po rename to addons/sale_service/i18n/id.po diff --git a/addons/project_mrp/i18n/it.po b/addons/sale_service/i18n/it.po similarity index 100% rename from addons/project_mrp/i18n/it.po rename to addons/sale_service/i18n/it.po diff --git a/addons/project_mrp/i18n/ja.po b/addons/sale_service/i18n/ja.po similarity index 100% rename from addons/project_mrp/i18n/ja.po rename to addons/sale_service/i18n/ja.po diff --git a/addons/project_mrp/i18n/ko.po b/addons/sale_service/i18n/ko.po similarity index 100% rename from addons/project_mrp/i18n/ko.po rename to addons/sale_service/i18n/ko.po diff --git a/addons/project_mrp/i18n/lt.po b/addons/sale_service/i18n/lt.po similarity index 100% rename from addons/project_mrp/i18n/lt.po rename to addons/sale_service/i18n/lt.po diff --git a/addons/project_mrp/i18n/lv.po b/addons/sale_service/i18n/lv.po similarity index 100% rename from addons/project_mrp/i18n/lv.po rename to addons/sale_service/i18n/lv.po diff --git a/addons/project_mrp/i18n/mk.po b/addons/sale_service/i18n/mk.po similarity index 100% rename from addons/project_mrp/i18n/mk.po rename to addons/sale_service/i18n/mk.po diff --git a/addons/project_mrp/i18n/mn.po b/addons/sale_service/i18n/mn.po similarity index 100% rename from addons/project_mrp/i18n/mn.po rename to addons/sale_service/i18n/mn.po diff --git a/addons/project_mrp/i18n/nb.po b/addons/sale_service/i18n/nb.po similarity index 100% rename from addons/project_mrp/i18n/nb.po rename to addons/sale_service/i18n/nb.po diff --git a/addons/project_mrp/i18n/nl.po b/addons/sale_service/i18n/nl.po similarity index 100% rename from addons/project_mrp/i18n/nl.po rename to addons/sale_service/i18n/nl.po diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/sale_service/i18n/nl_BE.po similarity index 100% rename from addons/project_mrp/i18n/nl_BE.po rename to addons/sale_service/i18n/nl_BE.po diff --git a/addons/project_mrp/i18n/pl.po b/addons/sale_service/i18n/pl.po similarity index 100% rename from addons/project_mrp/i18n/pl.po rename to addons/sale_service/i18n/pl.po diff --git a/addons/project_mrp/i18n/pt.po b/addons/sale_service/i18n/pt.po similarity index 100% rename from addons/project_mrp/i18n/pt.po rename to addons/sale_service/i18n/pt.po diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/sale_service/i18n/pt_BR.po similarity index 100% rename from addons/project_mrp/i18n/pt_BR.po rename to addons/sale_service/i18n/pt_BR.po diff --git a/addons/project_mrp/i18n/ro.po b/addons/sale_service/i18n/ro.po similarity index 100% rename from addons/project_mrp/i18n/ro.po rename to addons/sale_service/i18n/ro.po diff --git a/addons/project_mrp/i18n/ru.po b/addons/sale_service/i18n/ru.po similarity index 100% rename from addons/project_mrp/i18n/ru.po rename to addons/sale_service/i18n/ru.po diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/sale_service/i18n/sale_service.pot similarity index 100% rename from addons/project_mrp/i18n/project_mrp.pot rename to addons/sale_service/i18n/sale_service.pot diff --git a/addons/project_mrp/i18n/sl.po b/addons/sale_service/i18n/sl.po similarity index 100% rename from addons/project_mrp/i18n/sl.po rename to addons/sale_service/i18n/sl.po diff --git a/addons/project_mrp/i18n/sq.po b/addons/sale_service/i18n/sq.po similarity index 100% rename from addons/project_mrp/i18n/sq.po rename to addons/sale_service/i18n/sq.po diff --git a/addons/project_mrp/i18n/sv.po b/addons/sale_service/i18n/sv.po similarity index 100% rename from addons/project_mrp/i18n/sv.po rename to addons/sale_service/i18n/sv.po diff --git a/addons/project_mrp/i18n/tlh.po b/addons/sale_service/i18n/tlh.po similarity index 100% rename from addons/project_mrp/i18n/tlh.po rename to addons/sale_service/i18n/tlh.po diff --git a/addons/project_mrp/i18n/tr.po b/addons/sale_service/i18n/tr.po similarity index 100% rename from addons/project_mrp/i18n/tr.po rename to addons/sale_service/i18n/tr.po diff --git a/addons/project_mrp/i18n/uk.po b/addons/sale_service/i18n/uk.po similarity index 100% rename from addons/project_mrp/i18n/uk.po rename to addons/sale_service/i18n/uk.po diff --git a/addons/project_mrp/i18n/vi.po b/addons/sale_service/i18n/vi.po similarity index 100% rename from addons/project_mrp/i18n/vi.po rename to addons/sale_service/i18n/vi.po diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/sale_service/i18n/zh_CN.po similarity index 100% rename from addons/project_mrp/i18n/zh_CN.po rename to addons/sale_service/i18n/zh_CN.po diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/sale_service/i18n/zh_TW.po similarity index 100% rename from addons/project_mrp/i18n/zh_TW.po rename to addons/sale_service/i18n/zh_TW.po diff --git a/addons/sale_service/models/__init__.py b/addons/sale_service/models/__init__.py new file mode 100644 index 00000000000..d9728749476 --- /dev/null +++ b/addons/sale_service/models/__init__.py @@ -0,0 +1 @@ +import sale_service \ No newline at end of file diff --git a/addons/project_mrp/project_mrp.py b/addons/sale_service/models/sale_service.py similarity index 99% rename from addons/project_mrp/project_mrp.py rename to addons/sale_service/models/sale_service.py index 651aa7dda48..bcce63cf66d 100644 --- a/addons/project_mrp/project_mrp.py +++ b/addons/sale_service/models/sale_service.py @@ -151,7 +151,7 @@ class sale_order_line(osv.osv): _inherit = 'sale.order.line' def need_procurement(self, cr, uid, ids, context=None): - #when sale is installed alone, there is no need to create procurements, but with project_mrp + #when sale is installed alone, there is no need to create procurements, but with sale_service #we must create a procurement for each service that has the auto_create_task boolean set to True. for line in self.browse(cr, uid, ids, context=context): if line.product_id and line.product_id.type == 'service' and line.product_id.auto_create_task: diff --git a/addons/project_mrp/security/ir.model.access.csv b/addons/sale_service/security/ir.model.access.csv similarity index 100% rename from addons/project_mrp/security/ir.model.access.csv rename to addons/sale_service/security/ir.model.access.csv diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/sale_service/test/project_task_procurement.yml similarity index 100% rename from addons/project_mrp/test/project_task_procurement.yml rename to addons/sale_service/test/project_task_procurement.yml diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/sale_service/views/sale_service_view.xml similarity index 90% rename from addons/project_mrp/project_mrp_view.xml rename to addons/sale_service/views/sale_service_view.xml index 90ab6682cd5..0865d95fa0e 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/sale_service/views/sale_service_view.xml @@ -14,7 +14,7 @@ product.form.view.inherit product.template - + @@ -34,8 +34,8 @@ - - project.mrp.form.view.inherit + + sale.service.form.view.inherit project.task diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py index 8c1d5c87f99..f702ca81929 100644 --- a/addons/sale_stock/res_config.py +++ b/addons/sale_stock/res_config.py @@ -35,7 +35,7 @@ class sale_configuration(osv.osv_memory): help='Lets you transfer the entries under tasks defined for Project Management to ' 'the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways ' 'and to automatically creates project tasks from procurement lines.\n' - '-This installs the modules project_timesheet and project_mrp.'), + '-This installs the modules project_timesheet and sale_service.'), 'default_order_policy': fields.selection( [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')], 'The default invoicing method is', default_model='sale.order', @@ -50,7 +50,7 @@ class sale_configuration(osv.osv_memory): implied_group='sale.group_mrp_properties', help="Allows you to tag sales order lines with properties."), 'module_project_timesheet': fields.boolean("Project Timesheet"), - 'module_project_mrp': fields.boolean("Project MRP"), + 'module_sale_service': fields.boolean("Sale Service"), 'group_route_so_lines': fields.boolean('Choose MTO, drop shipping,... on sales order lines', implied_group='sale_stock.group_route_so_lines', help="Allows you to choose a delivery route on sales order lines"), @@ -63,7 +63,7 @@ class sale_configuration(osv.osv_memory): def default_get(self, cr, uid, fields, context=None): res = super(sale_configuration, self).default_get(cr, uid, fields, context) # task_work, time_unit depend on other fields - res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet') + res['task_work'] = res.get('module_sale_service') and res.get('module_project_timesheet') return res def get_default_sale_config(self, cr, uid, ids, context=None): diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml index 89c2f191915..69824ffdd5a 100644 --- a/addons/sale_stock/res_config_view.xml +++ b/addons/sale_stock/res_config_view.xml @@ -38,7 +38,7 @@ - +

diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py index f53776d4b9a..a8fc778f2e6 100644 --- a/addons/stock/procurement.py +++ b/addons/stock/procurement.py @@ -78,7 +78,7 @@ class procurement_rule(osv.osv): class procurement_order(osv.osv): _inherit = "procurement.order" _columns = { - 'location_id': fields.many2one('stock.location', 'Procurement Location'), # not required because task may create procurements that aren't linked to a location with project_mrp + 'location_id': fields.many2one('stock.location', 'Procurement Location'), # not required because task may create procurements that aren't linked to a location with sale_service 'partner_dest_id': fields.many2one('res.partner', 'Customer Address', help="In case of dropshipping, we need to know the destination address more precisely"), 'move_ids': fields.one2many('stock.move', 'procurement_id', 'Moves', help="Moves created by the procurement"), 'move_dest_id': fields.many2one('stock.move', 'Destination Move', help="Move which caused (created) the procurement"), diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 66c97aaefbe..fc7a94fc51f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -12,7 +12,7 @@ - + diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 5b2c7a5e91a..98f65075922 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1114,7 +1114,7 @@ class TreeView(View): class Binary(http.Controller): - @http.route('/web/binary/image', type='http', auth="user") + @http.route('/web/binary/image', type='http', auth="public") def image(self, model, id, field, **kw): last_update = '__last_update' Model = request.session.model(model) @@ -1169,7 +1169,7 @@ class Binary(http.Controller): addons_path = http.addons_manifest['web']['addons_path'] return open(os.path.join(addons_path, 'web', 'static', 'src', 'img', image), 'rb').read() - @http.route('/web/binary/saveas', type='http', auth="user") + @http.route('/web/binary/saveas', type='http', auth="public") @serialize_exception def saveas(self, model, field, id=None, filename_field=None, **kw): """ Download link for files stored as binary fields. @@ -1203,7 +1203,7 @@ class Binary(http.Controller): [('Content-Type', 'application/octet-stream'), ('Content-Disposition', content_disposition(filename))]) - @http.route('/web/binary/saveas_ajax', type='http', auth="user") + @http.route('/web/binary/saveas_ajax', type='http', auth="public") @serialize_exception def saveas_ajax(self, data, token): jdata = simplejson.loads(data) diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index e7a9350f8ba..5d908671a89 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -49,7 +49,7 @@ class Website(openerp.addons.web.controllers.main.Home): # TODO: can't we just put auth=public, ... in web client ? return super(Website, self).web_login(*args, **kw) - @http.route('/page/', type='http', auth="public", website=True) + @http.route('/page/', type='http', auth="public", website=True) def page(self, page, **opt): values = { 'path': page, diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 44b3f771f62..8e6846dd7a8 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -93,8 +93,7 @@ class ir_http(orm.AbstractModel): return self._dispatch() def _postprocess_args(self, arguments, rule): - if not getattr(request, 'website_enabled', False): - return super(ir_http, self)._postprocess_args(arguments, rule) + super(ir_http, self)._postprocess_args(arguments, rule) for arg, val in arguments.items(): # Replace uid placeholder by the current request.uid @@ -106,7 +105,7 @@ class ir_http(orm.AbstractModel): except Exception: return self._handle_exception(werkzeug.exceptions.NotFound()) - if request.httprequest.method in ('GET', 'HEAD'): + if getattr(request, 'website_multilang', False) and request.httprequest.method in ('GET', 'HEAD'): generated_path = werkzeug.url_unquote_plus(path) current_path = werkzeug.url_unquote_plus(request.httprequest.path) if generated_path != current_path: diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index 6c466355d07..cb2e8f191ed 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -15,6 +15,7 @@ import urllib2 import urlparse import re +import pytz import werkzeug.urls import werkzeug.utils from dateutil import parser @@ -153,15 +154,15 @@ class DateTime(orm.AbstractModel): def attributes(self, cr, uid, field_name, record, options, source_element, g_att, t_att, qweb_context, context=None): - column = record._model._all_columns[field_name].column value = record[field_name] if isinstance(value, basestring): value = datetime.datetime.strptime( value, DEFAULT_SERVER_DATETIME_FORMAT) if value: + # convert from UTC (server timezone) to user timezone value = fields.datetime.context_timestamp( cr, uid, timestamp=value, context=context) - value = value.strftime(openerp.tools.DEFAULT_SERVER_DATETIME_FORMAT) + value = value.strftime(DEFAULT_SERVER_DATETIME_FORMAT) attrs = super(DateTime, self).attributes( cr, uid, field_name, record, options, source_element, g_att, t_att, @@ -171,11 +172,31 @@ class DateTime(orm.AbstractModel): ]) def from_html(self, cr, uid, model, column, element, context=None): + if context is None: context = {} value = element.text_content().strip() if not value: return False - datetime.datetime.strptime(value, DEFAULT_SERVER_DATETIME_FORMAT) - return value + # parse from string to datetime + dt = datetime.datetime.strptime(value, DEFAULT_SERVER_DATETIME_FORMAT) + + # convert back from user's timezone to UTC + tz_name = context.get('tz') \ + or self.pool['res.users'].read(cr, openerp.SUPERUSER_ID, uid, ['tz'], context=context)['tz'] + if tz_name: + try: + user_tz = pytz.timezone(tz_name) + utc = pytz.utc + + dt = user_tz.localize(dt).astimezone(utc) + except Exception: + logger.warn( + "Failed to convert the value for a field of the model" + " %s back from the user's timezone (%s) to UTC", + model, tz_name, + exc_info=True) + + # format back to string + return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) class Text(orm.AbstractModel): _name = 'website.qweb.field.text' diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 7d8b1e609e8..f60530c3f0c 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -472,13 +472,14 @@ ul.oe_menu_editor .disclose { right: 0; z-index: 1000; height: 100%; + background: #2f3129; + color: white; } .oe_ace_view_editor .oe_ace_view_editor_title { width: 100%; padding-top: 0; padding-left: 0; height: 30px; - background: #2f3129; } .oe_ace_view_editor .oe_ace_view_editor_title .oe_view_list { width: 50%; @@ -496,13 +497,16 @@ ul.oe_menu_editor .disclose { } .oe_ace_view_editor .ace_editor { position: absolute; - top: 30px; + top: 50px; right: 0; left: 0; } .oe_ace_view_editor .ace_editor .ace_gutter { cursor: ew-resize; } +.oe_ace_view_editor #ace-view-id { + padding: 0 1em; +} .oe_ace_view_editor.oe_ace_open { filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=97); opacity: 0.97; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index d39b6abd453..07340c62698 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -408,6 +408,7 @@ $highlighted_text_color: #ffffff /* ---- ACE EDITOR ---- {{{ */ $editorbar_height: 30px +$infobar_height: 20px // TODO Fix => might break with themes .oe_ace_view_editor @@ -416,12 +417,13 @@ $editorbar_height: 30px right: 0 z-index: 1000 height: 100% + background: #2F3129 + color: white .oe_ace_view_editor_title width: 100% padding-top: 0 padding-left: 0 height: $editorbar_height - background: #2F3129 .oe_view_list width: 50% height: $editorbar_height @@ -432,12 +434,14 @@ $editorbar_height: 30px @include editor-font .ace_editor position: absolute - top: $editorbar_height + top: $editorbar_height + $infobar_height right: 0 // bottom property is set programmatically left: 0 .ace_gutter cursor: ew-resize + #ace-view-id + padding: 0 1em &.oe_ace_open +opacity(0.97) &.oe_ace_closed diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js index 27e5cd60e62..72ed6f2df9e 100644 --- a/addons/website/static/src/js/website.ace.js +++ b/addons/website/static/src/js/website.ace.js @@ -1,6 +1,7 @@ (function () { 'use strict'; + var _t = openerp._t; var hash = "#advanced-view-editor"; var website = openerp.website; @@ -65,12 +66,11 @@ website.ace.ViewOption = openerp.Widget.extend({ template: 'website.ace_view_option', init: function (parent, options) { - var indent = "- "; this.view_id = options.id; this.view_name = options.name; - for (var i = 0; iFormat
+
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 4d9c9fcd73d..684a46a9f43 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -14,7 +14,8 @@
- +
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index e5c1bfc0f86..92483061e10 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -59,6 +59,7 @@
- Create a free website with - OpenERP + Create a free website with + Odoo
Copyright © Company name @@ -179,8 +180,10 @@