From 79aa02650c22d951e7245cbf7a9c77574deeb895 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Sat, 28 Apr 2012 18:21:25 +0530 Subject: [PATCH 001/106] [FIX] product : Set the missing dependecy of mail module to product module lp bug: https://launchpad.net/bugs/990474 fixed bzr revid: amp@tinyerp.com-20120428125125-1unkvn70pz1wys6i --- addons/product/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 9b4d2cadee1..918545aa783 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -25,7 +25,7 @@ "version" : "1.1", "author" : "OpenERP SA", 'category': 'Sales Management', - "depends" : ["base", "process", "decimal_precision"], + "depends" : ["base", "process", "decimal_precision", "mail"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ From cef801058f56c81b68c25d443524105faa69c25b Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 14 May 2012 14:59:12 +0530 Subject: [PATCH 002/106] [IMP] l10n_in: improve code for the Indian chart of account add new file installer.py, installer_view.xml, l10n_in_partnership_private_chart.xml, l10n_in/l10n_in_public_firm_chart.xmlxml bzr revid: jap@tinyerp.com-20120514092912-lwbg1r8jy904o7u2 --- addons/l10n_in/__init__.py | 1 + addons/l10n_in/__openerp__.py | 7 +- addons/l10n_in/installer.py | 71 +++ addons/l10n_in/installer_view.xml | 16 + .../l10n_in_partnership_private_chart.xml | 413 +++++++++++++ addons/l10n_in/l10n_in_public_firm_chart.xml | 543 ++++++++++++++++++ 6 files changed, 1050 insertions(+), 1 deletion(-) create mode 100644 addons/l10n_in/installer.py create mode 100644 addons/l10n_in/installer_view.xml create mode 100644 addons/l10n_in/l10n_in_partnership_private_chart.xml create mode 100644 addons/l10n_in/l10n_in_public_firm_chart.xml diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index 19de03b504c..f97bda7fb89 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -27,5 +27,6 @@ # ############################################################################## +import installer # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index c13139f6736..9be4d35705e 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -36,8 +36,13 @@ Indian accounting chart and localization. ], "demo_xml": [], "update_xml": [ - "l10n_in_chart.xml", +# "l10n_in_chart.xml", + "l10n_in_partnership_private_chart.xml", + "installer_view.xml", + "l10n_in_public_firm_chart.xml", "l10n_in_wizard.xml", + + ], "auto_install": False, "installable": True, diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py new file mode 100644 index 00000000000..e4242ad5e91 --- /dev/null +++ b/addons/l10n_in/installer.py @@ -0,0 +1,71 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 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 osv import fields, osv +import netsvc +import tools +from os.path import join as opj + +class l10n_installer(osv.osv_memory): + _inherit = 'account.installer' + _columns = { + 'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'), + ('public_company', 'Public Company')], 'Company Type'), + } + + _defaults = { + 'company_type': 'public_company', + } + + def execute_simple(self, cr, uid, ids, context=None): + if context is None: + context = {} + fy_obj = self.pool.get('account.fiscalyear') + for res in self.read(cr, uid, ids, context=context): + if res['charts'] =='l10n_in' and res['company_type']=='public_company': + fp = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None) + fp.close() + if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': + fp = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None) + fp.close() + if 'date_start' in res and 'date_stop' in res: + f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context) + if not f_ids: + name = code = res['date_start'][:4] + if int(name) != int(res['date_stop'][:4]): + name = res['date_start'][:4] +'-'+ res['date_stop'][:4] + code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] + vals = { + 'name': name, + 'code': code, + 'date_start': res['date_start'], + 'date_stop': res['date_stop'], + 'company_id': res['company_id'][0] + } + fiscal_id = fy_obj.create(cr, uid, vals, context=context) + if res['period'] == 'month': + fy_obj.create_period(cr, uid, [fiscal_id]) + elif res['period'] == '3months': + fy_obj.create_period3(cr, uid, [fiscal_id]) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/installer_view.xml b/addons/l10n_in/installer_view.xml new file mode 100644 index 00000000000..cfac5ed8513 --- /dev/null +++ b/addons/l10n_in/installer_view.xml @@ -0,0 +1,16 @@ + + + + account.installer.form + account.installer + form + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml new file mode 100644 index 00000000000..ca009cf0c6e --- /dev/null +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -0,0 +1,413 @@ + + + + + + + + Indian Chart of Account Partnership/Private firm + 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 + + + + + + + Merchandise Inventory + 140 + other + + + + + + + Supplies + 150 + other + + + + + + + Prepaid Insurance + 160 + other + + + + + + + Land + 170 + other + + + + + + + Accumulated Depreciation - Buildings + 178 + other + + + + + + + Equipment + 180 + other + + + + + + + Accumulated Depreciation - Equipment + 188 + other + + + + + + + + + Liabilities + 20 + view + + + + + + + Notes Payable + 210 + other + + + + + + + Accounts Payable + 215 + payable + + + + + + + Wages Payable + 220 + other + + + + + + + Interest Payable + 230 + other + + + + + + + Unearned Revenues + 240 + other + + + + + + + Mortgage Loan Payable + 250 + other + + + + + + + + + Owner's Equity Accounts + 29 + view + + + + + + + Mary Smith, Capital + 290 + other + + + + + + + Mary Smith, Drawing + 295 + other + + + + + + + + + Profit And Loss Account + 3 + view + + + + + + + + + Income + 30 + view + + + + + + + + + + Operating Revenue Accounts + 31 + view + + + + + + + Service Revenues + 310 + other + + + + + + + + Non-Operating Revenue and Gains + 80 + view + + + + + + + Interest Revenues + 810 + other + + + + + + + Gain on Sale of Assets + 910 + other + + + + + + + + + Expense + 50 + view + + + + + + + Operating Expense Accounts + 51 + view + + + + + + + Salaries Expense + 500 + other + + + + + + + Wages Expense + 510 + other + + + + + + + Supplies Expense + 540 + other + + + + + + + Rent Expense + 560 + other + + + + + + + Utilities Expense + 570 + other + + + + + + + Telephone Expense + 576 + other + + + + + + + Advertising Expense + 610 + other + + + + + + + + Depreciation Expense + 750 + other + + + + + + + + + Non-Operating Expenses and Losses + 90 + view + + + + + + + Loss on Sale of Assets + 960 + other + + + + + + + + + Indian Chart of Account Partnership/Private firm + + + + + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml new file mode 100644 index 00000000000..2bd8a67f346 --- /dev/null +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -0,0 +1,543 @@ + + + + + + + + + Indian Chart of Account Public firm + 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 + + + + + + + + + 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 + + + + + + + + + + + Profit And Loss Account + 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 + + + + + + + + + India - Chart of Accounts Public firm + + + + + + + + + + + + From 9ce89b8af3ca6d479e74f8fb909f62b2b718389f Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 15 May 2012 10:26:41 +0530 Subject: [PATCH 003/106] [IMP] l10n_in: improve code and add new file account_tax_code_template.xml,account_wizard.py, account_wizard_view.xml bzr revid: jap@tinyerp.com-20120515045641-f509ihbt1gwnwpfx --- addons/l10n_in/__init__.py | 1 + addons/l10n_in/__openerp__.py | 6 ++- addons/l10n_in/account_tax.xml | 24 +++++----- addons/l10n_in/account_tax_code_template.xml | 36 +++++++++++++++ addons/l10n_in/account_wizard.py | 35 ++++++++++++++ addons/l10n_in/account_wizard_view.xml | 21 +++++++++ .../l10n_in_partnership_private_chart.xml | 46 +++++++++++++++++-- addons/l10n_in/l10n_in_public_firm_chart.xml | 5 +- 8 files changed, 155 insertions(+), 19 deletions(-) create mode 100644 addons/l10n_in/account_tax_code_template.xml create mode 100644 addons/l10n_in/account_wizard.py create mode 100644 addons/l10n_in/account_wizard_view.xml diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index f97bda7fb89..9eb002375e0 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -28,5 +28,6 @@ ############################################################################## import installer +import account_wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index 9be4d35705e..a0b8f990531 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -39,10 +39,12 @@ Indian accounting chart and localization. # "l10n_in_chart.xml", "l10n_in_partnership_private_chart.xml", "installer_view.xml", + "account_tax_code_template.xml", +# "account_tax_code.xml", "l10n_in_public_firm_chart.xml", + "account_tax.xml", "l10n_in_wizard.xml", - - + "account_wizard_view.xml", ], "auto_install": False, "installable": True, diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml index 80f1233f498..f4a62e4435e 100644 --- a/addons/l10n_in/account_tax.xml +++ b/addons/l10n_in/account_tax.xml @@ -3,17 +3,19 @@ - - PPn (10%)(10.0%) - 0.100000 + + Sale Central + + 0.12 percent - - - - - - - - + + + + + + + + + diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml new file mode 100644 index 00000000000..466d3f147b4 --- /dev/null +++ b/addons/l10n_in/account_tax_code_template.xml @@ -0,0 +1,36 @@ + + + + + + + Tax balance to pay + + + + Tax Due (Tax to pay) + + + + + Tax payable + + + + + Tax bases + + + + Base of taxed sales + + + + + + Base of taxed purchases + + + + + diff --git a/addons/l10n_in/account_wizard.py b/addons/l10n_in/account_wizard.py new file mode 100644 index 00000000000..eb6f0dd1491 --- /dev/null +++ b/addons/l10n_in/account_wizard.py @@ -0,0 +1,35 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Author: Nicolas Bessi. Copyright Camptocamp SA +# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +# +# 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 . +# +############################################################################## +import tools +from osv import osv +from osv import fields, osv + +class account_wizard(osv.osv_memory): + _inherit ='wizard.multi.charts.accounts' + _columns = { + 'sales_tax_central': fields.boolean('Sales tax central'), + 'vat_resellers': fields.boolean('VAT resellers'), + 'service_tax': fields.boolean('Service tax'), + 'excise_duty': fields.boolean('Excise duty'), + } + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/account_wizard_view.xml b/addons/l10n_in/account_wizard_view.xml new file mode 100644 index 00000000000..7af266c7a81 --- /dev/null +++ b/addons/l10n_in/account_wizard_view.xml @@ -0,0 +1,21 @@ + + + + + + Generate Chart of Accounts from a Chart Template + wizard.multi.charts.accounts + form + + + + + + + + + + + + + diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index ca009cf0c6e..63853401468 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -5,7 +5,7 @@ - Indian Chart of Account Partnership/Private firm + Partnership/Private Firm Chart of Account 0 view @@ -40,7 +40,7 @@ - Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited. + Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited. @@ -50,6 +50,7 @@ + Amounts owed to the company for services performed or products sold but not yet paid for. @@ -59,6 +60,7 @@ + Cost of merchandise purchased but has not yet been sold. @@ -68,6 +70,7 @@ + Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense. @@ -77,6 +80,7 @@ + Cost of insurance that is paid in advance and includes a future accounting period. @@ -86,7 +90,18 @@ - + 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 @@ -95,6 +110,7 @@ + Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired. @@ -104,6 +120,7 @@ + Cost to acquire and prepare equipment for use by the company. @@ -113,6 +130,7 @@ + Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. @@ -133,6 +151,7 @@ + The amount of principal due on a formal written promise to pay. Loans from banks are included in this account. @@ -142,6 +161,7 @@ + Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash. @@ -151,6 +171,7 @@ + Amount owed to employees for hours worked but not yet paid. @@ -160,6 +181,7 @@ + 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. @@ -169,6 +191,7 @@ + Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases. @@ -178,6 +201,7 @@ + A formal loan that involves a lien on real estate until the loan is repaid. @@ -198,6 +222,7 @@ + Amount the owner invested in the company (through cash or other assets) plus earnings of the company not withdrawn by the owner. @@ -207,6 +232,7 @@ + Amount that the owner of the sole proprietorship has withdrawn for personal use during the current accounting year. At the end of the year, the amount in this account will be transferred into Mary Smith, Capital (account 290). @@ -250,6 +276,7 @@ + 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. @@ -269,6 +296,7 @@ + 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. @@ -278,6 +306,7 @@ + Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value. @@ -307,6 +336,7 @@ + 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. @@ -316,6 +346,7 @@ + Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay. @@ -325,6 +356,7 @@ + Cost of supplies used up during the accounting period. @@ -334,6 +366,7 @@ + Cost of occupying rented facilities during the accounting period. @@ -343,6 +376,7 @@ + Costs for electricity, heat, water, and sewer that were used during the accounting period. @@ -352,6 +386,7 @@ + Cost of telephone used during the current accounting period. @@ -361,6 +396,7 @@ + Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries). @@ -371,6 +407,7 @@ + Cost of long-term assets allocated to expense during the current accounting period. @@ -391,12 +428,13 @@ + Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value. - Indian Chart of Account Partnership/Private firm + Partnership/Private Firm Chart of Account diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index 2bd8a67f346..297e2947352 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -6,7 +6,7 @@ - Indian Chart of Account Public firm + Public Firm Chart of Account 0 view @@ -528,8 +528,9 @@ - India - Chart of Accounts Public firm + Public Firm Chart of Account + From 9e4dadab42723953b82638f0b748f0af50345695 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 16 May 2012 11:55:29 +0530 Subject: [PATCH 004/106] [IMP] l10n_in: improve code bzr revid: jap@tinyerp.com-20120516062529-o1lip88uk38bmy33 --- addons/l10n_in/__init__.py | 2 +- addons/l10n_in/__openerp__.py | 7 ++---- ...izard.py => account_multi_chart_wizard.py} | 20 +++++++++++++---- ...ml => account_multi_chart_wizard_view.xml} | 4 ++-- addons/l10n_in/account_tax_code_template.xml | 22 ++++++++++++------- addons/l10n_in/installer.py | 12 +++++----- .../l10n_in_partnership_private_chart.xml | 2 +- addons/l10n_in/l10n_in_public_firm_chart.xml | 8 +++---- 8 files changed, 46 insertions(+), 31 deletions(-) rename addons/l10n_in/{account_wizard.py => account_multi_chart_wizard.py} (58%) rename addons/l10n_in/{account_wizard_view.xml => account_multi_chart_wizard_view.xml} (87%) diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index 9eb002375e0..db0c795ae73 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -28,6 +28,6 @@ ############################################################################## import installer -import account_wizard +import account_multi_chart_wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index a0b8f990531..ba901562a0b 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -36,15 +36,12 @@ Indian accounting chart and localization. ], "demo_xml": [], "update_xml": [ -# "l10n_in_chart.xml", "l10n_in_partnership_private_chart.xml", - "installer_view.xml", "account_tax_code_template.xml", -# "account_tax_code.xml", "l10n_in_public_firm_chart.xml", - "account_tax.xml", "l10n_in_wizard.xml", - "account_wizard_view.xml", + "installer_view.xml", + "account_multi_chart_wizard_view.xml", ], "auto_install": False, "installable": True, diff --git a/addons/l10n_in/account_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py similarity index 58% rename from addons/l10n_in/account_wizard.py rename to addons/l10n_in/account_multi_chart_wizard.py index eb6f0dd1491..ea7974dd430 100644 --- a/addons/l10n_in/account_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -19,17 +19,29 @@ # ############################################################################## import tools -from osv import osv from osv import fields, osv +from os.path import join as opj -class account_wizard(osv.osv_memory): +class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' _columns = { - 'sales_tax_central': fields.boolean('Sales tax central'), - 'vat_resellers': fields.boolean('VAT resellers'), + 'sales_tax': fields.boolean('Sales tax central'), + 'vat': fields.boolean('VAT resellers'), 'service_tax': fields.boolean('Service tax'), 'excise_duty': fields.boolean('Excise duty'), } + def execute(self, cr, uid, ids, context=None): + super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) + obj_multi = self.browse(cr, uid, ids[0]) + if obj_multi.chart_template_id.name == 'Public Firm Chart of Account': + path = tools.file_open(opj('l10n_in', 'account_sale_tax.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + elif obj_multi.chart_template_id.name == 'Partnership/Private Firm Chart of Account': + path = tools.file_open(opj('l10n_in', 'account_vat.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/account_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml similarity index 87% rename from addons/l10n_in/account_wizard_view.xml rename to addons/l10n_in/account_multi_chart_wizard_view.xml index 7af266c7a81..449b3af70b9 100644 --- a/addons/l10n_in/account_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -10,9 +10,9 @@ - - + + diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml index 466d3f147b4..55dbf427e86 100644 --- a/addons/l10n_in/account_tax_code_template.xml +++ b/addons/l10n_in/account_tax_code_template.xml @@ -3,8 +3,13 @@ + + Tax + + - Tax balance to pay + Tax Balance to Pay + @@ -13,23 +18,24 @@ - Tax payable + Tax Payable - Tax bases + Tax Bases + + - Base of taxed sales - + Base of Taxed Sales + - - Base of taxed purchases - + Base of Taxed Purchases + diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index e4242ad5e91..1b57127d35c 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -41,13 +41,13 @@ class l10n_installer(osv.osv_memory): fy_obj = self.pool.get('account.fiscalyear') for res in self.read(cr, uid, ids, context=context): if res['charts'] =='l10n_in' and res['company_type']=='public_company': - fp = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) - tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None) - fp.close() + path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': - fp = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) - tools.convert_xml_import(cr, 'l10n_in', fp, {}, 'init', True, None) - fp.close() + path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() if 'date_start' in res and 'date_stop' in res: f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context) if not f_ids: diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index 63853401468..f59aaeb407b 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -436,7 +436,7 @@ Partnership/Private Firm Chart of Account - + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index 297e2947352..bcc9a3918a4 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -296,7 +296,7 @@ - + Sales - Division #1, Product Line 010 31010 other @@ -524,18 +524,18 @@ - + Public Firm Chart of Account - + - + From 15938009e3d5b8bbaf61bc4f24b99806f8b67006 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 17 May 2012 12:40:59 +0530 Subject: [PATCH 005/106] [IMP] l10n_in: improve code and add new xml file for different taxes bzr revid: jap@tinyerp.com-20120517071059-0s96fem90ke2i5sw --- addons/l10n_in/__openerp__.py | 4 +- addons/l10n_in/account_multi_chart_wizard.py | 49 ++++++++++++++----- addons/l10n_in/account_tax.xml | 17 +++---- addons/l10n_in/account_tax_code_template.xml | 26 +++++----- .../l10n_in_partnership_private_chart.xml | 2 +- addons/l10n_in/l10n_in_public_firm_chart.xml | 2 +- addons/l10n_in/tax/private_exice_duty.xml | 47 ++++++++++++++++++ addons/l10n_in/tax/private_service.xml | 46 +++++++++++++++++ addons/l10n_in/tax/private_vat.xml | 27 ++++++++++ addons/l10n_in/tax/privete_sale_tax.xml | 27 ++++++++++ .../l10n_in/tax/public_firm_excise_duty.xml | 48 ++++++++++++++++++ addons/l10n_in/tax/public_firm_sales_tax.xml | 23 +++++++++ addons/l10n_in/tax/public_firm_service.xml | 49 +++++++++++++++++++ addons/l10n_in/tax/public_firm_vat.xml | 28 +++++++++++ 14 files changed, 357 insertions(+), 38 deletions(-) create mode 100644 addons/l10n_in/tax/private_exice_duty.xml create mode 100644 addons/l10n_in/tax/private_service.xml create mode 100644 addons/l10n_in/tax/private_vat.xml create mode 100644 addons/l10n_in/tax/privete_sale_tax.xml create mode 100644 addons/l10n_in/tax/public_firm_excise_duty.xml create mode 100644 addons/l10n_in/tax/public_firm_sales_tax.xml create mode 100644 addons/l10n_in/tax/public_firm_service.xml create mode 100644 addons/l10n_in/tax/public_firm_vat.xml diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index ba901562a0b..cbacb5e5ac3 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -36,12 +36,10 @@ Indian accounting chart and localization. ], "demo_xml": [], "update_xml": [ - "l10n_in_partnership_private_chart.xml", "account_tax_code_template.xml", - "l10n_in_public_firm_chart.xml", + "account_multi_chart_wizard_view.xml", "l10n_in_wizard.xml", "installer_view.xml", - "account_multi_chart_wizard_view.xml", ], "auto_install": False, "installable": True, diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index ea7974dd430..c19997e3f98 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -21,6 +21,7 @@ import tools from osv import fields, osv from os.path import join as opj +from lxml import etree class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' @@ -32,16 +33,42 @@ class account_multi_charts_wizard(osv.osv_memory): } def execute(self, cr, uid, ids, context=None): - super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) obj_multi = self.browse(cr, uid, ids[0]) - if obj_multi.chart_template_id.name == 'Public Firm Chart of Account': - path = tools.file_open(opj('l10n_in', 'account_sale_tax.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - elif obj_multi.chart_template_id.name == 'Partnership/Private Firm Chart of Account': - path = tools.file_open(opj('l10n_in', 'account_vat.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - - + acc_template_id= self.pool.get('account.chart.template').search(cr, uid, [('name','=',obj_multi.chart_template_id.name)], context=context) + for chart_name in self.pool.get('account.chart.template').browse(cr, uid, acc_template_id,context=context): + if obj_multi.chart_template_id.name == chart_name.name: + if obj_multi.sales_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.vat == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.service_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.excise_duty == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + elif obj_multi.chart_template_id.name == chart_name.name: + if obj_multi.sales_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.vat == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.service_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.excise_duty == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml index 5077ec64e6e..90e6264398f 100644 --- a/addons/l10n_in/account_tax.xml +++ b/addons/l10n_in/account_tax.xml @@ -4,16 +4,15 @@ - Sale Central - - 0.12 + PPn (10%)(10.0%) + 0.100000 percent - - - - - - + + + + + + diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml index 55dbf427e86..0677ab6dfa6 100644 --- a/addons/l10n_in/account_tax_code_template.xml +++ b/addons/l10n_in/account_tax_code_template.xml @@ -3,39 +3,39 @@ - + Tax - + Tax Balance to Pay - + - + Tax Due (Tax to pay) - + - + Tax Payable - + - + Tax Bases - + - + Base of Taxed Sales - + - + Base of Taxed Purchases - + diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index f59aaeb407b..2bda406dbee 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -436,7 +436,7 @@ Partnership/Private Firm Chart of Account - + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index bcc9a3918a4..92cad026926 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -530,7 +530,7 @@ Public Firm Chart of Account - + diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml new file mode 100644 index 00000000000..5e8f531c0e1 --- /dev/null +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -0,0 +1,47 @@ + + + + + + + 10 + Exice Duty(10.30%) + Exice Duty + + 0.10 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Excise duty(10%)(%2) + Excise duty (%2) + 0.02 + percent + sale + + + + + + Excise duty(10%)(%1) + Excise duty (%1) + 0.01 + percent + sale + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml new file mode 100644 index 00000000000..49d5bc3542e --- /dev/null +++ b/addons/l10n_in/tax/private_service.xml @@ -0,0 +1,46 @@ + + + + + + + Service(12%) + Service + + 0.12 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Service(12%)(%2) + Service (%2) + 0.02 + percent + sale + + + + + + Service(12%)(%1) + Service (%1) + 0.01 + percent + sale + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml new file mode 100644 index 00000000000..860a499ccde --- /dev/null +++ b/addons/l10n_in/tax/private_vat.xml @@ -0,0 +1,27 @@ + + + + + + + 10 + VAT(12%) + VAT resellers + + 0.15 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml new file mode 100644 index 00000000000..6421180506d --- /dev/null +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -0,0 +1,27 @@ + + + + + + + 10 + Sale Central (12%) + Sale Central + + 0.12 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml new file mode 100644 index 00000000000..6c5185ed560 --- /dev/null +++ b/addons/l10n_in/tax/public_firm_excise_duty.xml @@ -0,0 +1,48 @@ + + + + + + + Excise duty(10%) + Excise duty + + + + 0.10 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Excise duty(10%)(%2) + Excise duty (%2) + 0.02 + percent + sale + + + + + + Excise duty(10%)(%1) + Excise duty (%1) + 0.01 + percent + sale + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml new file mode 100644 index 00000000000..05fbd4db5b9 --- /dev/null +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -0,0 +1,23 @@ + + + + + + + Sale Central (12%) + Sale Central + + + + 0.12 + percent + sale + + + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml new file mode 100644 index 00000000000..58c85cb3f74 --- /dev/null +++ b/addons/l10n_in/tax/public_firm_service.xml @@ -0,0 +1,49 @@ + + + + + + + Service(12%) + Service + + + + 0.12 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Service(12%)(%2) + Service (%2) + 0.02 + percent + sale + + + + + + Service(12%)(%1) + Service (%1) + 0.01 + percent + sale + + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml new file mode 100644 index 00000000000..02fe9cf56f4 --- /dev/null +++ b/addons/l10n_in/tax/public_firm_vat.xml @@ -0,0 +1,28 @@ + + + + + + + VAT(12%) + VAT + + + + 0.15 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + \ No newline at end of file From 9ee1727eb7c65267726a82337be81cc10b73d0a9 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 18 May 2012 10:29:17 +0530 Subject: [PATCH 006/106] [IMP] l10n_in: improve code for tax account bzr revid: jap@tinyerp.com-20120518045917-rv2mgpo2tlel5fm2 --- addons/l10n_in/account_multi_chart_wizard.py | 79 +++++++++---------- addons/l10n_in/tax/private_exice_duty.xml | 28 ++++++- addons/l10n_in/tax/private_service.xml | 21 ++++- addons/l10n_in/tax/private_vat.xml | 20 +++++ addons/l10n_in/tax/privete_sale_tax.xml | 20 +++++ .../l10n_in/tax/public_firm_excise_duty.xml | 22 +++++- addons/l10n_in/tax/public_firm_sales_tax.xml | 22 +++++- addons/l10n_in/tax/public_firm_service.xml | 22 +++++- addons/l10n_in/tax/public_firm_vat.xml | 22 +++++- 9 files changed, 203 insertions(+), 53 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index c19997e3f98..ae2b48055d2 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -26,49 +26,48 @@ from lxml import etree class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' _columns = { - 'sales_tax': fields.boolean('Sales tax central'), - 'vat': fields.boolean('VAT resellers'), - 'service_tax': fields.boolean('Service tax'), - 'excise_duty': fields.boolean('Excise duty'), + 'sales_tax': fields.boolean('Sales tax central', help='If this field is true it allows you use Sales Tax'), + 'vat': fields.boolean('VAT resellers',help='If this field is true it allows you use VAT'), + 'service_tax': fields.boolean('Service tax', help='If this field is true it allows you use Service tax'), + 'excise_duty': fields.boolean('Excise duty', help='If this field is true it allows you use Excise duty'), } def execute(self, cr, uid, ids, context=None): obj_multi = self.browse(cr, uid, ids[0]) - acc_template_id= self.pool.get('account.chart.template').search(cr, uid, [('name','=',obj_multi.chart_template_id.name)], context=context) - for chart_name in self.pool.get('account.chart.template').browse(cr, uid, acc_template_id,context=context): - if obj_multi.chart_template_id.name == chart_name.name: - if obj_multi.sales_tax == True: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.vat == True: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.service_tax == True: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.excise_duty == True: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - elif obj_multi.chart_template_id.name == chart_name.name: - if obj_multi.sales_tax == True: - path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.vat == True: - path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.service_tax == True: - path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if obj_multi.excise_duty == True: - path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + if obj_multi.chart_template_id.name == 'Public Firm Chart of Account': + if obj_multi.sales_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.vat == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.service_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.excise_duty == True: + path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + elif obj_multi.chart_template_id.name == 'Partnership/Private Firm Chart of Account': + if obj_multi.sales_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.vat == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.service_tax == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() + if obj_multi.excise_duty == True: + path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) + tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) + path.close() return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 5e8f531c0e1..8ea3a972fdf 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -3,14 +3,34 @@ - + + Exice Duty Receivable + 128 + receivable + + + + + + + Exice Duty Payable + 219 + payable + + + + + + 10 Exice Duty(10.30%) Exice Duty 0.10 percent - sale + all + + 1 @@ -29,7 +49,7 @@ 0.02 percent sale - + @@ -39,7 +59,7 @@ 0.01 percent sale - + diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index 49d5bc3542e..0bb8352096d 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -3,13 +3,32 @@ + + Service Tax Receivable + 126 + receivable + + + + + + + Service Tax Payable + 218 + payable + + + + + Service(12%) Service 0.12 percent - sale + + 1 diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index 860a499ccde..559115ccc78 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -3,6 +3,24 @@ + + VAT Receivable + 124 + receivable + + + + + + + VAT Payable + 217 + payable + + + + + 10 VAT(12%) @@ -11,6 +29,8 @@ 0.15 percent sale + + 1 diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index 6421180506d..2565f2a9e83 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -3,6 +3,24 @@ + + Sales Tax Receivable + 122 + receivable + + + + + + + Sales Tax Payable + 216 + payable + + + + + 10 Sale Central (12%) @@ -11,6 +29,8 @@ 0.12 percent sale + + 1 diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml index 6c5185ed560..7a78037bcaa 100644 --- a/addons/l10n_in/tax/public_firm_excise_duty.xml +++ b/addons/l10n_in/tax/public_firm_excise_duty.xml @@ -3,11 +3,29 @@ + + Exice Duty Receivable + 158000 + receivable + + + + + + + Exice Duty Payable + 24900 + payable + + + + + Excise duty(10%) Excise duty - - + + 0.10 percent diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml index 05fbd4db5b9..f0240de33fe 100644 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -3,11 +3,29 @@ + + Sales Tax Receivable + 154000 + receivable + + + + + + + Sales Tax Payable + 24600 + payable + + + + + Sale Central (12%) Sale Central - - + + 0.12 percent diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml index 58c85cb3f74..f4ef12defa2 100644 --- a/addons/l10n_in/tax/public_firm_service.xml +++ b/addons/l10n_in/tax/public_firm_service.xml @@ -3,11 +3,29 @@ + + Service Tax Receivable + 156000 + receivable + + + + + + + Service Tax Payable + 24700 + payable + + + + + Service(12%) Service - - + + 0.12 percent diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml index 02fe9cf56f4..29fd2f3f9ca 100644 --- a/addons/l10n_in/tax/public_firm_vat.xml +++ b/addons/l10n_in/tax/public_firm_vat.xml @@ -3,11 +3,29 @@ + + VAT Receivable + 157000 + receivable + + + + + + + VAT Payable + 24800 + payable + + + + + VAT(12%) VAT - - + + 0.15 percent From 87f1f877c341752f11196157ebef30f5225d370b Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 18 May 2012 17:24:21 +0530 Subject: [PATCH 007/106] [IMP] l10n_in: improve code in xml bzr revid: jap@tinyerp.com-20120518115421-z8uejo5jfbtjc03g --- .../l10n_in_partnership_private_chart.xml | 4 +- addons/l10n_in/tax/private_exice_duty.xml | 2 +- addons/l10n_in/tax/private_service.xml | 5 +- addons/l10n_in/tax/private_vat.xml | 70 +++++++++++++++++-- addons/l10n_in/tax/privete_sale_tax.xml | 22 +++++- addons/l10n_in/tax/public_firm_sales_tax.xml | 18 ++++- addons/l10n_in/tax/public_firm_service.xml | 6 +- addons/l10n_in/tax/public_firm_vat.xml | 70 +++++++++++++++++-- 8 files changed, 179 insertions(+), 18 deletions(-) diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index 2bda406dbee..06d046d320c 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -215,7 +215,7 @@ - + diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 8ea3a972fdf..0127d2bd444 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -28,7 +28,7 @@ 0.10 percent - all + sale diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index 0bb8352096d..ff049c31f21 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -22,6 +22,7 @@ + all Service(12%) Service @@ -46,7 +47,7 @@ Service (%2) 0.02 percent - sale + all @@ -56,7 +57,7 @@ Service (%1) 0.01 percent - sale + all diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index 559115ccc78..c91a9fe657a 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -22,13 +22,12 @@ - 10 - VAT(12%) + VAT(%4) VAT resellers - 0.15 + 0.04 percent - sale + all @@ -43,5 +42,68 @@ + + VAT(4%)(%1) + VAT (%1) + 0.01 + percent + all + + + + + + VAT(12.5%) + VAT (12.5%) + + 0.125 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + + VAT(12.5%)(%2.5) + VAT (%2.5) + 0.025 + percent + sale + + + + + + VAT(8%) + VAT (8%) + + 0.8 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index 2565f2a9e83..424126aec29 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -21,8 +21,28 @@ + + Sale Central (15%) + Sale Central + + 0.15 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + - 10 Sale Central (12%) Sale Central diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml index f0240de33fe..fbc92ca9049 100644 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -22,6 +22,22 @@ + Sale Central (15%) + Sale Central + + + + 0.15 + percent + sale + + + + + + + + Sale Central (12%) Sale Central @@ -35,7 +51,7 @@ - + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml index f4ef12defa2..d78000ca5d5 100644 --- a/addons/l10n_in/tax/public_firm_service.xml +++ b/addons/l10n_in/tax/public_firm_service.xml @@ -29,7 +29,7 @@ 0.12 percent - sale + all 1 @@ -47,7 +47,7 @@ Service (%2) 0.02 percent - sale + all @@ -57,7 +57,7 @@ Service (%1) 0.01 percent - sale + all diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml index 29fd2f3f9ca..53d3f1efc5a 100644 --- a/addons/l10n_in/tax/public_firm_vat.xml +++ b/addons/l10n_in/tax/public_firm_vat.xml @@ -22,14 +22,45 @@ - VAT(12%) - VAT + VAT(%4) + VAT(%4) - 0.15 + 0.04 percent - sale + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT(4%)(%1) + VAT (%1) + 0.01 + percent + all + + + + + + VAT(12.5%) + VAT (12.5%) + + + + 0.125 + percent + all 1 @@ -41,6 +72,37 @@ + + + VAT(12.5%)(%2.5) + VAT(12.5%)(%2.5) + 0.025 + percent + all + + + + + + VAT(8%) + VAT(8%) + + + + 0.08 + percent + all + + 1 + + 1 + + 1 + + 1 + + + \ No newline at end of file From b4676557b420d113490d704741e6550ea5ace2f0 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 21 May 2012 15:41:04 +0530 Subject: [PATCH 008/106] [IMP] l10n_in: improve code for different tax name bzr revid: jap@tinyerp.com-20120521101104-vdbovr1c37f1fye1 --- addons/l10n_in/account_multi_chart_wizard.py | 2 ++ .../l10n_in_partnership_private_chart.xml | 3 +-- addons/l10n_in/l10n_in_public_firm_chart.xml | 1 - addons/l10n_in/tax/private_exice_duty.xml | 16 +++++++------ addons/l10n_in/tax/private_service.xml | 10 ++++---- addons/l10n_in/tax/private_vat.xml | 23 ++++++++++--------- addons/l10n_in/tax/privete_sale_tax.xml | 14 +++++------ .../l10n_in/tax/public_firm_excise_duty.xml | 10 ++++---- addons/l10n_in/tax/public_firm_sales_tax.xml | 10 ++++---- addons/l10n_in/tax/public_firm_service.xml | 6 ++--- addons/l10n_in/tax/public_firm_vat.xml | 22 +++++++++--------- 11 files changed, 60 insertions(+), 57 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index ae2b48055d2..f530cd44b62 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -69,5 +69,7 @@ class account_multi_charts_wizard(osv.osv_memory): tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) + +account_multi_charts_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index 06d046d320c..d77ed6424fd 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -442,8 +442,7 @@ - - + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index 92cad026926..f3a9c4d7c6e 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -537,7 +537,6 @@ - diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 0127d2bd444..825bb4afab0 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -22,10 +22,10 @@ - 10 - Exice Duty(10.30%) + Exice Duty - 10.30% + 10 Exice Duty - + 0.10 percent sale @@ -44,8 +44,9 @@ - Excise duty(10%)(%2) - Excise duty (%2) + 11 + Excise duty -10% -%2 + Excise duty - 2% 0.02 percent sale @@ -54,8 +55,9 @@ - Excise duty(10%)(%1) - Excise duty (%1) + 11 + Excise duty - 10% - %1 + Excise duty - 1% 0.01 percent sale diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index ff049c31f21..f5566a5dce1 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -23,7 +23,7 @@ all - Service(12%) + Service - 12% Service 0.12 @@ -43,8 +43,8 @@ - Service(12%)(%2) - Service (%2) + Service - 12% - %2 + Service - 2% 0.02 percent all @@ -53,8 +53,8 @@ - Service(12%)(%1) - Service (%1) + Service - 12% - 1% + Service - 1% 0.01 percent all diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index c91a9fe657a..a025e72310c 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -22,9 +22,10 @@ - VAT(%4) + 30 + VAT - 4% VAT resellers - + 0.04 percent all @@ -43,8 +44,8 @@ - VAT(4%)(%1) - VAT (%1) + VAT - 4% - %1 + VAT - %1 0.01 percent all @@ -53,9 +54,9 @@ - VAT(12.5%) - VAT (12.5%) - + VAT - 12.5% + VAT - 12.5% + 0.125 percent all @@ -74,7 +75,7 @@ - VAT(12.5%)(%2.5) + VAT - 12.5%- %2.5 VAT (%2.5) 0.025 percent @@ -84,8 +85,8 @@ - VAT(8%) - VAT (8%) + VAT - 8% + VAT - 8% 0.8 percent @@ -100,7 +101,7 @@ 1 1 - + diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index 424126aec29..5d741879798 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -20,10 +20,10 @@ - + - Sale Central (15%) - Sale Central + Sale Tax - 15% + Sale Tax - 15% 0.15 percent @@ -38,13 +38,13 @@ 1 1 - + - Sale Central (12%) - Sale Central + Sale Tax -12% + Sale Tax - 12% 0.12 percent @@ -59,7 +59,7 @@ 1 1 - + diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml index 7a78037bcaa..e8f010da3ac 100644 --- a/addons/l10n_in/tax/public_firm_excise_duty.xml +++ b/addons/l10n_in/tax/public_firm_excise_duty.xml @@ -22,7 +22,7 @@ - Excise duty(10%) + Excise duty - 10% Excise duty @@ -43,8 +43,8 @@ - Excise duty(10%)(%2) - Excise duty (%2) + Excise duty - 10% - 2% + Excise duty - %2 0.02 percent sale @@ -53,8 +53,8 @@ - Excise duty(10%)(%1) - Excise duty (%1) + Excise duty - 10% - 1% + Excise duty - 1% 0.01 percent sale diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml index fbc92ca9049..3d805a4a049 100644 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -22,8 +22,8 @@ - Sale Central (15%) - Sale Central + Sale Tax - 15% + Sale Tax - 15% @@ -38,8 +38,8 @@ - Sale Central (12%) - Sale Central + Sale Tax - 12% + Sale Tax - 12% @@ -51,7 +51,7 @@ - + \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml index d78000ca5d5..dcfc7cd343e 100644 --- a/addons/l10n_in/tax/public_firm_service.xml +++ b/addons/l10n_in/tax/public_firm_service.xml @@ -22,7 +22,7 @@ - Service(12%) + Service - 12% Service @@ -43,7 +43,7 @@ - Service(12%)(%2) + Service - 12% - 2% Service (%2) 0.02 percent @@ -53,7 +53,7 @@ - Service(12%)(%1) + Service - 12% - 1% Service (%1) 0.01 percent diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml index 53d3f1efc5a..3fb5eea8dcc 100644 --- a/addons/l10n_in/tax/public_firm_vat.xml +++ b/addons/l10n_in/tax/public_firm_vat.xml @@ -22,11 +22,11 @@ - VAT(%4) - VAT(%4) + VAT - 4% + VAT - 4% - + 0.04 percent all @@ -43,8 +43,8 @@ - VAT(4%)(%1) - VAT (%1) + VAT - 4% -1% + VAT - 1% 0.01 percent all @@ -53,8 +53,8 @@ - VAT(12.5%) - VAT (12.5%) + VAT - 12.5% + VAT - 12.5% @@ -74,8 +74,8 @@ - VAT(12.5%)(%2.5) - VAT(12.5%)(%2.5) + VAT - 12.5% - %2.5 + VAT - 12.5% - %2.5 0.025 percent all @@ -84,8 +84,8 @@ - VAT(8%) - VAT(8%) + VAT - 8% + VAT - 8% From 2808efa6fd74890e15f1bdbafb1443b3be871d8c Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 22 May 2012 18:51:19 +0530 Subject: [PATCH 009/106] [IMP] l10n_in: improve code in account_multi_chart_wizard_view.py add new onchange method bzr revid: jap@tinyerp.com-20120522132119-0mwnk1ue8r2ct7q0 --- addons/l10n_in/account_multi_chart_wizard.py | 24 ++++++++++++++++--- .../account_multi_chart_wizard_view.xml | 9 +++---- addons/l10n_in/tax/public_firm_sales_tax.xml | 2 +- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index f530cd44b62..784a7b748ca 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -30,19 +30,37 @@ class account_multi_charts_wizard(osv.osv_memory): 'vat': fields.boolean('VAT resellers',help='If this field is true it allows you use VAT'), 'service_tax': fields.boolean('Service tax', help='If this field is true it allows you use Service tax'), 'excise_duty': fields.boolean('Excise duty', help='If this field is true it allows you use Excise duty'), + 'is_indian_chart': fields.boolean('Flag') } + def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): + res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context) + tax_templ_obj = self.pool.get('account.tax.template') + res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False} + data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context) + if data.name in ('Public Firm Chart of Account','Partnership/Private Firm Chart of Account'): + res.update({'value': {'is_indian_chart': True}}) + else: + res.update({'value': {'is_indian_chart': False}}) + if data.complete_tax_set: + sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc") + purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc") + res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False}) + return res + def execute(self, cr, uid, ids, context=None): obj_multi = self.browse(cr, uid, ids[0]) if obj_multi.chart_template_id.name == 'Public Firm Chart of Account': if obj_multi.sales_tax == True: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + path.close() if obj_multi.vat == True: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + path.close() if obj_multi.service_tax == True: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) @@ -67,7 +85,7 @@ class account_multi_charts_wizard(osv.osv_memory): if obj_multi.excise_duty == True: path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + path.close() return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) account_multi_charts_wizard() diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index 449b3af70b9..63ef1ccc94c 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -10,10 +10,11 @@ - - - - + + + + + diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml index 3d805a4a049..d88c1370368 100644 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -20,7 +20,7 @@ - + Sale Tax - 15% Sale Tax - 15% From 2ae3cb623e2a5d9c061f3ee2397f1d68eb1db442 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 23 May 2012 17:34:55 +0530 Subject: [PATCH 010/106] [IMP] l10n_in: Remove the receivable accounts from tax, change template name, add new account product sale and improve code bzr revid: jap@tinyerp.com-20120523120455-197vc5xqni5atdcp --- addons/l10n_in/account_multi_chart_wizard.py | 51 +++++++++---------- .../account_multi_chart_wizard_view.xml | 2 +- addons/l10n_in/installer.py | 5 +- .../l10n_in_partnership_private_chart.xml | 17 +++++-- addons/l10n_in/l10n_in_public_firm_chart.xml | 4 +- addons/l10n_in/tax/private_exice_duty.xml | 11 +--- addons/l10n_in/tax/private_service.xml | 11 +--- addons/l10n_in/tax/private_vat.xml | 17 ++----- addons/l10n_in/tax/privete_sale_tax.xml | 13 +---- .../l10n_in/tax/public_firm_excise_duty.xml | 11 +--- addons/l10n_in/tax/public_firm_sales_tax.xml | 13 +---- addons/l10n_in/tax/public_firm_service.xml | 11 +--- addons/l10n_in/tax/public_firm_vat.xml | 15 ++---- 13 files changed, 58 insertions(+), 123 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index 784a7b748ca..4fbe1fa2cc5 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -18,18 +18,19 @@ # along with this program. If not, see . # ############################################################################## -import tools +from lxml import etree from osv import fields, osv from os.path import join as opj -from lxml import etree +import tools + class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' _columns = { - 'sales_tax': fields.boolean('Sales tax central', help='If this field is true it allows you use Sales Tax'), - 'vat': fields.boolean('VAT resellers',help='If this field is true it allows you use VAT'), - 'service_tax': fields.boolean('Service tax', help='If this field is true it allows you use Service tax'), - 'excise_duty': fields.boolean('Excise duty', help='If this field is true it allows you use Excise duty'), + 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you use Sales Tax'), + 'vat': fields.boolean('VAT',help='If this field is true it allows you use VAT'), + 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you use Service tax'), + 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you use Excise duty'), 'is_indian_chart': fields.boolean('Flag') } @@ -38,51 +39,49 @@ class account_multi_charts_wizard(osv.osv_memory): tax_templ_obj = self.pool.get('account.tax.template') res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False} data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context) - if data.name in ('Public Firm Chart of Account','Partnership/Private Firm Chart of Account'): - res.update({'value': {'is_indian_chart': True}}) - else: - res.update({'value': {'is_indian_chart': False}}) - if data.complete_tax_set: - sale_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" - , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence, id desc") - purchase_tax_ids = tax_templ_obj.search(cr, uid, [("chart_template_id" - , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence, id desc") - res['value'].update({'sale_tax': sale_tax_ids and sale_tax_ids[0] or False, 'purchase_tax': purchase_tax_ids and purchase_tax_ids[0] or False}) + if data.name in ('India - Chart of Accounts for Public Firm','India - Chart of Accounts for Partnership/Private Firm'): + res['value'].update({'is_indian_chart': True}) + else: + res['value'].update({'is_indian_chart': False}) + if data.name == 'India - Chart of Accounts for Public Firm': + res['value'].update({'sales_tax': True,'vat':True, 'service_tax':True, 'excise_duty': True}) + elif data.name == 'India - Chart of Accounts for Partnership/Private Firm': + res['value'].update({'sales_tax': True,'vat':True}) return res def execute(self, cr, uid, ids, context=None): obj_multi = self.browse(cr, uid, ids[0]) - if obj_multi.chart_template_id.name == 'Public Firm Chart of Account': - if obj_multi.sales_tax == True: + if obj_multi.chart_template_id.name == 'India - Chart of Accounts for Public Firm': + if obj_multi.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat == True: + if obj_multi.vat: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax == True: + if obj_multi.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty == True: + if obj_multi.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - elif obj_multi.chart_template_id.name == 'Partnership/Private Firm Chart of Account': - if obj_multi.sales_tax == True: + elif obj_multi.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': + if obj_multi.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat == True: + if obj_multi.vat: path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax == True: + if obj_multi.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty == True: + if obj_multi.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index 63ef1ccc94c..4851392748f 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -8,7 +8,7 @@ form - + diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index 1b57127d35c..b189a061da4 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -18,17 +18,16 @@ # along with this program. If not, see . # ############################################################################## - from osv import fields, osv +from os.path import join as opj import netsvc import tools -from os.path import join as opj class l10n_installer(osv.osv_memory): _inherit = 'account.installer' _columns = { 'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'), - ('public_company', 'Public Company')], 'Company Type'), + ('public_company', 'Public Firm')], 'Company Type', required=True), } _defaults = { diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index d77ed6424fd..f5185d85426 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -238,7 +238,7 @@ - Profit And Loss Account + Profit And Loss 3 view @@ -277,8 +277,17 @@ 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 @@ -301,7 +310,7 @@ Gain on Sale of Assets - 910 + 811 other @@ -434,7 +443,7 @@ - Partnership/Private Firm Chart of Account + India - Chart of Accounts for Partnership/Private Firm diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index f3a9c4d7c6e..8e84d9b8d79 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -266,7 +266,7 @@ - Profit And Loss Account + Profit And Loss 3 view @@ -528,7 +528,7 @@ - Public Firm Chart of Account + India - Chart of Accounts for Public Firm diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 825bb4afab0..568d480eb86 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -3,15 +3,6 @@ - - Exice Duty Receivable - 128 - receivable - - - - - Exice Duty Payable 219 @@ -29,7 +20,7 @@ 0.10 percent sale - + 1 diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index f5566a5dce1..1ce8cbfe74c 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -3,15 +3,6 @@ - - Service Tax Receivable - 126 - receivable - - - - - Service Tax Payable 218 @@ -28,7 +19,7 @@ 0.12 percent - + 1 diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index a025e72310c..d717201b577 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -3,15 +3,6 @@ - - VAT Receivable - 124 - receivable - - - - - VAT Payable 217 @@ -24,12 +15,12 @@ 30 VAT - 4% - VAT resellers + VAT 0.04 percent all - + 1 @@ -60,7 +51,7 @@ 0.125 percent all - + 1 @@ -91,7 +82,7 @@ 0.8 percent all - + 1 diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index 5d741879798..dc89d3d3fee 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -3,15 +3,6 @@ - - Sales Tax Receivable - 122 - receivable - - - - - Sales Tax Payable 216 @@ -28,7 +19,7 @@ 0.15 percent sale - + 1 @@ -49,7 +40,7 @@ 0.12 percent sale - + 1 diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml index e8f010da3ac..031c92307fd 100644 --- a/addons/l10n_in/tax/public_firm_excise_duty.xml +++ b/addons/l10n_in/tax/public_firm_excise_duty.xml @@ -3,15 +3,6 @@ - - Exice Duty Receivable - 158000 - receivable - - - - - Exice Duty Payable 24900 @@ -24,7 +15,7 @@ Excise duty - 10% Excise duty - + 0.10 diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml index d88c1370368..27d768aba7a 100644 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ b/addons/l10n_in/tax/public_firm_sales_tax.xml @@ -3,15 +3,6 @@ - - Sales Tax Receivable - 154000 - receivable - - - - - Sales Tax Payable 24600 @@ -24,7 +15,7 @@ Sale Tax - 15% Sale Tax - 15% - + 0.15 @@ -40,7 +31,7 @@ Sale Tax - 12% Sale Tax - 12% - + 0.12 diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml index dcfc7cd343e..f57eee6796b 100644 --- a/addons/l10n_in/tax/public_firm_service.xml +++ b/addons/l10n_in/tax/public_firm_service.xml @@ -3,15 +3,6 @@ - - Service Tax Receivable - 156000 - receivable - - - - - Service Tax Payable 24700 @@ -24,7 +15,7 @@ Service - 12% Service - + 0.12 diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml index 3fb5eea8dcc..9ffe2b9d9ca 100644 --- a/addons/l10n_in/tax/public_firm_vat.xml +++ b/addons/l10n_in/tax/public_firm_vat.xml @@ -3,15 +3,6 @@ - - VAT Receivable - 157000 - receivable - - - - - VAT Payable 24800 @@ -24,7 +15,7 @@ VAT - 4% VAT - 4% - + 0.04 @@ -55,7 +46,7 @@ VAT - 12.5% VAT - 12.5% - + 0.125 @@ -86,7 +77,7 @@ VAT - 8% VAT - 8% - + 0.08 From f86c011e90cb81208d6f4739134ce7e3e37c45be Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 28 May 2012 17:31:17 +0530 Subject: [PATCH 011/106] [IMP] l10n_in: Improve code and use proper id name in l10n_in_partnership_private_chart.xml bzr revid: jap@tinyerp.com-20120528120117-iinpi1vuh2v71dvt --- addons/l10n_in/account_multi_chart_wizard.py | 46 +- .../account_multi_chart_wizard_view.xml | 14 +- addons/l10n_in/account_tax_code_template.xml | 2 +- addons/l10n_in/installer.py | 26 +- addons/l10n_in/installer_view.xml | 1 + addons/l10n_in/l10n_in_chart.xml | 447 ------------------ .../l10n_in_partnership_private_chart.xml | 166 +++---- addons/l10n_in/l10n_in_public_firm_chart.xml | 2 +- addons/l10n_in/l10n_in_wizard.xml | 1 + addons/l10n_in/tax/private_exice_duty.xml | 2 +- addons/l10n_in/tax/private_service.xml | 2 +- addons/l10n_in/tax/private_vat.xml | 2 +- addons/l10n_in/tax/privete_sale_tax.xml | 2 +- 13 files changed, 124 insertions(+), 589 deletions(-) delete mode 100644 addons/l10n_in/l10n_in_chart.xml diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index 4fbe1fa2cc5..058c2a41617 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -18,28 +18,25 @@ # along with this program. If not, see . # ############################################################################## -from lxml import etree + from osv import fields, osv from os.path import join as opj import tools - class account_multi_charts_wizard(osv.osv_memory): _inherit ='wizard.multi.charts.accounts' _columns = { - 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you use Sales Tax'), - 'vat': fields.boolean('VAT',help='If this field is true it allows you use VAT'), - 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you use Service tax'), - 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you use Excise duty'), - 'is_indian_chart': fields.boolean('Flag') + 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you install Sales Tax'), + 'vat': fields.boolean('VAT', help='If this field is true it allows install use VAT'), + 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you install Service tax'), + 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you install Excise duty'), + 'is_indian_chart': fields.boolean('Indian Chart?') } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): - res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context) - tax_templ_obj = self.pool.get('account.tax.template') - res['value'] = {'complete_tax_set': False, 'sale_tax': False, 'purchase_tax': False} + res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context=context) data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context) - if data.name in ('India - Chart of Accounts for Public Firm','India - Chart of Accounts for Partnership/Private Firm'): + if data.name in ('India - Chart of Accounts for Public Firm', 'India - Chart of Accounts for Partnership/Private Firm'): res['value'].update({'is_indian_chart': True}) else: res['value'].update({'is_indian_chart': False}) @@ -50,42 +47,43 @@ class account_multi_charts_wizard(osv.osv_memory): return res def execute(self, cr, uid, ids, context=None): - obj_multi = self.browse(cr, uid, ids[0]) - if obj_multi.chart_template_id.name == 'India - Chart of Accounts for Public Firm': - if obj_multi.sales_tax: + multichart_data = self.browse(cr, uid, ids[0], context=context) + if multichart_data.chart_template_id.name == 'India - Chart of Accounts for Public Firm': + if multichart_data.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat: + if multichart_data.vat: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax: + if multichart_data.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty: + if multichart_data.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - elif obj_multi.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': - if obj_multi.sales_tax: + elif multichart_data.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': + if multichart_data.sales_tax: path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.vat: + if multichart_data.vat: path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.service_tax: + if multichart_data.service_tax: path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) path.close() - if obj_multi.excise_duty: + if multichart_data.excise_duty: path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - return super(account_multi_charts_wizard, self).execute(cr, uid, ids, context) + path.close() + res = super(account_multi_charts_wizard, self).execute(cr, uid, ids, context=context) + return res account_multi_charts_wizard() diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index 4851392748f..899d81fc65b 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -1,7 +1,6 @@ + - - Generate Chart of Accounts from a Chart Template wizard.multi.charts.accounts @@ -9,12 +8,13 @@ - - - - - + + + + + + diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/account_tax_code_template.xml index 0677ab6dfa6..1d8e5ed3b70 100644 --- a/addons/l10n_in/account_tax_code_template.xml +++ b/addons/l10n_in/account_tax_code_template.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index b189a061da4..e9e4157a23f 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -18,9 +18,9 @@ # along with this program. If not, see . # ############################################################################## + from osv import fields, osv from os.path import join as opj -import netsvc import tools class l10n_installer(osv.osv_memory): @@ -35,9 +35,9 @@ class l10n_installer(osv.osv_memory): } def execute_simple(self, cr, uid, ids, context=None): + res = super(l10n_installer, self).execute_simple(cr, uid, ids, context=context) if context is None: context = {} - fy_obj = self.pool.get('account.fiscalyear') for res in self.read(cr, uid, ids, context=context): if res['charts'] =='l10n_in' and res['company_type']=='public_company': path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) @@ -46,25 +46,7 @@ class l10n_installer(osv.osv_memory): if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if 'date_start' in res and 'date_stop' in res: - f_ids = fy_obj.search(cr, uid, [('date_start', '<=', res['date_start']), ('date_stop', '>=', res['date_stop']), ('company_id', '=', res['company_id'][0])], context=context) - if not f_ids: - name = code = res['date_start'][:4] - if int(name) != int(res['date_stop'][:4]): - name = res['date_start'][:4] +'-'+ res['date_stop'][:4] - code = res['date_start'][2:4] +'-'+ res['date_stop'][2:4] - vals = { - 'name': name, - 'code': code, - 'date_start': res['date_start'], - 'date_stop': res['date_stop'], - 'company_id': res['company_id'][0] - } - fiscal_id = fy_obj.create(cr, uid, vals, context=context) - if res['period'] == 'month': - fy_obj.create_period(cr, uid, [fiscal_id]) - elif res['period'] == '3months': - fy_obj.create_period3(cr, uid, [fiscal_id]) + path.close() + return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/installer_view.xml b/addons/l10n_in/installer_view.xml index cfac5ed8513..63dbe44eabd 100644 --- a/addons/l10n_in/installer_view.xml +++ b/addons/l10n_in/installer_view.xml @@ -1,3 +1,4 @@ + diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml deleted file mode 100644 index d18d2b801e0..00000000000 --- a/addons/l10n_in/l10n_in_chart.xml +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - - - Indian Chart of Account - 0 - view - - - - - - Balance Sheet - IA_AC0 - view - - - - - - - Assets - IA_AC01 - view - - - - - - - Current Assets - IA_AC011 - view - - - - - - - Bank Account - IA_AC0111 - liquidity - - - - - - - Cash In Hand Account - IA_AC0112 - view - - - - - - - Cash Account - IA_AC01121 - view - - - - - - - Deposit Account - IA_AC0113 - other - - - - - - - Loan & Advance(Assets) Account - IA_AC0114 - other - - - - - - - Total Sundry Debtors Account - IA_AC0116 - view - - - - - - - Sundry Debtors Account - IA_AC01161 - receivable - - - - - - - Fixed Assets - IA_AC012 - other - - - - - - - Investment - IA_AC013 - other - - - - - - - Misc. Expenses(Asset) - IA_AC014 - other - - - - - - - Liabilities - IA_AC02 - view - - - - - - - Current Liabilities - IA_AC021 - view - - - - - - - Duties & Taxes - IA_AC0211 - other - - - - - - - Provision - IA_AC0212 - other - - - - - - - Total Sundry Creditors - IA_AC0213 - view - - - - - - - Sundry Creditors Account - IA_AC02131 - payable - - - - - - - Branch/Division - IA_AC022 - other - - - - - - - Share Holder/Owner Fund - IA_AC023 - view - - - - - - - Capital Account - IA_AC0231 - other - - - - - - - Reserve and Profit/Loss Account - IA_AC0232 - other - - - - - - - Loan(Liability) Account - IA_AC024 - view - - - - - - - Bank OD Account - IA_AC0241 - other - - - - - - - Secured Loan Account - IA_AC0242 - other - - - - - - - Unsecured Loan Account - IA_AC0243 - other - - - - - - - Suspense Account - IA_AC025 - other - - - - - - - - Profit And Loss Account - IA_AC1 - view - - - - - - - Expense - IA_AC11 - view - - - - - - - Direct Expenses - IA_AC111 - other - - - - - - - Indirect Expenses - IA_AC112 - other - - - - - - - Purchase - IA_AC113 - other - - - - - - - Opening Stock - IA_AC114 - other - - - - - - Salary Expenses - IA_AC115 - other - - - - - - - - Income - IA_AC12 - view - - - - - - - Direct Incomes - IA_AC121 - other - - - - - - - Indirect Incomes - IA_AC122 - other - - - - - - - Sales Account - IA_AC123 - other - - - - - - Goods Given Account - IA_AC124 - other - - - - - - - - - Tax - - - - Tax Balance to Pay - - - - - Tax Due (Tax to pay) - - - - - Tax Payable - - - - - Tax Bases - - - - - - Base of Taxed Sales - - - - - - Base of Taxed Purchases - - - - - OPJ - Opening Journal - situation - - - - - India - Chart of Accounts - - - - - - - - - - - - - diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_partnership_private_chart.xml index f5185d85426..6e2a764d64f 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_partnership_private_chart.xml @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ - + Balance Sheet 1 view @@ -24,183 +24,183 @@ - + Assets 10 view - + - + Cash 101 liquidity - + Checking account balance (as shown in company records), currency, coins, checks received from customers but not yet deposited. - + Accounts Receivable 120 receivable - + Amounts owed to the company for services performed or products sold but not yet paid for. - + Merchandise Inventory 140 other - + Cost of merchandise purchased but has not yet been sold. - + Supplies 150 other - + Cost of supplies that have not yet been used. Supplies that have been used are recorded in Supplies Expense. - + Prepaid Insurance 160 other - + Cost of insurance that is paid in advance and includes a future accounting period. - + Land 170 other - + Cost to acquire and prepare land for use by the company. - + Buildings 175 other - + Cost to purchase or construct buildings for use by the company. - + Accumulated Depreciation - Buildings 178 other - + Amount of the buildings' cost that has been allocated to Depreciation Expense since the time the building was acquired. - + Equipment 180 other - + Cost to acquire and prepare equipment for use by the company. - + Accumulated Depreciation - Equipment 188 other - + Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. - + Liabilities 20 view - + - + Notes Payable 210 other - + The amount of principal due on a formal written promise to pay. Loans from banks are included in this account. - + Accounts Payable 215 payable - + Amount owed to suppliers who provided goods and services to the company but did not require immediate payment in cash. - + Wages Payable 220 other - + Amount owed to employees for hours worked but not yet paid. - + Interest Payable 230 other - + Amount owed for interest on Notes Payable up until the date of the balance sheet. This is computed by multiplying the amount of the note times the effective interest rate times the time period. - + Unearned Revenues 240 other - + Amounts received in advance of delivering goods or providing services. When the goods are delivered or services are provided, this liability amount decreases. - + Mortgage Loan Payable 250 other - + A formal loan that involves a lien on real estate until the loan is repaid. @@ -212,7 +212,7 @@ view - + - + Profit And Loss 3 view @@ -248,186 +248,186 @@ - + Income 30 view - + - + Operating Revenue Accounts 31 view - + - + Service Revenues 310 other - + Amounts earned from providing services to clients, either for cash or on credit. When a service is provided on credit, both this account and Accounts Receivable will increase. When a service is provided for immediate cash, both this account and Cash will increase. - + Product Sales 311 other - + Sales of product account - + Non-Operating Revenue and Gains 80 view - + - + Interest Revenues 810 other - + Interest and dividends earned on bank accounts, investments or notes receivable. This account is increased when the interest is earned and either Cash or Interest Receivable is also increased. - + Gain on Sale of Assets 811 other - + Occurs when the company sells one of its assets (other than inventory) for more than the asset's book value. - + Expense 50 view - + - + Operating Expense Accounts 51 view - + - + Salaries Expense 500 other - + Expenses incurred for the work performed by salaried employees during the accounting period. These employees normally receive a fixed amount on a weekly, monthly, or annual basis. - + Wages Expense 510 other - + Expenses incurred for the work performed by non-salaried employees during the accounting period. These employees receive an hourly rate of pay. - + Supplies Expense 540 other - + Cost of supplies used up during the accounting period. - + Rent Expense 560 other - + Cost of occupying rented facilities during the accounting period. - + Utilities Expense 570 other - + Costs for electricity, heat, water, and sewer that were used during the accounting period. - + Telephone Expense 576 other - + Cost of telephone used during the current accounting period. - + Advertising Expense 610 other - + Costs incurred by the company during the accounting period for ads, promotions, and other selling and expenses (other than salaries). - + Depreciation Expense 750 other - + Cost of long-term assets allocated to expense during the current accounting period. - + Non-Operating Expenses and Losses 90 view - + @@ -436,7 +436,7 @@ other - + Occurs when the company sells one of its assets (other than inventory) for less than the asset's book value. @@ -446,12 +446,12 @@ India - Chart of Accounts for Partnership/Private Firm - - - - - - + + + + + + diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_firm_chart.xml index 8e84d9b8d79..9e72ec9569c 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_firm_chart.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml index 17bd975d140..19d7df181f7 100644 --- a/addons/l10n_in/l10n_in_wizard.xml +++ b/addons/l10n_in/l10n_in_wizard.xml @@ -1,3 +1,4 @@ + diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml index 568d480eb86..14f4636cf32 100644 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ b/addons/l10n_in/tax/private_exice_duty.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml index 1ce8cbfe74c..1a36cf4cc0f 100644 --- a/addons/l10n_in/tax/private_service.xml +++ b/addons/l10n_in/tax/private_service.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml index d717201b577..9f917a329f0 100644 --- a/addons/l10n_in/tax/private_vat.xml +++ b/addons/l10n_in/tax/private_vat.xml @@ -9,7 +9,7 @@ payable - + diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml index dc89d3d3fee..a221ff1317b 100644 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ b/addons/l10n_in/tax/privete_sale_tax.xml @@ -9,7 +9,7 @@ payable - + From 29b1abbe04b5e98d891d08a76c093dd6778fc871 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Sat, 2 Jun 2012 17:36:56 +0530 Subject: [PATCH 012/106] [IMP] l10n_in: Improve code for Create template tax from Install chart of account wizard added new tax template xml file bzr revid: jap@tinyerp.com-20120602120656-4a2itir1joo10x3d --- addons/l10n_in/account_multi_chart_wizard.py | 91 ++++--- addons/l10n_in/installer.py | 25 +- .../l10n_in_private_firm_tax_template.xml | 224 +++++++++++++++++ .../l10n_in_public_firm_tax_template.xml | 231 ++++++++++++++++++ addons/l10n_in/tax/private_exice_duty.xml | 60 ----- addons/l10n_in/tax/private_service.xml | 57 ----- addons/l10n_in/tax/private_vat.xml | 101 -------- addons/l10n_in/tax/privete_sale_tax.xml | 58 ----- .../l10n_in/tax/public_firm_excise_duty.xml | 57 ----- addons/l10n_in/tax/public_firm_sales_tax.xml | 48 ---- addons/l10n_in/tax/public_firm_service.xml | 58 ----- addons/l10n_in/tax/public_firm_vat.xml | 99 -------- 12 files changed, 523 insertions(+), 586 deletions(-) create mode 100644 addons/l10n_in/l10n_in_private_firm_tax_template.xml create mode 100644 addons/l10n_in/l10n_in_public_firm_tax_template.xml delete mode 100644 addons/l10n_in/tax/private_exice_duty.xml delete mode 100644 addons/l10n_in/tax/private_service.xml delete mode 100644 addons/l10n_in/tax/private_vat.xml delete mode 100644 addons/l10n_in/tax/privete_sale_tax.xml delete mode 100644 addons/l10n_in/tax/public_firm_excise_duty.xml delete mode 100644 addons/l10n_in/tax/public_firm_sales_tax.xml delete mode 100644 addons/l10n_in/tax/public_firm_service.xml delete mode 100644 addons/l10n_in/tax/public_firm_vat.xml diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index 058c2a41617..b9c242312a6 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -18,7 +18,7 @@ # along with this program. If not, see . # ############################################################################## - +from tools.translate import _ from osv import fields, osv from os.path import join as opj import tools @@ -45,45 +45,56 @@ class account_multi_charts_wizard(osv.osv_memory): elif data.name == 'India - Chart of Accounts for Partnership/Private Firm': res['value'].update({'sales_tax': True,'vat':True}) return res - - def execute(self, cr, uid, ids, context=None): - multichart_data = self.browse(cr, uid, ids[0], context=context) - if multichart_data.chart_template_id.name == 'India - Chart of Accounts for Public Firm': - if multichart_data.sales_tax: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_sales_tax.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.vat: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_vat.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.service_tax: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_service.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.excise_duty: - path = tools.file_open(opj('l10n_in', 'tax', 'public_firm_excise_duty.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - elif multichart_data.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': - if multichart_data.sales_tax: - path = tools.file_open(opj('l10n_in', 'tax', 'privete_sale_tax.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.vat: - path = tools.file_open(opj('l10n_in', 'tax', 'private_vat.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.service_tax: - path = tools.file_open(opj('l10n_in', 'tax', 'private_service.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - if multichart_data.excise_duty: - path = tools.file_open(opj('l10n_in', 'tax', 'private_exice_duty.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() - res = super(account_multi_charts_wizard, self).execute(cr, uid, ids, context=context) - return res + + def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None): + res = super(account_multi_charts_wizard, self)._load_template(cr, uid, template_id, company_id, code_digits, obj_wizard, account_ref, taxes_ref, tax_code_ref, context=context) + template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context) + obj_tax_code_template = self.pool.get('account.tax.code.template') + obj_tax_temp = self.pool.get('account.tax.template') + obj_tax = self.pool.get('account.tax') + tax_code_ref.update(obj_tax_code_template.generate_tax_code(cr, uid, template.tax_code_root_id.id, company_id, context=context)) + if obj_wizard.sales_tax == False and obj_wizard.excise_duty == False and obj_wizard.vat == False and obj_wizard.service_tax == False: + raise osv.except_osv(_('Error !'), _('Select Tax to Install')) + # Unlink the Tax for current company + tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) + obj_tax.unlink(cr, uid, tax_ids, context=context) + #Create new Tax as per selected from wizard + if obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Public Firm': + if obj_wizard.sales_tax: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.vat: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.service_tax: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax','Service Tax - %2','Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.excise_duty: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty','Excise Duty - %2','Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + + elif obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': + if obj_wizard.sales_tax: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.vat: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.service_tax: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + if obj_wizard.excise_duty: + tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) + tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + return account_ref, taxes_ref, tax_code_ref account_multi_charts_wizard() diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index e9e4157a23f..2d9a2a3d39b 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -27,9 +27,9 @@ class l10n_installer(osv.osv_memory): _inherit = 'account.installer' _columns = { 'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'), - ('public_company', 'Public Firm')], 'Company Type', required=True), + ('public_company', 'Public Firm')], 'Company Type', required=True, + help='Select your company Type according to your need to install account chart'), } - _defaults = { 'company_type': 'public_company', } @@ -40,13 +40,22 @@ class l10n_installer(osv.osv_memory): context = {} for res in self.read(cr, uid, ids, context=context): if res['charts'] =='l10n_in' and res['company_type']=='public_company': - path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) + acc_file_path.close() + + tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_tax_template.xml')) + tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) + tax_file_path.close() + if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': - path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) - tools.convert_xml_import(cr, 'l10n_in', path, {}, 'init', True, None) - path.close() + acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) + tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) + acc_file_path.close() + + tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_firm_tax_template.xml')) + tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) + tax_file_path.close() return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/l10n_in_private_firm_tax_template.xml b/addons/l10n_in/l10n_in_private_firm_tax_template.xml new file mode 100644 index 00000000000..564eb41fdfd --- /dev/null +++ b/addons/l10n_in/l10n_in_private_firm_tax_template.xml @@ -0,0 +1,224 @@ + + + + + + + + Sales Tax Payable + 216 + payable + + + + + + + VAT Payable + 217 + payable + + + + + + + Service Tax Payable + 218 + payable + + + + + + + Exice Duty Payable + 219 + payable + + + + + + + + + Sale Tax - 15% + Sale Tax - 15% + + 0.15 + percent + sale + + + + + + + + + + + + Sale Tax -12% + Sale Tax - 12% + + 0.12 + percent + sale + + + + + + + + + + + + + + VAT - 5% + VAT - 5% + + 0.05 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + + VAT - 15% + VAT - 15% + + 0.15 + percent + all + + + + 1 + + 1 + + 1 + + 1 + + + + + + VAT - 8% + VAT - 8% + + 0.8 + percent + all + + + + + + + + + + + + + + Exice Duty - 10.30% + Excise Duty + + 0.10 + percent + sale + + + + 1 + + 1 + + 1 + + 1 + + + + + + Excise duty -10% -%2 + Excise Duty - %2 + 0.02 + percent + sale + + + + + + Excise duty - 10% - %1 + Excise Duty - 1% + 0.01 + percent + sale + + + + + + + + all + Service - 12% + Service Tax + + 0.12 + percent + + + + + + + + + + + + Service - 12% - %2 + Service Tax - %2 + 0.02 + percent + all + + + + + + Service - 12% - 1% + Service Tax - %1 + 0.01 + percent + all + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/l10n_in_public_firm_tax_template.xml b/addons/l10n_in/l10n_in_public_firm_tax_template.xml new file mode 100644 index 00000000000..6dd08be944b --- /dev/null +++ b/addons/l10n_in/l10n_in_public_firm_tax_template.xml @@ -0,0 +1,231 @@ + + + + + + + + + Sales Tax Payable + 24600 + payable + + + + + + + VAT Payable + 24800 + payable + + + + + + + Exice Duty Payable + 24900 + payable + + + + + + + Service Tax Payable + 24700 + payable + + + + + + + + + + Sale Tax - 15% + Sale Tax - 15% + + + + 0.15 + percent + sale + + + + + + + + + Sale Tax - 12% + Sale Tax - 12% + + + + 0.12 + percent + sale + + + + + + + + + + + VAT - 5% + VAT - 5% + + + + 0.05 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT - 15% + VAT - 15% + + + + 0.15 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT - 8% + VAT - 8% + + + + 0.08 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + + + Service - 12% + Service Tax + + + + 0.12 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + Service - 12% - 2% + Service Tax - %2 + 0.02 + percent + all + + + + + + Service - 12% - 1% + Service Tax - %1 + 0.01 + percent + all + + + + + + + + Excise duty - 10% + Excise Duty + + + + 0.10 + percent + sale + + 1 + + 1 + + 1 + + 1 + + + + + + Excise duty - 10% - 2% + Excise Duty - %2 + 0.02 + percent + sale + + + + + + Excise duty - 10% - 1% + Excise Duty - 1% + 0.01 + percent + sale + + + + + + \ No newline at end of file diff --git a/addons/l10n_in/tax/private_exice_duty.xml b/addons/l10n_in/tax/private_exice_duty.xml deleted file mode 100644 index 14f4636cf32..00000000000 --- a/addons/l10n_in/tax/private_exice_duty.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - Exice Duty Payable - 219 - payable - - - - - - - Exice Duty - 10.30% - 10 - Exice Duty - - 0.10 - percent - sale - - - - 1 - - 1 - - 1 - - 1 - - - - - - 11 - Excise duty -10% -%2 - Excise duty - 2% - 0.02 - percent - sale - - - - - - 11 - Excise duty - 10% - %1 - Excise duty - 1% - 0.01 - percent - sale - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/private_service.xml b/addons/l10n_in/tax/private_service.xml deleted file mode 100644 index 1a36cf4cc0f..00000000000 --- a/addons/l10n_in/tax/private_service.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Service Tax Payable - 218 - payable - - - - - - - all - Service - 12% - Service - - 0.12 - percent - - - - 1 - - 1 - - 1 - - 1 - - - - - - Service - 12% - %2 - Service - 2% - 0.02 - percent - all - - - - - - Service - 12% - 1% - Service - 1% - 0.01 - percent - all - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/private_vat.xml b/addons/l10n_in/tax/private_vat.xml deleted file mode 100644 index 9f917a329f0..00000000000 --- a/addons/l10n_in/tax/private_vat.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - VAT Payable - 217 - payable - - - - - - - 30 - VAT - 4% - VAT - - 0.04 - percent - all - - - - 1 - - 1 - - 1 - - 1 - - - - - - VAT - 4% - %1 - VAT - %1 - 0.01 - percent - all - - - - - - VAT - 12.5% - VAT - 12.5% - - 0.125 - percent - all - - - - 1 - - 1 - - 1 - - 1 - - - - - - VAT - 12.5%- %2.5 - VAT (%2.5) - 0.025 - percent - sale - - - - - - VAT - 8% - VAT - 8% - - 0.8 - percent - all - - - - 1 - - 1 - - 1 - - 1 - - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/privete_sale_tax.xml b/addons/l10n_in/tax/privete_sale_tax.xml deleted file mode 100644 index a221ff1317b..00000000000 --- a/addons/l10n_in/tax/privete_sale_tax.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - Sales Tax Payable - 216 - payable - - - - - - - Sale Tax - 15% - Sale Tax - 15% - - 0.15 - percent - sale - - - - 1 - - 1 - - 1 - - 1 - - - - - - Sale Tax -12% - Sale Tax - 12% - - 0.12 - percent - sale - - - - 1 - - 1 - - 1 - - 1 - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_excise_duty.xml b/addons/l10n_in/tax/public_firm_excise_duty.xml deleted file mode 100644 index 031c92307fd..00000000000 --- a/addons/l10n_in/tax/public_firm_excise_duty.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - Exice Duty Payable - 24900 - payable - - - - - - - Excise duty - 10% - Excise duty - - - - 0.10 - percent - sale - - 1 - - 1 - - 1 - - 1 - - - - - - Excise duty - 10% - 2% - Excise duty - %2 - 0.02 - percent - sale - - - - - - Excise duty - 10% - 1% - Excise duty - 1% - 0.01 - percent - sale - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_sales_tax.xml b/addons/l10n_in/tax/public_firm_sales_tax.xml deleted file mode 100644 index 27d768aba7a..00000000000 --- a/addons/l10n_in/tax/public_firm_sales_tax.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - Sales Tax Payable - 24600 - payable - - - - - - - Sale Tax - 15% - Sale Tax - 15% - - - - 0.15 - percent - sale - - - - - - - - - Sale Tax - 12% - Sale Tax - 12% - - - - 0.12 - percent - sale - - - - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_service.xml b/addons/l10n_in/tax/public_firm_service.xml deleted file mode 100644 index f57eee6796b..00000000000 --- a/addons/l10n_in/tax/public_firm_service.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - Service Tax Payable - 24700 - payable - - - - - - - Service - 12% - Service - - - - 0.12 - percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - Service - 12% - 2% - Service (%2) - 0.02 - percent - all - - - - - - Service - 12% - 1% - Service (%1) - 0.01 - percent - all - - - - - - - \ No newline at end of file diff --git a/addons/l10n_in/tax/public_firm_vat.xml b/addons/l10n_in/tax/public_firm_vat.xml deleted file mode 100644 index 9ffe2b9d9ca..00000000000 --- a/addons/l10n_in/tax/public_firm_vat.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - VAT Payable - 24800 - payable - - - - - - - VAT - 4% - VAT - 4% - - - - 0.04 - percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - VAT - 4% -1% - VAT - 1% - 0.01 - percent - all - - - - - - VAT - 12.5% - VAT - 12.5% - - - - 0.125 - percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - VAT - 12.5% - %2.5 - VAT - 12.5% - %2.5 - 0.025 - percent - all - - - - - - VAT - 8% - VAT - 8% - - - - 0.08 - percent - all - - 1 - - 1 - - 1 - - 1 - - - - - - \ No newline at end of file From a7bfa42417a3047600b8357e53c4f8fdc1e0b92e Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Mon, 4 Jun 2012 10:34:39 +0530 Subject: [PATCH 013/106] [IMP] l10n_in: Improve code in installer.py bzr revid: jap@tinyerp.com-20120604050439-sja8sl3j92co825d --- addons/l10n_in/installer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index 2d9a2a3d39b..23d03bfc87d 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -28,7 +28,7 @@ class l10n_installer(osv.osv_memory): _columns = { 'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'), ('public_company', 'Public Firm')], 'Company Type', required=True, - help='Select your company Type according to your need to install account chart'), + help='Select your company Type according to your need to install Chart Of Account'), } _defaults = { 'company_type': 'public_company', @@ -48,7 +48,7 @@ class l10n_installer(osv.osv_memory): tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) tax_file_path.close() - if res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': + elif res['charts'] =='l10n_in' and res['company_type']=='partnership_private_company': acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) acc_file_path.close() From 088e65bd0b044dc9fb148e8e80927f56d938dd84 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 5 Jun 2012 11:34:41 +0530 Subject: [PATCH 014/106] [IMP] l10n_in: Improve Usability and link account with tax bzr revid: jap@tinyerp.com-20120605060441-52p0hoksc2hr3ey6 --- addons/l10n_in/account_multi_chart_wizard.py | 46 +++++++++++++------ .../account_multi_chart_wizard_view.xml | 11 ++--- addons/l10n_in/installer.py | 2 +- .../l10n_in_private_firm_tax_template.xml | 36 +++++++-------- 4 files changed, 55 insertions(+), 40 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index b9c242312a6..a7e018b2cdb 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -1,8 +1,8 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +# OpenERP, Open Source Business Applications +# Copyright (C) 2004-2012 OpenERP S.A. (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -24,7 +24,8 @@ from os.path import join as opj import tools class account_multi_charts_wizard(osv.osv_memory): - _inherit ='wizard.multi.charts.accounts' + _name = 'wizard.multi.charts.accounts' + _inherit = 'wizard.multi.charts.accounts' _columns = { 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you install Sales Tax'), 'vat': fields.boolean('VAT', help='If this field is true it allows install use VAT'), @@ -45,57 +46,72 @@ class account_multi_charts_wizard(osv.osv_memory): elif data.name == 'India - Chart of Accounts for Partnership/Private Firm': res['value'].update({'sales_tax': True,'vat':True}) return res - + def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None): res = super(account_multi_charts_wizard, self)._load_template(cr, uid, template_id, company_id, code_digits, obj_wizard, account_ref, taxes_ref, tax_code_ref, context=context) template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context) - obj_tax_code_template = self.pool.get('account.tax.code.template') obj_tax_temp = self.pool.get('account.tax.template') obj_tax = self.pool.get('account.tax') - tax_code_ref.update(obj_tax_code_template.generate_tax_code(cr, uid, template.tax_code_root_id.id, company_id, context=context)) if obj_wizard.sales_tax == False and obj_wizard.excise_duty == False and obj_wizard.vat == False and obj_wizard.service_tax == False: raise osv.except_osv(_('Error !'), _('Select Tax to Install')) - # Unlink the Tax for current company - tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) - obj_tax.unlink(cr, uid, tax_ids, context=context) - #Create new Tax as per selected from wizard if obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Public Firm': + # Unlink the Tax for current company + tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) + obj_tax.unlink(cr, uid, tax_ids, context=context) + #Create new Tax as per selected from wizard if obj_wizard.sales_tax: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.vat: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.service_tax: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax','Service Tax - %2','Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.excise_duty: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty','Excise Duty - %2','Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) elif obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': + # Unlink the Tax for current company + tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) + obj_tax.unlink(cr, uid, tax_ids, context=context) + #Create new Tax as per selected from wizard if obj_wizard.sales_tax: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.vat: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.service_tax: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) if obj_wizard.excise_duty: tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) return account_ref, taxes_ref, tax_code_ref - + + def _tax_account(self, cr, uid, account_ref, taxes_ref, context=None): + obj_tax = self.pool.get('account.tax') + for key,value in taxes_ref['account_dict'].items(): + obj_tax.write(cr, uid, [key], { 'account_collected_id': account_ref.get(value['account_collected_id'], False), 'account_paid_id': account_ref.get(value['account_paid_id'], False),}) + return True + account_multi_charts_wizard() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index 899d81fc65b..dde9e5981ca 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -9,12 +9,11 @@ - - - - - - + + + + + diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index 23d03bfc87d..7d4cb04b803 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -28,7 +28,7 @@ class l10n_installer(osv.osv_memory): _columns = { 'company_type':fields.selection([('partnership_private_company', 'Partnership/Private Firm'), ('public_company', 'Public Firm')], 'Company Type', required=True, - help='Select your company Type according to your need to install Chart Of Account'), + help='Company Type is used to install Indian chart of accounts as per your type of business.'), } _defaults = { 'company_type': 'public_company', diff --git a/addons/l10n_in/l10n_in_private_firm_tax_template.xml b/addons/l10n_in/l10n_in_private_firm_tax_template.xml index 564eb41fdfd..d3d627b54da 100644 --- a/addons/l10n_in/l10n_in_private_firm_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_firm_tax_template.xml @@ -4,7 +4,7 @@ - + Sales Tax Payable 216 payable @@ -13,7 +13,7 @@ - + VAT Payable 217 payable @@ -22,7 +22,7 @@ - + Service Tax Payable 218 payable @@ -31,7 +31,7 @@ - + Exice Duty Payable 219 payable @@ -50,8 +50,8 @@ 0.15 percent sale - - + + @@ -67,8 +67,8 @@ 0.12 percent sale - - + + @@ -86,8 +86,8 @@ 0.05 percent all - - + + 1 @@ -107,8 +107,8 @@ 0.15 percent all - - + + 1 @@ -128,8 +128,8 @@ 0.8 percent all - - + + @@ -147,8 +147,8 @@ 0.10 percent sale - - + + 1 @@ -190,8 +190,8 @@ 0.12 percent - - + + From a5db806929c6265eb891b6017746ae04bcedb194 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Fri, 8 Jun 2012 18:36:38 +0530 Subject: [PATCH 015/106] [IMP] l10n_in: Improve code bzr revid: jap@tinyerp.com-20120608130638-0zii119hfa340wgv --- addons/l10n_in/account_multi_chart_wizard.py | 49 ++++++------------- .../account_multi_chart_wizard_view.xml | 11 +++-- 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py index a7e018b2cdb..78fa5fe23da 100644 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ b/addons/l10n_in/account_multi_chart_wizard.py @@ -44,7 +44,7 @@ class account_multi_charts_wizard(osv.osv_memory): if data.name == 'India - Chart of Accounts for Public Firm': res['value'].update({'sales_tax': True,'vat':True, 'service_tax':True, 'excise_duty': True}) elif data.name == 'India - Chart of Accounts for Partnership/Private Firm': - res['value'].update({'sales_tax': True,'vat':True}) + res['value'].update({'sales_tax': True,'vat':True, 'service_tax':False, 'excise_duty': False}) return res def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None): @@ -52,58 +52,37 @@ class account_multi_charts_wizard(osv.osv_memory): template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context) obj_tax_temp = self.pool.get('account.tax.template') obj_tax = self.pool.get('account.tax') - if obj_wizard.sales_tax == False and obj_wizard.excise_duty == False and obj_wizard.vat == False and obj_wizard.service_tax == False: - raise osv.except_osv(_('Error !'), _('Select Tax to Install')) + tax_temp_ids = [] if obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Public Firm': # Unlink the Tax for current company tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) obj_tax.unlink(cr, uid, tax_ids, context=context) #Create new Tax as per selected from wizard if obj_wizard.sales_tax: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.vat: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.service_tax: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax','Service Tax - %2','Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.excise_duty: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty','Excise Duty - %2','Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) elif obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': # Unlink the Tax for current company tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) obj_tax.unlink(cr, uid, tax_ids, context=context) #Create new Tax as per selected from wizard if obj_wizard.sales_tax: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.vat: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.service_tax: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) if obj_wizard.excise_duty: - tax_temp_ids = obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context) - tax_temp_data = obj_tax_temp.browse(cr, uid, tax_temp_ids, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) + tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) + for temp in tax_temp_ids: + tax_temp_data = obj_tax_temp.browse(cr, uid, temp, context=context) + taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) + self._tax_account(cr, uid, account_ref, taxes_ref, context=context) return account_ref, taxes_ref, tax_code_ref def _tax_account(self, cr, uid, account_ref, taxes_ref, context=None): diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml index dde9e5981ca..d864a01a3a8 100644 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ b/addons/l10n_in/account_multi_chart_wizard_view.xml @@ -9,11 +9,12 @@ - - - - - + + + + + + From 96333130201c0db03f284fe85cf29d9d6d55defb Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 12 Jun 2012 12:17:12 +0530 Subject: [PATCH 016/106] [IMP] l10n_in: Remove file l10n_in/account_multi_chart_wizard.py and l10n_in/account_multi_chart_wizard_view.xml bzr revid: jap@tinyerp.com-20120612064712-tviq139uo8yyd1zs --- addons/l10n_in/__init__.py | 1 - addons/l10n_in/__openerp__.py | 1 - addons/l10n_in/account_multi_chart_wizard.py | 96 ------------------- .../account_multi_chart_wizard_view.xml | 22 ----- 4 files changed, 120 deletions(-) delete mode 100644 addons/l10n_in/account_multi_chart_wizard.py delete mode 100644 addons/l10n_in/account_multi_chart_wizard_view.xml diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index db0c795ae73..f97bda7fb89 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -28,6 +28,5 @@ ############################################################################## import installer -import account_multi_chart_wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index cbacb5e5ac3..630d99ca8db 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -37,7 +37,6 @@ Indian accounting chart and localization. "demo_xml": [], "update_xml": [ "account_tax_code_template.xml", - "account_multi_chart_wizard_view.xml", "l10n_in_wizard.xml", "installer_view.xml", ], diff --git a/addons/l10n_in/account_multi_chart_wizard.py b/addons/l10n_in/account_multi_chart_wizard.py deleted file mode 100644 index 78fa5fe23da..00000000000 --- a/addons/l10n_in/account_multi_chart_wizard.py +++ /dev/null @@ -1,96 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Business Applications -# Copyright (C) 2004-2012 OpenERP S.A. (). -# -# 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 tools.translate import _ -from osv import fields, osv -from os.path import join as opj -import tools - -class account_multi_charts_wizard(osv.osv_memory): - _name = 'wizard.multi.charts.accounts' - _inherit = 'wizard.multi.charts.accounts' - _columns = { - 'sales_tax': fields.boolean('Sales Tax', help='If this field is true it allows you install Sales Tax'), - 'vat': fields.boolean('VAT', help='If this field is true it allows install use VAT'), - 'service_tax': fields.boolean('Service Tax', help='If this field is true it allows you install Service tax'), - 'excise_duty': fields.boolean('Excise Duty', help='If this field is true it allows you install Excise duty'), - 'is_indian_chart': fields.boolean('Indian Chart?') - } - - def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): - res = super(account_multi_charts_wizard, self).onchange_chart_template_id(cr, uid, ids, chart_template_id, context=context) - data = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context) - if data.name in ('India - Chart of Accounts for Public Firm', 'India - Chart of Accounts for Partnership/Private Firm'): - res['value'].update({'is_indian_chart': True}) - else: - res['value'].update({'is_indian_chart': False}) - if data.name == 'India - Chart of Accounts for Public Firm': - res['value'].update({'sales_tax': True,'vat':True, 'service_tax':True, 'excise_duty': True}) - elif data.name == 'India - Chart of Accounts for Partnership/Private Firm': - res['value'].update({'sales_tax': True,'vat':True, 'service_tax':False, 'excise_duty': False}) - return res - - def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None): - res = super(account_multi_charts_wizard, self)._load_template(cr, uid, template_id, company_id, code_digits, obj_wizard, account_ref, taxes_ref, tax_code_ref, context=context) - template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context) - obj_tax_temp = self.pool.get('account.tax.template') - obj_tax = self.pool.get('account.tax') - tax_temp_ids = [] - if obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Public Firm': - # Unlink the Tax for current company - tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) - obj_tax.unlink(cr, uid, tax_ids, context=context) - #Create new Tax as per selected from wizard - if obj_wizard.sales_tax: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.vat: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.service_tax: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.excise_duty: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - elif obj_wizard.chart_template_id.name == 'India - Chart of Accounts for Partnership/Private Firm': - # Unlink the Tax for current company - tax_ids = obj_tax.search(cr, uid, [('company_id','=',company_id)], context=context) - obj_tax.unlink(cr, uid, tax_ids, context=context) - #Create new Tax as per selected from wizard - if obj_wizard.sales_tax: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Sale Tax - 15%','Sale Tax - 12%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.vat: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['VAT - 5%','VAT - 15%','VAT - 8%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.service_tax: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Service Tax', 'Service Tax - %2', 'Service Tax - %1']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - if obj_wizard.excise_duty: - tax_temp_ids.append(obj_tax_temp.search(cr, uid, [('name','in',['Excise Duty', 'Excise Duty - %2', 'Excise Duty - 1%']),('chart_template_id','=',obj_wizard.chart_template_id.id)], context=context)) - for temp in tax_temp_ids: - tax_temp_data = obj_tax_temp.browse(cr, uid, temp, context=context) - taxes_ref = obj_tax_temp._generate_tax(cr, uid, tax_temp_data, tax_code_ref, company_id, context=context) - self._tax_account(cr, uid, account_ref, taxes_ref, context=context) - return account_ref, taxes_ref, tax_code_ref - - def _tax_account(self, cr, uid, account_ref, taxes_ref, context=None): - obj_tax = self.pool.get('account.tax') - for key,value in taxes_ref['account_dict'].items(): - obj_tax.write(cr, uid, [key], { 'account_collected_id': account_ref.get(value['account_collected_id'], False), 'account_paid_id': account_ref.get(value['account_paid_id'], False),}) - return True - -account_multi_charts_wizard() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/account_multi_chart_wizard_view.xml b/addons/l10n_in/account_multi_chart_wizard_view.xml deleted file mode 100644 index d864a01a3a8..00000000000 --- a/addons/l10n_in/account_multi_chart_wizard_view.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Generate Chart of Accounts from a Chart Template - wizard.multi.charts.accounts - form - - - - - - - - - - - - - - - From 2911d6a8c5532310e07b3b593d78c43653190137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Thu, 21 Jun 2012 12:40:18 +0200 Subject: [PATCH 017/106] [IMP] Provide _prepare* hooks in bank statement object for the entries creations of account.move.line from a statement line bzr revid: joel.grandguillaume@camptocamp.com-20120621104018-ryylbaxh6696e0rc --- addons/account/account_bank_statement.py | 247 +++++++++++++++++------ 1 file changed, 184 insertions(+), 63 deletions(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 1f47a6be9bd..97d10bfc022 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -205,7 +205,182 @@ class account_bank_statement(osv.osv): def button_dummy(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {}, context=context) + def _prepare_move(self, cr, uid, st_line, st_line_number, context=None): + """Prepare the dict of values to create the move from a + statement line. This method may be overridden to implement custom + move generation (making sure to call super() to establish + a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param char st_line_number: will be used as the name of the generated account move + :return: dict of value to create() the account.move + """ + move_vals = { + 'journal_id': st_line.statement_id.journal_id.id, + 'period_id': st_line.statement_id.period_id.id, + 'date': st_line.date, + 'name': st_line_number, + 'ref': st_line.ref, + } + return move_vals + + def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, + context=None): + """Compute the args to build the dict of values to create the bank move line from a + statement line by calling the _prepare_move_line_vals. This method may be + overridden to implement custom move generation (making sure to call super() to + establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float amount: amount of the move line + :param int/long company_currency_id: ID of currency of the concerned company + :return: dict of value to create() the bank account.move.line + """ + anl_id = st_line.analytic_account_id and st_line.analytic_account_id.id or False + debit = ((amount<0) and -amount) or 0.0 + credit = ((amount>0) and amount) or 0.0 + cur_id = False + amt_cur = False + if st_line.statement_id.currency.id <> company_currency_id: + amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, + st.currency.id, amount, context=context) + amt_cur = -amount_cur + if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id: + cur_id = st_line.account_id.currency_id.id + amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, + st_line.account_id.currency_id.id, amount, context=context) + amt_cur = -amount_cur + + res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit, + amount_currency=amt_cur, currency_id=cur_id, analytic_id = anl_id, context=context) + return res + + def _get_counter_part_account(sefl, cr, uid, st_line, context=None): + """Retrieve the account to use in the counterpart move. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :return: int/long of the account.account to use as counterpart + """ + account_id = False + if st_line.amount >= 0: + account_id = st_line.statement_id.journal_id.default_credit_account_id.id + else: + account_id = st_line.statement_id.journal_id.default_debit_account_id.id + return account_id + + def _get_counter_part_partner(sefl, cr, uid, st_line, context=None): + """Retrieve the partner to use in the counterpart move. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :return: int/long of the res.partner to use as counterpart + """ + import pdb;pdb.set_trace() + partner_id = ((st_line.partner_id) and st_line.partner_id.id) or False + return partner_id + + + def _prepare_counterpart_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, + context=None): + """Compute the args to build the dict of values to create the counter part move line from a + statement line by calling the _prepare_move_line_vals. This method may be + overridden to implement custom move generation (making sure to call super() to + establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float amount: amount of the move line + :param int/long account_id: ID of account to use as counter part + :param int/long company_currency_id: ID of currency of the concerned company + :return: dict of value to create() the bank account.move.line + """ + account_id = self._get_counter_part_account(cr, uid, st_line, context=context) + partner_id = self._get_counter_part_partner(cr, uid, st_line, context=context) + debit = ((amount > 0) and amount) or 0.0 + credit = ((amount < 0) and -amount) or 0.0 + cur_id = False + amt_cur = False + if st_line.statement_id.currency.id <> company_currency_id: + amt_cur = st_line.amount + cur_id = st_line.statement_id.currency.id + res = self._prepare_move_line_vals(cr, uid, st_line, move_id, debit, credit, + amount_currency = amt_cur, currency_id = cur_id, account_id = account_id, + partner_id = partner_id, context=context) + return res + + def _prepare_move_line_vals(self, cr, uid, st_line, move_id, debit, credit, currency_id = False, + amount_currency= False, account_id = False, analytic_id = False, + partner_id = False, context=None): + """Prepare the dict of values to create the move line from a + statement line. All non-mandatory args will replace the default computed one. + This method may be overridden to implement custom move generation (making sure to + call super() to establish a clean extension chain). + + :param browse_record st_line: account.bank.statement.line record to + create the move from. + :param int/long move_id: ID of the account.move to link the move line + :param float debit: debit amount of the move line + :param float credit: credit amount of the move line + :param int/long currency_id: ID of currency of the move line to create + :param float amount_currency: amount of the debit/credit expressed in the currency_id + :param int/long account_id: ID of the account to use in the move line if different + from the statement line account ID + :param int/long analytic_id: ID of analytic account to put on the move line + :param int/long partner_id: ID of the partner to put on the move line + :return: dict of value to create() the account.move.line + """ + acc_id = (st_line.account_id) and st_line.account_id.id + cur_id = st_line.statement_id.currency.id + par_id = ((st_line.partner_id) and st_line.partner_id.id) or False + anl_acc_id = False + am_curr = False + amount_currency = False + if account_id: + acc_id = account_id + if currency_id: + cur_id = currency_id + if amount_currency: + am_curr = amount_currency + if analytic_id: + anl_acc_id = analytic_id + if partner_id: + par_id = partner_id + ml_val = { + 'name': st_line.name, + 'date': st_line.date, + 'ref': st_line.ref, + 'move_id': move_id, + 'partner_id': partner_id, + 'account_id': acc_id, + 'credit': credit, + 'debit': debit, + 'statement_id': st_line.statement_id.id, + 'journal_id': st_line.statement_id.journal_id.id, + 'period_id': st_line.statement_id.period_id.id, + 'currency_id': cur_id, + 'amount_currency': am_curr, + 'analytic_account_id': anl_acc_id, + } + return ml_val + def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None): + """Create the account move from the statement line using the _prepare_bank_move_line and + _prepare_counterpart_move_line hook methods. + :param int/long st_line: ID of the account.bank.statement.line to create the move from. + :param int/long company_currency_id: ID of the res.currency of the company + :param char st_line_number: will be used as the name of the generated account move + :return: ID of the account.move created + """ + if context is None: context = {} res_currency_obj = self.pool.get('res.currency') @@ -217,82 +392,28 @@ class account_bank_statement(osv.osv): context.update({'date': st_line.date}) - move_id = account_move_obj.create(cr, uid, { - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'date': st_line.date, - 'name': st_line_number, - 'ref': st_line.ref, - }, context=context) + move_vals = self._prepare_move(cr, uid, st_line, st_line_number, context=context) + move_id = account_move_obj.create(cr, uid, move_vals, context=context) account_bank_statement_line_obj.write(cr, uid, [st_line.id], { 'move_ids': [(4, move_id, False)] }) - torec = [] - if st_line.amount >= 0: - account_id = st.journal_id.default_credit_account_id.id - else: - account_id = st.journal_id.default_debit_account_id.id - acc_cur = ((st_line.amount<=0) and st.journal_id.default_debit_account_id) or st_line.account_id + context.update({ 'res.currency.compute.account': acc_cur, }) amount = res_currency_obj.compute(cr, uid, st.currency.id, company_currency_id, st_line.amount, context=context) - val = { - 'name': st_line.name, - 'date': st_line.date, - 'ref': st_line.ref, - 'move_id': move_id, - 'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False, - 'account_id': (st_line.account_id) and st_line.account_id.id, - 'credit': ((amount>0) and amount) or 0.0, - 'debit': ((amount<0) and -amount) or 0.0, - 'statement_id': st.id, - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'currency_id': st.currency.id, - 'analytic_account_id': st_line.analytic_account_id and st_line.analytic_account_id.id or False - } - - if st.currency.id <> company_currency_id: - amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, - st.currency.id, amount, context=context) - val['amount_currency'] = -amount_cur - - if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id: - val['currency_id'] = st_line.account_id.currency_id.id - amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, - st_line.account_id.currency_id.id, amount, context=context) - val['amount_currency'] = -amount_cur - - move_line_id = account_move_line_obj.create(cr, uid, val, context=context) + bank_move_val = self._prepare_bank_move_line(cr, uid, st_line, move_id, amount, + company_currency_id, context=context) + move_line_id = account_move_line_obj.create(cr, uid, bank_move_val, context=context) torec.append(move_line_id) - # Fill the secondary amount/currency - # if currency is not the same than the company - amount_currency = False - currency_id = False - if st.currency.id <> company_currency_id: - amount_currency = st_line.amount - currency_id = st.currency.id - account_move_line_obj.create(cr, uid, { - 'name': st_line.name, - 'date': st_line.date, - 'ref': st_line.ref, - 'move_id': move_id, - 'partner_id': ((st_line.partner_id) and st_line.partner_id.id) or False, - 'account_id': account_id, - 'credit': ((amount < 0) and -amount) or 0.0, - 'debit': ((amount > 0) and amount) or 0.0, - 'statement_id': st.id, - 'journal_id': st.journal_id.id, - 'period_id': st.period_id.id, - 'amount_currency': amount_currency, - 'currency_id': currency_id, - }, context=context) + counterpart_move_val = self._prepare_counterpart_move_line(cr, uid, st_line, move_id, + amount, company_currency_id, context=context) + account_move_line_obj.create(cr, uid, counterpart_move_val, context=context) for line in account_move_line_obj.browse(cr, uid, [x.id for x in account_move_obj.browse(cr, uid, move_id, From 28908bea003e11e2df7ccedc58f9a0fbee159bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=ABl=20Grand-Guillaume?= Date: Thu, 21 Jun 2012 13:49:16 +0200 Subject: [PATCH 018/106] [FIX] Remove pdb... no comment... bzr revid: joel.grandguillaume@camptocamp.com-20120621114916-a0uy3ipru8usgzo0 --- addons/account/account_bank_statement.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 97d10bfc022..ece18a016fe 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -283,7 +283,6 @@ class account_bank_statement(osv.osv): create the move from. :return: int/long of the res.partner to use as counterpart """ - import pdb;pdb.set_trace() partner_id = ((st_line.partner_id) and st_line.partner_id.id) or False return partner_id From ed8e667fcfc9f5cfd99da2d6fac31dd985b13a6b Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 28 Jun 2012 17:01:33 +0530 Subject: [PATCH 019/106] [FIX]changed tax reference in indian chart bzr revid: kbh@tinyerp.com-20120628113133-tone5ugzjqsorazq --- .../l10n_in_private_firm_tax_template.xml | 32 +++++++++---------- .../l10n_in_public_firm_tax_template.xml | 32 +++++++++---------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_firm_tax_template.xml b/addons/l10n_in/l10n_in_private_firm_tax_template.xml index 35e9ecc6cdb..5bff8157884 100644 --- a/addons/l10n_in/l10n_in_private_firm_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_firm_tax_template.xml @@ -54,8 +54,8 @@ - - + + @@ -71,8 +71,8 @@ - - + + @@ -88,8 +88,8 @@ 0.15 percent purchase - - + + @@ -110,9 +110,9 @@ 1 - + 1 - + 1 1 @@ -131,9 +131,9 @@ 1 - + 1 - + 1 1 @@ -151,8 +151,8 @@ - - + + @@ -173,9 +173,9 @@ 1 1 - + 1 - + 1 @@ -214,8 +214,8 @@ - - + + diff --git a/addons/l10n_in/l10n_in_public_firm_tax_template.xml b/addons/l10n_in/l10n_in_public_firm_tax_template.xml index d86ef360134..c597fe260f4 100644 --- a/addons/l10n_in/l10n_in_public_firm_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_firm_tax_template.xml @@ -55,8 +55,8 @@ sale - - + + @@ -71,8 +71,8 @@ sale - - + + @@ -87,8 +87,8 @@ 0.15 percent purchase - - + + @@ -107,9 +107,9 @@ 0.05 percent all - + 1 - + 1 1 @@ -128,9 +128,9 @@ 0.15 percent all - + 1 - + 1 1 @@ -149,9 +149,9 @@ 0.08 percent all - + 1 - + 1 1 @@ -172,13 +172,13 @@ 0.12 percent all - + 1 1 1 - + 1 @@ -215,13 +215,13 @@ 0.10 percent sale - + 1 1 1 - + 1 From 4abbbe1e6a0775f0b54aa4975c70b7940eb7d408 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 29 Jun 2012 12:38:29 +0530 Subject: [PATCH 020/106] [IMP] Clean code bzr revid: mra@tinyerp.com-20120629070829-whk2yy9ilhojf7vf --- addons/l10n_in/installer.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index 83a63fba122..5342e6c50bc 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -26,10 +26,10 @@ import tools class l10n_installer(osv.osv_memory): _inherit = 'account.installer' _columns = { - 'company_type': fields.selection([('public_company', 'Public Firm'), + 'company_type': fields.selection([('public_company', 'Public Firm'), ('partnership_private_company', 'Partnership/Private Firm') - ], 'Company Type', required=True, - help='Company Type is used to install Indian chart of accounts as per need of business.'), + ], 'Company Type', required=True, + help='Company Type is used to install Indian chart of accounts as per need of business.'), } _defaults = { 'company_type': 'public_company', @@ -42,7 +42,7 @@ class l10n_installer(osv.osv_memory): res = super(l10n_installer, self).execute_simple(cr, uid, ids, context=context) for chart in self.read(cr, uid, ids, context=context): - if chart['charts'] =='l10n_in' and chart['company_type']=='public_company': + if chart['charts'] == 'l10n_in' and chart['company_type'] == 'public_company': acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) acc_file_path.close() @@ -51,7 +51,7 @@ class l10n_installer(osv.osv_memory): tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) tax_file_path.close() - elif chart['charts'] =='l10n_in' and chart['company_type']=='partnership_private_company': + elif chart['charts'] == 'l10n_in' and chart['company_type'] == 'partnership_private_company': acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) acc_file_path.close() @@ -62,4 +62,4 @@ class l10n_installer(osv.osv_memory): return res -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 64e33e43e17e79a3dfc6106927a60adf05ad8b28 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Fri, 29 Jun 2012 14:14:29 +0530 Subject: [PATCH 021/106] [IMP] licence changed bzr revid: mra@tinyerp.com-20120629084429-0lsk4mvbdlanhvdj --- addons/l10n_in/__init__.py | 35 ++++++++++++++--------------------- addons/l10n_in/__openerp__.py | 4 ++-- addons/l10n_in/installer.py | 2 +- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index f97bda7fb89..975dcf5aa59 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -1,32 +1,25 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). # -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company +# 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 Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# 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. # -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # ############################################################################## + import installer # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index 630d99ca8db..06b254605a7 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -1,8 +1,8 @@ -# -*- encoding: utf-8 -*- +# -*- coding: utf-8 -*- ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# 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 diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/installer.py index 5342e6c50bc..3568f04d2dd 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/installer.py @@ -2,7 +2,7 @@ ############################################################################## # # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# 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 From 798f519842c2bce0eedf36aab1d983285fc13525 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Fri, 29 Jun 2012 19:00:41 +0530 Subject: [PATCH 022/106] [FIX]ids changed,tax added bzr revid: kbh@tinyerp.com-20120629133041-2tf9c0wkxm3waf2u --- addons/l10n_in/__init__.py | 2 +- addons/l10n_in/__openerp__.py | 4 +- addons/l10n_in/account_tax.xml | 19 -- addons/l10n_in/account_tax_code.xml | 36 --- .../{installer.py => l10n_in_installer.py} | 8 +- ...er_view.xml => l10n_in_installer_view.xml} | 0 ...te_chart.xml => l10n_in_private_chart.xml} | 213 ++++++++------ ...e.xml => l10n_in_private_tax_template.xml} | 195 ++++++------- ...irm_chart.xml => l10n_in_public_chart.xml} | 274 ++++++++++-------- ...te.xml => l10n_in_public_tax_template.xml} | 198 ++++++------- ...late.xml => l10n_in_tax_code_template.xml} | 10 +- 11 files changed, 489 insertions(+), 470 deletions(-) delete mode 100644 addons/l10n_in/account_tax.xml delete mode 100644 addons/l10n_in/account_tax_code.xml rename addons/l10n_in/{installer.py => l10n_in_installer.py} (95%) rename addons/l10n_in/{installer_view.xml => l10n_in_installer_view.xml} (100%) rename addons/l10n_in/{l10n_in_partnership_private_chart.xml => l10n_in_private_chart.xml} (74%) rename addons/l10n_in/{l10n_in_private_firm_tax_template.xml => l10n_in_private_tax_template.xml} (53%) rename addons/l10n_in/{l10n_in_public_firm_chart.xml => l10n_in_public_chart.xml} (68%) rename addons/l10n_in/{l10n_in_public_firm_tax_template.xml => l10n_in_public_tax_template.xml} (53%) rename addons/l10n_in/{account_tax_code_template.xml => l10n_in_tax_code_template.xml} (81%) diff --git a/addons/l10n_in/__init__.py b/addons/l10n_in/__init__.py index f97bda7fb89..a7105d9d278 100644 --- a/addons/l10n_in/__init__.py +++ b/addons/l10n_in/__init__.py @@ -27,6 +27,6 @@ # ############################################################################## -import installer +import l10n_in_installer # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index 630d99ca8db..3c635082f7f 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -36,9 +36,9 @@ Indian accounting chart and localization. ], "demo_xml": [], "update_xml": [ - "account_tax_code_template.xml", + "l10n_in_tax_code_template.xml", "l10n_in_wizard.xml", - "installer_view.xml", + "l10n_in_installer_view.xml", ], "auto_install": False, "installable": True, diff --git a/addons/l10n_in/account_tax.xml b/addons/l10n_in/account_tax.xml deleted file mode 100644 index 90e6264398f..00000000000 --- a/addons/l10n_in/account_tax.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - PPn (10%)(10.0%) - 0.100000 - percent - - - - - - - - - - diff --git a/addons/l10n_in/account_tax_code.xml b/addons/l10n_in/account_tax_code.xml deleted file mode 100644 index bec870dd426..00000000000 --- a/addons/l10n_in/account_tax_code.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - Tax balance to pay - - - - Tax Due (Tax to pay) - - - - - Tax payable - - - - - Tax bases - - - - Base of taxed sales - - - - - - Base of taxed purchases - - - - - diff --git a/addons/l10n_in/installer.py b/addons/l10n_in/l10n_in_installer.py similarity index 95% rename from addons/l10n_in/installer.py rename to addons/l10n_in/l10n_in_installer.py index 83a63fba122..01c9395eb58 100644 --- a/addons/l10n_in/installer.py +++ b/addons/l10n_in/l10n_in_installer.py @@ -43,20 +43,20 @@ class l10n_installer(osv.osv_memory): for chart in self.read(cr, uid, ids, context=context): if chart['charts'] =='l10n_in' and chart['company_type']=='public_company': - acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_chart.xml')) + acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) acc_file_path.close() - tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_firm_tax_template.xml')) + tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_public_tax_template.xml')) tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) tax_file_path.close() elif chart['charts'] =='l10n_in' and chart['company_type']=='partnership_private_company': - acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_partnership_private_chart.xml')) + acc_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_chart.xml')) tools.convert_xml_import(cr, 'l10n_in', acc_file_path, {}, 'init', True, None) acc_file_path.close() - tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_firm_tax_template.xml')) + tax_file_path = tools.file_open(opj('l10n_in', 'l10n_in_private_tax_template.xml')) tools.convert_xml_import(cr, 'l10n_in', tax_file_path, {}, 'init', True, None) tax_file_path.close() diff --git a/addons/l10n_in/installer_view.xml b/addons/l10n_in/l10n_in_installer_view.xml similarity index 100% rename from addons/l10n_in/installer_view.xml rename to addons/l10n_in/l10n_in_installer_view.xml diff --git a/addons/l10n_in/l10n_in_partnership_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml similarity index 74% rename from addons/l10n_in/l10n_in_partnership_private_chart.xml rename to addons/l10n_in/l10n_in_private_chart.xml index 6e2a764d64f..dcb705c113e 100644 --- a/addons/l10n_in/l10n_in_partnership_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -4,7 +4,7 @@ - + Partnership/Private Firm Chart of Account 0 view @@ -13,197 +13,234 @@ - + 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. - + 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. - - + + + + + Sales Tax Payable + 216 + payable + + + + + + + VAT Payable + 217 + payable + + + + + + + Service Tax Payable + 218 + payable + + + + + + + Exice Duty Payable + 219 + payable + + + + + @@ -212,7 +249,7 @@ 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 @@ -430,13 +467,13 @@ - + 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. @@ -444,14 +481,14 @@ India - Chart of Accounts for Partnership/Private Firm - + - - - - - - + + + + + + diff --git a/addons/l10n_in/l10n_in_private_firm_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml similarity index 53% rename from addons/l10n_in/l10n_in_private_firm_tax_template.xml rename to addons/l10n_in/l10n_in_private_tax_template.xml index 5bff8157884..e95a9bc48e1 100644 --- a/addons/l10n_in/l10n_in_private_firm_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -2,117 +2,90 @@ - - - - Sales Tax Payable - 216 - payable - - - - - - - VAT Payable - 217 - payable - - - - - - - Service Tax Payable - 218 - payable - - - - - - - Exice Duty Payable - 219 - payable - - - - - + - Sale Tax - 15% Sale Tax - 15% 0.15 percent sale - - - - - - + + + + + + - Sale Tax -12% Sale Tax - 12% 0.12 percent sale - - - - - - + + + + + + + + Sale Tax - 4% + + 0.04 + percent + sale + + + + + + + + + + - Purchase Tax - 15% Purchase Tax - 15% - - + + 0.15 percent purchase - + - + - - - VAT - 5% - VAT - 5% + VAT - 5% (4% VAT + 1% Add. Tax.) 0.05 percent all - - - + + + 1 1 - + 1 1 @@ -121,19 +94,18 @@ - VAT - 15% - VAT - 15% + VAT - 15% (12.5% VAT + 2.5% Add. Tax.) 0.15 percent all - - - + + + 1 1 - + 1 1 @@ -142,17 +114,48 @@ - VAT - 8% VAT - 8% - 0.8 + 0.08 percent all - - - + + + - + + + + + + + + VAT - 10% + + 0.10 + percent + all + + + + + + + + + + + + VAT - 12.5% + + 12.5 + percent + all + + + + + @@ -161,29 +164,27 @@ - Exice Duty - 10.30% - Excise Duty + Excise Duty - 10% 0.10 percent sale - - - + + + 1 - + 1 - + 1 - + 1 - + - Excise duty -10% -%2 - Excise Duty - %2 + Excise Duty - 2% 0.02 percent sale @@ -192,7 +193,6 @@ - Excise duty - 10% - %1 Excise Duty - 1% 0.01 percent @@ -205,23 +205,21 @@ all - Service - 12% - Service Tax + Service Tax - 12% 0.12 percent - - - - - - + + + + + + - Service - 12% - %2 Service Tax - %2 0.02 percent @@ -231,7 +229,6 @@ - Service - 12% - 1% Service Tax - %1 0.01 percent diff --git a/addons/l10n_in/l10n_in_public_firm_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml similarity index 68% rename from addons/l10n_in/l10n_in_public_firm_chart.xml rename to addons/l10n_in/l10n_in_public_chart.xml index 9e72ec9569c..1b9bf1fc298 100644 --- a/addons/l10n_in/l10n_in_public_firm_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -5,7 +5,7 @@ - + Public Firm Chart of Account 0 view @@ -14,529 +14,565 @@ - + 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 - + - + 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 - + - - - + + + + + Sales Tax Payable + 24600 + payable + + + + + + + VAT Payable + 24800 + payable + + + + + + + Exice Duty Payable + 24900 + payable + + + + + + + Service Tax Payable + 24700 + payable + + + + + - + 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 - + India - Chart of Accounts for Public Firm - + - - - - - - + + + + + + diff --git a/addons/l10n_in/l10n_in_public_firm_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml similarity index 53% rename from addons/l10n_in/l10n_in_public_firm_tax_template.xml rename to addons/l10n_in/l10n_in_public_tax_template.xml index c597fe260f4..0d2427af93a 100644 --- a/addons/l10n_in/l10n_in_public_firm_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -3,93 +3,66 @@ - - - - Sales Tax Payable - 24600 - payable - - - - - - - VAT Payable - 24800 - payable - - - - - - - Exice Duty Payable - 24900 - payable - - - - - - - Service Tax Payable - 24700 - payable - - - - - - - Sale Tax - 15% Sale Tax - 15% - - + + 0.15 percent sale - - - - + + + + - Sale Tax - 12% Sale Tax - 12% - - + + 0.12 percent sale - - - - + + + + + + + + + Sale Tax - 4% + + + + 0.04 + percent + sale + + + + - Purchase Tax - 15% Purchase Tax - 15% - - + + 0.15 percent purchase - + - + @@ -99,19 +72,18 @@ - VAT - 5% - VAT - 5% - - + VAT - 5% (4% VAT + 1% Add. Tax.) + + 0.05 percent all - + 1 1 - + 1 1 @@ -120,19 +92,18 @@ - VAT - 15% - VAT - 15% - - + VAT - 15% (12.5% VAT + 2.5% Add. Tax.) + + 0.15 percent all - + 1 1 - + 1 1 @@ -141,51 +112,88 @@ - VAT - 8% VAT - 8% - - + + 0.08 percent all - + 1 1 - + 1 1 - + + + VAT - 10% + + + + 0.10 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + + + VAT - 12.5% + + + + 12.5 + percent + all + + 1 + + 1 + + 1 + + 1 + + + + - Service - 12% - Service Tax - - + Service Tax - 12% + + 0.12 percent all - + 1 - + 1 - + 1 - + 1 - Service - 12% - 2% Service Tax - %2 0.02 percent @@ -195,7 +203,6 @@ - Service - 12% - 1% Service Tax - %1 0.01 percent @@ -207,28 +214,26 @@ - Excise duty - 10% - Excise Duty - - + Excise Duty - 10% + + 0.10 percent sale - + 1 - + 1 - + 1 - + 1 - + - Excise duty - 10% - 2% Excise Duty - %2 0.02 percent @@ -238,7 +243,6 @@ - Excise duty - 10% - 1% Excise Duty - 1% 0.01 percent diff --git a/addons/l10n_in/account_tax_code_template.xml b/addons/l10n_in/l10n_in_tax_code_template.xml similarity index 81% rename from addons/l10n_in/account_tax_code_template.xml rename to addons/l10n_in/l10n_in_tax_code_template.xml index 1d8e5ed3b70..94217d79c3c 100644 --- a/addons/l10n_in/account_tax_code_template.xml +++ b/addons/l10n_in/l10n_in_tax_code_template.xml @@ -12,13 +12,13 @@ - - Tax Due (Tax to pay) + + Tax Received - Tax Payable + Tax Paid @@ -28,12 +28,12 @@ - + Base of Taxed Sales - + Base of Taxed Purchases From 879c8bb5a233d307a374c29c2b97c7fa9f34c72a Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 2 Jul 2012 10:32:25 +0530 Subject: [PATCH 023/106] [FIX]Id changed bzr revid: kbh@tinyerp.com-20120702050225-r95sr06v9adxnqp3 --- addons/l10n_in/l10n_in_private_chart.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index dcb705c113e..999c6e8c219 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -13,7 +13,7 @@ - + Balance Sheet 1 view From d762efd3c5a44fcef04042f37f2a7bdab2bb577b Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 2 Jul 2012 11:16:52 +0530 Subject: [PATCH 024/106] [FIX]ref chenged bzr revid: kbh@tinyerp.com-20120702054652-z66w4imb2hgakv7h --- addons/l10n_in/l10n_in_private_chart.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index 999c6e8c219..0314c85710b 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -464,7 +464,7 @@ view - + @@ -486,7 +486,7 @@ - + From 3a49884f6fc3d4c8dca30a961fc581187878c0d6 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 2 Jul 2012 11:29:49 +0530 Subject: [PATCH 025/106] [IMP] : improve description for modules bzr revid: cha@tinyerp.com-20120702055949-cr9i6q2yrhhosuzr --- addons/account/__openerp__.py | 1 - addons/account_asset/__openerp__.py | 9 ++++--- addons/account_budget/__openerp__.py | 11 ++++---- addons/account_cancel/__openerp__.py | 2 +- addons/account_followup/__openerp__.py | 6 ++--- addons/account_voucher/__openerp__.py | 6 ++--- addons/base_module_record/__openerp__.py | 2 +- addons/crm/__openerp__.py | 6 +++-- addons/event/__openerp__.py | 2 +- addons/hr_evaluation/__openerp__.py | 2 +- addons/hr_holidays/__openerp__.py | 8 +++--- addons/hr_timesheet_sheet/__openerp__.py | 4 +-- addons/import_google/__openerp__.py | 2 +- addons/mrp/__openerp__.py | 4 +-- addons/project/__openerp__.py | 2 -- addons/purchase/__openerp__.py | 5 ++-- addons/sale/__openerp__.py | 32 +++++++++++------------- addons/stock/__openerp__.py | 1 - 18 files changed, 51 insertions(+), 54 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index cd19c730a3f..644942a718f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -42,7 +42,6 @@ Creates a dashboard for accountants that includes: -------------------------------------------------- * List of Customer Invoice to Approve * Company Analysis -* Graph of Aged Receivables * Graph of Treasury The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 4b7379d8a6a..7d5863e6fb4 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -24,9 +24,12 @@ "version" : "1.0", "depends" : ["account"], "author" : "OpenERP S.A.", - "description": """Financial and accounting asset management. - This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on - those assets. And it allows to create Move's of the depreciation lines. + "description": """ +Financial and accounting asset management. +========================================== +This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on those assets. +And it allows to create Move's of the depreciation lines. + """, "website" : "http://www.openerp.com", "category" : "Accounting & Finance", diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 89d06dccdca..9d56f3d02c8 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -28,21 +28,20 @@ This module allows accountants to manage analytic and crossovered budgets. ========================================================================== -Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/), +Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers can set the planned amount on each Analytic Account. The accountant has the possibility to see the total of amount planned for each -Budget and Master Budget in order to ensure the total planned is not -greater/lower than what he planned for this Budget/Master Budget. Each list of +Budget in order to ensure the total planned is not +greater/lower than what he planned for this Budget. Each list of record can also be switched to a graphical view of it. Three reports are available: - 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts per Master Budgets. + 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts. 2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts. - 3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets. - + 3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of Budgets. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index 6749cef0c8e..83f3a24ca88 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -28,7 +28,7 @@ Allows cancelling accounting entries. ===================================== -This module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices. +This module adds 'Allow Cancelling Entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices. """, 'website': 'http://www.openerp.com', "images" : ["images/account_cancel.jpeg"], diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index 49e7f09863d..bdc4b12bb3e 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -28,17 +28,17 @@ Module to automate letters for unpaid invoices, with multi-level recalls. ========================================================================== You can define your multiple levels of recall through the menu: - Accounting/Configuration/Miscellaneous/Follow-ups + Invoicing/Configuration/Miscellaneous/Follow-ups Once it is defined, you can automatically print recalls every day through simply clicking on the menu: - Accounting/Periodical Processing/Billing/Send follow-ups + Invoicing/Periodical Processing/Billing/Send follow-ups It will generate a PDF with all the letters according to the the different levels of recall defined. You can define different policies for different companies. You can also send mail to the customer. Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu: - Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent + Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent """, 'author': 'OpenERP SA', diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index a7899338b8e..fc6a430e2d8 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -24,11 +24,11 @@ "version" : "1.0", "author" : 'OpenERP SA', "description": """ -Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc. -==================================================================================================================================== +Account Voucher module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expanse, Contra, etc. * Voucher Entry - * Voucher Receipt + * Voucher Receipt [Sales & Purchase] + * Voucher payment [Customer & Supplier] * Cheque Register """, "category": 'Accounting & Finance', diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py index bfb3c497218..4d4168160c0 100644 --- a/addons/base_module_record/__openerp__.py +++ b/addons/base_module_record/__openerp__.py @@ -40,7 +40,7 @@ This should help you to easily create reusable and publishable modules for custom configurations and demo/testing data. How to use it: -Run Administration/Customization/Module Creation/Export Customizations As a Module wizard. +Run Settings/Technical/Module Creation/Export Customizations As a Module wizard. Select datetime criteria of recording and objects to be recorded and Record module. """, 'author': 'OpenERP SA', diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 0c9b75b4d41..9bdf7cd250f 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -48,9 +48,11 @@ The CRM module has a email gateway for the synchronisation interface between mails and OpenERP. Creates a dashboard for CRM that includes: - * Opportunities by Categories (graph) - * Opportunities by Stage (graph) + * List of New Leads + * List of My Opportunities + * List of My Next Meetings * Planned Revenue by Stage and User (graph) + * Opportunities by Stage (graph) """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 040df5ce987..7cb527b1681 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -36,7 +36,7 @@ This module allows you Note that: - You can define new types of events in - Association / Configuration / Types of Events + Events / Configuration / Types of Events """, 'author': 'OpenERP SA', 'depends': ['base_setup', 'board', 'email_template', 'google_map'], diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 231f4593868..2694815b367 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -36,7 +36,7 @@ juniors as well as his manager.The evaluation is done under a plan in which various surveys can be created and it can be defined which level of employee hierarchy fills what and final review and evaluation is done by the manager.Every evaluation filled by the employees can be viewed -in the form of pdf file. Implements a dashboard for My Current Evaluations +in the form of pdf file. """, "demo": ["hr_evaluation_demo.xml"], "data": [ diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 09809e488ba..5fbe3ba458b 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -36,16 +36,16 @@ Implements a dashboard for human resource management that includes. Note that: - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in - Human Resources/Configuration/Holidays/Leave Type + Human Resources/Configuration/Leave Type - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted). - There are two ways to print the employee's holidays: * The first will allow to choose employees by department and is used by clicking the menu item located in - Human Resources/Reporting/Holidays/Leaves by Department + Reporting/Human Resources/Leaves/Leaves by Department * The second will allow you to choose the holidays report for specific employees. Go on the list Human Resources/Human Resources/Employees then select the ones you want to choose, click on the print icon and select the option - 'Employee's Holidays' - - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in + 'Leaves Summary' + - The wizard allows you to choose if you want to print either the approved & confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in Administration / Users / Users for example, you maybe will do it for the user 'admin'. """, diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index defa3ee5873..a6324ac99af 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -29,8 +29,8 @@ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== -The upper part of the view is for attendances and track (sign in/sign out) events. -The lower part is for timesheet. +* It will mentain attendances and track (sign in/sign out) events. +* Track the timesheet lines. Other tabs contains statistics views to help you analyse your time or the time of your team: diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py index 5c538e5912f..a4bbe6ce281 100644 --- a/addons/import_google/__openerp__.py +++ b/addons/import_google/__openerp__.py @@ -23,7 +23,7 @@ 'name': 'Google Import', 'version': '1.0', 'category': 'Customer Relationship Management', - 'description': """The module adds google contact in partner address and add google calendar events details in Meeting""", + 'description': """The module adds google contact in partner address and add google calendar events details in Meeting.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base', 'import_base', 'google_base_account','crm'], diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index bdf6f63b755..8debba67878 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -58,12 +58,12 @@ Reports provided by this module: * Load forecast on Work Centers * Print a production order * Stock forecasts + * Cost Structure Dashboard provided by this module: ---------------------------------- - * List of next production orders * List of procurements in exception - * Graph of work center load + * List of next production orders * Graph of stock value variation """, 'init_xml': [], diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index dad67f5dc30..3cc4ab80882 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -38,8 +38,6 @@ It is able to render planning, order tasks, eso. Dashboard for project members that includes: -------------------------------------------- * List of my open tasks - * List of my delegated tasks - * Graph of My Projects: Planned vs Total Hours * Graph of My Remaining Hours by Project """, "init_xml": [], diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index d84408a690d..6c014acae19 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -32,9 +32,8 @@ Purchase module is for generating a purchase order for purchase of goods from a A supplier invoice is created for the particular purchase order. Dashboard for purchase management that includes: - * Current Purchase Orders - * Draft Purchase Orders - * Graph for quantity and amount per month + * Request for Quotations + * Monthly Purchasess by Category """, 'author': 'OpenERP SA', diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 968d8d1cecd..a14f10de69d 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -32,35 +32,33 @@ Workflow with validation steps: ------------------------------- * Quotation -> Sales order -> Invoice -Invoicing methods: +Create Invoice: ------------------ - * Invoice on order (before or after shipping) - * Invoice on delivery - * Invoice on timesheets - * Advance invoice + * Invoice on Demand + * Invoice on Delivery Order + * Invoice Before Delivery Partners preferences: --------------------- - * shipping - * invoicing - * incoterm + * Incoterm + * Shipping + * Invoicing + Products stocks and prices -------------------------- -Delivery methods: +Delivery method: ----------------- - * all at once - * multi-parcel - * delivery costs + * The Poste + * Free Delivery Charges + * Normal Delivery Charges + * Based on the Delivery Order(if not Add to sale order) Dashboard for Sales Manager that includes: ------------------------------------------ - * Quotations - * Sales by Month - * Graph of Sales by Salesman in last 90 days - * Graph of Sales per Customer in last 90 days - * Graph of Sales by Product's Category in last 90 days + * My Quotations + * Monthly Turnover (Graph) """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 50bcb23df7b..d3e2d8967c8 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -29,7 +29,6 @@ OpenERP Inventory Management module can manage multi-warehouses, multi and struc Thanks to the double entry management, the inventory controlling is powerful and flexible: * Moves history and planning, - * Different inventory methods (FIFO, LIFO, ...) * Stock valuation (standard or average price, ...) * Robustness faced with Inventory differences * Automatic reordering rules (stock level, JIT, ...) From 08c802ce008a32259b8423251da1974552202ad3 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 2 Jul 2012 14:23:15 +0530 Subject: [PATCH 026/106] [IMP] : improve description for modules bzr revid: cha@tinyerp.com-20120702085315-1gu1ctx983sy7b40 --- addons/l10n_be_hr_payroll/__openerp__.py | 2 +- addons/mrp_operations/__openerp__.py | 17 ++++++++--------- addons/process/__openerp__.py | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py index ebe2c8c0743..9b6cd025b3f 100644 --- a/addons/l10n_be_hr_payroll/__openerp__.py +++ b/addons/l10n_be_hr_payroll/__openerp__.py @@ -32,7 +32,7 @@ Belgian Payroll Rules * Employee Contracts * Passport based Contract * Allowances / Deductions - * Allow to configure Basic / Grows / Net Salary + * Allow to configure Basic / Gross / Net Salary * Employee Payslip * Monthly Payroll Register * Integrated with Holiday Management diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 1361f2ec3f3..3fc06f9b5f7 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -25,30 +25,29 @@ 'version': '1.0', 'category': 'Manufacturing', 'description': """ -This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). +This module adds state, date_start,date_stop in manufacturing order operation lines (in the "Work Orders" tab). ============================================================================================================= Status: draft, confirm, done, cancel -When finishing/confirming,cancelling production orders set all state lines to the according state +When finishing/confirming, cancelling manufacturing orders set all state lines to the according state Create menus: Manufacturing > Manufacturing > Work Orders -Which is a view on "Work Centers" lines in production order. +Which is a view on "Work Orders" lines in manufacturing order. -Add buttons in the form view of production order under workcenter tab: +Add buttons in the form view of manufacturing order under workorders tab: * start (set state to confirm), set date_start * done (set state to done), set date_stop * set to draft (set state to draft) * cancel set state to cancel -When the production order becomes "ready to produce", operations must -become 'confirmed'. When the production order is done, all operations +When the manufacturing order becomes "ready to produce", operations must +become 'confirmed'. When the manufacturing order is done, all operations must become done. -The field delay is the delay(stop date - start date). -So that we can compare the theoretic delay and real delay. - +The field 'Working Hours' is the delay(stop date - start date). +So that we can compare the theoretic delay and real delay. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py index 1c592f3771b..278a2f25025 100644 --- a/addons/process/__openerp__.py +++ b/addons/process/__openerp__.py @@ -28,8 +28,8 @@ This module shows the basic processes involved in the selected modules and in the sequence they occur. ====================================================================================================== -Note: This applies to the modules containing modulename_process_xml -e.g product/process/product_process_xml +Note: This applies to the modules containing modulename_process.xml +e.g product/process/product_process.xml """, 'author': 'OpenERP SA', From 1be34826ff31300768e5e9abd145bce30fc4f757 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Mon, 2 Jul 2012 14:55:37 +0530 Subject: [PATCH 027/106] [IMP] knowledge: update title of module bzr revid: cha@tinyerp.com-20120702092537-at05rln1vpmzph5a --- addons/knowledge/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py index dca620b0f07..f6b042f364b 100644 --- a/addons/knowledge/__openerp__.py +++ b/addons/knowledge/__openerp__.py @@ -21,7 +21,7 @@ { - "name" : "Document Management System", + "name" : "Knowledge Management System", "version" : "1.0", "depends" : ["base","base_setup"], "author" : "OpenERP SA", From 1d220128e3a262e7d9b07b6f44a03add3c60dde2 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Mon, 2 Jul 2012 15:18:25 +0530 Subject: [PATCH 028/106] [FIX]ref chenged for account expense category bzr revid: kbh@tinyerp.com-20120702094825-ov0947vs0o4z2yip --- addons/l10n_in/l10n_in_private_chart.xml | 2 +- addons/l10n_in/l10n_in_public_chart.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index 0314c85710b..6fea0cfd970 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -486,7 +486,7 @@ - + diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 1b9bf1fc298..a1f7dc4e466 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -570,7 +570,7 @@ - + From 37ddb2948ac13604ba3eee4c627a57a839b32a18 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Mon, 2 Jul 2012 16:14:44 +0530 Subject: [PATCH 029/106] [IMP] typo bzr revid: psi@tinyerp.com-20120702104444-6tuk8fv9junqq66i --- addons/account_voucher/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index fc6a430e2d8..5a899c1a302 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -24,7 +24,7 @@ "version" : "1.0", "author" : 'OpenERP SA', "description": """ -Account Voucher module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expanse, Contra, etc. +Account Voucher module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra, etc. * Voucher Entry * Voucher Receipt [Sales & Purchase] From 42d455b899670da5006e93e6069f61b637fe5aad Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 3 Jul 2012 11:36:21 +0530 Subject: [PATCH 030/106] [IMP] l10n_in: Add Reserve and Surplus Account and Improve name of tax bzr revid: jap@tinyerp.com-20120703060621-n1g1kdql0uqp8mqv --- addons/l10n_in/l10n_in_private_chart.xml | 13 ++++++++++++- addons/l10n_in/l10n_in_private_tax_template.xml | 4 ++-- addons/l10n_in/l10n_in_public_chart.xml | 17 +++++++++++++---- addons/l10n_in/l10n_in_public_tax_template.xml | 4 ++-- 4 files changed, 29 insertions(+), 9 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index 6fea0cfd970..b0e05f4a781 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -204,6 +204,17 @@ 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. + + + Sales Tax Payable @@ -488,7 +499,7 @@ - + diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index d4334eb49e1..d28160b16ca 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -164,7 +164,7 @@ - Excise Duty - 10% + Excise Duty - 10.30% 0.10 percent @@ -205,7 +205,7 @@ all - Service Tax - 12% + Service Tax - 12.30% 0.12 percent diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index cf9804fd929..7d96458539d 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -178,7 +178,7 @@ - + Unearned Revenues 24500 @@ -259,8 +259,8 @@ - - + + @@ -299,6 +299,15 @@ + + Reserve and Surplus Account + 24950 + other + + + + + @@ -572,7 +581,7 @@ - + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index fb1c470aade..ccf813bb713 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -174,7 +174,7 @@ - Service Tax - 12% + Service Tax - 12.30% @@ -214,7 +214,7 @@ - Excise Duty - 10% + Excise Duty - 10.30% From 75de0e54bb8185f4ad9a28bc1dbb489fd304d53c Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 3 Jul 2012 14:47:21 +0530 Subject: [PATCH 031/106] [IMP] l10n_in: Change reference of refund tax code bzr revid: jap@tinyerp.com-20120703091721-lmrwljpc91dyf3ir --- .../l10n_in/l10n_in_private_tax_template.xml | 20 +++++++++---------- .../l10n_in/l10n_in_public_tax_template.xml | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index d28160b16ca..24fa028c23d 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -83,11 +83,11 @@ 1 - + 1 1 - + 1 @@ -103,11 +103,11 @@ 1 - + 1 1 - + 1 @@ -122,9 +122,9 @@ - + - + @@ -138,9 +138,9 @@ - + - + @@ -154,9 +154,9 @@ - + - + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index ccf813bb713..ac043a8951f 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -81,11 +81,11 @@ all 1 - + 1 1 - + 1 @@ -101,11 +101,11 @@ all 1 - + 1 1 - + 1 @@ -121,11 +121,11 @@ all 1 - + 1 1 - + 1 @@ -141,11 +141,11 @@ all 1 - + 1 1 - + 1 @@ -161,11 +161,11 @@ all 1 - + 1 1 - + 1 From 54521dc35a5b516351ef692e654a915f8e42e608 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 3 Jul 2012 15:12:57 +0530 Subject: [PATCH 032/106] [IMP] l10n_in: Remove extra space in tax name bzr revid: jap@tinyerp.com-20120703094257-ygdja7kek2oav7u6 --- .../l10n_in/l10n_in_private_tax_template.xml | 30 +++++++++---------- .../l10n_in/l10n_in_public_tax_template.xml | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index 24fa028c23d..f7b07dfd8dc 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -7,7 +7,7 @@ Sale Tax --> - Sale Tax - 15% + Sale Tax-15% 0.15 percent @@ -23,7 +23,7 @@ - Sale Tax - 12% + Sale Tax-12% 0.12 percent @@ -39,7 +39,7 @@ - Sale Tax - 4% + Sale Tax-4% 0.04 percent @@ -57,7 +57,7 @@ - Purchase Tax - 15% + Purchase Tax-15% @@ -74,7 +74,7 @@ - VAT - 5% (4% VAT + 1% Add. Tax.) + VAT-5%(4% VAT+1% Add. Tax.) 0.05 percent @@ -94,7 +94,7 @@ - VAT - 15% (12.5% VAT + 2.5% Add. Tax.) + VAT-15%(12.5% VAT+2.5% Add. Tax.) 0.15 percent @@ -114,7 +114,7 @@ - VAT - 8% + VAT-8% 0.08 percent @@ -130,7 +130,7 @@ - VAT - 10% + VAT-10% 0.10 percent @@ -146,7 +146,7 @@ - VAT - 12.5% + VAT-12.5% 12.5 percent @@ -164,7 +164,7 @@ - Excise Duty - 10.30% + Excise Duty-10.30% 0.10 percent @@ -184,7 +184,7 @@ - Excise Duty - 2% + Excise Duty-2% 0.02 percent sale @@ -193,7 +193,7 @@ - Excise Duty - 1% + Excise Duty-1% 0.01 percent sale @@ -205,7 +205,7 @@ all - Service Tax - 12.30% + Service Tax-12.30% 0.12 percent @@ -220,7 +220,7 @@ - Service Tax - %2 + Service Tax-%2 0.02 percent all @@ -229,7 +229,7 @@ - Service Tax - %1 + Service Tax-%1 0.01 percent all diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index ac043a8951f..efb49459973 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -6,7 +6,7 @@ - Sale Tax - 15% + Sale Tax-15% @@ -21,7 +21,7 @@ - Sale Tax - 12% + Sale Tax-12% @@ -36,7 +36,7 @@ - Sale Tax - 4% + Sale Tax-4% @@ -53,7 +53,7 @@ - Purchase Tax - 15% + Purchase Tax-15% @@ -72,7 +72,7 @@ - VAT - 5% (4% VAT + 1% Add. Tax.) + VAT-5%(4% VAT+1% Add. Tax.) @@ -92,7 +92,7 @@ - VAT - 15% (12.5% VAT + 2.5% Add. Tax.) + VAT-15% (12.5% VAT + 2.5% Add. Tax.) @@ -112,7 +112,7 @@ - VAT - 8% + VAT-8% @@ -132,7 +132,7 @@ - VAT - 10% + VAT-10% @@ -152,7 +152,7 @@ - VAT - 12.5% + VAT-12.5% @@ -174,7 +174,7 @@ - Service Tax - 12.30% + Service Tax-12.30% @@ -194,7 +194,7 @@ - Service Tax - %2 + Service Tax-%2 0.02 percent all @@ -203,7 +203,7 @@ - Service Tax - %1 + Service Tax-%1 0.01 percent all @@ -214,7 +214,7 @@ - Excise Duty - 10.30% + Excise Duty-10.30% @@ -234,7 +234,7 @@ - Excise Duty - %2 + Excise Duty-%2 0.02 percent sale @@ -243,7 +243,7 @@ - Excise Duty - 1% + Excise Duty-1% 0.01 percent sale From 41956ffca79abd9e71cb4e93883805e638ec205f Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 4 Jul 2012 14:19:16 +0530 Subject: [PATCH 033/106] [IMP] l10n_in: Rename company type and add Tax payable account put 4 accounts of tax inside it, also add Tax receivable account for Purchase tax. bzr revid: jap@tinyerp.com-20120704084916-o9ke1u84aw2kv4ct --- addons/l10n_in/l10n_in_installer.py | 4 +- addons/l10n_in/l10n_in_private_chart.xml | 54 +++++++-- .../l10n_in/l10n_in_private_tax_template.xml | 44 +++---- addons/l10n_in/l10n_in_public_chart.xml | 113 +++++++++++------- .../l10n_in/l10n_in_public_tax_template.xml | 44 +++---- 5 files changed, 158 insertions(+), 101 deletions(-) diff --git a/addons/l10n_in/l10n_in_installer.py b/addons/l10n_in/l10n_in_installer.py index f3b82d7b0dd..c76346057c8 100644 --- a/addons/l10n_in/l10n_in_installer.py +++ b/addons/l10n_in/l10n_in_installer.py @@ -26,8 +26,8 @@ import tools class l10n_installer(osv.osv_memory): _inherit = 'account.installer' _columns = { - 'company_type': fields.selection([('public_company', 'Public Firm'), - ('partnership_private_company', 'Partnership/Private Firm') + 'company_type': fields.selection([('public_company', 'Public Ltd.'), + ('partnership_private_company', 'Private/Partnership Ltd.') ], 'Company Type', required=True, help='Company Type is used to install Indian chart of accounts as per need of business.'), } diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index d6ef24a20a6..bacaf5487eb 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -132,7 +132,26 @@ Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. + + + Tax Receivable + 190 + view + + + + + + Purchase Tax + 191 + receivable + + + + + + @@ -215,41 +234,52 @@ + + - Sales Tax Payable + Tax payable 216 + view + + + + + + + Sales Tax Payable + 2161 other - + - + VAT Payable - 217 + 2162 other - + - + Service Tax Payable - 218 + 2163 other - + - + Exice Duty Payable - 219 + 2164 other - + @@ -491,7 +521,7 @@ - India - Chart of Accounts for Partnership/Private Firm + India - Chart of Accounts for Private/Partnership Ltd. diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index f7b07dfd8dc..2198e2a1034 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -12,8 +12,8 @@ 0.15 percent sale - - + + @@ -28,8 +28,8 @@ 0.12 percent sale - - + + @@ -44,8 +44,8 @@ 0.04 percent sale - - + + @@ -58,8 +58,8 @@ Purchase Tax-15% - - + + 0.15 percent @@ -79,8 +79,8 @@ 0.05 percent all - - + + 1 @@ -99,8 +99,8 @@ 0.15 percent all - - + + 1 @@ -119,8 +119,8 @@ 0.08 percent all - - + + @@ -135,8 +135,8 @@ 0.10 percent all - - + + @@ -151,8 +151,8 @@ 12.5 percent all - - + + @@ -169,8 +169,8 @@ 0.10 percent sale - - + + 1 @@ -209,8 +209,8 @@ 0.12 percent - - + + diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 7084d2ee1cf..6781d35008f 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -113,7 +113,25 @@ - + + + Tax Receivable + 15400 + view + + + + + + + Purchase tax + 15410 + other + + + + + @@ -260,54 +278,63 @@ - + + + Reserve and Surplus Account + 24600 + other + + + + + - - Sales Tax Payable - 24600 - other - - - - - - - VAT Payable - 24800 - other - - - - - - - Exice Duty Payable - 24900 - other - - - - - - Service Tax Payable + Tax payable 24700 - other - - - - - - - Reserve and Surplus Account - 24950 - other + view - + + + Sales Tax Payable + 24710 + other + + + + + + + VAT Payable + 24720 + other + + + + + + + Exice Duty Payable + 24730 + other + + + + + + + Service Tax Payable + 24740 + other + + + + + @@ -573,7 +600,7 @@ - India - Chart of Accounts for Public Firm + India - Chart of Accounts for Public Ltd. @@ -581,7 +608,7 @@ - + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index efb49459973..f213b72408a 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -7,8 +7,8 @@ Sale Tax-15% - - + + 0.15 percent @@ -22,8 +22,8 @@ Sale Tax-12% - - + + 0.12 percent @@ -37,8 +37,8 @@ Sale Tax-4% - - + + 0.04 percent @@ -54,8 +54,8 @@ Purchase Tax-15% - - + + 0.15 percent @@ -73,8 +73,8 @@ VAT-5%(4% VAT+1% Add. Tax.) - - + + 0.05 percent @@ -93,8 +93,8 @@ VAT-15% (12.5% VAT + 2.5% Add. Tax.) - - + + 0.15 percent @@ -113,8 +113,8 @@ VAT-8% - - + + 0.08 percent @@ -133,8 +133,8 @@ VAT-10% - - + + 0.10 percent @@ -153,8 +153,8 @@ VAT-12.5% - - + + 12.5 percent @@ -175,8 +175,8 @@ Service Tax-12.30% - - + + 0.12 percent @@ -215,8 +215,8 @@ Excise Duty-10.30% - - + + 0.10 percent From 1fdad4f4928ee381d51b6c577bd13499937f5bd1 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 4 Jul 2012 15:25:34 +0530 Subject: [PATCH 034/106] [IMP] l10n_in: remove purchase tax account and improve name bzr revid: jap@tinyerp.com-20120704095534-1agdv0mn41dvmnmx --- addons/l10n_in/l10n_in_installer.py | 4 ++-- addons/l10n_in/l10n_in_private_chart.xml | 19 +++++-------------- .../l10n_in/l10n_in_private_tax_template.xml | 6 +++--- addons/l10n_in/l10n_in_public_chart.xml | 13 ++----------- .../l10n_in/l10n_in_public_tax_template.xml | 6 +++--- 5 files changed, 15 insertions(+), 33 deletions(-) diff --git a/addons/l10n_in/l10n_in_installer.py b/addons/l10n_in/l10n_in_installer.py index c76346057c8..0d2b4f665b6 100644 --- a/addons/l10n_in/l10n_in_installer.py +++ b/addons/l10n_in/l10n_in_installer.py @@ -26,8 +26,8 @@ import tools class l10n_installer(osv.osv_memory): _inherit = 'account.installer' _columns = { - 'company_type': fields.selection([('public_company', 'Public Ltd.'), - ('partnership_private_company', 'Private/Partnership Ltd.') + 'company_type': fields.selection([('public_company', 'Public Ltd'), + ('partnership_private_company', 'Private Ltd/Partnership') ], 'Company Type', required=True, help='Company Type is used to install Indian chart of accounts as per need of business.'), } diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index bacaf5487eb..c156f5596ac 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -133,22 +133,13 @@ Amount of equipment's cost that has been allocated to Depreciation Expense since the time the equipment was acquired. - + Tax Receivable - 190 - view - - - - - - - Purchase Tax - 191 - receivable + 189 + other - + @@ -521,7 +512,7 @@ - India - Chart of Accounts for Private/Partnership Ltd. + 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 index 2198e2a1034..2aa6ddbad22 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -58,8 +58,8 @@ Purchase Tax-15% - - + + 0.15 percent @@ -238,4 +238,4 @@ - \ 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 index 6781d35008f..703093372db 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -117,19 +117,10 @@ Tax Receivable 15400 - view - - - - - - - Purchase tax - 15410 other - + @@ -600,7 +591,7 @@ - India - Chart of Accounts for Public Ltd. + 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 index f213b72408a..f32c5b6356a 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -54,8 +54,8 @@ Purchase Tax-15% - - + + 0.15 percent @@ -252,4 +252,4 @@ - \ No newline at end of file + From 28d4c08aefde3bf2fe81ea90810de63423009be6 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Wed, 4 Jul 2012 16:41:51 +0530 Subject: [PATCH 035/106] [IMP] l10n_in: Change user_type of tax account bzr revid: jap@tinyerp.com-20120704111151-a48mtne32mg0p0ym --- addons/l10n_in/l10n_in_private_chart.xml | 10 +++++----- addons/l10n_in/l10n_in_public_chart.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml index c156f5596ac..feb7e58521e 100644 --- a/addons/l10n_in/l10n_in_private_chart.xml +++ b/addons/l10n_in/l10n_in_private_chart.xml @@ -137,7 +137,7 @@ Tax Receivable 189 other - + @@ -241,7 +241,7 @@ Sales Tax Payable 2161 other - + @@ -250,7 +250,7 @@ VAT Payable 2162 other - + @@ -259,7 +259,7 @@ Service Tax Payable 2163 other - + @@ -268,7 +268,7 @@ Exice Duty Payable 2164 other - + diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 703093372db..452a483b1dc 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -118,7 +118,7 @@ Tax Receivable 15400 other - + @@ -294,7 +294,7 @@ Sales Tax Payable 24710 other - + @@ -303,7 +303,7 @@ VAT Payable 24720 other - + @@ -312,7 +312,7 @@ Exice Duty Payable 24730 other - + @@ -321,7 +321,7 @@ Service Tax Payable 24740 other - + From 29059749b5c1b2f2b9f007dddf67fab9c8e98e01 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Thu, 5 Jul 2012 11:03:07 +0530 Subject: [PATCH 036/106] [IMP] l10n_in: Add new account in public chart bzr revid: jap@tinyerp.com-20120705053307-xcsu2hzg0pudz03c --- addons/l10n_in/l10n_in_public_chart.xml | 76 ++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml index 452a483b1dc..40c3227dc4c 100644 --- a/addons/l10n_in/l10n_in_public_chart.xml +++ b/addons/l10n_in/l10n_in_public_chart.xml @@ -122,7 +122,81 @@ - + + + + + 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 + + + + + From 039b7397c9fcf139b0e02519b3f2b9b7a090f593 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Thu, 5 Jul 2012 16:32:07 +0530 Subject: [PATCH 037/106] [FIX] l10n_in: Fix indetation bzr revid: mra@tinyerp.com-20120705110207-gdvvbz07jy1vt8or --- .../l10n_in/l10n_in_public_tax_template.xml | 80 +++++++++---------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index f32c5b6356a..88f78121b22 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -1,11 +1,10 @@ - - - - - - + + + + + Sale Tax-15% @@ -19,8 +18,8 @@ - - + + Sale Tax-12% @@ -52,7 +51,7 @@ - + Purchase Tax-15% @@ -68,10 +67,10 @@ - - - - + + + + VAT-5%(4% VAT+1% Add. Tax.) @@ -91,7 +90,7 @@ - + VAT-15% (12.5% VAT + 2.5% Add. Tax.) @@ -109,9 +108,9 @@ 1 - - - + + + VAT-8% @@ -151,7 +150,7 @@ - + VAT-12.5% @@ -171,9 +170,9 @@ - - - + + + Service Tax-12.30% @@ -191,29 +190,28 @@ 1 - - - + + Service Tax-%2 0.02 percent all - - - + + + Service Tax-%1 0.01 percent all - + + + - - - + Excise Duty-10.30% @@ -231,25 +229,25 @@ 1 - - - + + + Excise Duty-%2 0.02 percent sale - - - + + + Excise Duty-1% 0.01 percent sale - - - - + + + + \ No newline at end of file From 986b1af0996c8829ff77e6d02c3d3bea79923247 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Thu, 5 Jul 2012 16:35:34 +0530 Subject: [PATCH 038/106] [FIX] l10n_in: Fix indetation bzr revid: mra@tinyerp.com-20120705110534-qqcya0kf4w84c65n --- .../l10n_in/l10n_in_private_tax_template.xml | 81 +++++++++---------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index 2aa6ddbad22..6cb8933728c 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -1,12 +1,9 @@ - - - - - - + + + + Sale Tax-15% 0.15 @@ -20,9 +17,9 @@ - - - + + + Sale Tax-12% 0.12 @@ -36,7 +33,7 @@ - + Sale Tax-4% @@ -70,10 +67,10 @@ - - - - + + + + VAT-5%(4% VAT+1% Add. Tax.) 0.05 @@ -91,9 +88,9 @@ 1 - - - + + + VAT-15%(12.5% VAT+2.5% Add. Tax.) 0.15 @@ -112,8 +109,8 @@ - - + + VAT-8% 0.08 @@ -161,11 +158,11 @@ - - - + + + Excise Duty-10.30% - + 0.10 percent sale @@ -181,9 +178,9 @@ 1 - - - + + + Excise Duty-2% 0.02 percent @@ -191,8 +188,8 @@ - - + + Excise Duty-1% 0.01 percent @@ -200,10 +197,10 @@ - - - - + + + + all Service Tax-12.30% @@ -218,24 +215,24 @@ - - + + Service Tax-%2 0.02 percent all - - - + + + Service Tax-%1 0.01 percent all - - - - + + + + \ No newline at end of file From 4fe87edb8fb8323dba8a4974fd4f65d739c2ca5f Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 6 Jul 2012 16:03:56 +0530 Subject: [PATCH 039/106] [IMP] : improve description for modules bzr revid: cha@tinyerp.com-20120706103356-lctrqno2dy0wrpvt --- addons/account/__openerp__.py | 5 ++--- addons/account_budget/__openerp__.py | 5 ++--- addons/account_voucher/__openerp__.py | 4 ++-- addons/association/__openerp__.py | 2 +- addons/base_crypt/__openerp__.py | 2 +- addons/base_tools/__openerp__.py | 2 +- addons/crm/__openerp__.py | 2 +- addons/decimal_precision/__openerp__.py | 4 ++-- addons/fetchmail/__openerp__.py | 3 +-- addons/hr/__openerp__.py | 2 +- addons/hr_holidays/__openerp__.py | 4 ++-- addons/hr_timesheet_invoice/__openerp__.py | 2 +- addons/l10n_ch/__openerp__.py | 4 ++-- addons/l10n_fr/__openerp__.py | 2 +- addons/marketing_campaign/__openerp__.py | 6 +++--- addons/procurement/__openerp__.py | 2 +- addons/profile_tools/__openerp__.py | 4 ++-- addons/project/__openerp__.py | 10 +++++----- addons/purchase/__openerp__.py | 2 +- addons/share/__openerp__.py | 4 ++-- addons/stock/__openerp__.py | 14 ++++++++------ addons/stock_location/__openerp__.py | 2 +- 22 files changed, 43 insertions(+), 44 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 644942a718f..d9cc97d5155 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -44,9 +44,8 @@ Creates a dashboard for accountants that includes: * Company Analysis * Graph of Treasury -The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or -grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a -module named account_voucher. +The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular +financial year and for preparation of vouchers there is a module named account_voucher. """, 'website': 'http://www.openerp.com', 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'], diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 9d56f3d02c8..26de308d088 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -32,9 +32,8 @@ Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers can set the planned amount on each Analytic Account. The accountant has the possibility to see the total of amount planned for each -Budget in order to ensure the total planned is not -greater/lower than what he planned for this Budget. Each list of -record can also be switched to a graphical view of it. +Budget in order to ensure the total planned is not greater/lower than what he planned +for this Budget. Each list of record can also be switched to a graphical view of it. Three reports are available: 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts. diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 5a899c1a302..bdbee61eba6 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -24,11 +24,11 @@ "version" : "1.0", "author" : 'OpenERP SA', "description": """ -Account Voucher module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra, etc. +eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra. * Voucher Entry * Voucher Receipt [Sales & Purchase] - * Voucher payment [Customer & Supplier] + * Voucher Payment [Customer & Supplier] * Cheque Register """, "category": 'Accounting & Finance', diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index 00683d18333..a3ad6a34c6d 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -28,7 +28,7 @@ This module is to configure modules related to an association. ============================================================== -It installs the profile for associations to manage events, registrations, memberships, membership products (schemes), etc. +It installs the profile for associations to manage events, registrations, memberships, membership products (schemes). """, 'author': 'OpenERP SA', 'depends': ['base_setup', 'membership', 'event'], diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 369a55bb278..0930f6da415 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -47,7 +47,7 @@ are using a secure protocol such as XML-RPCS or HTTPS. It also does not protect the rest of the content of the database, which may contain critical data. Appropriate security measures need to be implemented by the system administrator in all areas, such as: protection of database -backups, system files, remote shell access, physical server access, etc. +backups, system files, remote shell access, physical server access. Interation with LDAP authentication +++++++++++++++++++++++++++++++++++ diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py index 747ecf64e83..8989c6d0a78 100644 --- a/addons/base_tools/__openerp__.py +++ b/addons/base_tools/__openerp__.py @@ -9,7 +9,7 @@ Common base for tools modules. ============================== -Creates menu link for Tools from where tools like survey, lunch, idea, etc. are accessible if installed. +Creates menu link for Tools from where tools like survey, lunch, idea are accessible if installed. """, "init_xml": [], "update_xml": [ diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 9bdf7cd250f..ecde853cfff 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -30,7 +30,7 @@ The generic OpenERP Customer Relationship Management. ===================================================== This system enables a group of people to intelligently and efficiently manage -leads, opportunities, meeting, phonecall etc. +leads, opportunities, meeting, phonecall. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification. diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py index 53c05e4dd63..9da1f2161a1 100644 --- a/addons/decimal_precision/__openerp__.py +++ b/addons/decimal_precision/__openerp__.py @@ -22,8 +22,8 @@ { "name": "Decimal Precision Configuration", "description": """ -Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases, etc. -====================================================================================================== +Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases. +================================================================================================= The decimal precision is configured per company. """, diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index c16bfb217c9..5067de7db4c 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -43,10 +43,9 @@ email-enabled OpenERP documents, such as: * Project Issues * Project Tasks * Human Resource Recruitments (Applicants) - * etc. Just install the relevant application, and you can assign any of -these document types (Leads, Project Issues, etc.) to your incoming +these document types (Leads, Project Issues.) to your incoming email accounts. New emails will automatically spawn new documents of the chosen type, so it's a snap to create a mailbox-to-OpenERP integration. Even better: these documents directly act as mini diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 1135b55034a..db3624caf6b 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -27,7 +27,7 @@ "sequence": 12, "website": "http://www.openerp.com", "description": """ -Module for human resource management. +Module for Human Resource Management. ===================================== You can manage: diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 5fbe3ba458b..7074314b21a 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -36,7 +36,7 @@ Implements a dashboard for human resource management that includes. Note that: - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in - Human Resources/Configuration/Leave Type + Human Resources/Configuration/Leave Type - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted). - There are two ways to print the employee's holidays: * The first will allow to choose employees by department and is used by clicking the menu item located in @@ -45,7 +45,7 @@ Note that: Human Resources/Human Resources/Employees then select the ones you want to choose, click on the print icon and select the option 'Leaves Summary' - - The wizard allows you to choose if you want to print either the approved & confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in + - The wizard allows you to choose if you want to print either the Approved & Confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in Administration / Users / Users for example, you maybe will do it for the user 'admin'. """, diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index 65b8905fca0..d8760a92590 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -29,7 +29,7 @@ Module to generate invoices based on costs (human resources, expenses, ...). ============================================================================ You can define price lists in analytic account, make some theoretical revenue -reports, etc.""", +reports.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_bill_task_work.jpeg','images/hr_type_of_invoicing.jpeg'], diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index ab56327573c..d5ed358d25c 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -23,8 +23,8 @@ "description" : """ Swiss localisation : - DTA generation for a lot of payment types - - BVR management (number generation, report, etc..) - - Import account move from the bank file (like v11 etc..) + - BVR management (number generation, report.) + - Import account move from the bank file (like v11) - Simplify the way you handle the bank statement for reconciliation You can also add ZIP and bank completion with: diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 99849d62649..bab6af2d49c 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -35,7 +35,7 @@ This is the module to manage the accounting chart for France in OpenERP. ======================================================================== -This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...) +This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte) This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions). diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 3544145411c..8d2166998ac 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -35,13 +35,13 @@ This module provides leads automation through marketing campaigns (campaigns can ========================================================================================================================================= The campaigns are dynamic and multi-channels. The process is as follows: - * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc. - * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.) + * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions. + * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries.) * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it * You may also start the real campaign in manual mode, where each action requires manual validation * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. -While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc. +While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow. Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads. """, diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index 6e03cb0fa20..f401b42c596 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -32,7 +32,7 @@ This is the module for computing Procurements. ============================================== In the MRP process, procurements orders are created to launch manufacturing -orders, purchase orders, stock allocations, etc. Procurement orders are +orders, purchase orders, stock allocations. Procurement orders are generated automatically by the system and unless there is a problem, the user will not be notified. In case of problems, the system will raise some procurement exceptions to inform the user about blocking problems that need diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py index 4ba0298346e..d1055c60318 100644 --- a/addons/profile_tools/__openerp__.py +++ b/addons/profile_tools/__openerp__.py @@ -27,8 +27,8 @@ "author" : "OpenERP SA", "category" : "Hidden/Dependency", "description": """ -Installer for extra Hidden like lunch, survey, idea, share, etc. -================================================================ +Installer for extra Hidden like lunch, survey, idea, share. +=========================================================== Makes the Extra Hidden Configuration available from where you can install modules like share, lunch, pad, idea, survey and subscription. diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 3cc4ab80882..b109867f3d8 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -30,14 +30,14 @@ "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["base_setup", "base_status", "product", "analytic", "board", "mail", "resource","web_kanban"], "description": """ -Project management module tracks multi-level projects, tasks, work done on tasks, eso. -====================================================================================== +Project Management module tracks multi-level projects, tasks, work done on tasks. +================================================================================= -It is able to render planning, order tasks, eso. +It is able to render planning, order tasks. -Dashboard for project members that includes: +Dashboard for project management that includes: -------------------------------------------- - * List of my open tasks + * List of My Open Tasks * Graph of My Remaining Hours by Project """, "init_xml": [], diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 6c014acae19..5b3a801165f 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -26,7 +26,7 @@ 'category': 'Purchase Management', "sequence": 19, 'description': """ -Purchase module is for generating a purchase order for purchase of goods from a supplier. +Purchase Management module is for generating a purchase order for purchase of goods from a supplier. ========================================================================================= A supplier invoice is created for the particular purchase order. diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 8b997e2357e..f5065bf6b8c 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -32,14 +32,14 @@ This module adds generic sharing tools to your current OpenERP database. ======================================================================== It specifically adds a 'share' button that is available in the Web client to -share any kind of OpenERP data with colleagues, customers, friends, etc. +share any kind of OpenERP data with colleagues, customers, friends. The system will work by creating new users and groups on the fly, and by combining the appropriate access rights and ir.rules to ensure that the shared users only have access to the data that has been shared with them. This is extremely useful for collaborative work, knowledge sharing, -synchronization with other companies, etc. +synchronization with other companies. """, 'website': 'http://www.openerp.com', diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index d3e2d8967c8..94175aa38c8 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -35,12 +35,14 @@ Thanks to the double entry management, the inventory controlling is powerful and * Bar code supported * Rapid detection of mistakes through double entry system * Traceability (upstream/downstream, production lots, serial number, ...) - * Dashboard for warehouse that includes: - * Procurement in exception - * List of Incoming Products - * List of Outgoing Products - * Graph : Products to receive in delay (date < = today) - * Graph : Products to send in delay (date < = today) + +Dashboard for warehouse that includes: +-------------------------------------- + * Procurement in exception + * List of Incoming Products + * List of Outgoing Products + * Graph : Products to receive in delay (date < = today) + * Graph : Products to send in delay (date < = today) """, "website" : "http://www.openerp.com", "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"], diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py index 53189727f0e..6dea8fb4df8 100644 --- a/addons/stock_location/__openerp__.py +++ b/addons/stock_location/__openerp__.py @@ -51,7 +51,7 @@ Locations themselves, but these cannot be refined per-product. A push flow specification indicates which location is chained with which location, and with what parameters. As soon as a given quantity of products is moved in the source location, a chained move is automatically foreseen according to the parameters set on the flow specification -(destination location, delay, type of move, journal, etc.) The new move can be automatically +(destination location, delay, type of move, journal.) The new move can be automatically processed, or require a manual confirmation, depending on the parameters. Pull flows From 4db49fc84d6164c9648cb8a496ea456c5d98dc07 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 11:50:15 +0530 Subject: [PATCH 040/106] [IMP] : update description bzr revid: cha@tinyerp.com-20120712062015-vz3w55yen0y2ixaw --- addons/account_anglo_saxon/__openerp__.py | 3 ++- addons/account_asset/__openerp__.py | 1 + .../__openerp__.py | 1 + addons/account_budget/__openerp__.py | 1 + addons/account_check_writing/__openerp__.py | 2 +- addons/account_coda/__openerp__.py | 1 + addons/account_voucher/__openerp__.py | 1 - .../__openerp__.py | 1 - .../__openerp__.py | 1 - .../analytic_contract_project/__openerp__.py | 2 +- addons/anonymous/__openerp__.py | 2 +- addons/base_crypt/__openerp__.py | 5 +++-- addons/base_status/__openerp__.py | 1 + addons/base_vat/__openerp__.py | 4 ++-- addons/email_template/__openerp__.py | 2 +- addons/event_moodle/__openerp__.py | 9 +++++---- addons/fetchmail/__openerp__.py | 4 ++-- addons/google_base_account/__openerp__.py | 2 +- addons/hr_timesheet_sheet/__openerp__.py | 18 +++++++++--------- addons/mail/__openerp__.py | 2 +- 20 files changed, 34 insertions(+), 29 deletions(-) diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 78b2ff825c6..e6987ab6a0e 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -30,9 +30,10 @@ This module supports the Anglo-Saxon accounting methodology by changing the acco The difference between the Anglo-Saxon accounting countries and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped. + This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account when the invoice is created to transfer this amount to the debtor or creditor account. -Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""", +Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account.""", "images": ["images/account_anglo_saxon.jpeg"], "depends": ["product", "purchase"], "category": "Hidden/Dependency", diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py index 7d5863e6fb4..2cf79e9d30d 100644 --- a/addons/account_asset/__openerp__.py +++ b/addons/account_asset/__openerp__.py @@ -27,6 +27,7 @@ "description": """ Financial and accounting asset management. ========================================== + This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on those assets. And it allows to create Move's of the depreciation lines. diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py index 2f9bc0a87eb..2a31e3388a6 100644 --- a/addons/account_bank_statement_extensions/__openerp__.py +++ b/addons/account_bank_statement_extensions/__openerp__.py @@ -27,6 +27,7 @@ 'category': 'Generic Modules/Accounting', 'description': ''' Module that extends the standard account_bank_statement_line object for improved e-banking support. +=================================================================================================== Adds - valuta date diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 26de308d088..9e61f7314a7 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -36,6 +36,7 @@ Budget in order to ensure the total planned is not greater/lower than what he pl for this Budget. Each list of record can also be switched to a graphical view of it. Three reports are available: + 1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts. 2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts. diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py index 18ca4e3248c..d07457d0d00 100644 --- a/addons/account_check_writing/__openerp__.py +++ b/addons/account_check_writing/__openerp__.py @@ -24,7 +24,7 @@ "author" : "OpenERP SA, NovaPoint Group", "category": "Generic Modules/Accounting", "description": """ - Module for the Check writing and check printing +Module for the Check writing and check printing. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 77d48c43cf1..d6a44bbaba8 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -53,6 +53,7 @@ The removal of a CODA File containing multiple Bank Statements will also remove statements. The following reconciliation logic has been implemented in the CODA processing: + 1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard. 2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type). 3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records. diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 888e73ec7c3..177233e5ccc 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -27,7 +27,6 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra. ============================================================================================================================================================================================== - * Voucher Entry * Voucher Receipt [Sales & Purchase] * Voucher Payment [Customer & Supplier] diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/analytic_contract_expense_project/__openerp__.py index 9dc4c114743..b569330d117 100644 --- a/addons/analytic_contract_expense_project/__openerp__.py +++ b/addons/analytic_contract_expense_project/__openerp__.py @@ -26,7 +26,6 @@ 'category': 'Hidden', 'description': """ This module is for modifying project view to show some data related to the hr_expense module. -====================================================================================================== """, "author": "OpenERP S.A.", diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py index fb56d3d1749..b5ab6bea9ab 100644 --- a/addons/analytic_contract_hr_expense/__openerp__.py +++ b/addons/analytic_contract_hr_expense/__openerp__.py @@ -26,7 +26,6 @@ 'category': 'Hidden', 'description': """ This module is for modifying account analytic view to show some data related to the hr_expense module. -====================================================================================================== """, "author": "OpenERP S.A.", diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/analytic_contract_project/__openerp__.py index 80300f40f1e..4e4f621663c 100644 --- a/addons/analytic_contract_project/__openerp__.py +++ b/addons/analytic_contract_project/__openerp__.py @@ -27,7 +27,7 @@ "website" : "http://www.openerp.com", "depends" : ["project", "account_analytic_analysis"], "description": """ - Add "Contract Data" in project view. +Add "Contract Data" in project view. """, "init_xml" : [], "update_xml": ["analytic_contract_project_view.xml"], diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py index 6babe973aba..3494fca7a9f 100644 --- a/addons/anonymous/__openerp__.py +++ b/addons/anonymous/__openerp__.py @@ -1,6 +1,6 @@ { 'name': 'Anonymous', - 'description': 'Allow anonymous access to OpenERP', + 'description': 'Allow anonymous access to OpenERP.', 'author': 'OpenERP SA', 'version': '1.0', 'category': 'Tools', diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 0930f6da415..efb2c662f04 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -26,8 +26,9 @@ "website" : "http://www.openerp.com", "category" : "Tools", "description": """ -Replaces cleartext passwords in the database with a secure hash -=============================================================== +Replaces cleartext passwords in the database with a secure hash. +================================================================ + For your existing user base, the removal of the cleartext passwords occurs immediately when you instal base_crypt. diff --git a/addons/base_status/__openerp__.py b/addons/base_status/__openerp__.py index fcb8f54a7ee..bbd82b703ac 100644 --- a/addons/base_status/__openerp__.py +++ b/addons/base_status/__openerp__.py @@ -26,6 +26,7 @@ 'description': """ This module handles state and stage. It is derived from the crm_base and crm_case classes from crm. +======================================================================== * ``base_state``: state management * ``base_stage``: stage management diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py index ef46cd800d9..1a14211dbcc 100644 --- a/addons/base_vat/__openerp__.py +++ b/addons/base_vat/__openerp__.py @@ -24,8 +24,8 @@ 'version': '1.0', "category": 'Hidden/Dependency', 'description': """ -VAT validation for Partners' VAT numbers -======================================== +VAT validation for Partners' VAT numbers. +========================================= After installing this module, values entered in the VAT field of Partners will be validated for all supported countries. The country is inferred from the diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index c426e3ae746..a8303247ec0 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -54,7 +54,7 @@ These email templates are also at the heart of the marketing campaign system campaigns on any OpenERP document. Technical note: only the templating system of the original Power Email by -Openlabs was kept +Openlabs was kept. """, "data": [ diff --git a/addons/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py index 82fccad0914..954ce7d5bc6 100644 --- a/addons/event_moodle/__openerp__.py +++ b/addons/event_moodle/__openerp__.py @@ -25,7 +25,8 @@ 'version': '0.1', 'category': 'Tools', 'description': """ - Configure your moodle server +Configure your moodle server. +============================= With this module you are able to connect your OpenERP with a moodle plateform. This module will create courses and students automatically in your moodle plateform to avoid wasting time. @@ -37,15 +38,15 @@ STEPS TO CONFIGURE 1. activate web service in moodle ---------------------------------- ->site administration >plugins>web sevices >manage protocols +>site administration >plugins >web sevices >manage protocols activate the xmlrpc web service ->site administration >plugins>web sevices >manage tokens +>site administration >plugins >web sevices >manage tokens create a token ->site administration >plugins>web sevices >overview +>site administration >plugins >web sevices >overview activate webservice diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index 5067de7db4c..8c720045197 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -27,8 +27,8 @@ "author" : "OpenERP SA", "category": 'Tools', "description": """ -Retrieve incoming email on POP / IMAP servers -============================================= +Retrieve incoming email on POP / IMAP servers. +============================================== Enter the parameters of your POP/IMAP account(s), and any incoming emails on these accounts will be automatically downloaded into your OpenERP diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py index 66b46064097..9dc4a233dcb 100644 --- a/addons/google_base_account/__openerp__.py +++ b/addons/google_base_account/__openerp__.py @@ -24,7 +24,7 @@ 'name': 'Google Users', 'version': '1.0', 'category': 'Tools', - 'description': """The module adds google user in res user""", + 'description': """The module adds google user in res user.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index a6324ac99af..1a3ee5b70bc 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -29,22 +29,22 @@ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== -* It will mentain attendances and track (sign in/sign out) events. -* Track the timesheet lines. + * It will mentain attendances and track (sign in/sign out) events. + * Track the timesheet lines. Other tabs contains statistics views to help you analyse your time or the time of your team: -* Time spent by day (with attendances) -* Time spent by project + * Time spent by day (with attendances) + * Time spent by project This module also implements a complete timesheet validation process: -* Draft sheet -* Confirmation at the end of the period by the employee -* Validation by the project manager + * Draft sheet + * Confirmation at the end of the period by the employee + * Validation by the project manager The validation can be configured in the company: -* Period size (day, week, month, year) -* Maximal difference between timesheet and attendances + * Period size (day, week, month, year) + * Maximal difference between timesheet and attendances """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index e911f24e809..349a2e15b5a 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -28,6 +28,7 @@ A bussiness oriented Social Networking with a fully-integrated email and message management. ===================================================================== + The Social Networking module provides an unified social network abstraction layer allowing applications to display a complete communication history on documents.It gives the users the possibility @@ -38,7 +39,6 @@ allows to follow documents, and to be constantly updated about recent news. The main features of the module are : - * a clean and renewed communication history for any OpenERP document that can act as a discussion topic, * a discussion mean on documents, From 66b80419e091463034e6b2e8ae221d0278b87a42 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 15:24:25 +0530 Subject: [PATCH 041/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712095425-l1i8o33okp2tzfjx --- addons/account/__openerp__.py | 22 +++++----- .../account_analytic_default/__openerp__.py | 10 ++--- addons/account_anglo_saxon/__openerp__.py | 14 ++++--- .../__openerp__.py | 16 +++---- addons/account_budget/__openerp__.py | 4 +- addons/account_cancel/__openerp__.py | 3 +- addons/account_coda/__openerp__.py | 42 ++++++++++--------- addons/mail/__openerp__.py | 4 +- addons/point_of_sale/__openerp__.py | 2 +- addons/project/__openerp__.py | 2 +- 10 files changed, 62 insertions(+), 57 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index d955dc2c242..9df9fa00e5a 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -29,20 +29,20 @@ Accounting and Financial Management. Financial and accounting module that covers: -------------------------------------------- -General accountings -Cost/Analytic accounting -Third party accounting -Taxes management -Budgets -Customer and Supplier Invoices -Bank statements -Reconciliation process by partner + * General accountings + * Cost/Analytic accounting + * Third party accounting + * Taxes management + * Budgets + * Customer and Supplier Invoices + * Bank statements + * Reconciliation process by partner Creates a dashboard for accountants that includes: -------------------------------------------------- -* List of Customer Invoice to Approve -* Company Analysis -* Graph of Treasury + * List of Customer Invoice to Approve + * Company Analysis + * Graph of Treasury The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a module named account_voucher. diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index e02f477d1af..0a3ee7ff748 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -27,11 +27,11 @@ Allows to automatically select analytic accounts based on criterions: ===================================================================== -* Product -* Partner -* User -* Company -* Date + * Product + * Partner + * User + * Company + * Date """, 'author' : 'OpenERP SA', 'website' : 'http://www.openerp.com', diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index e6987ab6a0e..7a260b087f9 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -27,13 +27,15 @@ This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions. ===================================================================================================================== -The difference between the Anglo-Saxon accounting countries -and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. -Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped. +The difference between the Anglo-Saxon accounting countries and the Rhine or also called +Continental accounting countries is the moment of taking the Cost of Goods Sold versus +Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, +Continental accounting will take the cost at the moment the goods are shipped. -This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account -when the invoice is created to transfer this amount to the debtor or creditor account. -Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account.""", +This module will add this functionality by using a interim account, to store the value of +shipped goods and will contra book this interim account when the invoice is created to +transfer this amount to the debtor or creditor account. Secondly, price differences between +actual purchase price and fixed product standard price are booked on a separate account.""", "images": ["images/account_anglo_saxon.jpeg"], "depends": ["product", "purchase"], "category": "Hidden/Dependency", diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py index 2a31e3388a6..a3765d33622 100644 --- a/addons/account_bank_statement_extensions/__openerp__.py +++ b/addons/account_bank_statement_extensions/__openerp__.py @@ -29,14 +29,14 @@ Module that extends the standard account_bank_statement_line object for improved e-banking support. =================================================================================================== -Adds -- valuta date -- batch payments -- traceability of changes to bank statement lines -- bank statement line views -- bank statements balances report -- performance improvements for digital import of bank statement (via 'ebanking_import' context flag) -- name_search on res.partner.bank enhanced to allow search on bank and iban account numbers +This module adds: + - valuta date + - batch payments + - traceability of changes to bank statement lines + - bank statement line views + - bank statements balances report + - performance improvements for digital import of bank statement (via 'ebanking_import' context flag) + - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers ''', 'depends': ['account'], 'demo_xml': [], diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 9e61f7314a7..420991c18ee 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -28,8 +28,8 @@ This module allows accountants to manage analytic and crossovered budgets. ========================================================================== -Once the Budgets are defined (in Invoicing/Budgets/Budgets), -the Project Managers can set the planned amount on each Analytic Account. +Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Managers +can set the planned amount on each Analytic Account. The accountant has the possibility to see the total of amount planned for each Budget in order to ensure the total planned is not greater/lower than what he planned diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index 83f3a24ca88..c616cc9d5e0 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -28,7 +28,8 @@ Allows cancelling accounting entries. ===================================== -This module adds 'Allow Cancelling Entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices. +This module adds 'Allow Cancelling Entries' field on form view of account journal. +If set to true it allows user to cancel entries & invoices. """, 'website': 'http://www.openerp.com', "images" : ["images/account_cancel.jpeg"], diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index d6a44bbaba8..094ab45acc0 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -29,28 +29,29 @@ Module to import CODA bank statements. ====================================== Supported are CODA flat files in V2 format from Belgian bank accounts. -* CODA v1 support. -* CODA v2.2 support. -* Foreign Currency support. -* Support for all data record types (0, 1, 2, 3, 4, 8, 9). -* Parsing & logging of all Transaction Codes and Structured Format Communications. -* Automatic Financial Journal assignment via CODA configuration parameters. -* Support for multiple Journals per Bank Account Number. -* Support for multiple statements from different bank accounts in a single CODA file. -* Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records). -* Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR. + * CODA v1 support. + * CODA v2.2 support. + * Foreign Currency support. + * Support for all data record types (0, 1, 2, 3, 4, 8, 9). + * Parsing & logging of all Transaction Codes and Structured Format Communications. + * Automatic Financial Journal assignment via CODA configuration parameters. + * Support for multiple Journals per Bank Account Number. + * Support for multiple statements from different bank accounts in a single CODA file. + * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records). + * Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR. -The machine readable CODA Files are parsed and stored in human readable format in CODA Bank Statements. -Also Bank Statements are generated containing a subset of the CODA information (only those transaction lines -that are required for the creation of the Financial Accounting records). -The CODA Bank Statement is a 'read-only' object, hence remaining a reliable representation of the original CODA file -whereas the Bank Statement will get modified as required by accounting business processes. +The machine readable CODA Files are parsed and stored in human readable format in +CODA Bank Statements. Also Bank Statements are generated containing a subset of +the CODA information (only those transaction lines that are required for the creation +of the Financial Accounting records). The CODA Bank Statement is a 'read-only' +object, hence remaining a reliable representation of the original CODA file whereas +the Bank Statement will get modified as required by accounting business processes. CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements. -A removal of one object in the CODA processing results in the removal of the associated objects. -The removal of a CODA File containing multiple Bank Statements will also remove those associated -statements. +A removal of one object in the CODA processing results in the removal of the associated +objects. The removal of a CODA File containing multiple Bank Statements will also +remove those associated statements. The following reconciliation logic has been implemented in the CODA processing: @@ -59,8 +60,9 @@ The following reconciliation logic has been implemented in the CODA processing: 3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records. 4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing. -In stead of a manual adjustment of the generated Bank Statements, you can also re-import the CODA -after updating the OpenERP database with the information that was missing to allow automatic reconciliation. +In stead of a manual adjustment of the generated Bank Statements, you can also +re-import the CODA after updating the OpenERP database with the information that +was missing to allow automatic reconciliation. Remark on CODA V1 support: In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2. diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index 349a2e15b5a..6230e636296 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -31,14 +31,14 @@ and message management. The Social Networking module provides an unified social network abstraction layer allowing applications to display a complete -communication history on documents.It gives the users the possibility +communication history on documents. It gives the users the possibility to read and send messages and emails in an unified way. It also provides a feeds page combined to a subscription mechanism, that allows to follow documents, and to be constantly updated about recent news. -The main features of the module are : +The main features of the module are: * a clean and renewed communication history for any OpenERP document that can act as a discussion topic, * a discussion mean on documents, diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index ffe2b3cebe7..80933eaa785 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -29,7 +29,7 @@ This module provides a quick and easy sale process. =================================================== -Main features : +Main features: --------------- * Fast encoding of the sale. * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode. diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index b109867f3d8..512ecfb6845 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -36,7 +36,7 @@ Project Management module tracks multi-level projects, tasks, work done on tasks It is able to render planning, order tasks. Dashboard for project management that includes: --------------------------------------------- +----------------------------------------------- * List of My Open Tasks * Graph of My Remaining Hours by Project """, From 1b4b0df313888d596e1afc16809c9dff78abf367 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 15:57:15 +0530 Subject: [PATCH 042/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712102715-wynxquf3zpidgmoz --- addons/account_followup/__openerp__.py | 12 +++++++----- addons/account_payment/__openerp__.py | 4 ++-- addons/analytic_user_function/__openerp__.py | 6 ++++-- addons/association/__openerp__.py | 3 ++- addons/audittrail/__openerp__.py | 4 ++-- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index bdc4b12bb3e..f82741c15ad 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -30,14 +30,16 @@ Module to automate letters for unpaid invoices, with multi-level recalls. You can define your multiple levels of recall through the menu: Invoicing/Configuration/Miscellaneous/Follow-ups -Once it is defined, you can automatically print recalls every day through simply clicking on the menu: +Once it is defined, you can automatically print recalls every day through simply +clicking on the menu: Invoicing/Periodical Processing/Billing/Send follow-ups -It will generate a PDF with all the letters according to the the -different levels of recall defined. You can define different policies -for different companies. You can also send mail to the customer. +It will generate a PDF with all the letters according to the the different levels +of recall defined. You can define different policies for different companies. You +can also send mail to the customer. -Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu: +Note that if you want to check the follow-up level for a given partner/account +entry, you can do from in the menu: Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent """, diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 1959d71da74..9e7209a348e 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -29,8 +29,8 @@ Module to manage the payment of your supplier invoices. ======================================================= This module allows you to create and manage your payment orders, with purposes to -* serve as base for an easy plug-in of various automated payment mechanisms. -* provide a more efficient way to manage invoice payment. + * serve as base for an easy plug-in of various automated payment mechanisms. + * provide a more efficient way to manage invoice payment. Warning: -------- diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index c2dcc3cc91b..33a6a543874 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -28,9 +28,11 @@ This module allows you to define what is the default function of a specific user on a given account. ==================================================================================================== -This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. +This is mostly used when a user encodes his timesheet: the values are retrieved and +the fields are auto-filled. But the possibility to change these values is still available. -Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. +Obviously if no data has been recorded for the current account, the default value is given +as usual by the employee data so that this module is perfectly compatible with older configurations. """, 'author': 'OpenERP SA', diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index a3ad6a34c6d..2b7fcab8b12 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -28,7 +28,8 @@ This module is to configure modules related to an association. ============================================================== -It installs the profile for associations to manage events, registrations, memberships, membership products (schemes). +It installs the profile for associations to manage events, registrations, memberships, +membership products (schemes). """, 'author': 'OpenERP SA', 'depends': ['base_setup', 'membership', 'event'], diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index 94061548a89..9ba403bcee3 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -28,8 +28,8 @@ This module lets administrator track every user operation on all the objects of the system. =========================================================================================== -The administrator can subscribe to rules for read, write and -delete on objects and can check logs. +The administrator can subscribe to rules for read, write and delete on objects +and can check logs. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', From 1cd28c42bc3505117c6c59187599120661eff044 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 16:15:02 +0530 Subject: [PATCH 043/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712104502-o1prt23y0azyksix --- addons/base_crypt/__openerp__.py | 14 ++++++-------- addons/base_iban/__openerp__.py | 3 ++- addons/base_module_record/__openerp__.py | 9 ++++----- addons/base_report_designer/__openerp__.py | 5 ++--- addons/crm_caldav/__openerp__.py | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index efb2c662f04..3163f78ae7d 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -29,16 +29,14 @@ Replaces cleartext passwords in the database with a secure hash. ================================================================ -For your existing user base, the removal of the cleartext -passwords occurs immediately when you instal base_crypt. +For your existing user base, the removal of the cleartext passwords occurs +immediately when you instal base_crypt. -All passwords will be replaced by a secure, salted, cryptographic -hash, preventing anyone from reading the original password in -the database. +All passwords will be replaced by a secure, salted, cryptographic hash, +preventing anyone from reading the original password in the database. -After installing this module it won't be possible to recover a -forgotten password for your users, the only solution is for an -admin to set a new password. +After installing this module it won't be possible to recover a forgotten password +for your users, the only solution is for an admin to set a new password. Security Warning ++++++++++++++++ diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index d31f2f4ade5..cb0d89e6efe 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -26,7 +26,8 @@ This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity. ===================================================================================================================== -The ability to extract the correctly represented local accounts from IBAN accounts with a single statement. +The ability to extract the correctly represented local accounts from IBAN accounts +with a single statement. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py index 4d4168160c0..0cbc3e02f90 100644 --- a/addons/base_module_record/__openerp__.py +++ b/addons/base_module_record/__openerp__.py @@ -28,16 +28,15 @@ This module allows you to create a new module without any development. ====================================================================== -It records all operations on objects during the recording session and -produce a .ZIP module. So you can create your own module directly from -the OpenERP client. +It records all operations on objects during the recording session and produce a +.ZIP module. So you can create your own module directly from the OpenERP client. This version works for creating and updating existing records. It recomputes dependencies and links for all types of widgets (many2one, many2many, ...). It also support workflows and demo/update data. -This should help you to easily create reusable and publishable modules -for custom configurations and demo/testing data. +This should help you to easily create reusable and publishable modules for custom +configurations and demo/testing data. How to use it: Run Settings/Technical/Module Creation/Export Customizations As a Module wizard. diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 3b46389184d..078916b9439 100644 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -28,9 +28,8 @@ This module is used along with OpenERP OpenOffice Plugin. ========================================================= -This module adds wizards to Import/Export .sxw report that -you can modify in OpenOffice. Once you have modified it you can -upload the report using the same wizard. +This module adds wizards to Import/Export .sxw report that you can modify in OpenOffice. +Once you have modified it you can upload the report using the same wizard. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py index ce3193a595d..6e4c108e5dd 100644 --- a/addons/crm_caldav/__openerp__.py +++ b/addons/crm_caldav/__openerp__.py @@ -29,7 +29,7 @@ Caldav features in Meeting. =========================== - * Share meeting with other calendar clients like sunbird + * Share meeting with other calendar clients like sunbird """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', From e2ebb07bd05be4e08db81124cfcabc7fb743ded2 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 16:31:12 +0530 Subject: [PATCH 044/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712110112-sv55u52q6f7s8k8m --- addons/crm_profiling/__openerp__.py | 10 +++++++--- addons/delivery/__openerp__.py | 4 ++-- addons/document/__openerp__.py | 4 ++-- addons/document_webdav/__openerp__.py | 3 ++- addons/edi/__openerp__.py | 13 ++++++------- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py index 52fcf1173ed..68594281b9b 100644 --- a/addons/crm_profiling/__openerp__.py +++ b/addons/crm_profiling/__openerp__.py @@ -28,11 +28,15 @@ This module allows users to perform segmentation within partners. ================================================================= -It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner. +It uses the profiles criteria from the earlier segmentation module and improve it. +Thanks to the new concept of questionnaire. You can now regroup questions into a +questionnaire and directly use it on a partner. -It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping. +It also has been merged with the earlier CRM & SRM segmentation tool because they +were overlapping. - * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed. + * Note: this module is not compatible with the module segmentation, since + it's the same which has been renamed. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py index cd8d2520db6..d0c25835371 100644 --- a/addons/delivery/__openerp__.py +++ b/addons/delivery/__openerp__.py @@ -28,8 +28,8 @@ Allows you to add delivery methods in sale orders and picking. ============================================================== -You can define your own carrier and delivery grids for prices. -When creating invoices from picking, OpenERP is able to add and compute the shipping line. +You can define your own carrier and delivery grids for prices. When creating +invoices from picking, OpenERP is able to add and compute the shipping line. """, 'author': 'OpenERP SA', diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index d8e42703efc..388a92e3abf 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -37,8 +37,8 @@ This is a complete document management system. * Files Size by Month (graph) ATTENTION: - - When you install this module in a running company that have already PDF files stored into the database, - you will lose them all. + - When you install this module in a running company that have already PDF + files stored into the database, you will lose them all. - After installing this module PDF's are no longer stored into the database, but in the servers rootpad like /server/bin/filestore. """, diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index ec50d9301dc..f694e588058 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -40,7 +40,8 @@ With this module, the WebDAV server for documents is activated. You can then use any compatible browser to remotely see the attachments of OpenObject. -After installation, the WebDAV server can be controlled by a [webdav] section in the server's config. +After installation, the WebDAV server can be controlled by a [webdav] section in +the server's config. Server Configuration Parameter: [webdav] diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py index 580b838d155..3084d22685c 100644 --- a/addons/edi/__openerp__.py +++ b/addons/edi/__openerp__.py @@ -23,15 +23,14 @@ 'version': '1.0', 'category': 'Tools', 'description': """ -Provides a common EDI platform that other Applications can use -============================================================== +Provides a common EDI platform that other Applications can use. +=============================================================== -OpenERP specifies a generic EDI format for exchanging business -documents between different systems, and provides generic -mechanisms to import and export them. +OpenERP specifies a generic EDI format for exchanging business documents between +different systems, and provides generic mechanisms to import and export them. -More details about OpenERP's EDI format may be found in the -technical OpenERP documentation at http://doc.openerp.com +More details about OpenERP's EDI format may be found in the technical OpenERP +documentation at http://doc.openerp.com """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', From 3e94213845b7713b4e61e71922a0b0feeb51fc4f Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 17:15:35 +0530 Subject: [PATCH 045/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712114535-4a6ge109hskz0gcq --- addons/email_template/__openerp__.py | 4 +-- addons/event/__openerp__.py | 3 +- addons/event_moodle/__openerp__.py | 22 +++++++------- addons/event_sale/__openerp__.py | 9 ++++-- addons/fetchmail/__openerp__.py | 44 +++++++++++++--------------- 5 files changed, 42 insertions(+), 40 deletions(-) diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index a8303247ec0..b69dd2bb65c 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -28,8 +28,8 @@ "category" : "Marketing", "depends" : ['mail'], "description": """ -Email Templating (simplified version of the original Power Email by Openlabs) -============================================================================= +Email Templating (simplified version of the original Power Email by Openlabs). +============================================================================== Lets you design complete email templates related to any OpenERP document (Sale Orders, Invoices and so on), including sender, recipient, subject, body (HTML and diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index 0da2615d3a2..ea772778835 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -31,7 +31,8 @@ Organization and management of Events. This module allows you * to manage your events and their registrations - * to use emails to automatically confirm and send acknowledgements for any registration to an event + * to use emails to automatically confirm and send acknowledgements for any + registration to an event Note that: - You can define new types of events in diff --git a/addons/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py index 954ce7d5bc6..a1e61377ce1 100644 --- a/addons/event_moodle/__openerp__.py +++ b/addons/event_moodle/__openerp__.py @@ -29,30 +29,28 @@ Configure your moodle server. ============================= With this module you are able to connect your OpenERP with a moodle plateform. -This module will create courses and students automatically in your moodle plateform to avoid wasting time. +This module will create courses and students automatically in your moodle plateform +to avoid wasting time. Now you have a simple way to create training or courses with OpenERP and moodle - STEPS TO CONFIGURE ------------------ -1. activate web service in moodle +1. activate web service in moodle. ---------------------------------- ->site administration >plugins >web sevices >manage protocols -activate the xmlrpc web service +>site administration >plugins >web sevices >manage protocols activate the xmlrpc web service ->site administration >plugins >web sevices >manage tokens -create a token +>site administration >plugins >web sevices >manage tokens create a token ->site administration >plugins >web sevices >overview -activate webservice +>site administration >plugins >web sevices >overview activate webservice -2. Create confirmation email with login and password ----------------------------------------------------- -we strongly suggest you to add those following lines at the bottom of your event confirmation email to communicate the login/password of moodle to your subscribers. +2. Create confirmation email with login and password. +----------------------------------------------------- +we strongly suggest you to add those following lines at the bottom of your event +confirmation email to communicate the login/password of moodle to your subscribers. ........your configuration text....... diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py index d06e964c483..ddbb8fec22a 100644 --- a/addons/event_sale/__openerp__.py +++ b/addons/event_sale/__openerp__.py @@ -28,9 +28,14 @@ Creating registration with sale orders. ======================================= -This module allows you to automatize and connect your registration creation with your main sale flow and, therefore, to enable the invoicing feature of registrations. +This module allows you to automatize and connect your registration creation with +your main sale flow and, therefore, to enable the invoicing feature of registrations. -It defines a new kind of service products that offers you the possibility to choose an event category associated with it. When you encode a sale order for that product, you will be able to choose an existing event of that category and when you confirm your sale order it will automatically create a registration for this event. +It defines a new kind of service products that offers you the possibility to +choose an event category associated with it. When you encode a sale order for +that product, you will be able to choose an existing event of that category and +when you confirm your sale order it will automatically create a registration for +this event. """, 'author': 'OpenERP SA', 'depends': ['event','sale','sale_crm'], diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index 8c720045197..c5e2a232c34 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -27,35 +27,33 @@ "author" : "OpenERP SA", "category": 'Tools', "description": """ -Retrieve incoming email on POP / IMAP servers. -============================================== +Retrieve incoming email on POP/IMAP servers. +============================================ -Enter the parameters of your POP/IMAP account(s), and any incoming -emails on these accounts will be automatically downloaded into your OpenERP -system. All POP3/IMAP-compatible servers are supported, included those -that require an encrypted SSL/TLS connection. +Enter the parameters of your POP/IMAP account(s), and any incoming emails on +these accounts will be automatically downloaded into your OpenERP system. All +POP3/IMAP-compatible servers are supported, included those that require an +encrypted SSL/TLS connection. -This can be used to easily create email-based workflows for many -email-enabled OpenERP documents, such as: +This can be used to easily create email-based workflows for many email-enabled +OpenERP documents, such as: - * CRM Leads/Opportunities - * CRM Claims - * Project Issues - * Project Tasks - * Human Resource Recruitments (Applicants) + * CRM Leads/Opportunities + * CRM Claims + * Project Issues + * Project Tasks + * Human Resource Recruitments (Applicants) -Just install the relevant application, and you can assign any of -these document types (Leads, Project Issues.) to your incoming -email accounts. New emails will automatically spawn new documents -of the chosen type, so it's a snap to create a mailbox-to-OpenERP -integration. Even better: these documents directly act as mini -conversations synchronized by email. You can reply from within -OpenERP, and the answers will automatically be collected when -they come back, and attached to the same *conversation* document. +Just install the relevant application, and you can assign any of these document +types (Leads, Project Issues.) to your incoming email accounts. New emails will +automatically spawn new documents of the chosen type, so it's a snap to create a +mailbox-to-OpenERP integration. Even better: these documents directly act as mini +conversations synchronized by email. You can reply from within OpenERP, and the +answers will automatically be collected when they come back, and attached to the +same *conversation* document. For more specific needs, you may also assign custom-defined actions -(technically: Server Actions) to be triggered for each incoming -mail. +(technically: Server Actions) to be triggered for each incoming mail. """, 'website': 'http://www.openerp.com', 'init_xml': [], From dc336de847e161f349668fca68d160c14d347ee3 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Thu, 12 Jul 2012 18:21:14 +0530 Subject: [PATCH 046/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120712125114-pa2sf1scg4s17qjl --- addons/hr_evaluation/__openerp__.py | 11 +++++------ addons/hr_timesheet/__openerp__.py | 4 ++-- addons/import_base/__openerp__.py | 4 ++-- addons/import_sugarcrm/__openerp__.py | 5 +++-- addons/l10n_at/__openerp__.py | 5 ++++- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index d2ca0df9738..25fe43a755c 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -31,12 +31,11 @@ Ability to create employees evaluation. ======================================= -An evaluation can be created by employee for subordinates, -juniors as well as his manager. The evaluation is done under a plan -in which various surveys can be created and it can be defined which -level of employee hierarchy fills what and final review and evaluation -is done by the manager. Every evaluation filled by the employees can be viewed -in the form of pdf file. +An evaluation can be created by employee for subordinates, juniors as well as +his manager. The evaluation is done under a plan in which various surveys can be +created and it can be defined which level of employee hierarchy fills what and +final review and evaluation is done by the manager. Every evaluation filled by +the employees can be viewed in the form of pdf file. """, "demo": ["hr_evaluation_demo.xml"], "data": [ diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index 6b8e618116e..d6a6232d1a0 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -34,8 +34,8 @@ the analytic account. Lots of reporting on time and employee tracking are provided. -It is completely integrated with the cost accounting module. It allows you -to set up a management by affair. +It is completely integrated with the cost accounting module. It allows you to set +up a management by affair. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/import_base/__openerp__.py b/addons/import_base/__openerp__.py index 847ed89f1ec..294f864a0e3 100644 --- a/addons/import_base/__openerp__.py +++ b/addons/import_base/__openerp__.py @@ -24,8 +24,8 @@ 'version': '0.9', 'category': 'Hidden/Dependency', 'description': """ - This module provide a class import_framework to help importing - complex data from other software +This module provide a class import_framework to help importing complex data from +other software. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py index ea23247761d..f84b096e28a 100644 --- a/addons/import_sugarcrm/__openerp__.py +++ b/addons/import_sugarcrm/__openerp__.py @@ -23,8 +23,9 @@ 'name': 'SugarCRM Import', 'version': '1.0', 'category': 'Customer Relationship Management', - 'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", - "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""", + 'description': """ +This Module Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees, +Meetings, Phonecalls, Emails, Project and Project Tasks Data into OpenERP Module.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['import_base','crm', 'document'], diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py index 0f70ec5ddbd..fc266e40d51 100644 --- a/addons/l10n_at/__openerp__.py +++ b/addons/l10n_at/__openerp__.py @@ -26,7 +26,10 @@ "website" : "http://www.conexus.at", "category" : "Localization/Account Charts", "depends" : ["account_chart", 'base_vat'], - "description": "This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at. Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.", + "description": """ +This module provides the standard Accounting Chart for Austria which is based on +the Template from BMF.gv.at. Please keep in mind that you should review and adapt +it with your Accountant, before using it in a live Environment.""", "demo_xml" : [], "update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml',"l10n_chart_at_wizard.xml"], "auto_install": False, From 476970cc2e6eb70a1506a7a3b0910ef7f976f293 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 10:41:29 +0530 Subject: [PATCH 047/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713051129-2590w2op0bx2znj7 --- addons/l10n_be/__openerp__.py | 20 ++++++++++++------- addons/l10n_be_hr_payroll/__openerp__.py | 8 ++++---- .../l10n_be_hr_payroll_account/__openerp__.py | 2 +- addons/l10n_be_invoice_bba/__openerp__.py | 9 ++++++--- addons/l10n_br/__openerp__.py | 18 +++++++++++++++-- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py index d8bf8fb88a2..1f4bcfe6284 100644 --- a/addons/l10n_be/__openerp__.py +++ b/addons/l10n_be/__openerp__.py @@ -27,17 +27,23 @@ This is the base module to manage the accounting chart for Belgium in OpenERP. After installing this module, the Configuration wizard for accounting is launched. * We have the account templates which can be helpful to generate Charts of Accounts. - * On that particular wizard, you will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate, the code for your account and bank account, currency to create journals. + * On that particular wizard, you will be asked to pass the name of the company, + the chart template to follow, the no. of digits to generate, the code for your + account and bank account, currency to create journals. Thus, the pure copy of Chart Template is generated. Wizards provided by this module: - * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format. - Path to access : Accounting/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing - * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in. - Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration - * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year - Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers + * Partner VAT Intra: Enlist the partners with their related VAT and invoiced + amounts. Prepares an XML file format. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra + * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of + the Main company of the User currently Logged in. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration + * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat + Declaration of the Main company of the User currently Logged in Based on + Fiscal year. + Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers """, 'author': 'Noviat & OpenERP SA', diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py index 9b6cd025b3f..e0d7ada059b 100644 --- a/addons/l10n_be_hr_payroll/__openerp__.py +++ b/addons/l10n_be_hr_payroll/__openerp__.py @@ -25,14 +25,14 @@ 'depends': ['hr_payroll'], 'version': '1.0', 'description': """ -Belgian Payroll Rules -===================== +Belgian Payroll Rules. +====================== * Employee Details * Employee Contracts * Passport based Contract - * Allowances / Deductions - * Allow to configure Basic / Gross / Net Salary + * Allowances/Deductions + * Allow to configure Basic/Gross/Net Salary * Employee Payslip * Monthly Payroll Register * Integrated with Holiday Management diff --git a/addons/l10n_be_hr_payroll_account/__openerp__.py b/addons/l10n_be_hr_payroll_account/__openerp__.py index ce6730df3da..81c7e243b39 100644 --- a/addons/l10n_be_hr_payroll_account/__openerp__.py +++ b/addons/l10n_be_hr_payroll_account/__openerp__.py @@ -25,7 +25,7 @@ 'depends': ['l10n_be_hr_payroll', 'hr_payroll_account', 'l10n_be'], 'version': '1.0', 'description': """ -Accounting Data for Belgian Payroll Rules +Accounting Data for Belgian Payroll Rules. """, 'auto_install': True, diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py index 9cdc97d0c71..9f4efe1b31e 100644 --- a/addons/l10n_be_invoice_bba/__openerp__.py +++ b/addons/l10n_be_invoice_bba/__openerp__.py @@ -32,7 +32,9 @@ Belgian localisation for in- and outgoing invoices (prereq to account_coda): - Rename 'reference' field labels to 'Communication' - Add support for Belgian Structured Communication -A Structured Communication can be generated automatically on outgoing invoices according to the following algorithms: +A Structured Communication can be generated automatically on outgoing invoices +according to the following algorithms: + 1) Random : +++RRR/RRRR/RRRDD+++ R..R = Random Digits, DD = Check Digits 2) Date : +++DOY/YEAR/SSSDD+++ @@ -40,8 +42,9 @@ A Structured Communication can be generated automatically on outgoing invoices a 3) Customer Reference +++RRR/RRRR/SSSDDD+++ R..R = Customer Reference without non-numeric characters, SSS = Sequence Number, DD = Check Digits) -The preferred type of Structured Communication and associated Algorithm can be specified on the Partner records. -A 'random' Structured Communication will generated if no algorithm is specified on the Partner record. +The preferred type of Structured Communication and associated Algorithm can be +specified on the Partner records. A 'random' Structured Communication will +generated if no algorithm is specified on the Partner record. """, 'depends': ['account'], diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py index 909d4f53600..a2acd722eaf 100644 --- a/addons/l10n_br/__openerp__.py +++ b/addons/l10n_br/__openerp__.py @@ -41,9 +41,23 @@ This module consists in: - Tax Situation Code (CST) required for the electronic fiscal invoicing (NFe) -The field tax_discount has also been added in the account.tax.template and account.tax objects to allow the proper computation of some Brazilian VATs such as ICMS. The chart of account creation wizard has been extended to propagate those new data properly. +The field tax_discount has also been added in the account.tax.template and account.tax +objects to allow the proper computation of some Brazilian VATs such as ICMS. The +chart of account creation wizard has been extended to propagate those new data properly. -It's important to note however that this module lack many implementations to use OpenERP properly in Brazil. Those implementations (such as the electronic fiscal Invoicing which is already operational) are brought by more than 15 additional modules of the Brazilian Launchpad localization project https://launchpad.net/openerp.pt-br-localiz and their dependencies in the extra addons branch. Those modules aim at not breaking with the remarkable OpenERP modularity, this is why they are numerous but small. One of the reasons for maintaining those modules apart is that Brazilian Localization leaders need commit rights agility to complete the localization as companies fund the remaining legal requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and PAF ECF that are still missing as September 2011). Those modules are also strictly licensed under AGPL V3 and today don't come with any additional paid permission for online use of 'private modules'.""", +It's important to note however that this module lack many implementations to use +OpenERP properly in Brazil. Those implementations (such as the electronic fiscal +Invoicing which is already operational) are brought by more than 15 additional +modules of the Brazilian Launchpad localization project +https://launchpad.net/openerp.pt-br-localiz and their dependencies in the extra +addons branch. Those modules aim at not breaking with the remarkable OpenERP +modularity, this is why they are numerous but small. One of the reasons for +maintaining those modules apart is that Brazilian Localization leaders need commit +rights agility to complete the localization as companies fund the remaining legal +requirements (such as soon fiscal ledgers, accounting SPED, fiscal SPED and PAF +ECF that are still missing as September 2011). Those modules are also strictly +licensed under AGPL V3 and today don't come with any additional paid permission +for online use of 'private modules'.""", 'license': 'AGPL-3', 'author': 'Akretion, OpenERP Brasil', 'website': 'http://openerpbrasil.org', From 3b36ef133917540bccf8a25a2c22fdaf04020729 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 10:56:52 +0530 Subject: [PATCH 048/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713052652-fy5dlrltgdmsz9z1 --- addons/l10n_br/__openerp__.py | 4 ++-- addons/l10n_ch/__openerp__.py | 20 ++++++++++---------- addons/l10n_cn/__openerp__.py | 6 +++--- addons/l10n_cr/__openerp__.py | 14 +++++++------- addons/l10n_es/__openerp__.py | 14 +++++++------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py index a2acd722eaf..022fa1b6a4d 100644 --- a/addons/l10n_br/__openerp__.py +++ b/addons/l10n_br/__openerp__.py @@ -22,8 +22,8 @@ 'name': 'Brazilian - Accounting', 'category': 'Localization/Account Charts', 'description': """ -Base module for the Brazilian localization -========================================== +Base module for the Brazilian localization. +=========================================== This module consists in: diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index d5ed358d25c..d3b7e796aee 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -36,10 +36,11 @@ You can also add ZIP and bank completion with: ------------------------------------------------------------------------ -Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. Cette nouvelle version -comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement) -et l'import du relevé de compte depuis la banque de manière automatisée. -De plus, nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing). +Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. +Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement +électronique via DTA (pour les banques, le système postal est en développement) +et l'import du relevé de compte depuis la banque de manière automatisée. De plus, +nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing). Par ailleurs, conjointement à ce module, nous proposons la complétion NPA: @@ -52,12 +53,11 @@ Vous pouvez ajouter la completion des banques et des NPA avec with: -------------------------------------------------------------------------- TODO : -- Implement bvr import partial reconciliation -- Replace wizard by osv_memory when possible -- Add mising HELP -- Finish code comment -- Improve demo data - + - Implement bvr import partial reconciliation + - Replace wizard by osv_memory when possible + - Add mising HELP + - Finish code comment + - Improve demo data """, "version": "6.1", diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py index 6e66c77e45b..e173c5ebba2 100644 --- a/addons/l10n_cn/__openerp__.py +++ b/addons/l10n_cn/__openerp__.py @@ -26,9 +26,9 @@ "website":"http://openerp-china.org", "url":"http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn", "description": """ - 添加中文省份数据 - 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 - ============================================================ +添加中文省份数据 +科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 +============================================================ """, "depends" : ["base","account"], 'init_xml': [ diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py index e224f22358a..562af835398 100644 --- a/addons/l10n_cr/__openerp__.py +++ b/addons/l10n_cr/__openerp__.py @@ -44,14 +44,14 @@ Chart of accounts for Costa Rica. ================================= Includes: -* account.type -* account.account.template -* account.tax.template -* account.tax.code.template -* account.chart.template + * account.type + * account.account.template + * account.tax.template + * account.tax.code.template + * account.chart.template -Everything is in English with Spanish translation. Further translations are welcome, please go to -http://translations.launchpad.net/openerp-costa-rica +Everything is in English with Spanish translation. Further translations are welcome, +please go to http://translations.launchpad.net/openerp-costa-rica. """, 'depends': ['account', 'account_chart', 'base'], 'init_xml': [], diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index 95b8ab7b57c..aabe62ac567 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -31,14 +31,14 @@ Spanish Charts of Accounts (PGCE 2008). ======================================= -* Defines the following chart of account templates: - * Spanish General Chart of Accounts 2008. - * Spanish General Chart of Accounts 2008 for small and medium companies. -* Defines templates for sale and purchase VAT. -* Defines tax code templates. + * Defines the following chart of account templates: + * Spanish General Chart of Accounts 2008. + * Spanish General Chart of Accounts 2008 for small and medium companies. + * Defines templates for sale and purchase VAT. + * Defines tax code templates. -Note: You should install the l10n_ES_account_balance_report module -for yearly account reporting (balance, profit & losses). +Note: You should install the l10n_ES_account_balance_report module for yearly + account reporting (balance, profit & losses). """, "license" : "GPL-3", "depends" : ["account", "base_vat", "base_iban"], From a68bc608286d2a3c74cc4464470fc29023ba245d Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 11:20:22 +0530 Subject: [PATCH 049/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713055022-bn9rl00g9dzkfjg8 --- addons/l10n_fr/__openerp__.py | 16 ++++++++++--- addons/l10n_fr_hr_payroll/__openerp__.py | 25 +++++++++++--------- addons/l10n_fr_rib/__openerp__.py | 29 ++++++++++++++++-------- addons/l10n_gt/__openerp__.py | 4 +++- addons/l10n_hn/__openerp__.py | 5 +++- 5 files changed, 53 insertions(+), 26 deletions(-) diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index bab6af2d49c..ec31f71513a 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -35,11 +35,21 @@ This is the module to manage the accounting chart for France in OpenERP. ======================================================================== -This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte) +This module applies to companies based in France mainland. It doesn't apply to +companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte). -This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions). +This localisation module creates the VAT taxes of type "tax included" for purchases +(it is notably required when you use the module "hr_expense"). Beware that these +"tax included" VAT taxes are not managed by the fiscal positions provided by this +module (because it is complex to manage both "tax excluded" and "tax included" +scenarios in fiscal positions). -This localisation module doesn't properly handle the scenario when a France-mainland company sells services to a company based in the DOMs. We could manage it in the fiscal positions, but it would require to differentiate between "product" VAT taxes and "service" VAT taxes. We consider that it is too "heavy" to have this by default in l10n_fr ; companies that sell services to DOM-based companies should update the configuration of their taxes and fiscal positions manually. +This localisation module doesn't properly handle the scenario when a France-mainland +company sells services to a company based in the DOMs. We could manage it in the +fiscal positions, but it would require to differentiate between "product" VAT taxes +and "service" VAT taxes. We consider that it is too "heavy" to have this by default +in l10n_fr; companies that sell services to DOM-based companies should update the +configuration of their taxes and fiscal positions manually. Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp. """, diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py index b9bc3b74f22..fd1f595a7e3 100755 --- a/addons/l10n_fr_hr_payroll/__openerp__.py +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -25,19 +25,22 @@ 'depends': ['hr_payroll', 'l10n_fr'], 'version': '1.0', 'description': """ -French Payroll Rules -======================= +French Payroll Rules. +===================== - -Configuration of hr_payroll for french localization - -All main contributions rules for french payslip, for 'cadre' and 'non-cadre' - -New payslip report + - Configuration of hr_payroll for french localization + - All main contributions rules for french payslip, for 'cadre' and 'non-cadre' + - New payslip report - TODO : - -Integration with holidays module for deduction and allowance - -Integration with hr_payroll_account for the automatic account_move_line creation from the payslip - -Continue to integrate the contribution. Only the main contribution are currently implemented - -Remake the report under webkit - -The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report +TODO : + - Integration with holidays module for deduction and allowance + - Integration with hr_payroll_account for the automatic account_move_line + creation from the payslip + - Continue to integrate the contribution. Only the main contribution are + currently implemented + - Remake the report under webkit + - The payslip.line with appears_in_payslip = False should appears in the + payslip interface, but not in the payslip report """, 'active': False, diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py index ac1b03f4b3e..fedac46381d 100644 --- a/addons/l10n_fr_rib/__openerp__.py +++ b/addons/l10n_fr_rib/__openerp__.py @@ -25,17 +25,26 @@ "category": 'Hidden/Dependency', 'description': ''' This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details). -RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". The four standard RIB fields will then become mandatory: -- Bank Code -- Office Code -- Account number -- RIB key -As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and will refuse to record the data if the key is incorrect. Please bear in mind that this can only happen when the user presses the "save" button, for example on the Partner Form. -Since each bank account may relate to a Bank, users may enter the RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB when they select the Bank. -To make this easier, this module will also let users find Banks using their RIB code. +=========================================================================================================================== -The module base_iban can be a useful addition to this module, because French banks are now progressively adopting the international IBAN format instead of the RIB format. -The RIB and IBAN codes for a single account can be entered by recording two Bank Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". +RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying +the account type "RIB". The four standard RIB fields will then become mandatory: + - Bank Code + - Office Code + - Account number + - RIB key +As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and +will refuse to record the data if the key is incorrect. Please bear in mind that +this can only happen when the user presses the "save" button, for example on the +Partner Form. Since each bank account may relate to a Bank, users may enter the +RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB +when they select the Bank. To make this easier, this module will also let users +find Banks using their RIB code. + +The module base_iban can be a useful addition to this module, because French banks +are now progressively adopting the international IBAN format instead of the RIB format. +The RIB and IBAN codes for a single account can be entered by recording two Bank +Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". ''', 'author' : u'Numérigraphe SARL', 'depends': ['account', 'base_iban'], diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py index f05bbdaaff1..44389e68439 100644 --- a/addons/l10n_gt/__openerp__.py +++ b/addons/l10n_gt/__openerp__.py @@ -40,7 +40,9 @@ This is the base module to manage the accounting chart for Guatemala. ===================================================================== -Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency""", +Agrega una nomenclatura contable para Guatemala. También icluye impuestos y +la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes +taxes and the Quetzal currency.""", 'author': 'José Rodrigo Fernández Menegazzo', 'website': 'http://solucionesprisma.com/', 'depends': ['base', 'account', 'account_chart'], diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py index af8bb4cfa1d..25655e52e70 100644 --- a/addons/l10n_hn/__openerp__.py +++ b/addons/l10n_hn/__openerp__.py @@ -36,7 +36,10 @@ 'name': 'Honduras - Accounting', 'version': '0.1', 'category': 'Localization/Account Charts', - 'description': """Agrega una nomenclatura contable para Honduras. También incluye impuestos y la moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes and the Lempira currency""", + 'description': """ +Agrega una nomenclatura contable para Honduras. También incluye impuestos y la +moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes +and the Lempira currency.""", 'author': 'Salvatore Josue Trimarchi Pinto', 'website': 'http://trimarchi.co.cc', 'depends': ['base', 'account', 'account_chart'], From 12f3cef6292cf11e20827ce397f9d10aac0b6f35 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 11:32:55 +0530 Subject: [PATCH 050/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713060255-izdtqq9196n2emz6 --- addons/l10n_in/__openerp__.py | 4 ++-- addons/l10n_lu/__openerp__.py | 2 +- addons/l10n_ma/__openerp__.py | 6 +++++- addons/l10n_multilang/__openerp__.py | 7 ++++--- addons/l10n_nl/__openerp__.py | 23 ++++++++++++++++------- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index c13139f6736..f052a2d63ca 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -23,8 +23,8 @@ "name": "India - Accounting", "version": "1.0", "description": """ -Indian Accounting : Chart of Account. -===================================== +Indian Accounting: Chart of Account. +==================================== Indian accounting chart and localization. """, diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py index bb12abd76fc..1ade34faaca 100644 --- a/addons/l10n_lu/__openerp__.py +++ b/addons/l10n_lu/__openerp__.py @@ -28,7 +28,7 @@ This is the base module to manage the accounting chart for Luxembourg. ====================================================================== - * the KLUWER Chart of Accounts, + * the KLUWER Chart of Accounts * the Tax Code Chart for Luxembourg * the main taxes used in Luxembourg""", 'author': 'OpenERP SA', diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py index 21b7c632d6b..52f453af8bb 100644 --- a/addons/l10n_ma/__openerp__.py +++ b/addons/l10n_ma/__openerp__.py @@ -28,7 +28,11 @@ This is the base module to manage the accounting chart for Maroc. ================================================================= -Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010""", +Ce Module charge le modèle du plan de comptes standard Marocain et permet de +générer les états comptables aux normes marocaines (Bilan, CPC (comptes de +produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). +L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable +Seddik au cours du troisième trimestre 2010.""", "website": "http://www.kazacube.com", "depends" : ["base", "account"], "init_xml" : [], diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py index 42ca20a2f8e..cf521f124f4 100644 --- a/addons/l10n_multilang/__openerp__.py +++ b/addons/l10n_multilang/__openerp__.py @@ -25,10 +25,11 @@ "author" : "OpenERP SA", "category": 'Hidden/Dependency', "description": """ - * Multi language support for Chart of Accounts, Taxes, Tax Codes , Journals, Accounting Templates, - Analytic Chart of Accounts and Analytic Journals. + * Multi language support for Chart of Accounts, Taxes, Tax Codes, Journals, + Accounting Templates, Analytic Chart of Accounts and Analytic Journals. * Setup wizard changes - - Copy translations for COA, Tax, Tax Code and Fiscal Position from templates to target objects. + - Copy translations for COA, Tax, Tax Code and Fiscal Position from + templates to target objects. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index 562fd0ab876..b46c8781f42 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -94,19 +94,28 @@ This is the module to manage the accounting chart for Netherlands in OpenERP. ============================================================================= Read changelog in file __openerp__.py for version information. -Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederlandse bedrijven te installeren in OpenERP versie 5. +Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor +Nederlandse bedrijven te installeren in OpenERP versie 5. -De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, denk b.v. aan intracommunautaire verwervingen -waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken. +De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, +denk b.v. aan intracommunautaire verwervingen waarbij u 19% BTW moet opvoeren, +maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken. Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen. - * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind. + * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het + Nederlandse grootboekschema bevind. - * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren. + * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf + in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een + grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency + om Journalen te creeren. -Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen" +Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 +cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. +De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen". - * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via + Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. """, "author" : "Veritos - Jan Verlaan", From 413535b2ca88322bd51634fdc9cdf7a01ee621c7 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 11:41:34 +0530 Subject: [PATCH 051/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713061134-rg66cns2fqnhovcj --- addons/l10n_pe/__openerp__.py | 5 +++-- addons/l10n_syscohada/__openerp__.py | 13 ++++++++----- addons/l10n_tr/__openerp__.py | 5 +++-- addons/l10n_uk/__openerp__.py | 4 +++- addons/l10n_us/__openerp__.py | 2 +- addons/l10n_uy/__openerp__.py | 6 +++--- 6 files changed, 21 insertions(+), 14 deletions(-) diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py index fa65c1033b7..7908664ca83 100644 --- a/addons/l10n_pe/__openerp__.py +++ b/addons/l10n_pe/__openerp__.py @@ -22,9 +22,10 @@ "name": "Peru Localization Chart Account", "version": "1.0", "description": """ -Peruvian accounting chart and tax localization. Acording the PCGE 2010 +Peruvian accounting chart and tax localization. Acording the PCGE 2010. -Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la SUNAT 2011 (PCGE 2010) +Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la +SUNAT 2011 (PCGE 2010). """, "author": ["Cubic ERP"], diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py index 01c1aaef96f..2fd6917ec11 100644 --- a/addons/l10n_syscohada/__openerp__.py +++ b/addons/l10n_syscohada/__openerp__.py @@ -24,12 +24,15 @@ "version" : "1.0", "author" : "Baamtu Senegal", "category" : "Localization/Account Charts", - "description": """This module implements the accounting chart for OHADA area. - It allows any company or association to manage its financial accounting. - Countries that use OHADA are the following: + "description": """ +This module implements the accounting chart for OHADA area. +=========================================================== + +It allows any company or association to manage its financial accounting. +Countries that use OHADA are the following: Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, Congo, - Ivory Coast, Gabon, Guinea, Guinea Bissau, - Equatorial Guinea, Mali, Niger, Replica of Democratic Congo, Senegal, Chad, Togo. + Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, Niger, + Replica of Democratic Congo, Senegal, Chad, Togo. """, "website": "http://www.baamtu.com", "depends" : ["account", "base_vat"], diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py index ad4621499d3..d72865a216c 100644 --- a/addons/l10n_tr/__openerp__.py +++ b/addons/l10n_tr/__openerp__.py @@ -23,10 +23,11 @@ 'category': 'Localization/Account Charts', 'description': """ Türkiye için Tek düzen hesap planı şablonu OpenERP Modülü. -============================================================================== +========================================================== Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır - * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket,banka hesap bilgileriniz,ilgili para birimi gibi bilgiler isteyecek. + * Sihirbaz sizden hesap planı şablonu, planın kurulacağı şirket, banka hesap + bilgileriniz, ilgili para birimi gibi bilgiler isteyecek. """, 'author': 'Ahmet Altınışık', 'maintainer':'https://launchpad.net/~openerp-turkey', diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py index f6e8212aed0..19a9747ea6a 100644 --- a/addons/l10n_uk/__openerp__.py +++ b/addons/l10n_uk/__openerp__.py @@ -23,7 +23,9 @@ 'name': 'UK - Accounting', 'version': '1.0', 'category': 'Localization/Account Charts', - 'description': """This is the latest UK OpenERP localisation necesary to run OpenERP accounting for UK SME's with: + 'description': """ +This is the latest UK OpenERP localisation necesary to run OpenERP accounting +for UK SME's with: - a CT600-ready chart of accounts - VAT100-ready tax structure - InfoLogic UK counties listing diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py index 4aac9b14287..f900c3d5e99 100644 --- a/addons/l10n_us/__openerp__.py +++ b/addons/l10n_us/__openerp__.py @@ -24,7 +24,7 @@ "author": "OpenERP SA", "category": 'Localization/Account Charts', "description": """ - United States - Chart of accounts +United States - Chart of accounts. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py index 4edfe22e1e8..5e4eb51ffc0 100644 --- a/addons/l10n_uy/__openerp__.py +++ b/addons/l10n_uy/__openerp__.py @@ -28,10 +28,10 @@ "category" : "Localization/Account Charts", "website" : "https://launchpad.net/openerp-uruguay", "description": """ -General Chart of Accounts -========================= +General Chart of Accounts. +========================== -Provide Templates for Chart of Accounts, Taxes for Uruguay +Provide Templates for Chart of Accounts, Taxes for Uruguay. """, "license" : "AGPL-3", From e0d24ed957fa0ec6c30d4bfe27d728ecf1e13b67 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 12:28:10 +0530 Subject: [PATCH 052/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713065810-91bvrnod20nr38gq --- addons/lunch/__openerp__.py | 15 ++++----------- addons/marketing_campaign/__openerp__.py | 22 +++++++++++++++------- addons/membership/__openerp__.py | 8 ++++---- addons/mrp_operations/__openerp__.py | 3 ++- addons/pad/__openerp__.py | 4 ++-- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index dcc33ed9c44..ad476588e93 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -22,22 +22,15 @@ { "name": "Lunch Orders", "author": "OpenERP SA", - "Description": """ - The lunch module is for keeping a record of the order placed and payment of the orders. - ======================================================================================= - - The products are defined under categories and the payment records are maintained user-wise. - Every user has a cashbox which keeps track of the amount paid for a particular order. - - """, "version": "0.1", "depends": ["base_tools"], "category" : "Tools", 'description': """ - The base module to manage lunch. +The base module to manage lunch. +================================ - keep track for the Lunch Order, Cash Moves, CashBox, Product. - Apply Different Category for the product. +keep track for the Lunch Order, Cash Moves, CashBox, Product. Apply Different +Category for the product. """, "init_xml": [], "update_xml": [ diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 8d2166998ac..e0cf8b56439 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -35,15 +35,23 @@ This module provides leads automation through marketing campaigns (campaigns can ========================================================================================================================================= The campaigns are dynamic and multi-channels. The process is as follows: - * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions. - * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries.) - * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it - * You may also start the real campaign in manual mode, where each action requires manual validation - * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. + * Design marketing campaigns like workflows, including email templates to + send, reports to print and send by email, custom actions + * Define input segments that will select the items that should enter the + campaign (e.g leads from certain countries.) + * Run you campaign in simulation mode to test it real-time or accelerated, + and fine-tune it + * You may also start the real campaign in manual mode, where each action + requires manual validation + * Finally launch your campaign live, and watch the statistics as the + campaign does everything fully automatically. -While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow. +While the campaign runs you can of course continue to fine-tune the parameters, +input segments, workflow. -Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads. +Note: If you need demo data, you can install the marketing_campaign_crm_demo + module, but this will also install the CRM application as it depends on + CRM Leads. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py index 48a4b77cf68..eae5861e93c 100644 --- a/addons/membership/__openerp__.py +++ b/addons/membership/__openerp__.py @@ -29,10 +29,10 @@ This module allows you to manage all operations for managing memberships. ========================================================================= It supports different kind of members: -* Free member -* Associated member (eg.: a group subscribes to a membership for all subsidiaries) -* Paid members, -* Special member prices, ... + * Free member + * Associated member (eg.: a group subscribes to a membership for all subsidiaries) + * Paid members + * Special member prices It is integrated with sales and accounting to allow you to automatically invoice and send propositions for membership renewal. diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 61b745bd9d6..4950b85aef0 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -29,7 +29,8 @@ This module adds state, date_start, date_stop in manufacturing order operation l ============================================================================================================= Status: draft, confirm, done, cancel -When finishing/confirming, cancelling manufacturing orders set all state lines to the according state +When finishing/confirming, cancelling manufacturing orders set all state lines +to the according state. Create menus: Manufacturing > Manufacturing > Work Orders diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 267f595c7e5..8949091e24d 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -7,8 +7,8 @@ Adds enhanced support for (Ether)Pad attachments in the web client. =================================================================== -Lets the company customize which Pad installation should be used to link to new pads -(by default, http://ietherpad.com/). +Lets the company customize which Pad installation should be used to link to new +pads (by default, http://ietherpad.com/). """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', From 5847fae7a3dbb243e6112add7756d18f3585e0e5 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 14:30:33 +0530 Subject: [PATCH 053/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713090033-h0lnq0rceganv5mv --- addons/pad_project/__openerp__.py | 3 +-- addons/plugin/__openerp__.py | 4 +--- addons/plugin_outlook/__openerp__.py | 9 +++++---- addons/portal/__openerp__.py | 4 ++-- addons/product/__openerp__.py | 13 ++++++------- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py index 8ca761d2737..f8ee3138d27 100644 --- a/addons/pad_project/__openerp__.py +++ b/addons/pad_project/__openerp__.py @@ -24,8 +24,7 @@ 'version': '1.0', "category": "Project Management", 'description': """ -This module adds a PAD in all project kanban views -================================================== +This module adds a PAD in all project kanban views. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py index dba41649ff6..801e0571c58 100644 --- a/addons/plugin/__openerp__.py +++ b/addons/plugin/__openerp__.py @@ -25,9 +25,7 @@ 'version': '1.0', 'category': 'Hidden/Dependency', 'description': """ -The common interface for pugin. -===================================================== - +The common interface for plug-in. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py index ac6cb32cae7..077b0aa6746 100644 --- a/addons/plugin_outlook/__openerp__.py +++ b/addons/plugin_outlook/__openerp__.py @@ -30,10 +30,11 @@ 'description': ''' This module provides the Outlook Plug-in. ========================================= -Outlook plug-in allows you to select an object that you would like to add -to your email and its attachments from MS Outlook. You can select a partner, a task, -a project, an analytical account, or any other object and archive selected -mail into mail.message with attachments. + +Outlook plug-in allows you to select an object that you would like to add to +your email and its attachments from MS Outlook. You can select a partner, a task, +a project, an analytical account, or any other object and archive selected mail +into mail.message with attachments. ''', 'init_xml' : [], 'demo_xml' : [], diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py index 53204ec8064..70791995958 100644 --- a/addons/portal/__openerp__.py +++ b/addons/portal/__openerp__.py @@ -26,8 +26,8 @@ 'author' : "OpenERP SA", 'category': 'Portal', 'description': """ -This module defines 'portals' to customize the access to your OpenERP database -for external users. +This module defines 'portals' to customize the access to your OpenERP database for external users. +================================================================================================== A portal defines customized user menu and access rights for a group of users (the ones associated to that portal). It also associates user groups to the diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 9b4d2cadee1..19f5e552ab0 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -32,17 +32,16 @@ This is the base module for managing products and pricelists in OpenERP. ======================================================================== -Products support variants, different pricing methods, suppliers -information, make to stock/order, different unit of measures, -packaging and properties. +Products support variants, different pricing methods, suppliers information, +make to stock/order, different unit of measures, packaging and properties. Pricelists support: * Multiple-level of discount (by product, category, quantities) * Compute price based on different criteria: - * Other pricelist, - * Cost price, - * List price, - * Supplier price, ... + * Other pricelist + * Cost price + * List price + * Supplier price Pricelists preferences by product and/or partners. From 339051cadf4b9af80c2671521fe0de7441714b4f Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 14:43:24 +0530 Subject: [PATCH 054/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713091324-sengeariqawfira9 --- .../product_visible_discount/__openerp__.py | 8 ++++--- addons/project_long_term/__openerp__.py | 16 ++++++++----- addons/project_mailgate/__openerp__.py | 13 +++++----- addons/project_mrp/__openerp__.py | 24 +++++++++---------- addons/project_retro_planning/__openerp__.py | 3 ++- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index d957c6d87ed..0bba2cca4ac 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -29,9 +29,11 @@ This module lets you calculate discounts on Sale Order lines and Invoice lines b To this end, a new check box named "Visible Discount" is added to the pricelist form. Example: - For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225 - If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225 - If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225 + For the product PC1 and the partner "Asustek": if listprice=450, and the price + calculated using Asustek's pricelist is 225. If the check box is checked, we + will have on the sale order line: Unit price=450, Discount=50,00, Net price=225. + If the check box is unchecked, we will have on Sale Order and Invoice lines: + Unit price=225, Discount=0,00, Net price=225. """, "depends": ["sale"], "demo_xml": [], diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 8ed12a06e10..b44bd92ad57 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -31,14 +31,18 @@ Long Term Project management module that tracks planning, scheduling, resources allocation. =========================================================================================== -Features --------- +Features: +--------- * Manage Big project. * Define various Phases of Project. - * Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given. - If no project given then all the draft,open and pending state phases will be taken. - * Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks. - * Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date + * Compute Phase Scheduling: Compute start date and end date of the phases + which are in draft, open and pending state of the project given. If no + project given then all the draft, open and pending state phases will be taken. + * Compute Task Scheduling: This works same as the scheduler button on + project.phase. It takes the project as argument and computes all the open, + draft and pending tasks. + * Schedule Tasks: All the tasks which are in draft,pending and open state + are scheduled with taking the phase's start date """, "init_xml": [], "demo_xml": ["project_long_term_demo.xml"], diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py index dad9fd09eae..bd1cb5f4e20 100644 --- a/addons/project_mailgate/__openerp__.py +++ b/addons/project_mailgate/__openerp__.py @@ -29,18 +29,17 @@ "images": ["images/project_mailgate_task.jpeg"], "depends": ["project", "mail"], "description": """ -This module can automatically create Project Tasks based on incoming emails -=========================================================================== +This module can automatically create Project Tasks based on incoming emails. +============================================================================ Allows creating tasks based on new emails arriving at a given mailbox, similarly to what the CRM application has for Leads/Opportunities. There are two common alternatives to configure the mailbox integration: - * Install the ``fetchmail`` module and configure a new mailbox, then select - ``Project Tasks`` as the target for incoming emails. - * Set it up manually on your mail server based on the 'mail gateway' script - provided in the ``mail`` module - and connect it to the `project.task` model. - + * Install the ``fetchmail`` module and configure a new mailbox, then select + ``Project Tasks`` as the target for incoming emails. + * Set it up manually on your mail server based on the 'mail gateway' script + provided in the ``mail`` module - and connect it to the `project.task` model. """, "init_xml": [], diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index 9992bd3b2b7..c5c17ec85e0 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -25,24 +25,24 @@ 'version': '1.0', "category": "Project Management", 'description': """ -Automatically creates project tasks from procurement lines -========================================================== +Automatically creates project tasks from procurement lines. +=========================================================== -This module will automatically create a new task for each procurement -order line (e.g. for sale order lines), if the corresponding product -meets the following characteristics: +This module will automatically create a new task for each procurement order line +(e.g. for sale order lines), if the corresponding product meets the following +characteristics: - * Type = Service - * Procurement method (Order fulfillment) = MTO (make to order) - * Supply/Procurement method = Produce + * Type = Service + * Procurement method (Order fulfillment) = MTO (make to order) + * Supply/Procurement method = Produce If on top of that a projet is specified on the product form (in the Procurement -tab), then the new task will be created in that specific project. -Otherwise, the new task will not belong to any project, and may be added to a -project manually later. +tab), then the new task will be created in that specific project. Otherwise, the +new task will not belong to any project, and may be added to a project manually +later. When the project task is completed or cancelled, the workflow of the corresponding -procurement line is updated accordingly. For example if this procurement corresponds +procurement line is updated accordingly. For example, if this procurement corresponds to a sale order line, the sale order line will be considered delivered when the task is completed. diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py index d334a421de4..f5fa2d11d89 100644 --- a/addons/project_retro_planning/__openerp__.py +++ b/addons/project_retro_planning/__openerp__.py @@ -27,7 +27,8 @@ Changes dates according to change in project End Date. ====================================================== -If end date of project is changed then the deadline date and start date for all the tasks will change accordingly. +If end date of project is changed then the deadline date and start date for all +the tasks will change accordingly. """, 'author': 'OpenERP SA', 'depends': ['base', 'project'], From 01981534f6fe8d61c200baf2b66257a003d478cb Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 15:01:14 +0530 Subject: [PATCH 055/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713093114-wzrprgaeo34tzjbx --- addons/project_timesheet/__openerp__.py | 5 +++-- addons/purchase_analytic_plans/__openerp__.py | 4 ++-- .../purchase_double_validation/__openerp__.py | 4 ++-- addons/purchase_requisition/__openerp__.py | 5 +++-- addons/report_intrastat/__openerp__.py | 3 ++- addons/report_webkit/__openerp__.py | 22 +++++++++---------- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index f1a82867a6f..569ccc1023b 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -27,8 +27,9 @@ Synchronization of project task work entries with timesheet entries. ==================================================================== -This module 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. +This module 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. """, 'author': 'OpenERP SA', diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index 73a222ec551..283923895d6 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -28,8 +28,8 @@ The base module to manage analytic distribution and purchase orders. ==================================================================== -Allows the user to maintain several analysis plans. These let you split -a line on a supplier purchase order into several accounts and analytic plans. +Allows the user to maintain several analysis plans. These let you split a line +on a supplier purchase order into several accounts and analytic plans. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index 47124e689ef..970c85bc08c 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -30,8 +30,8 @@ Double-validation for purchases exceeding minimum amount. ========================================================= -This module modifies the purchase workflow in order to validate purchases -that exceeds minimum amount set by configuration wizard. +This module modifies the purchase workflow in order to validate purchases that +exceeds minimum amount set by configuration wizard. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index e6ca746841b..6824ef5d725 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -28,8 +28,9 @@ This module allows you to manage your Purchase Requisition. =========================================================== -When a purchase order is created, you now have the opportunity to save the related requisition. -This new object will regroup and will allow you to easily keep track and order all your purchase orders. +When a purchase order is created, you now have the opportunity to save the +related requisition. This new object will regroup and will allow you to easily +keep track and order all your purchase orders. """, "depends" : ["purchase","mrp"], "init_xml" : [], diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py index 1704d436042..8d980c51f4f 100644 --- a/addons/report_intrastat/__openerp__.py +++ b/addons/report_intrastat/__openerp__.py @@ -28,7 +28,8 @@ A module that adds intrastat reports. ===================================== -This module gives the details of the goods traded between the countries of European Union """, +This module gives the details of the goods traded between the countries of +European Union.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base', 'product', 'stock', 'sale', 'purchase'], diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index f0bf0d1a32e..c86a2238f55 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -50,10 +50,8 @@ The module allows: - Margins definition - Paper size definition -... and much more - -Multiple headers and logos can be defined per company. -CSS style, header and footer body are defined per company. +Multiple headers and logos can be defined per company. CSS style, header and +footer body are defined per company. For a sample report see also the webkit_report_sample module, and this video: http://files.me.com/nbessi/06n92k.mov @@ -61,8 +59,8 @@ For a sample report see also the webkit_report_sample module, and this video: Requirements and Installation ----------------------------- This module requires the ``wkthtmltopdf`` library to render HTML documents as -PDF. Version 0.9.9 or later is necessary, and can be found at http://code.google.com/p/wkhtmltopdf/ -for Linux, Mac OS X (i386) and Windows (32bits). +PDF. Version 0.9.9 or later is necessary, and can be found at +http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits). After installing the library on the OpenERP Server machine, you need to set the path to the ``wkthtmltopdf`` executable file on each Company. @@ -72,13 +70,13 @@ install a "static" version of the library. The default ``wkhtmltopdf`` on Ubuntu is known to have this issue. -TODO ----- +TODO: +----- - * JavaScript support activation deactivation - * Collated and book format support - * Zip return for separated PDF - * Web client WYSIWYG + * JavaScript support activation deactivation + * Collated and book format support + * Zip return for separated PDF + * Web client WYSIWYG """, "version": "0.9", From 4f72fafa9161ce97869f5d4d8d69a580e20a98c3 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 15:22:16 +0530 Subject: [PATCH 056/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713095216-l4xxa28z5lfhp5i1 --- addons/resource/__openerp__.py | 7 +++---- addons/sale_crm/__openerp__.py | 7 +++---- addons/sale_journal/__openerp__.py | 14 +++++++------- addons/sale_margin/__openerp__.py | 3 ++- addons/sale_mrp/__openerp__.py | 5 ++--- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py index 71afebce932..cdec91d0496 100644 --- a/addons/resource/__openerp__.py +++ b/addons/resource/__openerp__.py @@ -29,10 +29,9 @@ Module for resource management. =============================== -A resource represent something that can be scheduled -(a developer on a task or a work center on manufacturing orders). -This module manages a resource calendar associated to every resource. -It also manages the leaves of every resource. +A resource represent something that can be scheduled (a developer on a task or a +work center on manufacturing orders). This module manages a resource calendar +associated to every resource. It also manages the leaves of every resource. """, 'author': 'OpenERP SA', diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py index 92b4491d449..684c23aeab9 100644 --- a/addons/sale_crm/__openerp__.py +++ b/addons/sale_crm/__openerp__.py @@ -28,12 +28,11 @@ This module adds a shortcut on one or several opportunity cases in the CRM. =========================================================================== This shortcut allows you to generate a sales order based on the selected case. -If different cases are open (a list), it generates one sale order by -case. +If different cases are open (a list), it generates one sale order by case. The case is then closed and linked to the generated sales order. -We suggest you to install this module if you installed both the sale and the -crm modules. +We suggest you to install this module if you installed both the sale and the crm +modules. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py index c104ae19d97..11408161bf4 100644 --- a/addons/sale_journal/__openerp__.py +++ b/addons/sale_journal/__openerp__.py @@ -27,8 +27,7 @@ The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals. ======================================================================================================================== -This module is very helpful for bigger companies that -works by departments. +This module is very helpful for bigger companies that works by departments. You can use journal for different purposes, some examples: * isolate sales of different departments @@ -37,12 +36,13 @@ You can use journal for different purposes, some examples: Journals have a responsible and evolves between different status: * draft, open, cancel, done. -Batch operations can be processed on the different journals to -confirm all sales at once, to validate or invoice packing, ... +Batch operations can be processed on the different journals to confirm all sales +at once, to validate or invoice packing. -It also supports batch invoicing methods that can be configured by partners and sales orders, examples: - * daily invoicing, - * monthly invoicing, ... +It also supports batch invoicing methods that can be configured by partners and +sales orders, examples: + * daily invoicing + * monthly invoicing Some statistics by journals are provided. """, diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py index 623f442578a..936f5a6b350 100644 --- a/addons/sale_margin/__openerp__.py +++ b/addons/sale_margin/__openerp__.py @@ -26,7 +26,8 @@ This module adds the 'Margin' on sales order. ============================================= -This gives the profitability by calculating the difference between the Unit Price and Cost Price. +This gives the profitability by calculating the difference between the Unit +Price and Cost Price. """, "author":"OpenERP SA", "images":["images/sale_margin.jpeg"], diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py index 2d7ed96cca4..d5b3d6b7849 100644 --- a/addons/sale_mrp/__openerp__.py +++ b/addons/sale_mrp/__openerp__.py @@ -28,9 +28,8 @@ This module provides facility to the user to install mrp and sales modulesat a time. ==================================================================================== -It is basically used when we want to keep track of production -orders generated from sales order. -It adds sales name and sales Reference on production order. +It is basically used when we want to keep track of production orders generated +from sales order. It adds sales name and sales Reference on production order. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', From 71122ae47ac248053c84464d9307de89689b88f8 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Fri, 13 Jul 2012 15:47:51 +0530 Subject: [PATCH 057/106] [IMP]tooltip : I have changed the tooltip of fields as suggested bzr revid: rpr@tinyerp.com-20120713101751-zokuph2bcpcmlfc5 --- addons/account/account.py | 6 +++--- addons/account/wizard/account_financial_report.py | 2 +- .../wizard/account_report_common_journal.py | 2 +- .../wizard/account_report_general_ledger.py | 2 +- .../wizard/account_report_partner_ledger.py | 2 +- .../account_analytic_analysis.py | 2 +- .../account_analytic_default.py | 14 +++++++------- addons/crm/crm.py | 2 +- addons/event_sale/event_sale.py | 2 +- addons/hr_evaluation/hr_evaluation.py | 2 +- addons/hr_holidays/hr_holidays.py | 2 +- addons/hr_payroll/hr_payroll.py | 2 +- addons/hr_recruitment/hr_recruitment.py | 4 ++-- .../hr_timesheet_invoice/hr_timesheet_invoice.py | 2 +- .../wizard/hr_timesheet_invoice_create.py | 2 +- .../wizard/l10n_be_account_vat_declaration.py | 2 +- addons/l10n_be/wizard/l10n_be_vat_intra.py | 2 +- addons/mrp/mrp.py | 6 +++--- addons/mrp_repair/mrp_repair.py | 8 ++++---- addons/product/product.py | 2 +- addons/product_margin/product_margin.py | 2 +- .../project_issue/report/project_issue_report.py | 2 +- addons/project_long_term/project_long_term.py | 2 +- addons/purchase/purchase.py | 4 ++-- addons/resource/resource.py | 2 +- addons/sale/wizard/sale_make_invoice_advance.py | 2 +- addons/stock/wizard/stock_partial_picking.py | 2 +- addons/stock_location/stock_location.py | 2 +- 28 files changed, 43 insertions(+), 43 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 571ea40698d..7cf84551029 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -101,7 +101,7 @@ class account_payment_term_line(osv.osv): 'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), ('fixed', 'Fixed Amount')], 'Valuation', - required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be threated."""), + required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""), 'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."), 'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \ @@ -730,7 +730,7 @@ class account_journal(osv.osv): 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), 'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"), 'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), - 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the informatin related to the numbering of the journal entries of this journal.", required=True), + 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True), 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), @@ -1263,7 +1263,7 @@ class account_move(osv.osv): 'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}), 'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True, - help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will be behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), + help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'), 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py index 0ddc50f4859..f96127f6375 100644 --- a/addons/account/wizard/account_financial_report.py +++ b/addons/account/wizard/account_financial_report.py @@ -36,7 +36,7 @@ class accounting_report(osv.osv_memory): 'period_to_cmp': fields.many2one('account.period', 'End Period'), 'date_from_cmp': fields.date("Start Date"), 'date_to_cmp': fields.date("End Date"), - 'debit_credit': fields.boolean('Display Debit/Credit Columns', help="This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison"), + 'debit_credit': fields.boolean('Display Debit/Credit Columns', help="This option allows you to get more details about the way your balances are computed. Because it is space consuming, we do not allow to use it while doing a comparison."), } def _get_account_report(self, cr, uid, context=None): diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py index 92076cfe572..ed0f03df5b5 100644 --- a/addons/account/wizard/account_report_common_journal.py +++ b/addons/account/wizard/account_report_common_journal.py @@ -26,7 +26,7 @@ class account_common_journal_report(osv.osv_memory): _description = 'Account Common Journal Report' _inherit = "account.common.report" _columns = { - 'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="Print Report with the currency column if the currency differs from the company currency."), } def _build_contexts(self, cr, uid, ids, data, context=None): diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py index d0b3c0fa3d3..8078da372ca 100644 --- a/addons/account/wizard/account_report_general_ledger.py +++ b/addons/account/wizard/account_report_general_ledger.py @@ -30,7 +30,7 @@ class account_report_general_ledger(osv.osv_memory): 'landscape': fields.boolean("Landscape Mode"), 'initial_balance': fields.boolean('Include Initial Balances', help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'), - 'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column on report if the currency differs from the company currency."), 'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True), 'journal_ids': fields.many2many('account.journal', 'account_report_general_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True), } diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py index 7a3f3932f1b..60ac20a42ed 100644 --- a/addons/account/wizard/account_report_partner_ledger.py +++ b/addons/account/wizard/account_report_partner_ledger.py @@ -34,7 +34,7 @@ class account_partner_ledger(osv.osv_memory): help='If you selected to filter by date or period, this field allow you to add a row to display the amount of debit/credit/balance that precedes the filter you\'ve set.'), 'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods'), ('unreconciled', 'Unreconciled Entries')], "Filter by", required=True), 'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'), - 'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"), + 'amount_currency': fields.boolean("With Currency", help="It adds the currency column on report if the currency differs from the company currency."), 'journal_ids': fields.many2many('account.journal', 'account_partner_ledger_journal_rel', 'account_id', 'journal_id', 'Journals', required=True), } _defaults = { diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 6e15fe1d5a5..93718a75211 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -446,7 +446,7 @@ class account_analytic_account(osv.osv): help="Computed using the formula: Invoiced Amount - Total Costs.", digits_compute=dp.get_precision('Account')), 'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin', - help="Computed using the formula: Theorial Revenue - Total Costs", + help="Computed using the formula: Theoretical Revenue - Total Costs", digits_compute=dp.get_precision('Account')), 'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100.", diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index 0f868f91d34..affc514e203 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -30,13 +30,13 @@ class account_analytic_default(osv.osv): _order = "sequence" _columns = { 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"), - 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account' , help="Analytical Account"), - 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"), - 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"), - 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="select a user which will use analytical account specified in analytic default"), - 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"), - 'date_start': fields.date('Start Date', help="Default start date for this Analytical Account"), - 'date_stop': fields.date('End Date', help="Default end date for this Analytical Account"), + 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), + 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Select a product which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this product, it will automatically take this as an analytic account)"), + 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="Select a partner which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this partner, it will automatically take this as an analytic account)"), + 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="Select a user which will use analytic account specified in analytic default."), + 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="Select a company which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this company, it will automatically take this as an analytic account)"), + 'date_start': fields.date('Start Date', help="Default start date for this Analytic Account."), + 'date_stop': fields.date('End Date', help="Default end date for this Analytic Account."), } def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None): diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 65af3f9e530..6778f0bbe87 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -110,7 +110,7 @@ class crm_case_section(osv.osv): 'active': fields.boolean('Active', help="If the active field is set to "\ "true, it will allow you to hide the sales team without removing it."), 'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), - 'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the saleman with the team leader."), + 'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."), 'user_id': fields.many2one('res.users', 'Team Leader'), 'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'), 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"), diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index 9e65a034544..681116d064e 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -37,7 +37,7 @@ product() class sale_order_line(osv.osv): _inherit = 'sale.order.line' _columns = { - 'event_id': fields.many2one('event.event', 'Event', help="Choose an event and it will authomaticaly create a registration for this event"), + 'event_id': fields.many2one('event.event', 'Event', help="Choose an event and it will automatically create a registration for this event."), #those 2 fields are used for dynamic domains and filled by onchange 'event_type_id': fields.related('event_type_id', type='many2one', relation="event.type", string="Event Type"), 'event_ok': fields.related('event_ok', string='event_ok', type='boolean'), diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index e85f0274d84..5180050ddb9 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -156,7 +156,7 @@ class hr_evaluation(osv.osv): ('2','Meet expectations'), ('3','Exceeds expectations'), ('4','Significantly exceeds expectations'), - ], "Appreciation", help="This is the appreciation on that summarize the evaluation"), + ], "Appreciation", help="This is the appreciation on which the evaluation is summarized."), 'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'), 'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True), 'state': fields.selection([ diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 04fe67b94f7..73e10ead40c 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -76,7 +76,7 @@ class hr_holidays_status(osv.osv): 'name': fields.char('Leave Type', size=64, required=True, translate=True), 'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type', help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'), - 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'), + 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'), 'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), 'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'), diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 676eedf4ebc..a8bafe43685 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -769,7 +769,7 @@ class hr_salary_rule(osv.osv): 'quantity': fields.char('Quantity', size=256, help="It is used in computation for percentage and fixed amount.For e.g. A rule for Meal Voucher having fixed amount of 1€ per worked day can have its quantity defined in expression like worked_days.WORK100.number_of_days."), 'category_id':fields.many2one('hr.salary.rule.category', 'Category', required=True), 'active':fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the salary rule without removing it."), - 'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used for the display of rule on payslip"), + 'appears_on_payslip': fields.boolean('Appears on Payslip', help="Used to display the salary rule on payslip."), 'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True), 'company_id':fields.many2one('res.company', 'Company', required=False), 'condition_select': fields.selection([('none', 'Always True'),('range', 'Range'), ('python', 'Python Expression')], "Condition Based on", required=True), diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index a3cd2f3a629..40b7bbb62f1 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -62,8 +62,8 @@ class hr_recruitment_stage(osv.osv): _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."), - 'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep tempy this field."), - 'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."), + 'department_id':fields.many2one('hr.department', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."), + 'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change according to the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."), 'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."), 'requirements': fields.text('Requirements'), } diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py index f1138d7b246..54257f5efba 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py @@ -64,7 +64,7 @@ class account_analytic_account(osv.osv): _inherit = "account.analytic.account" _columns = { 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', - help="The product to invoice is defined on the employee form, the price will be deduced by this pricelist on the product."), + help="The product to invoice is defined on the employee form, the price will be deducted by this pricelist on the product."), 'amount_max': fields.float('Max. Invoice Price', help="Keep empty if this contract is not limited to a total fixed price."), 'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount', diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index bcae996a8ee..2cd8961a9b7 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -179,7 +179,7 @@ class hr_timesheet_invoice_create(osv.osv_memory): 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'), 'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'), 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'), - 'product': fields.many2one('product.product', 'Product', help='Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), + 'product': fields.many2one('product.product', 'Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), } _defaults = { diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py index eed2a537f62..95978ac52e7 100644 --- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py +++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py @@ -45,7 +45,7 @@ class l10n_be_vat_declaration(osv.osv_memory): 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], required=True), 'msg': fields.text('File created', size=64, readonly=True), 'file_save': fields.binary('Save File'), - 'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'), + 'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a restitution is to made or not?'), 'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'), 'client_nihil': fields.boolean('Last Declaration, no clients in client listing', help='Tick this case only if it concerns only the last statement on the civil or cessation of activity: ' \ 'no clients to be included in the client listing.'), diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index 123d235f19b..2bfc4de6bad 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -60,7 +60,7 @@ class partner_vat_intra(osv.osv_memory): 'test_xml': fields.boolean('Test XML file', help="Sets the XML output as test file"), 'mand_id' : fields.char('Reference', size=14, help="Reference given by the Representative of the sending company."), 'msg': fields.text('File created', size=14, readonly=True), - 'no_vat': fields.text('Partner With No VAT', size=14, readonly=True, help="The Partner whose VAT number is not defined they doesn't include in XML File."), + 'no_vat': fields.text('Partner With No VAT', size=14, readonly=True, help="The Partner whose VAT number is not defined and they are not included in XML File."), 'file_save' : fields.binary('Save File', readonly=True), 'country_ids': fields.many2many('res.country', 'vat_country_rel', 'vat_id', 'country_id', 'European Countries'), 'comments': fields.text('Comments'), diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index c4a4d8df895..b0186938864 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -48,14 +48,14 @@ class mrp_workcenter(osv.osv): 'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."), 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work Center per hour."), 'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')], - help="Complete this only if you want automatic analytic accounting entries on production orders."), + help="Fill this only if you want automatic analytic accounting entries on production orders."), 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work Center per cycle."), 'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')], - help="Complete this only if you want automatic analytic accounting entries on production orders."), + help="Fill this only if you want automatic analytic accounting entries on production orders."), 'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'), 'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]), 'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True), - 'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to track easily your production costs in the analytic accounting."), + 'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to easily track your production costs in the analytic accounting."), } _defaults = { 'capacity_per_cycle': 1.0, diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py index 6f14ba22bea..fc898dbf419 100644 --- a/addons/mrp_repair/mrp_repair.py +++ b/addons/mrp_repair/mrp_repair.py @@ -116,7 +116,7 @@ class mrp_repair(osv.osv): _columns = { 'name': fields.char('Repair Reference',size=24, required=True), 'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='This field allow you to choose the parner that will be invoiced and delivered'), + 'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.'), 'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]"), 'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"), 'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"), @@ -141,21 +141,21 @@ class mrp_repair(osv.osv): 'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}), 'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."), 'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}), - 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='The pricelist comes from the selected partner, by default.'), + 'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'), 'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'), 'invoice_method':fields.selection([ ("none","No Invoice"), ("b4repair","Before Repair"), ("after_repair","After Repair") ], "Invoice Method", - select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='This field allow you to change the workflow of the repair order. If value selected is different from \'No Invoice\', it also allow you to select the pricelist and invoicing address.'), + select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='Selecting \'Before Repair\' or \'After Repair\' will allow you to generate invoice before or after the repair is done respectively. \'No invoice\' means you don\'t want to generate invoice for this repair order.'), 'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True), 'picking_id': fields.many2one('stock.picking', 'Picking',readonly=True), 'fees_lines': fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}), 'internal_notes': fields.text('Internal Notes'), 'quotation_notes': fields.text('Quotation Notes'), 'company_id': fields.many2one('res.company', 'Company'), - 'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."), + 'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."), 'invoiced': fields.boolean('Invoiced', readonly=True), 'repaired': fields.boolean('Repaired', readonly=True), 'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount', diff --git a/addons/product/product.py b/addons/product/product.py index 3cbff880cf9..7a2a10af8d3 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -286,7 +286,7 @@ class product_template(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), - 'product_manager': fields.many2one('res.users','Product Manager',help="This is use as task responsible"), + 'product_manager': fields.many2one('res.users','Product Manager',help="Responsible for product."), 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index 5895feedf3f..8f946467384 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -98,7 +98,7 @@ class product_product(osv.osv): ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid') ], string='Invoice State',multi='product_margin', readonly=True), 'sale_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin', - help="Avg. Price in Customer Invoices)"), + help="Avg. Price in Customer Invoices."), 'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin', help="Avg. Price in Supplier Invoices "), 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin', diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index be3309d7175..5957ee284e8 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -56,7 +56,7 @@ class project_issue_report(osv.osv): 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True), 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True), 'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg", - help="Number of Days to close the project issue"), + help="Number of Days to open the project issue."), 'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg", help="Number of Days to close the project issue"), 'company_id' : fields.many2one('res.company', 'Company'), diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index a4df1eb6917..7604d43af1b 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -114,7 +114,7 @@ class project_phase(osv.osv): 'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'user_force_ids': fields.many2many('res.users', string='Force Assigned Users'), 'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}, - help="The ressources on the project can be computed automatically by the scheduler"), + help="The resources on the project can be computed automatically by the scheduler."), 'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', readonly=True, required=True, help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\ \n If the phase is over, the states is set to \'Done\'.'), diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index e74ca83a92b..b465ab9b5e6 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -154,7 +154,7 @@ class purchase_order(osv.osv): ] _columns = { - 'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"), + 'name': fields.char('Order Reference', size=64, required=True, select=True, help="Unique number of the purchase order, computed automatically when the purchase order is created."), 'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this purchase order request." ), @@ -175,7 +175,7 @@ class purchase_order(osv.osv): 'validator' : fields.many2one('res.users', 'Validated by', readonly=True), 'notes': fields.text('Terms and Conditions'), 'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"), - 'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incomming shipments that have been generated for this purchase order."), + 'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incoming shipments that have been generated for this purchase order."), 'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"), 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'), 'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"), diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 5fed5b96218..354e9c5b27c 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -292,7 +292,7 @@ class resource_resource(osv.osv): 'company_id' : fields.many2one('res.company', 'Company'), 'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True), 'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'), - 'time_efficiency' : fields.float('Efficiency Factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."), + 'time_efficiency' : fields.float('Efficiency Factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficiency of 200%, then his load will only be 50%."), 'calendar_id' : fields.many2one("resource.calendar", "Working Time", help="Define the schedule of resource"), } _defaults = { diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index f3d9bd65a91..08f67106870 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -38,7 +38,7 @@ class sale_advance_payment_inv(osv.osv_memory): 'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."), 'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), required=True, help="The amount to be invoiced in advance."), 'qtty': fields.float('Quantity', digits=(16, 2), required=True), - 'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amound in Advance, Use Percentage if you want to give percentage of Total Invoice Amount."), + 'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amount in Advance. Use Percentage if you want to give percentage of Total Invoice Amount."), } _defaults = { diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py index dd91f20e8cf..ce0efff280d 100644 --- a/addons/stock/wizard/stock_partial_picking.py +++ b/addons/stock/wizard/stock_partial_picking.py @@ -70,7 +70,7 @@ class stock_partial_picking(osv.osv_memory): 'date': fields.datetime('Date', required=True), 'move_ids' : fields.one2many('stock.partial.picking.line', 'wizard_id', 'Product Moves'), 'picking_id': fields.many2one('stock.picking', 'Picking', required=True, ondelete='CASCADE'), - 'hide_tracking': fields.function(_hide_tracking, string='Tracking', type='boolean', help='This field is for internal purpose. It is used to decide if the column prodlot has to be shown on the move_ids field or not'), + 'hide_tracking': fields.function(_hide_tracking, string='Tracking', type='boolean', help='This field is for internal purpose. It is used to decide if the column production lot has to be shown on the moves or not.'), } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index de4e2e7f561..d025bc9252d 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -67,7 +67,7 @@ class product_pulled_flow(osv.osv): 'journal_id': fields.many2one('stock.journal','Journal'), 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), 'type_proc': fields.selection([('produce','Produce'),('buy','Buy'),('move','Move')], 'Type of Procurement', required=True), - 'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company belong packings and moves"), + 'company_id': fields.many2one('res.company', 'Company', help="Is used to know to which company the pickings and moves belong."), 'partner_address_id': fields.many2one('res.partner', 'Partner Address'), 'picking_type': fields.selection([('out','Sending Goods'),('in','Getting Goods'),('internal','Internal')], 'Shipping Type', required=True, select=True, help="Depending on the company, choose whatever you want to receive or send products"), 'product_id':fields.many2one('product.product','Product'), From 59e9f0ca0004ebf01a44645e8f32df7859044430 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 16:20:30 +0530 Subject: [PATCH 058/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713105030-jbl2mm81j6cyjake --- addons/share/__openerp__.py | 4 +- addons/stock_invoice_directly/__openerp__.py | 4 +- addons/stock_location/__openerp__.py | 70 ++--- addons/stock_no_autopicking/__openerp__.py | 6 +- addons/stock_planning/__openerp__.py | 269 +++++++++++-------- addons/subscription/__openerp__.py | 3 +- addons/survey/__openerp__.py | 9 +- addons/users_ldap/__openerp__.py | 122 ++++----- 8 files changed, 267 insertions(+), 220 deletions(-) diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index f5065bf6b8c..3e21d3d6c68 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -35,8 +35,8 @@ It specifically adds a 'share' button that is available in the Web client to share any kind of OpenERP data with colleagues, customers, friends. The system will work by creating new users and groups on the fly, and by -combining the appropriate access rights and ir.rules to ensure that the -shared users only have access to the data that has been shared with them. +combining the appropriate access rights and ir.rules to ensure that the shared +users only have access to the data that has been shared with them. This is extremely useful for collaborative work, knowledge sharing, synchronization with other companies. diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py index 4ae8d518d83..c7c87af7ee0 100644 --- a/addons/stock_invoice_directly/__openerp__.py +++ b/addons/stock_invoice_directly/__openerp__.py @@ -28,8 +28,8 @@ Invoice Wizard for Delivery. ============================ -When you send or deliver goods, this module automatically launch -the invoicing wizard if the delivery is to be invoiced. +When you send or deliver goods, this module automatically launch the invoicing +wizard if the delivery is to be invoiced. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py index 6dea8fb4df8..108b0e4d848 100644 --- a/addons/stock_location/__openerp__.py +++ b/addons/stock_location/__openerp__.py @@ -38,51 +38,59 @@ Typically this could be used to: * Help rental management, by generating automated return moves for rented products -Once this module is installed, an additional tab appear on the product form, where you can add -Push and Pull flow specifications. The demo data of CPU1 product for that push/pull : +Once this module is installed, an additional tab appear on the product form, +where you can add Push and Pull flow specifications. The demo data of CPU1 +product for that push/pull : -Push flows ----------- -Push flows are useful when the arrival of certain products in a given location should always -be followed by a corresponding move to another location, optionally after a certain delay. -The original Warehouse application already supports such Push flow specifications on the -Locations themselves, but these cannot be refined per-product. +Push flows: +----------- -A push flow specification indicates which location is chained with which location, and with -what parameters. As soon as a given quantity of products is moved in the source location, -a chained move is automatically foreseen according to the parameters set on the flow specification -(destination location, delay, type of move, journal.) The new move can be automatically -processed, or require a manual confirmation, depending on the parameters. +Push flows are useful when the arrival of certain products in a given location +should always be followed by a corresponding move to another location, optionally +after a certain delay. The original Warehouse application already supports such +Push flow specifications on the Locations themselves, but these cannot be +refined per-product. -Pull flows ----------- -Pull flows are a bit different from Push flows, in the sense that they are not related to -the processing of product moves, but rather to the processing of procurement orders. -What is being pulled is a need, not directly products. -A classical example of Pull flow is when you have an Outlet company, with a parent Company -that is responsible for the supplies of the Outlet. +A push flow specification indicates which location is chained with which location, +and with what parameters. As soon as a given quantity of products is moved in the +source location, a chained move is automatically foreseen according to the +parameters set on the flow specification (destination location, delay, type of +move, journal.) The new move can be automatically processed, or require a manual +confirmation, depending on the parameters. + +Pull flows: +----------- + +Pull flows are a bit different from Push flows, in the sense that they are not +related to the processing of product moves, but rather to the processing of +procurement orders. What is being pulled is a need, not directly products. A +classical example of Pull flow is when you have an Outlet company, with a parent +Company that is responsible for the supplies of the Outlet. [ Customer ] <- A - [ Outlet ] <- B - [ Holding ] <~ C ~ [ Supplier ] -When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives -in the Outlet, it is converted into another procurement (B, via a Pull flow of type 'move') -requested from the Holding. When procurement order B is processed by the Holding company, and -if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier -(Pull flow of type Purchase). The result is that the procurement order, the need, is pushed +When a new procurement order (A, coming from the confirmation of a Sale Order +for example) arrives in the Outlet, it is converted into another procurement +(B, via a Pull flow of type 'move') requested from the Holding. When procurement +order B is processed by the Holding company, and if the product is out of stock, +it can be converted into a Purchase Order (C) from the Supplier (Pull flow of +type Purchase). The result is that the procurement order, the need, is pushed all the way between the Customer and Supplier. -Technically, Pull flows allow to process procurement orders differently, not only depending on -the product being considered, but also depending on which location holds the "need" for that -product (i.e. the destination location of that procurement order). +Technically, Pull flows allow to process procurement orders differently, not +only depending on the product being considered, but also depending on which +location holds the "need" for that product (i.e. the destination location of +that procurement order). -Use-Case --------- +Use-Case: +--------- You can use the demo data as follow: CPU1: Sell some CPU1 from Shop 1 and run the scheduler - Warehouse: delivery order, Shop 1: reception CPU3: - - When receiving the product, it goes to Quality Control location then stored to shelf 2. + - When receiving the product, it goes to Quality Control location then + stored to shelf 2. - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A """, 'author': 'OpenERP SA', diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py index 5278768633c..7d9b84276d6 100644 --- a/addons/stock_no_autopicking/__openerp__.py +++ b/addons/stock_no_autopicking/__openerp__.py @@ -29,9 +29,9 @@ This module allows an intermediate picking process to provide raw materials to p ================================================================================================= One example of usage of this module is to manage production made by your -suppliers (sub-contracting). To achieve this, set the assembled product -which is sub-contracted to "No Auto-Picking" and put the location of the -supplier in the routing of the assembly operation. +suppliers (sub-contracting). To achieve this, set the assembled product which is +sub-contracted to "No Auto-Picking" and put the location of the supplier in the +routing of the assembly operation. """, 'author': 'OpenERP SA', 'depends': ['mrp'], diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py index df373f59097..7391668eec3 100644 --- a/addons/stock_planning/__openerp__.py +++ b/addons/stock_planning/__openerp__.py @@ -27,165 +27,214 @@ "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"], "depends": ["crm", "stock","sale"], "description": """ -MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules -========================================================================================================================================= +MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules. +========================================================================================================================================== -Quick Glossary --------------- -- Stock Period - the time boundaries (between Start Date and End Date) for your Sales and Stock forecasts and planning -- Sales Forecast - the quantity of products you plan to sell during the related Stock Period. -- Stock Planning - the quantity of products you plan to purchase or produce for the related Stock Period. +Quick Glossary: +--------------- + - Stock Period - the time boundaries (between Start Date and End Date) for + your Sales and Stock forecasts and planning + - Sales Forecast - the quantity of products you plan to sell during the + related Stock Period. + - Stock Planning - the quantity of products you plan to purchase or produce + for the related Stock Period. -To avoid confusion with the terms used by the ``sale_forecast`` module, ("Sales Forecast" and "Planning" are amounts) we use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. +To avoid confusion with the terms used by the ``sale_forecast`` module, +("Sales Forecast" and "Planning" are amounts) we use terms "Stock and Sales +Forecast" and "Stock Planning" to emphasize that we use quantity values. -Where to begin --------------- +Where to begin: +--------------- Using this module is done in three steps: - * Create Stock Periods via the Warehouse>Configuration>Stock Periods menu (Mandatory step) - * Create Sale Forecasts fill them with forecast quantities, via the Sales>Sales Forecast menu. (Optional step but useful for further planning) - * Create the actual MPS plan, check the balance and trigger the procurements as required. The actual procurement is the final step for the Stock Period. + * Create Stock Periods via the Warehouse>Configuration>Stock Periods menu + (Mandatory step) + * Create Sale Forecasts fill them with forecast quantities, via the + Sales > Sales Forecast menu. (Optional step but useful for further planning) + * Create the actual MPS plan, check the balance and trigger the procurements + as required. The actual procurement is the final step for the Stock Period. -Stock Period configuration --------------------------- -You have two menu items for Periods in "Warehouse > Configuration > Stock Periods". There are: +Stock Period configuration: +--------------------------- +You have two menu items for Periods in "Warehouse > Configuration > Stock Periods". +There are: - * "Create Stock Periods" - can automatically creating daily, weekly or monthly periods. - * "Stock Periods" - allows to create any type of periods, change the dates and change the state of period. + * "Create Stock Periods" - can automatically creating daily, weekly or + monthly periods. + * "Stock Periods" - allows to create any type of periods, change the dates + and change the state of period. -Creating periods is the first step. You can create custom periods using the "New" button in "Stock Periods", but it is recommended to use the automatic assistant "Create Stock Periods". +Creating periods is the first step. You can create custom periods using the "New" +button in "Stock Periods", but it is recommended to use the automatic assistant +"Create Stock Periods". Remarks: - - These periods (Stock Periods) are completely distinct from Financial or other periods in the system. - - Periods are not assigned to companies (when you use multicompany). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods. - - When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. When you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. - - If you use overlapping periods for the same product, warehouse and company results can be unpredictable. - - If current date doesn't belong to any period or you have holes between periods results can be unpredictable. + - These periods (Stock Periods) are completely distinct from Financial or + other periods in the system. + - Periods are not assigned to companies (when you use multicompany). Module + suppose that you use the same periods across companies. If you wish to use + different periods for different companies define them as you wish (they can + overlap). Later on in this text will be indications how to use such periods. + - When periods are created automatically their start and finish dates are with + start hour 00:00:00 and end hour 23:59:00. When you create daily periods they + will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. + It works only in automatic creation of periods. When you create periods + manually you have to take care about hours because you can have incorrect + values form sales or stock. + - If you use overlapping periods for the same product, warehouse and company + results can be unpredictable. + - If current date doesn't belong to any period or you have holes between + periods results can be unpredictable. -Sales Forecasts configuration ------------------------------ +Sales Forecasts configuration: +------------------------------ You have few menus for Sales forecast in "Sales > Sales Forecasts": - - "Create Sales Forecasts" - can automatically create forecast lines according to your needs - - "Sales Forecasts" - for managing the Sales forecasts + - "Create Sales Forecasts" - can automatically create forecast lines + according to your needs + - "Sales Forecasts" - for managing the Sales forecasts -Menu "Create Sales Forecasts" creates Forecasts for products from selected Category, for selected Period and for selected Warehouse. +Menu "Create Sales Forecasts" creates Forecasts for products from selected +Category, for selected Period and for selected Warehouse. It is also possible to copy the previous forecast. Remarks: - - This tool doesn't duplicate lines if you already have an entry for the same Product, Period, Warehouse, created or validated by the same user. If you wish to create another forecast, if relevant lines exists you have to do it manually as described below. - - When created lines are validated by someone else you can use this tool to create another line for the same Period, Product and Warehouse. - - When you choose "Copy Last Forecast", created line take quantity and other settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. + - This tool doesn't duplicate lines if you already have an entry for the same + Product, Period, Warehouse, created or validated by the same user. If you + wish to create another forecast, if relevant lines exists you have to do it + manually as described below. + - When created lines are validated by someone else you can use this tool to + create another line for the same Period, Product and Warehouse. + - When you choose "Copy Last Forecast", created line take quantity and other + settings from your (validated by you or created by you if not validated yet) + forecast which is for last period before period of created forecast. -On "Sales Forecast" form mainly you have to enter a forecast quantity in "Product Quantity". -Further calculation can work for draft forecasts. But validation can save your data against any accidental changes. -You can click "Validate" button but it is not mandatory. +On "Sales Forecast" form mainly you have to enter a forecast quantity in +"Product Quantity". Further calculation can work for draft forecasts. But +validation can save your data against any accidental changes. You can click +"Validate" button but it is not mandatory. -Instead of forecast quantity you may enter the amount of forecast sales via the "Product Amount" field. -The system will count quantity from amount according to Sale price of the Product. +Instead of forecast quantity you may enter the amount of forecast sales via the +"Product Amount" field. The system will count quantity from amount according to +Sale price of the Product. -All values on the form are expressed in unit of measure selected on form. -You can select a unit of measure from the default category or from secondary category. -When you change unit of measure the forecast product quantity will be re-computed according to new UoM. +All values on the form are expressed in unit of measure selected on form. You can +select a unit of measure from the default category or from secondary category. +When you change unit of measure the forecast product quantity will be re-computed +according to new UoM. To work out your Sale Forecast you can use the "Sales History" of the product. -You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. -So you can get results for a given sales team or period. +You have to enter parameters to the top and left of this table and system will +count sale quantities according to these parameters. So you can get results for +a given sales team or period. -MPS or Procurement Planning ---------------------------- -An MPS planning consists in Stock Planning lines, used to analyze and possibly drive the procurement of -products for each relevant Stock Period and Warehouse. +MPS or Procurement Planning: +---------------------------- +An MPS planning consists in Stock Planning lines, used to analyze and possibly +drive the procurement of products for each relevant Stock Period and Warehouse. The menu is located in "Warehouse > Schedulers > Master Procurement Schedule": - - "Create Stock Planning Lines" - a wizard to help automatically create many planning lines - - "Master Procurement Schedule" - management of your planning lines + - "Create Stock Planning Lines" - a wizard to help automatically create many + planning lines + - "Master Procurement Schedule" - management of your planning lines -Similarly to the way Sales forecast serves to define your sales planning, the MPS lets you plan your procurements (Purchase/Manufacturing). -You can quickly populate the MPS with the "Create Stock Planning Lines" wizard, and then proceed to review them via the "Master Procurement Schedule" menu. +Similarly to the way Sales forecast serves to define your sales planning, the MPS +lets you plan your procurements (Purchase/Manufacturing).You can quickly populate +the MPS with the "Create Stock Planning Lines" wizard, and then proceed to review +them via the "Master Procurement Schedule" menu. -The "Create Stock Planning Lines" wizard lets you to quickly create all MPS lines for a given Product Category, and a given Period and Warehouse. -When you enable the "All Products with Forecast" option of the wizard, the system creates lines for all products having sales forecast for selected -Period and Warehouse (the selected Category will be ignored in this case). +The "Create Stock Planning Lines" wizard lets you to quickly create all MPS lines +for a given Product Category, and a given Period and Warehouse.When you enable +the "All Products with Forecast" option of the wizard, the system creates lines +for all products having sales forecast for selected Period and Warehouse (the +selected Category will be ignored in this case). -Under menu "Master Procurement Schedule" you will usually change the "Planned Out" and "Planned In" quantities and observe the resulting "Stock Simulation" value -to decide if you need to procure more products for the given Period. -"Planned Out" will be initially based on "Warehouse Forecast" which is the sum of all outgoing stock moves already planned for the Period and Warehouse. -Of course you can alter this value to provide your own quantities. It is not necessary to have any forecast. -"Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to reach the "Stock Simulation" at the end of Period. -You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. -And you can plan different quantity than in Minimum Stock Rules. Calculations are done for whole Warehouse by default, -if you want to see values for Stock location of calculated warehouse you can check "Stock Location Only". +Under menu "Master Procurement Schedule" you will usually change the "Planned Out" +and "Planned In" quantities and observe the resulting "Stock Simulation" value +to decide if you need to procure more products for the given Period. "Planned Out" +will be initially based on "Warehouse Forecast" which is the sum of all outgoing +stock moves already planned for the Period and Warehouse. Of course you can alter +this value to provide your own quantities. It is not necessary to have any forecast. +"Planned In" quantity is used to calculate field "Incoming Left" which is the +quantity to be procured to reach the "Stock Simulation" at the end of Period. You +can compare "Stock Simulation" quantity to minimum stock rules visible on the form. +And you can plan different quantity than in Minimum Stock Rules. Calculations are +done for whole Warehouse by default, if you want to see values for Stock location +of calculated warehouse you can check "Stock Location Only". -When you are satisfied with the "Planned Out", "Planned In" and end of period "Stock Simulation", -you can click on "Procure Incoming Left" to create a procurement for the "Incoming Left" quantity. -You can decide if procurement will go to the to Stock or Input location of the Warehouse. +When you are satisfied with the "Planned Out", "Planned In" and end of period +"Stock Simulation", you can click on "Procure Incoming Left" to create a +procurement for the "Incoming Left" quantity. You can decide if procurement will +go to the to Stock or Input location of the Warehouse. -If you don't want to Produce or Buy the product but just transfer the calculated quantity from another warehouse -you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left") and the system will -create the appropriate picking list (stock moves). -You can choose to take the goods from the Stock or the Output location of the source warehouse. -Destination location (Stock or Input) in the destination warehouse will be taken as for the procurement case. +If you don't want to Produce or Buy the product but just transfer the calculated +quantity from another warehouse you can click "Supply from Another Warehouse" +(instead of "Procure Incoming Left") and the system will create the appropriate +picking list (stock moves). You can choose to take the goods from the Stock or +the Output location of the source warehouse. Destination location (Stock or Input) +in the destination warehouse will be taken as for the procurement case. -To see update the quantities of "Confirmed In", "Confirmed Out", "Confirmed In Before", "Planned Out Before" -and "Stock Simulation" you can press "Calculate Planning". +To see update the quantities of "Confirmed In", "Confirmed Out", "Confirmed In +Before", "Planned Out Before" and "Stock Simulation" you can press "Calculate +Planning". -All values on the form are expressed in unit of measure selected on form. -You can select one of unit of measure from default category or from secondary category. -When you change unit of measure the editable quantities will be re-computed according to new UoM. The others will be updated after pressing "Calculate Planning". +All values on the form are expressed in unit of measure selected on form. You can +select one of unit of measure from default category or from secondary category. +When you change unit of measure the editable quantities will be re-computed +according to new UoM. The others will be updated after pressing "Calculate Planning". -Computation of Stock Simulation quantities ------------------------------------------- -The Stock Simulation value is the estimated stock quantity at the end of the period. -The calculation always starts with the real stock on hand at the beginning of the current period, then -adds or subtracts the computed quantities. -When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows: +Computation of Stock Simulation quantities: +------------------------------------------- +The Stock Simulation value is the estimated stock quantity at the end of the +period. The calculation always starts with the real stock on hand at the beginning +of the current period, then adds or subtracts the computed quantities. +When you are in the same period (current period is the same as calculated) Stock +Simulation is calculated as follows: -Stock Simulation = - Stock of beginning of current Period - - Planned Out - + Planned In +Stock Simulation = Stock of beginning of current Period - Planned Out + Planned In When you calculate period next to current: -Stock Simulation = - Stock of beginning of current Period - - Planned Out of current Period - + Confirmed In of current Period (incl. Already In) - - Planned Out of calculated Period - + Planned In of calculated Period . +Stock Simulation = Stock of beginning of current Period - Planned Out of current Period + + Confirmed In of current Period (incl. Already In) - Planned Out of calculated Period + + Planned In of calculated Period . -As you see the calculated Period is taken the same way as in previous case, but the calculation in the current -Period is a little bit different. First you should note that system takes for only Confirmed moves for the -current period. This means that you should complete the planning and procurement of the current Period before +As you see the calculated Period is taken the same way as in previous case, but +the calculation in the current Period is a little bit different. First you should +note that system takes for only Confirmed moves for the current period. This means +that you should complete the planning and procurement of the current Period before going to the next one. When you plan for future Periods: -Stock Simulation = - Stock of beginning of current Period - - Sum of Planned Out of Periods before calculated - + Sum of Confirmed In of Periods before calculated (incl. Already In) - - Planned Out of calculated Period - + Planned In of calculated Period. +Stock Simulation = Stock of beginning of current Period + - Sum of Planned Out of Periods before calculated + + Sum of Confirmed In of Periods before calculated (incl. Already In) + - Planned Out of calculated Period + + Planned In of calculated Period. -Here "Periods before calculated" designates all periods starting with the current until the period before the one being calculated. +Here "Periods before calculated" designates all periods starting with the current +until the period before the one being calculated. Remarks: - - Remember to make the proceed with the planning of each period in chronological order, otherwise the numbers will not reflect the - reality - - If you planned for future periods and find that real Confirmed Out is larger than Planned Out in some periods before, - you can repeat Planning and make another procurement. You should do it in the same planning line. - If you create another planning line the suggestions can be wrong. - - When you wish to work with different periods for some products, define two kinds of periods (e.g. Weekly and Monthly) and use - them for different products. Example: If you use always Weekly periods for Product A, and Monthly periods for Product B - all calculations will work correctly. You can also use different kind of periods for the same product from different warehouse - or companies. But you cannot use overlapping periods for the same product, warehouse and company because results - can be unpredictable. The same applies to Forecasts lines. + - Remember to make the proceed with the planning of each period in chronological + order, otherwise the numbers will not reflect the reality + - If you planned for future periods and find that real Confirmed Out is larger + than Planned Out in some periods before, you can repeat Planning and make + another procurement. You should do it in the same planning line. If you + create another planning line the suggestions can be wrong. + - When you wish to work with different periods for some products, define two + kinds of periods (e.g. Weekly and Monthly) and use them for different + products. Example: If you use always Weekly periods for Product A, and + Monthly periods for Product B all calculations will work correctly. You + can also use different kind of periods for the same product from different + warehouse or companies. But you cannot use overlapping periods for the same + product, warehouse and company because results can be unpredictable. The + same applies to Forecasts lines. """, "data": [ "security/stock_planning_security.xml", diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py index 9e90b032bf9..3a4220efe52 100644 --- a/addons/subscription/__openerp__.py +++ b/addons/subscription/__openerp__.py @@ -32,7 +32,8 @@ This module allows to create new documents and add subscriptions on that documen e.g. To have an invoice generated automatically periodically: * Define a document type based on Invoice object - * Define a subscription whose source document is the document defined as above. Specify the interval information and partner to be invoice. + * Define a subscription whose source document is the document defined as + above. Specify the interval information and partner to be invoice. """, 'author': 'OpenERP SA', 'depends': ['base_tools'], diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py index 90d7c2e469f..150623b0db7 100644 --- a/addons/survey/__openerp__.py +++ b/addons/survey/__openerp__.py @@ -27,10 +27,11 @@ This module is used for surveying. ================================== -It depends on the answers or reviews of some questions by different users. -A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers. -Different users may give different answers of question and according to that survey is done. -Partners are also sent mails with user name and password for the invitation of the survey +It depends on the answers or reviews of some questions by different users. A +survey may have multiple pages. Each page may contain multiple questions and each +question may have multiple answers. Different users may give different answers of +question and according to that survey is done. Partners are also sent mails with +user name and password for the invitation of the survey. """, 'author': 'OpenERP SA', 'depends': ['base_tools', 'mail'], diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index e6cd59e8131..53a970997a8 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -27,89 +27,77 @@ "description": """ Adds support for authentication by LDAP server. =============================================== -This module allows users to login with their LDAP username and -password, and will automatically create OpenERP users for them -on the fly. +This module allows users to login with their LDAP username and password, and +will automatically create OpenERP users for them on the fly. -**Note**: This module only work on servers who have Python's -``ldap`` module installed. +Note: This module only work on servers who have Python's ``ldap`` module + installed. -Configuration -+++++++++++++ -After installing this module, you need to configure the LDAP -parameters in the Configuration tab of the Company details. -Different companies may have different LDAP servers, as long -as they have unique usernames (usernames need to be unique in -OpenERP, even across multiple companies). +Configuration: +-------------- +After installing this module, you need to configure the LDAP parameters in the +Configuration tab of the Company details. Different companies may have different +LDAP servers, as long as they have unique usernames (usernames need to be unique +in OpenERP, even across multiple companies). -Anonymous LDAP binding is also supported (for LDAP servers -that allow it), by simpling keeping the LDAP user and password -empty in the LDAP configuration. This does **not** allow -anonymous authentication for users, it is only for the master -LDAP account that is used to verify if a user exists before -attempting to authenticate it. +Anonymous LDAP binding is also supported (for LDAP servers that allow it), by +simpling keeping the LDAP user and password empty in the LDAP configuration. +This does not allow anonymous authentication for users, it is only for the master +LDAP account that is used to verify if a user exists before attempting to +authenticate it. -Securing the connection with STARTTLS is available for LDAP -servers supporting it, by enabling the TLS option in the LDAP -configuration. +Securing the connection with STARTTLS is available for LDAP servers supporting +it, by enabling the TLS option in the LDAP configuration. -For further options configuring the LDAP settings, refer to the -ldap.conf manpage: manpage:`ldap.conf(5)`. +For further options configuring the LDAP settings, refer to the ldap.conf +manpage: manpage:`ldap.conf(5)`. -Security Considerations -+++++++++++++++++++++++ -Users' LDAP passwords are never stored in the OpenERP database, -the LDAP server is queried whenever a user needs to be -authenticated. No duplication of the password occurs, and -passwords are managed in one place only. +Security Considerations: +------------------------ +Users' LDAP passwords are never stored in the OpenERP database, the LDAP server +is queried whenever a user needs to be authenticated. No duplication of the +password occurs, and passwords are managed in one place only. -OpenERP does not manage password changes in the LDAP, so -any change of password should be conducted by other means -in the LDAP directory directly (for LDAP users). +OpenERP does not manage password changes in the LDAP, so any change of password +should be conducted by other means in the LDAP directory directly (for LDAP users). -It is also possible to have local OpenERP users in the -database along with LDAP-authenticated users (the Administrator -account is one obvious example). +It is also possible to have local OpenERP users in the database along with +LDAP-authenticated users (the Administrator account is one obvious example). Here is how it works: - * The system first attempts to authenticate users against - the local OpenERP database ; - * if this authentication fails (for example because the - user has no local password), the system then attempts - to authenticate against LDAP ; + * The system first attempts to authenticate users against the local OpenERP + database; + * if this authentication fails (for example because the user has no local + password), the system then attempts to authenticate against LDAP; -As LDAP users have blank passwords by default in the local -OpenERP database (which means no access), the first step -always fails and the LDAP server is queried to do the -authentication. +As LDAP users have blank passwords by default in the local OpenERP database +(which means no access), the first step always fails and the LDAP server is +queried to do the authentication. -Enabling STARTTLS ensures that the authentication query to the -LDAP server is encrypted. +Enabling STARTTLS ensures that the authentication query to the LDAP server is +encrypted. -User Template -+++++++++++++ -In the LDAP configuration on the Company form, it is possible to -select a *User Template*. If set, this user will be used as -template to create the local users whenever someone authenticates -for the first time via LDAP authentication. -This allows pre-setting the default groups and menus of the -first-time users. +User Template: +-------------- +In the LDAP configuration on the Company form, it is possible to select a *User +Template*. If set, this user will be used as template to create the local users +whenever someone authenticates for the first time via LDAP authentication. This +allows pre-setting the default groups and menus of the first-time users. -**Warning**: if you set a password for the user template, -this password will be assigned as local password for each new -LDAP user, effectively setting a *master password* for these -users (until manually changed). You usually do not want this. -One easy way to setup a template user is to login once with -a valid LDAP user, let OpenERP create a blank local user with the -same login (and a blank password), then rename this new user -to a username that does not exist in LDAP, and setup its -groups the way you want. +Warning: if you set a password for the user template, this password will be + assigned as local password for each new LDAP user, effectively setting + a *master password* for these users (until manually changed). You + usually do not want this. One easy way to setup a template user is to + login once with a valid LDAP user, let OpenERP create a blank local + user with the same login (and a blank password), then rename this new + user to a username that does not exist in LDAP, and setup its groups + the way you want. -Interaction with base_crypt -+++++++++++++++++++++++++++ -The base_crypt module is not compatible with this module, and -will disable LDAP authentication if installed at the same time. +Interaction with base_crypt: +---------------------------- +The base_crypt module is not compatible with this module, and will disable LDAP +authentication if installed at the same time. """, From da641a1a00926eb44511731ce663f9cdcccd8ddf Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 16:53:05 +0530 Subject: [PATCH 059/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713112305-citpeas3va7ii3c6 --- addons/wiki_faq/__openerp__.py | 3 +-- addons/wiki_quality_manual/__openerp__.py | 4 ++-- addons/wiki_sale_faq/__openerp__.py | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py index 5568372d76d..e89a7f7e0c7 100644 --- a/addons/wiki_faq/__openerp__.py +++ b/addons/wiki_faq/__openerp__.py @@ -27,8 +27,7 @@ This module provides a Wiki FAQ Template. ========================================= -It provides demo data, thereby creating a Wiki Group and a Wiki Page -for Wiki FAQ. +It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki FAQ. """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py index 92512f9e093..5e8725c2c7d 100644 --- a/addons/wiki_quality_manual/__openerp__.py +++ b/addons/wiki_quality_manual/__openerp__.py @@ -27,8 +27,8 @@ Quality Manual Template. ======================== -It provides demo data, thereby creating a Wiki Group and a Wiki Page -for Wiki Quality Manual. +It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki +Quality Manual. """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py index e2a502527b7..d63e5af7d1e 100644 --- a/addons/wiki_sale_faq/__openerp__.py +++ b/addons/wiki_sale_faq/__openerp__.py @@ -27,8 +27,8 @@ This module provides a Wiki Sales FAQ Template. =============================================== -It provides demo data, thereby creating a Wiki Group and a Wiki Page -for Wiki Sale FAQ. +It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki +Sale FAQ. """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', From 9feb9aba747b59a4605468196cd76219c0bd7eac Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 17:21:25 +0530 Subject: [PATCH 060/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713115125-pyfzt5cijs63qr9d --- addons/account_accountant/__openerp__.py | 2 +- addons/account_check_writing/__openerp__.py | 2 +- addons/analytic_user_function/__openerp__.py | 10 ++++++---- addons/hr_holidays/__openerp__.py | 5 ++++- addons/point_of_sale/__openerp__.py | 14 +++++++------- addons/web_shortcuts/__openerp__.py | 4 ++-- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index f1155311f39..f80db855aca 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -28,7 +28,7 @@ Accounting Access Rights. ========================= -This module gives the admin user the access to all the accounting features +This module gives the Admin user the access to all the accounting features like the journal items and the chart of accounts. It assigns manager and user access rights to the Administrator, and only diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py index d07457d0d00..faba82928ed 100644 --- a/addons/account_check_writing/__openerp__.py +++ b/addons/account_check_writing/__openerp__.py @@ -24,7 +24,7 @@ "author" : "OpenERP SA, NovaPoint Group", "category": "Generic Modules/Accounting", "description": """ -Module for the Check writing and check printing. +Module for the Check Writing and Check Printing. """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index 33a6a543874..1c1f345aca0 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -28,11 +28,13 @@ This module allows you to define what is the default function of a specific user on a given account. ==================================================================================================== -This is mostly used when a user encodes his timesheet: the values are retrieved and -the fields are auto-filled. But the possibility to change these values is still available. +This is mostly used when a user encodes his timesheet: the values are retrieved +and the fields are auto-filled. But the possibility to change these values is +still available. -Obviously if no data has been recorded for the current account, the default value is given -as usual by the employee data so that this module is perfectly compatible with older configurations. +Obviously if no data has been recorded for the current account, the default +value is given as usual by the employee data so that this module is perfectly +compatible with older configurations. """, 'author': 'OpenERP SA', diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 09754eb9df8..98e77f81c31 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -35,7 +35,10 @@ Implements a dashboard for human resource management that includes. * Leaves Note that: - - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in + - A synchronisation with an internal agenda (use of the CRM module) is + possible: in order to automatically create a case when an holiday request + is accepted, you have to link the holidays status to a case section. You + can setup this info and your colour preferences in Human Resources/Configuration/Leave Type - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted). - There are two ways to print the employee's holidays: diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index 80933eaa785..f9d05d4797c 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -30,13 +30,13 @@ This module provides a quick and easy sale process. =================================================== Main features: ---------------- - * Fast encoding of the sale. - * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode. - * Computation of the amount of money to return. - * Create and confirm picking list automatically. - * Allow the user to create invoice automatically. - * Allow to refund former sales. +-------------- + * Fast encoding of the sale + * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode + * Computation of the amount of money to return + * Create and confirm picking list automatically + * Allow the user to create invoice automatically + * Allow to refund former sales """, 'author': 'OpenERP SA', 'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'], diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py index ca3119294ed..b587215a501 100644 --- a/addons/web_shortcuts/__openerp__.py +++ b/addons/web_shortcuts/__openerp__.py @@ -23,8 +23,8 @@ 'version': '1.0', 'category': 'Tools', 'description': """ -Enable shortcuts feature in the web client -========================================== +Enable shortcuts feature in the web client. +=========================================== Add a Shortcut icon in the systray in order to access the user's shortcuts (if any). Add a Shortcut icon besides the views title in order to add/remove a shortcut. From 31ae12a10f78b5ce26f175c51a7ba5ecad458989 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Fri, 13 Jul 2012 17:59:47 +0530 Subject: [PATCH 061/106] [IMP] : Update Description for modules bzr revid: cha@tinyerp.com-20120713122947-oaut0zx8fq0ers5m --- addons/base_crypt/__openerp__.py | 8 ++++---- addons/l10n_nl/__openerp__.py | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 3163f78ae7d..b106b7838c5 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -38,8 +38,8 @@ preventing anyone from reading the original password in the database. After installing this module it won't be possible to recover a forgotten password for your users, the only solution is for an admin to set a new password. -Security Warning -++++++++++++++++ +Security Warning: +----------------- Installing this module does not mean you can ignore other security measures, as the password is still transmitted unencrypted on the network, unless you are using a secure protocol such as XML-RPCS or HTTPS. @@ -48,8 +48,8 @@ contain critical data. Appropriate security measures need to be implemented by the system administrator in all areas, such as: protection of database backups, system files, remote shell access, physical server access. -Interation with LDAP authentication -+++++++++++++++++++++++++++++++++++ +Interation with LDAP authentication: +------------------------------------ This module is currently not compatible with the ``user_ldap`` module and will disable LDAP authentication completely if installed at the same time. diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index b46c8781f42..8b9cc3de451 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -114,9 +114,6 @@ Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen". - * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via - Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. - """, "author" : "Veritos - Jan Verlaan", "website" : "http://www.veritos.nl", From ea9963073295e4a752407a7955b5c5487a6f28bb Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Mon, 16 Jul 2012 11:22:20 +0530 Subject: [PATCH 062/106] [IMP] l10n_in: typo bzr revid: mra@tinyerp.com-20120716055220-m732ts6l1549mr5g --- addons/l10n_in/__openerp__.py | 2 +- addons/l10n_in/l10n_in_installer.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index 526b38318b5..18bc42a80cc 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - "name": "India - Accounting", + "name": "Indian - Accounting", "version": "1.0", "description": """ Indian Accounting : Chart of Account. diff --git a/addons/l10n_in/l10n_in_installer.py b/addons/l10n_in/l10n_in_installer.py index 0d2b4f665b6..0a15d034605 100644 --- a/addons/l10n_in/l10n_in_installer.py +++ b/addons/l10n_in/l10n_in_installer.py @@ -65,4 +65,4 @@ class l10n_installer(osv.osv_memory): return res -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file From edda972621f98d7f6436ee87101bf3c1fbae5a58 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Mon, 16 Jul 2012 11:38:12 +0530 Subject: [PATCH 063/106] [IMP] l10n_in: typo bzr revid: mra@tinyerp.com-20120716060812-dv6o6l2i3rw0vrmw --- addons/l10n_in/l10n_in_public_tax_template.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 88f78121b22..55fa139d618 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -232,7 +232,7 @@ - Excise Duty-%2 + Excise Duty-2% 0.02 percent sale From 58ed2b3d3f229e18804154738b3e769d6c738804 Mon Sep 17 00:00:00 2001 From: "Mustufa Rangwala (OpenERP)" Date: Mon, 16 Jul 2012 12:14:35 +0530 Subject: [PATCH 064/106] [FIX] l10n_in: Fixes for child tax bzr revid: mra@tinyerp.com-20120716064435-n60u5aszetiwa1ui --- .../l10n_in/l10n_in_private_tax_template.xml | 32 ++++++++++++++ .../l10n_in/l10n_in_public_tax_template.xml | 42 +++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/addons/l10n_in/l10n_in_private_tax_template.xml b/addons/l10n_in/l10n_in_private_tax_template.xml index 6cb8933728c..d78dc2cbad4 100644 --- a/addons/l10n_in/l10n_in_private_tax_template.xml +++ b/addons/l10n_in/l10n_in_private_tax_template.xml @@ -186,6 +186,16 @@ percent sale + + + + 1 + + 1 + + 1 + + 1 @@ -194,6 +204,16 @@ 0.01 percent sale + + + + 1 + + 1 + + 1 + + 1 @@ -221,6 +241,12 @@ 0.02 percent all + + + + + + @@ -230,6 +256,12 @@ 0.01 percent all + + + + + + diff --git a/addons/l10n_in/l10n_in_public_tax_template.xml b/addons/l10n_in/l10n_in_public_tax_template.xml index 55fa139d618..03dbfa7cc75 100644 --- a/addons/l10n_in/l10n_in_public_tax_template.xml +++ b/addons/l10n_in/l10n_in_public_tax_template.xml @@ -193,6 +193,17 @@ Service Tax-%2 + + + + + 1 + + 1 + + 1 + + 1 0.02 percent all @@ -203,6 +214,17 @@ Service Tax-%1 0.01 + + + + + 1 + + 1 + + 1 + + 1 percent all @@ -236,6 +258,16 @@ 0.02 percent sale + + + + 1 + + 1 + + 1 + + 1 @@ -245,6 +277,16 @@ 0.01 percent sale + + + + 1 + + 1 + + 1 + + 1 From 8dfc9f18d365d8decd635f69b2b03dcb7f254ad6 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Tue, 17 Jul 2012 15:43:07 +0530 Subject: [PATCH 065/106] [IMP] project_mrp: Improve the description as the produce is now Manufacture bzr revid: psi@tinyerp.com-20120717101307-zlojt3bltwkfa46s --- addons/project_mrp/__openerp__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index 2c858fb8814..5c818a57e7a 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -32,9 +32,9 @@ This module will automatically create a new task for each procurement order line (e.g. for sale order lines), if the corresponding product meets the following characteristics: - * Type = Service - * Procurement method (Order fulfillment) = MTO (make to order) - * Supply/Procurement method = Produce + * Product Type = Service + * Procurement Method (Order fulfillment) = MTO (Make to Order) + * Supply/Procurement Method = Manufacture If on top of that a projet is specified on the product form (in the Procurement tab), then the new task will be created in that specific project. Otherwise, the From e72f791b1321fb6d4496488ccf062ff92f710010 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 16:27:08 +0200 Subject: [PATCH 066/106] improved style of kanban vignette dropdown menu bzr revid: mit@openerp.com-20120718142708-5okzuclspou6khot --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- addons/web_kanban/static/src/css/kanban.css | 19 +++++++------------ addons/web_kanban/static/src/css/kanban.sass | 19 ++++++++----------- 4 files changed, 17 insertions(+), 25 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a3d24d41f4..8ee9bad823c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -599,6 +599,7 @@ float: none; display: block; position: relative; + padding: 2px 12px; } .openerp .oe_dropdown_menu > li:hover { background-color: #f0f0fa; @@ -615,7 +616,6 @@ .openerp .oe_dropdown_menu > li > a { white-space: nowrap; display: block; - padding: 4px 15px; color: #4c4c4c; text-decoration: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fb67945a02d..fe1e8cfe8d2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -483,10 +483,10 @@ $sheet-max-width: 860px float: none display: block position: relative + padding: 2px 12px > a white-space: nowrap display: block - padding: 4px 15px color: #4c4c4c text-decoration: none &:hover diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 5a7c1b84067..51cdc568a1e 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -359,6 +359,9 @@ .openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban { margin-top: 4px; } +.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban .oe_kanban_project_times li { + float: left; +} .openerp .oe_kanban_view .oe_kanban_star { float: left; position: inline-block; @@ -401,9 +404,6 @@ position: relative; top: 2px; } -.openerp .oe_kanban_view .oe_kanban_project_times li { - float: left; -} .openerp .oe_kanban_view .oe_kanban_status { position: relative; top: 4px; @@ -471,30 +471,25 @@ visibility: hidden; } .openerp .oe_kanban_view .oe_kanban_colorpicker { - padding: 3px 6px; white-space: nowrap; } .openerp .oe_kanban_view .oe_kanban_colorpicker li { float: left; + margin: 0; + padding: 0; } .openerp .oe_kanban_view .oe_kanban_colorpicker li a { display: inline-block; - width: 18px; - height: 18px; + width: 16px; + height: 16px; border: 1px solid white; } .openerp .oe_kanban_view .oe_kanban_colorpicker li a:hover { border: 1px solid gray !important; } .openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a { - margin-top: 1px; - height: 16px; border: 1px solid #cccccc; } -.openerp .oe_kanban_view .oe_kanban_colorpicker li:first-child a:hover { - margin-top: 0px; - height: 18px; -} .openerp .oe_kanban_view .oe_kanban_color_0 { background-color: white; } diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index cea95f2ce53..6478ea5b213 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -307,6 +307,10 @@ text-decoration: none .oe_dropdown_kanban margin-top: 4px + .oe_kanban_project_times + li + float: left + .oe_kanban_star float: left position: inline-block @@ -337,9 +341,6 @@ position: relative top: 2px - .oe_kanban_project_times li - float: left - .oe_kanban_status position: relative top: 4px @@ -387,24 +388,20 @@ // }}} // KanbanColorPicker {{{ .oe_kanban_colorpicker - padding: 3px 6px white-space: nowrap .oe_kanban_colorpicker li float: left + margin: 0 + padding: 0 a display: inline-block - width: 18px - height: 18px + width: 16px + height: 16px border: 1px solid white a:hover border: 1px solid gray !important .oe_kanban_colorpicker li:first-child a - margin-top: 1px - height: 16px border: 1px solid #ccc - &:hover - margin-top: 0px - height: 18px // }}} // KanbanColors {{{ .oe_kanban_color_0 From 8632675b82ed1b4cc50a3a48b02fb40dd316d3d6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 18 Jul 2012 16:35:39 +0200 Subject: [PATCH 067/106] re alignment of dropdown menu bzr revid: mit@openerp.com-20120718143539-0b1abwzq24f66s50 --- addons/web/static/src/css/base.css | 4 ++-- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8ee9bad823c..e96bb2666f5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -584,7 +584,7 @@ z-index: 1; border: 1px solid #afafb6; background: white; - padding: 6px 0; + padding: 4px 0; min-width: 140px; text-align: left; -moz-border-radius: 3px; @@ -599,7 +599,7 @@ float: none; display: block; position: relative; - padding: 2px 12px; + padding: 2px 8px; } .openerp .oe_dropdown_menu > li:hover { background-color: #f0f0fa; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fe1e8cfe8d2..d860fc69189 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -470,7 +470,7 @@ $sheet-max-width: 860px z-index: 1 border: 1px solid #afafb6 background: white - padding: 6px 0 + padding: 4px 0 min-width: 140px text-align: left @include radius(3px) @@ -483,7 +483,7 @@ $sheet-max-width: 860px float: none display: block position: relative - padding: 2px 12px + padding: 2px 8px > a white-space: nowrap display: block From cf6af909fb8f36f0a4ced1a3b61379d9d4899e34 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 17:28:04 +0200 Subject: [PATCH 068/106] fixed visual glitch in topbar dropdown menu bzr revid: mit@openerp.com-20120719152804-zcxvuaicpzfubdv1 --- addons/web/static/src/css/base.css | 3 ++- addons/web/static/src/css/base.sass | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e96bb2666f5..12f0de62b8c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -945,11 +945,12 @@ } .openerp .oe_topbar .oe_dropdown_menu li { float: none; + padding: 3px 12px; } .openerp .oe_topbar .oe_dropdown_menu li a { color: #eeeeee; } -.openerp .oe_topbar .oe_dropdown_menu li a:hover { +.openerp .oe_topbar .oe_dropdown_menu li:hover { background-color: #292929; background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); background-image: -webkit-linear-gradient(top, #292929, #191919); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d860fc69189..58fd8734fa7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -735,11 +735,12 @@ $sheet-max-width: 860px @include background-clip() li float: none + padding: 3px 12px a color: #eee - &:hover - @include vertical-gradient(#292929, #191919) - @include box-shadow(none) + &:hover + @include vertical-gradient(#292929, #191919) + @include box-shadow(none) // }}} // Webclient.leftbar {{{ From bd538220f36bd7b4c58c158ed3c831bd6b510af6 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 17:36:05 +0200 Subject: [PATCH 069/106] fixed offset of topbar dropdown menu bzr revid: mit@openerp.com-20120719153605-ivanvuvl3mv88bl3 --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 094e2f184e6..2ab4b61d9c0 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -910,7 +910,7 @@ instance.web.WebClient = instance.web.Widget.extend({ var doc_width = $(document).width(); var offset = $menu.offset(); var menu_width = $menu.width(); - var x = doc_width - offset.left - menu_width - 15; + var x = doc_width - offset.left - menu_width - 2; if (x < 0) { $menu.offset({ left: offset.left + x }).width(menu_width); } From 3c1dd6c0c2a985eebbbfb99b18a98f1151cdfd6d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 17:58:37 +0200 Subject: [PATCH 070/106] fixed cursor too close to search icon in searchview bzr revid: mit@openerp.com-20120719155837-g64bmhzesl7ode8t --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 12f0de62b8c..7c8085046fc 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1438,7 +1438,7 @@ outline: none; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_input { - padding: 0 3px; + padding: 0 0 0 6px; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 58fd8734fa7..b3ff70b72bd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1127,7 +1127,7 @@ $sheet-max-width: 860px &:focus outline: none .oe_searchview_input - padding: 0 3px + padding: 0 0 0 6px .oe_searchview_facet position: relative cursor: pointer From bff386ea36d2d24c21b16d4ed17db0c6d039bd3d Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 19 Jul 2012 18:04:56 +0200 Subject: [PATCH 071/106] fixed alignment of 'add to dashboard' button in searchview bzr revid: mit@openerp.com-20120719160456-vp9hip9f67d1ij84 --- addons/web/static/src/css/base.css | 6 +++--- addons/web/static/src/css/base.sass | 14 +++++++------- addons/web/static/src/xml/base.xml | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7c8085046fc..eda3a996d23 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1601,14 +1601,14 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section li:hover { background-color: #f0f0fa; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form { +.openerp .oe_searchview .oe_searchview_drawer form { margin-left: 12px; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form p { +.openerp .oe_searchview .oe_searchview_drawer form p { margin: 4px 0; line-height: 18px; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section form button { +.openerp .oe_searchview .oe_searchview_drawer form button { margin: 0 0 8px 0; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b3ff70b72bd..dbd3d30f453 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1249,13 +1249,13 @@ $sheet-max-width: 860px // after oe_selected so background color is not overridden &:hover background-color: $hover-background - form - margin-left: 12px - p - margin: 4px 0 - line-height: 18px - button - margin: 0 0 8px 0 + form + margin-left: 12px + p + margin: 4px 0 + line-height: 18px + button + margin: 0 0 8px 0 .oe_searchview_custom padding: 0 8px 8px 8px form diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 0ade5dd4d89..1bbffe3e2a7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1392,8 +1392,8 @@

Add to Dashboard

- - +

+
From 75fb9fbe9137b81fcc1a29eaa31850d2fc4a1a80 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 20 Jul 2012 12:11:11 +0530 Subject: [PATCH 072/106] [IMP]all: improve some typo in module description bzr revid: mma@tinyerp.com-20120720064111-216mdw2wjrwavhe4 --- addons/account/__openerp__.py | 2 +- addons/event_moodle/__openerp__.py | 10 +++++----- addons/hr_payroll_account/__openerp__.py | 2 +- addons/hr_timesheet_sheet/__openerp__.py | 2 +- addons/l10n_fr_hr_payroll/__openerp__.py | 4 ++-- addons/l10n_uk/__openerp__.py | 2 +- addons/membership/__openerp__.py | 2 +- addons/purchase/__openerp__.py | 2 +- addons/users_ldap/__openerp__.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index dae0485d709..e1b9078ec3f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -29,7 +29,7 @@ Accounting and Financial Management. Financial and accounting module that covers: -------------------------------------------- - * General accountings + * General Accounting * Cost/Analytic accounting * Third party accounting * Taxes management diff --git a/addons/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py index bd0ec2e7785..14f6de8668d 100644 --- a/addons/event_moodle/__openerp__.py +++ b/addons/event_moodle/__openerp__.py @@ -28,8 +28,8 @@ Configure your moodle server. ============================= -With this module you are able to connect your OpenERP with a moodle plateform. -This module will create courses and students automatically in your moodle plateform +With this module you are able to connect your OpenERP with a moodle platform. +This module will create courses and students automatically in your moodle platform to avoid wasting time. Now you have a simple way to create training or courses with OpenERP and moodle. @@ -38,13 +38,13 @@ STEPS TO CONFIGURE: 1. Activate web service in moodle. ---------------------------------- ->site administration >plugins >web sevices >manage protocols activate the xmlrpc web service +>site administration >plugins >web services >manage protocols activate the xmlrpc web service ->site administration >plugins >web sevices >manage tokens create a token +>site administration >plugins >web services >manage tokens create a token ->site administration >plugins >web sevices >overview activate webservice +>site administration >plugins >web services >overview activate webservice 2. Create confirmation email with login and password. diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py index 9ea8a10bbb8..f869c93697b 100644 --- a/addons/hr_payroll_account/__openerp__.py +++ b/addons/hr_payroll_account/__openerp__.py @@ -24,7 +24,7 @@ 'version': '1.0', 'category': 'Human Resources', 'description': """ -Generic Payroll system Integrated with Accountings. +Generic Payroll system Integrated with Accounting. =================================================== * Expense Encoding diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index 1a3ee5b70bc..d6a727d478d 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -29,7 +29,7 @@ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== - * It will mentain attendances and track (sign in/sign out) events. + * It will maintain attendances and track (sign in/sign out) events. * Track the timesheet lines. Other tabs contains statistics views to help you analyse your diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py index fd1f595a7e3..c3b2c332a46 100755 --- a/addons/l10n_fr_hr_payroll/__openerp__.py +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -28,8 +28,8 @@ French Payroll Rules. ===================== - - Configuration of hr_payroll for french localization - - All main contributions rules for french payslip, for 'cadre' and 'non-cadre' + - Configuration of hr_payroll for French localization + - All main contributions rules for French payslip, for 'cadre' and 'non-cadre' - New payslip report TODO : diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py index 19a9747ea6a..444ea2b9dd3 100644 --- a/addons/l10n_uk/__openerp__.py +++ b/addons/l10n_uk/__openerp__.py @@ -24,7 +24,7 @@ 'version': '1.0', 'category': 'Localization/Account Charts', 'description': """ -This is the latest UK OpenERP localisation necesary to run OpenERP accounting +This is the latest UK OpenERP localisation necessary to run OpenERP accounting for UK SME's with: - a CT600-ready chart of accounts - VAT100-ready tax structure diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py index eae5861e93c..a05240c08e7 100644 --- a/addons/membership/__openerp__.py +++ b/addons/membership/__openerp__.py @@ -30,7 +30,7 @@ This module allows you to manage all operations for managing memberships. It supports different kind of members: * Free member - * Associated member (eg.: a group subscribes to a membership for all subsidiaries) + * Associated member (e.g.: a group subscribes to a membership for all subsidiaries) * Paid members * Special member prices diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index d90ca351d8e..6b74b3c63d5 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -34,7 +34,7 @@ A supplier invoice is created for the particular purchase order. Dashboard for purchase management that includes: ------------------------------------------------ * Request for Quotations - * Monthly Purchasess by Category + * Monthly Purchases by Category """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index abb8e3e420e..ba153328af1 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -40,7 +40,7 @@ LDAP servers, as long as they have unique usernames (usernames need to be unique in OpenERP, even across multiple companies). Anonymous LDAP binding is also supported (for LDAP servers that allow it), by -simpling keeping the LDAP user and password empty in the LDAP configuration. +simply keeping the LDAP user and password empty in the LDAP configuration. This does not allow anonymous authentication for users, it is only for the master LDAP account that is used to verify if a user exists before attempting to authenticate it. From 09a5fbba59097a8c568bf2a4c116fa6ea0507885 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 20 Jul 2012 14:56:53 +0530 Subject: [PATCH 073/106] [IMP]all: improve some tool-tip bzr revid: mma@tinyerp.com-20120720092653-197y2amboq3hv9e5 --- .../account_analytic_default.py | 6 +++--- .../openerp_report_designer/bin/script/Fields.py | 2 +- .../openerp_report_designer/bin/script/Translation.py | 2 +- .../openerp_report_designer/bin/script/modify.py | 6 +++--- addons/document/nodes.py | 2 +- addons/product_margin/product_margin.py | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index affc514e203..4fe654adffc 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -31,10 +31,10 @@ class account_analytic_default(osv.osv): _columns = { 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"), 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), - 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Select a product which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this product, it will automatically take this as an analytic account)"), - 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="Select a partner which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this partner, it will automatically take this as an analytic account)"), + 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Select a product which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this product, it will automatically take this as an analytic account)"), + 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="Select a partner which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this partner, it will automatically take this as an analytic account)"), 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="Select a user which will use analytic account specified in analytic default."), - 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="Select a company which will use analytic account specified in analytic default (eg. create new customer invoice or Sale order if we select this company, it will automatically take this as an analytic account)"), + 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="Select a company which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this company, it will automatically take this as an analytic account)"), 'date_start': fields.date('Start Date', help="Default start date for this Analytic Account."), 'date_stop': fields.date('End Date', help="Default end date for this Analytic Account."), } diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py index 92044f78fe1..e7c2b33ca88 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py @@ -174,7 +174,7 @@ class Fields(unohelper.Base, XJobExecutor ): self.win.doModalDialog("lstFields",self.sValue) else: - ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice") + ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 E.g. http://localhost:8069 \nOR \nField-4 E.g. account.invoice") self.win.endExecute() def lstbox_selected(self,oItemEvent): diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py index 73146f1b68a..97e6427ae76 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py @@ -154,7 +154,7 @@ class AddLang(unohelper.Base, XJobExecutor ): self.win.doModalDialog("lstFields",self.sValue) else: - ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 Eg. http://localhost:8069 \nOR \nField-4 Eg. account.invoice") + ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 E.g. http://localhost:8069 \nOR \nField-4 E.g. account.invoice") self.win.endExecute() def lstbox_selected(self,oItemEvent): diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py index fc3d6672b79..f38424fd614 100644 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py @@ -77,7 +77,7 @@ class modify(unohelper.Base, XJobExecutor ): ErrorDialog( "Please insert user define field Field-1", "Just go to File->Properties->User Define \n" - "Field-1 Eg. http://localhost:8069" + "Field-1 E.g. http://localhost:8069" ) exit(1) @@ -108,9 +108,9 @@ class modify(unohelper.Base, XJobExecutor ): ErrorDialog( "Please insert user define field Field-1 or Field-4", "Just go to File->Properties->User Define \n" - "Field-1 Eg. http://localhost:8069 \n" + "Field-1 E.g. http://localhost:8069 \n" "OR \n" - "Field-4 Eg. account.invoice" + "Field-4 E.g. account.invoice" ) exit(1) diff --git a/addons/document/nodes.py b/addons/document/nodes.py index 273be7effa4..b4f423460d7 100644 --- a/addons/document/nodes.py +++ b/addons/document/nodes.py @@ -375,7 +375,7 @@ class node_class(object): could do various things. Should also consider node<->content, dir<->dir moves etc. - Move operations, as instructed from APIs (eg. request from DAV) could + Move operations, as instructed from APIs (e.g. request from DAV) could use this function. """ raise NotImplementedError(repr(self)) diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index 8f946467384..4c033a4a6ca 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -110,15 +110,15 @@ class product_product(osv.osv): 'purchase_gap' : fields.function(_product_margin, type='float', string='Purchase Gap', multi='product_margin', help="Normal Cost - Total Cost"), 'turnover' : fields.function(_product_margin, type='float', string='Turnover' ,multi='product_margin', - help="Sum of Multification of Invoice price and quantity of Customer Invoices"), + help="Sum of Multiplication of Invoice price and quantity of Customer Invoices"), 'total_cost' : fields.function(_product_margin, type='float', string='Total Cost', multi='product_margin', - help="Sum of Multification of Invoice price and quantity of Supplier Invoices "), + help="Sum of Multiplication of Invoice price and quantity of Supplier Invoices "), 'sale_expected' : fields.function(_product_margin, type='float', string='Expected Sale', multi='product_margin', - help="Sum of Multification of Sale Catalog price and quantity of Customer Invoices"), + help="Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"), 'normal_cost' : fields.function(_product_margin, type='float', string='Normal Cost', multi='product_margin', - help="Sum of Multification of Cost price and quantity of Supplier Invoices"), + help="Sum of Multiplication of Cost price and quantity of Supplier Invoices"), 'total_margin' : fields.function(_product_margin, type='float', string='Total Margin', multi='product_margin', - help="Turnorder - Standard price"), + help="Turnover - Standard price"), 'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin', help="Expected Sale - Normal Cost"), 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin', From d9c5368a2cbe3f19aed1e4be08adcad826207dd0 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 20 Jul 2012 15:57:51 +0530 Subject: [PATCH 074/106] [IMP] product : TypeError: The model 'product.product' specifies an unexisting parent class 'mail.thread'. bzr revid: mdi@tinyerp.com-20120720102751-g100uuhvxl0lcr91 --- addons/product/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 9b4d2cadee1..918545aa783 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -25,7 +25,7 @@ "version" : "1.1", "author" : "OpenERP SA", 'category': 'Sales Management', - "depends" : ["base", "process", "decimal_precision"], + "depends" : ["base", "process", "decimal_precision", "mail"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ From c63ec2c229de7061023b26a334ca89d8388d5945 Mon Sep 17 00:00:00 2001 From: "Divyesh Makwana (Open ERP)" Date: Fri, 20 Jul 2012 16:17:28 +0530 Subject: [PATCH 075/106] [IMP] stock : Added multiple location group to 'location' and manage serial number group to 'serial number'. bzr revid: mdi@tinyerp.com-20120720104728-1tvks4b4pzhsx34d --- addons/stock/wizard/stock_change_product_qty_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml index e360f5aa025..6713194f90b 100644 --- a/addons/stock/wizard/stock_change_product_qty_view.xml +++ b/addons/stock/wizard/stock_change_product_qty_view.xml @@ -10,8 +10,8 @@ - - + +