Merge lp:~camptocamp/openerp-swiss-localization/vre_change_onsales_account_tax into lp:~camptocamp/openerp-swiss-localization/7.0

Proposed by Vincent Renaville@camptocamp
Status: Rejected
Rejected by: Nicolas Bessi - Camptocamp
Proposed branch: lp:~camptocamp/openerp-swiss-localization/vre_change_onsales_account_tax
Merge into: lp:~camptocamp/openerp-swiss-localization/7.0
Diff against target: 66 lines (+8/-12)
1 file modified
l10n_ch/sterchi_chart/vat2011.xml (+8/-12)
To merge this branch: bzr merge lp:~camptocamp/openerp-swiss-localization/vre_change_onsales_account_tax
Reviewer Review Type Date Requested Status
Frederic Clementi - Camptocamp functional Approve
Review via email: mp+224439@code.launchpad.net

Description of the change

Hello,
This fix the issue that onsales taxes are on 1700 account instead to 2200

Vincent

To post a comment you must log in.
Revision history for this message
Frederic Clementi - Camptocamp (frederic-clementi) wrote :

LGTM

review: Approve (functional)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote :

Rejected as it moved to Github: https://github.com/OCA/switzerland/pull/6

Unmerged revisions

206. By Vincent Renaville@camptocamp

[FIX] remove unuseful comment

205. By Vincent Renaville@camptocamp

[FIX] change account 1170 to 2200 for onsales taxes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'l10n_ch/sterchi_chart/vat2011.xml'
--- l10n_ch/sterchi_chart/vat2011.xml 2013-03-18 14:44:54 +0000
+++ l10n_ch/sterchi_chart/vat2011.xml 2014-06-25 12:43:31 +0000
@@ -148,8 +148,8 @@
148 <field name="ref_base_sign" eval="-1.0"/>148 <field name="ref_base_sign" eval="-1.0"/>
149 <field name="ref_tax_sign" eval="-1.0"/>149 <field name="ref_tax_sign" eval="-1.0"/>
150 <field name="chart_template_id" ref="l10nch_chart_template"/>150 <field name="chart_template_id" ref="l10nch_chart_template"/>
151 <field name="account_collected_id" ref="ch_1170"/>151 <field name="account_collected_id" ref="ch_2200"/>
152 <field name="account_paid_id" ref="ch_1170"/>152 <field name="account_paid_id" ref="ch_2200"/>
153 <field name="type_tax_use">sale</field>153 <field name="type_tax_use">sale</field>
154 </record>154 </record>
155 <record model="account.tax.template" id="vat_25_purchase">155 <record model="account.tax.template" id="vat_25_purchase">
@@ -251,8 +251,8 @@
251 <field name="ref_tax_sign" eval="-1.0"/>251 <field name="ref_tax_sign" eval="-1.0"/>
252 <field name="chart_template_id" ref="l10nch_chart_template"/>252 <field name="chart_template_id" ref="l10nch_chart_template"/>
253 <field name="type_tax_use">sale</field>253 <field name="type_tax_use">sale</field>
254 <field name="account_collected_id" ref="ch_1170"/>254 <field name="account_collected_id" ref="ch_2200"/>
255 <field name="account_paid_id" ref="ch_1170"/>255 <field name="account_paid_id" ref="ch_2200"/>
256 </record>256 </record>
257 <record model="account.tax.template" id="vat_38_purchase">257 <record model="account.tax.template" id="vat_38_purchase">
258 <field name="name">TVA 3.8% sur achat B&amp;S (TS)</field>258 <field name="name">TVA 3.8% sur achat B&amp;S (TS)</field>
@@ -354,8 +354,8 @@
354 <field name="ref_tax_sign" eval="-1.0"/>354 <field name="ref_tax_sign" eval="-1.0"/>
355 <field name="chart_template_id" ref="l10nch_chart_template"/>355 <field name="chart_template_id" ref="l10nch_chart_template"/>
356 <field name="type_tax_use">sale</field>356 <field name="type_tax_use">sale</field>
357 <field name="account_collected_id" ref="ch_1170"/>357 <field name="account_collected_id" ref="ch_2200"/>
358 <field name="account_paid_id" ref="ch_1170"/>358 <field name="account_paid_id" ref="ch_2200"/>
359 </record>359 </record>
360 <record model="account.tax.template" id="vat_80_purchase">360 <record model="account.tax.template" id="vat_80_purchase">
361 <field name="name">TVA 8.0% sur achat B&amp;S (TN)</field>361 <field name="name">TVA 8.0% sur achat B&amp;S (TN)</field>
@@ -447,17 +447,15 @@
447 <field name="description">0%</field>447 <field name="description">0%</field>
448 <field name="type">percent</field>448 <field name="type">percent</field>
449 <field name="base_code_id" ref="vat_code_due_0"/>449 <field name="base_code_id" ref="vat_code_due_0"/>
450<!-- <field name="tax_code_id" ref="vat_code_due_tva0"/> -->
451 <field name="ref_base_code_id" ref="vat_code_due_0"/>450 <field name="ref_base_code_id" ref="vat_code_due_0"/>
452<!-- <field name="ref_tax_code_id" ref="vat_code_due_tva0"/> -->
453 <field name="base_sign" eval="1.0"/>451 <field name="base_sign" eval="1.0"/>
454 <field name="tax_sign" eval="1.0"/>452 <field name="tax_sign" eval="1.0"/>
455 <field name="ref_base_sign" eval="-1.0"/>453 <field name="ref_base_sign" eval="-1.0"/>
456 <field name="ref_tax_sign" eval="-1.0"/>454 <field name="ref_tax_sign" eval="-1.0"/>
457 <field name="chart_template_id" ref="l10nch_chart_template"/>455 <field name="chart_template_id" ref="l10nch_chart_template"/>
458 <field name="type_tax_use">sale</field>456 <field name="type_tax_use">sale</field>
459 <field name="account_collected_id" ref="ch_1170"/>457 <field name="account_collected_id" ref="ch_2200"/>
460 <field name="account_paid_id" ref="ch_1170"/>458 <field name="account_paid_id" ref="ch_2200"/>
461 </record>459 </record>
462 <record model="account.tax.template" id="vat_O_exclude">460 <record model="account.tax.template" id="vat_O_exclude">
463 <field name="name">TVA 0% exclue</field>461 <field name="name">TVA 0% exclue</field>
@@ -465,9 +463,7 @@
465 <field name="amount" eval="0.00"/>463 <field name="amount" eval="0.00"/>
466 <field name="type">percent</field>464 <field name="type">percent</field>
467 <field name="base_code_id" ref="vat_code_due_0_exclu"/>465 <field name="base_code_id" ref="vat_code_due_0_exclu"/>
468<!-- <field name="tax_code_id" ref="vat_code_due_tva0"/> -->
469 <field name="ref_base_code_id" ref="vat_code_due_0_exclu"/>466 <field name="ref_base_code_id" ref="vat_code_due_0_exclu"/>
470<!-- <field name="ref_tax_code_id" ref="vat_code_due_tva0"/> -->
471 <field name="base_sign" eval="1.0"/>467 <field name="base_sign" eval="1.0"/>
472 <field name="tax_sign" eval="1.0"/>468 <field name="tax_sign" eval="1.0"/>
473 <field name="ref_base_sign" eval="-1.0"/>469 <field name="ref_base_sign" eval="-1.0"/>

Subscribers

People subscribed via source and target branches

to all changes: