pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] l10n_sg is back, compliant with the new accounting

Browse Source
This commit is contained in:
pvy
2015-08-18 10:00:46 +02:00
parent 496c0eb51d
commit 698f750db9
5 changed files with 411 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_sg/__openerp__.py
+2 -2
View File
@@ -31,7 +31,7 @@ After installing this module, the Configuration wizard for accounting is launche
'data': [
'l10n_sg_chart.xml',
'l10n_sg_chart_tax.xml',
'l10n_sg_wizard.xml',
'account_chart_template.yml',
],
'installable': False,
'installable': True,
}
addons/l10n_sg/account_chart_template.yml
+3
View File
@@ -0,0 +1,3 @@
-
!python {model: account.chart.template, id: sg_chart_template}: |
self[0].try_loading_for_current_company()
addons/l10n_sg/l10n_sg_chart.xml
+222 -276
View File
File diff suppressed because it is too large Load Diff
addons/l10n_sg/l10n_sg_chart_tax.xml
+184 -92
View File
@@ -1,85 +1,177 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<odoo>
<data noupdate="1">
<!-- Account Tags -->
<record id="tag_sg_sale_tax_es_0" model="account.account.tag">
<field name="name">Sales Tax 0% ES33</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_sale_tax_ds_7" model="account.account.tag">
<field name="name">Sales Tax 7% DS</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_sale_tax_esn_0" model="account.account.tag">
<field name="name">Sales Tax 0% ESN33</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_sale_tax_os_0" model="account.account.tag">
<field name="name">Sales Tax 0% OS</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_sale_tax_zr_0" model="account.account.tag">
<field name="name">Sales Tax 0% ZR</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_sale_tax_sr_7" model="account.account.tag">
<field name="name">Sales Tax 7% SR</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_txn33_7" model="account.account.tag">
<field name="name">Purchase Tax 7% TX-N33</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_txe33_7" model="account.account.tag">
<field name="name">Purchase Tax 7% TX-E33</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_bl_7" model="account.account.tag">
<field name="name">Purchase Tax 7% BL</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_im_7" model="account.account.tag">
<field name="name">Purchase Tax 7% IM</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_txre_7" model="account.account.tag">
<field name="name">Purchase Tax 7% TX-RE</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_me_0" model="account.account.tag">
<field name="name">Purchase Tax 0% ME</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_nr_0" model="account.account.tag">
<field name="name">Purchase Tax 0% NR</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_zp_0" model="account.account.tag">
<field name="name">Purchase Tax 0% ZP</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_op_0" model="account.account.tag">
<field name="name">Purchase Tax 0% OP</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_ep_0" model="account.account.tag">
<field name="name">Purchase Tax 0% EP</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_mes_0" model="account.account.tag">
<field name="name">Purchase Tax MES</field>
<field name="applicability">taxes</field>
</record>
<record id="tag_sg_purchase_tax_tx7_7" model="account.account.tag">
<field name="name">Purchase Tax 7% TX7</field>
<field name="applicability">taxes</field>
</record>
<!-- Sales Tax -->
<record id="sg_sale_tax_es_0" model="account.tax.template">
<field name="name">Sales Tax 0% ES33</field>
<field name="description">0% ES33</field>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_791"/>
<field name="account_paid_id" ref="account_account_791"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_791"/>
<field name="refund_account_id" ref="account_account_791"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_es_0')])]"/>
</record>
<record id="sg_sale_tax_ds_7" model="account.tax.template">
<field name="name">Sales Tax 7% DS</field>
<field name="description">7% DS</field>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_792"/>
<field name="account_paid_id" ref="account_account_792"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_792"/>
<field name="refund_account_id" ref="account_account_792"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_ds_7')])]"/>
</record>
<record id="sg_sale_tax_esn_0" model="account.tax.template">
<field name="name">Sales Tax 0% ESN33</field>
<field name="description">0% ESN33</field>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_793"/>
<field name="account_paid_id" ref="account_account_793"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_793"/>
<field name="refund_account_id" ref="account_account_793"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_esn_0')])]"/>
</record>
<record id="sg_sale_tax_os_0" model="account.tax.template">
<field name="name">Sales Tax 0% OS</field>
<field name="description">0% OS</field>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_794"/>
<field name="account_paid_id" ref="account_account_794"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_794"/>
<field name="refund_account_id" ref="account_account_794"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_os_0')])]"/>
</record>
<record id="sg_sale_tax_zr_0" model="account.tax.template">
<field name="name">Sales Tax 0% ZR</field>
<field name="description">0% ZR</field>
<field name="price_include" eval="0"/>
<field name="amount">0.00</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_795"/>
<field name="account_paid_id" ref="account_account_795"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_795"/>
<field name="refund_account_id" ref="account_account_795"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_zr_0')])]"/>
</record>
<record id="sg_sale_tax_sr_7" model="account.tax.template">
<field name="name">Sales Tax 7% SR</field>
<field name="description">7% SR</field>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">sale</field>
<field name="account_collected_id" ref="account_account_796"/>
<field name="account_paid_id" ref="account_account_796"/>
<field name="child_depend" eval="0"/>
<field name="account_id" ref="account_account_796"/>
<field name="refund_account_id" ref="account_account_796"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_sale_tax_sr_7')])]"/>
</record>
<!-- Purchases Tax -->
@@ -87,158 +179,158 @@
<record id="sg_purchase_tax_txn33_7" model="account.tax.template">
<field name="name">Purchase Tax 7% TX-N33</field>
<field name="description">7% TX-N33</field>
<field name="account_collected_id" ref="account_account_738"/>
<field name="account_paid_id" ref="account_account_738"/>
<field name="account_id" ref="account_account_738"/>
<field name="refund_account_id" ref="account_account_738"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txn33_7')])]"/>
</record>
<record id="sg_purchase_tax_txe33_7" model="account.tax.template">
<field name="name">Purchase Tax 7% TX-E33</field>
<field name="description">7% TX-E33</field>
<field name="account_collected_id" ref="account_account_739"/>
<field name="account_paid_id" ref="account_account_739"/>
<field name="account_id" ref="account_account_739"/>
<field name="refund_account_id" ref="account_account_739"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txe33_7')])]"/>
</record>
<record id="sg_purchase_tax_bl_7" model="account.tax.template">
<field name="name">Purchase Tax 7% BL</field>
<field name="description">7% BL</field>
<field name="account_collected_id" ref="account_account_740"/>
<field name="account_paid_id" ref="account_account_740"/>
<field name="account_id" ref="account_account_740"/>
<field name="refund_account_id" ref="account_account_740"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_bl_7')])]"/>
</record>
<record id="sg_purchase_tax_im_7" model="account.tax.template">
<field name="name">Purchase Tax 7% IM</field>
<field name="description">7% IM</field>
<field name="account_collected_id" ref="account_account_741"/>
<field name="account_paid_id" ref="account_account_741"/>
<field name="account_id" ref="account_account_741"/>
<field name="refund_account_id" ref="account_account_741"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_im_7')])]"/>
</record>
<record id="sg_purchase_tax_txre_7" model="account.tax.template">
<field name="name">Purchase Tax 7% TX-RE</field>
<field name="description">7% TX-RE</field>
<field name="account_collected_id" ref="account_account_742"/>
<field name="account_paid_id" ref="account_account_742"/>
<field name="account_id" ref="account_account_742"/>
<field name="refund_account_id" ref="account_account_742"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_txre_7')])]"/>
</record>
<record id="sg_purchase_tax_me_0" model="account.tax.template">
<field name="name">Purchase Tax 0% ME</field>
<field name="description">0% ME</field>
<field name="account_collected_id" ref="account_account_743"/>
<field name="account_paid_id" ref="account_account_743"/>
<field name="account_id" ref="account_account_743"/>
<field name="refund_account_id" ref="account_account_743"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_me_0')])]"/>
</record>
<record id="sg_purchase_tax_nr_0" model="account.tax.template">
<field name="name">Purchase Tax 0% NR</field>
<field name="description">0% NR</field>
<field name="account_collected_id" ref="account_account_744"/>
<field name="account_paid_id" ref="account_account_744"/>
<field name="account_id" ref="account_account_744"/>
<field name="refund_account_id" ref="account_account_744"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_nr_0')])]"/>
</record>
<record id="sg_purchase_tax_zp_0" model="account.tax.template">
<field name="name">Purchase Tax 0% ZP</field>
<field name="description">0% ZP</field>
<field name="account_collected_id" ref="account_account_745"/>
<field name="account_paid_id" ref="account_account_745"/>
<field name="account_id" ref="account_account_745"/>
<field name="refund_account_id" ref="account_account_745"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_zp_0')])]"/>
</record>
<record id="sg_purchase_tax_op_0" model="account.tax.template">
<field name="name">Purchase Tax 0% OP</field>
<field name="description">0% OP</field>
<field name="account_collected_id" ref="account_account_746"/>
<field name="account_paid_id" ref="account_account_746"/>
<field name="account_id" ref="account_account_746"/>
<field name="refund_account_id" ref="account_account_746"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_op_0')])]"/>
</record>
<record id="sg_purchase_tax_ep_0" model="account.tax.template">
<field name="name">Purchase Tax 0% EP</field>
<field name="description">0% EP</field>
<field name="account_collected_id" ref="account_account_747"/>
<field name="account_paid_id" ref="account_account_747"/>
<field name="account_id" ref="account_account_747"/>
<field name="refund_account_id" ref="account_account_747"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_ep_0')])]"/>
</record>
<record id="sg_purchase_tax_mes_0" model="account.tax.template">
<field name="name">Purchase Tax MES</field>
<field name="description">0% MES</field>
<field name="account_collected_id" ref="account_account_748"/>
<field name="account_paid_id" ref="account_account_748"/>
<field name="account_id" ref="account_account_748"/>
<field name="refund_account_id" ref="account_account_748"/>
<field name="price_include" eval="0"/>
<field name="amount">0.0</field>
<field name="type">percent</field>
<field name="amount">0</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_mes_0')])]"/>
</record>
<record id="sg_purchase_tax_tx7_7" model="account.tax.template">
<field name="name">Purchase Tax 7% TX7</field>
<field name="description">7% TX7</field>
<field name="account_collected_id" ref="account_account_749"/>
<field name="account_paid_id" ref="account_account_749"/>
<field name="account_id" ref="account_account_749"/>
<field name="refund_account_id" ref="account_account_749"/>
<field name="price_include" eval="0"/>
<field name="amount">0.07</field>
<field name="type">percent</field>
<field name="amount">7</field>
<field name="amount_type">percent</field>
<field name="type_tax_use">purchase</field>
<field name="child_depend" eval="0"/>
<field name="chart_template_id" ref="sg_chart_template"/>
<field name="tag_ids" eval="[(6,0,[ref('tag_sg_purchase_tax_tx7_7')])]"/>
</record>
</data>
</openerp>
</odoo>
addons/l10n_sg/l10n_sg_wizard.xml
-9
View File
@@ -1,9 +0,0 @@
<openerp>
<data noupdate="1">
<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
<field name="state">open</field>
</record>
</data>
</openerp>