From 6fcf82430912e01ca186fef2bfca2374083f969b Mon Sep 17 00:00:00 2001 From: Rawish Murari Date: Tue, 29 Aug 2017 16:39:23 +0530 Subject: [PATCH] [IMP] l10n_sg: create new tags and assign to taxes task: https://www.odoo.com/web#id=22600&view_type=form&model=project.task&action=333&active_id=131&menu_id=4720 PR: #19099 --- addons/l10n_sg/__openerp__.py | 2 +- addons/l10n_sg/l10n_sg_chart_tax.xml | 244 ++++++++++++------ .../2.0/post-migrate_tags_on_taxes.py | 6 + .../2.0/pre-set_tags_and_taxes_updatable.py | 6 + 4 files changed, 184 insertions(+), 74 deletions(-) create mode 100644 addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py create mode 100644 addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py diff --git a/addons/l10n_sg/__openerp__.py b/addons/l10n_sg/__openerp__.py index 6a5366c8e8a..55d16ecda57 100644 --- a/addons/l10n_sg/__openerp__.py +++ b/addons/l10n_sg/__openerp__.py @@ -5,7 +5,7 @@ { 'name': 'Singapore - Accounting', - 'version': '1.0', + 'version': '2.0', 'author': 'Tech Receptives', 'website': 'http://www.techreceptives.com', 'category': 'Localization', diff --git a/addons/l10n_sg/l10n_sg_chart_tax.xml b/addons/l10n_sg/l10n_sg_chart_tax.xml index 9c241de0e4c..1ce6023c4f6 100644 --- a/addons/l10n_sg/l10n_sg_chart_tax.xml +++ b/addons/l10n_sg/l10n_sg_chart_tax.xml @@ -1,96 +1,194 @@ - + - - - Sales Tax 0% ES33 + + Chart of Singapore taxes - - - Sales Tax 7% DS + + Tax Balance To Pay taxes - - - Sales Tax 0% ESN33 + + Tax Received taxes - - - Sales Tax 0% OS + + Tax Received @ 0% taxes - - - Sales Tax 0% ZR + + Tax Received @ 7% SR taxes - - - Sales Tax 7% SR + + Tax Received @ 7% DS taxes - - - Purchase Tax 7% TX-N33 + + Tax Paid taxes - - - Purchase Tax 7% TX-E33 + + Tax Paid @ 7% TX7 taxes - - - Purchase Tax 7% BL + + Tax Paid @ 7% TX-N33 taxes - - - Purchase Tax 7% IM + + Tax Paid @ 7% TX-E33 taxes - - - Purchase Tax 7% TX-RE + + Tax Paid @ 7% BL taxes - - - Purchase Tax 0% ME + + Tax Paid @ 7% IM taxes - - - Purchase Tax 0% NR + + Tax Paid @ 7% TX-RE taxes - - - Purchase Tax 0% ZP + + Tax Paid @ 0% ME taxes - - - Purchase Tax 0% OP + + Tax Paid @ 0% NR taxes - - - Purchase Tax 0% EP + + Tax Paid @ 0% ZP taxes - - - Purchase Tax MES + + MES Purchase Tax taxes - - - Purchase Tax 7% TX7 + + Out of Scope Taxes + taxes + + + Out of Scope Purchase Tax + taxes + + + Out of Scope Sales Tax + taxes + + + Exempted Taxes + taxes + + + Exempted Purchase Tax + taxes + + + Exempted Sales Tax ES33 + taxes + + + Exempted Sales Tax ESN33 + taxes + + + Tax Bases + taxes + + + Base of Taxed Sales + taxes + + + Sales 7% Standard + taxes + + + Sales 7% Standard SR + taxes + + + Sales 7% Standard DS + taxes + + + Sales 0% Standard + taxes + + + Sales Exempted + taxes + + + Sales Exempted ES33 + taxes + + + Sales Exempted ESN33 + taxes + + + Base of Taxed Purchases + taxes + + + Purchase 7% Standard TX7 + taxes + + + Purchase 7% Standard TX-N33 + taxes + + + Purchase 7% Standard TX-E33 + taxes + + + Purchase 7% Standard BL + taxes + + + Purchase 7% Standard IM + taxes + + + Purchase 7% Standard TX-RE + taxes + + + Purchase 0% Standard ME + taxes + + + Purchase 0% Standard NR + taxes + + + Purchase 0% Standard ZP + taxes + + + Purchase Imports Under MES + taxes + + + Purchase Exempted + taxes + + + Purchase Out Of Scope + taxes + + + Sales Out Of Scope taxes @@ -106,7 +204,7 @@ - + @@ -119,7 +217,7 @@ - + @@ -132,7 +230,7 @@ - + @@ -145,7 +243,7 @@ - + @@ -158,7 +256,7 @@ - + @@ -171,7 +269,7 @@ - + @@ -186,7 +284,7 @@ percent purchase - + @@ -199,7 +297,7 @@ percent purchase - + @@ -212,7 +310,7 @@ percent purchase - + @@ -225,7 +323,7 @@ percent purchase - + @@ -238,7 +336,7 @@ percent purchase - + @@ -251,7 +349,7 @@ percent purchase - + @@ -264,7 +362,7 @@ percent purchase - + @@ -277,7 +375,7 @@ percent purchase - + @@ -290,7 +388,7 @@ percent purchase - + @@ -303,7 +401,7 @@ percent purchase - + @@ -316,7 +414,7 @@ percent purchase - + @@ -329,7 +427,7 @@ percent purchase - + diff --git a/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py new file mode 100644 index 00000000000..fa56fd00dfa --- /dev/null +++ b/addons/l10n_sg/migrations/2.0/post-migrate_tags_on_taxes.py @@ -0,0 +1,6 @@ +from openerp.modules.registry import RegistryManager + +def migrate(cr, version): + registry = RegistryManager.get(cr.dbname) + from openerp.addons.account.models.chart_template import migrate_tags_on_taxes + migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py b/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py new file mode 100644 index 00000000000..8d963dbac16 --- /dev/null +++ b/addons/l10n_sg/migrations/2.0/pre-set_tags_and_taxes_updatable.py @@ -0,0 +1,6 @@ +from openerp.modules.registry import RegistryManager + +def migrate(cr, version): + registry = RegistryManager.get(cr.dbname) + from openerp.addons.account.models.chart_template import migrate_set_tags_and_taxes_updatable + migrate_set_tags_and_taxes_updatable(cr, registry, 'l10n_sg')