[MRG] add tax included definition + Translation

OCA · May 1, 2013 · 821b32c · 821b32c
2 parents a5c3f01 + 1327077
commit 821b32c
Show file tree

Hide file tree

Showing 3 changed files with 194 additions and 22 deletions.
diff --git a/l10n_ch/i18n/de.po b/l10n_ch/i18n/de.po
@@ -5939,8 +5939,8 @@
     msgstr "Zu zahlende MwSt. bei 2,4% (USt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_24_purchase
-    msgid "TVA 2.4% sur achat B&amp;S (TR)"
-    msgstr "MwSt. 2,4 % auf Einkäufe B&amp;S (USt)"
+    msgid "TVA 2.4% sur achat B&S (TR)"
+    msgstr "MwSt. 2,4 % auf Einkäufe B&S (USt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_24_invest
     msgid "TVA 2.4% sur invest. et autres ch. (TR)"
@@ -5951,8 +5951,8 @@
     msgstr "Zu zahlende MwSt. bei 3,6% (LSt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_36_purchase
-    msgid "TVA 3.6% sur achat B&amp;S (TS)"
-    msgstr "MwSt. 3,6% auf Einkäufe B&amp;S (LSt)"
+    msgid "TVA 3.6% sur achat B&S (TS)"
+    msgstr "MwSt. 3,6% auf Einkäufe B&S (LSt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_36_invest
     msgid "TVA 3.6% sur invest. et autres ch. (TS)"
@@ -5963,8 +5963,8 @@
     msgstr "Zu zahlende MwSt. bei 7,6% (NRZ)"
 
 #: model:account.tax.template,name:l10n_ch.vat_76_purchase
-    msgid "TVA 7.6% sur achat B&amp;S"
-    msgstr "MwSt. 7.6% auf Einkäufe B&amp;S"
+    msgid "TVA 7.6% sur achat B&S"
+    msgstr "MwSt. 7.6% auf Einkäufe B&S"
 
 #: model:account.tax.template,name:l10n_ch.vat_76_invest
     msgid "TVA 7.6% sur invest. et autres ch. (TN)"
@@ -6079,37 +6079,61 @@
     msgstr "Zu zahlende MwSt. bei 2,5% (USt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_25_purchase
-    msgid "TVA 2.5% sur achat B&amp;S (TR)"
-    msgstr "MwSt. 2,5% auf Einkäufe B&amp;S (USt)"
+    msgid "TVA 2.5% sur achat B&S (TR)"
+    msgstr "MwSt. 2,5% auf Einkäufe B&S (USt)"
+
+#: model:account.tax.template,name:l10n_ch.vat_25_purchase_ttc
+    msgid "TVA 2.5% incl. sur achat B&S (TR)"
+    msgstr "MwSt. incl. 2,5% auf Einkäufe B&S (USt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_25_invest
     msgid "TVA 2.5% sur invest. et autres ch. (TR)"
     msgstr "MwSt. 2,5% auf Invest. und sonst. Aufw. (USt)"
 
+#: model:account.tax.template,name:l10n_ch.vat_25_invest_ttc
+    msgid "TVA incl. 2.5% sur invest. et autres ch. (TR)"
+    msgstr "MwSt. incl. 2,5% auf Invest. und sonst. Aufw. (USt)"
+
 #: model:account.tax.template,name:l10n_ch.vat_38
     msgid "TVA due a 3.8% (TS)"
     msgstr "Zu zahlende MwSt. bei 3,8% (LSt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_38_purchase
-    msgid "TVA 3.8% sur achat B&amp;S (TS)"
-    msgstr "MwSt. 3,8% auf Einkäufe B&amp;S (LSt)"
+    msgid "TVA 3.8% sur achat B&S (TS)"
+    msgstr "MwSt. 3,8% auf Einkäufe B&S (LSt)"
+
+#: model:account.tax.template,name:l10n_ch.vat_38_purchase_ttc
+    msgid "TVA incl. 3.8% sur achat B&S (TS)"
+    msgstr "MwSt. incl. 3,8% auf Einkäufe B&S (LSt)"
 
 #: model:account.tax.template,name:l10n_ch.vat_38_invest
     msgid "TVA 3.8% sur invest. et autres ch. (TS)"
     msgstr "MwSt. 3,8% auf Invest. und sonst. Aufw. (LSt)"
 
+#: model:account.tax.template,name:l10n_ch.vat_38_invest_ttc
+    msgid "TVA incl. 3.8% sur invest. et autres ch. (TS)"
+    msgstr "MwSt. incl. 3,8% auf Invest. und sonst. Aufw. (LSt)"
+
 #: model:account.tax.template,name:l10n_ch.vat_80
     msgid " b"
     msgstr "Zu zahlende MwSt. bei 8,0% (NRZ)"
 
 #: model:account.tax.template,name:l10n_ch.vat_80_purchase
-    msgid "TVA 8.0% sur achat B&amp;S (TN)"
-    msgstr "MwSt. 8,0% auf Einkäufe B&amp;S (NRZ)"
+    msgid "TVA 8.0% sur achat B&S (TN)"
+    msgstr "MwSt. 8,0% auf Einkäufe B&S (NRZ)"
+
+#: model:account.tax.template,name:l10n_ch.vat_80_purchase_ttc
+    msgid "TVA incl. 8.0% sur achat B&S (TN)"
+    msgstr "MwSt. incl. 8,0% auf Einkäufe B&S (NRZ)"
 
 #: model:account.tax.template,name:l10n_ch.vat_80_invest
     msgid "TVA 8.0% sur invest. et autres ch. (TN)"
     msgstr "MwSt. 8,0% auf Invest. und sonst. Aufw. (NRZ)"
 
+#: model:account.tax.template,name:l10n_ch.vat_80_invest_ttc
+    msgid "TVA 8.0% sur invest. et autres ch. (TN)"
+    msgstr "MwSt. incl. 8,0% auf Invest. und sonst. Aufw. (NRZ)"
+
 #: model:account.tax.template,name:l10n_ch.vat_XO
     msgid "TVA due a 0% (Exportations)"
     msgstr "Zu zahlende MwSt. bei 0% (Exporte)"
@@ -6125,4 +6149,3 @@
 #: model:account.tax.template,name:l10n_ch.vat_100_import
     msgid "100% sur import"
     msgstr "100% auf Import"
-
diff --git a/l10n_ch/i18n/it.po b/l10n_ch/i18n/it.po
@@ -5939,7 +5939,7 @@
     msgstr "IVA Vendite al 2.4% (TR)"
 
 #: model:account.tax.template,name:l10n_ch.vat_24_purchase
-    msgid "TVA 2.4% sur achat B&amp;S (TR)"
+    msgid "TVA 2.4% sur achat B&S (TR)"
     msgstr "IVA 2.4% Merci e servizi (TR)"
 
 #: model:account.tax.template,name:l10n_ch.vat_24_invest
@@ -5951,7 +5951,7 @@
     msgstr "IVA Vendite al 3.6% (TS)"
 
 #: model:account.tax.template,name:l10n_ch.vat_36_purchase
-    msgid "TVA 3.6% sur achat B&amp;S (TS)"
+    msgid "TVA 3.6% sur achat B&S (TS)"
     msgstr "IVA 3.6% Merci e servizi (TS)"
 
 #: model:account.tax.template,name:l10n_ch.vat_36_invest
@@ -5963,7 +5963,7 @@
     msgstr "IVA Vendite al 7.6% (TN)"
 
 #: model:account.tax.template,name:l10n_ch.vat_76_purchase
-    msgid "TVA 7.6% sur achat B&amp;S"
+    msgid "TVA 7.6% sur achat B&S"
     msgstr "IVA 7.6% Merci e servizi"
 
 #: model:account.tax.template,name:l10n_ch.vat_76_invest
@@ -6079,37 +6079,61 @@
     msgstr "IVA Vendite 2.5% (TR)"
 
 #: model:account.tax.template,name:l10n_ch.vat_25_purchase
-    msgid "TVA 2.5% sur achat B&amp;S (TR)"
+    msgid "TVA 2.5% sur achat B&S (TR)"
     msgstr "IVA 2.5% Merci e servizi (TR)"
 
+#: model:account.tax.template,name:l10n_ch.vat_25_purchase_ttc
+    msgid "TVA incl. 2.5% sur achat B&S (TR)"
+    msgstr "IVA incl. 2.5% Merci e servizi (TR)"
+
 #: model:account.tax.template,name:l10n_ch.vat_25_invest
     msgid "TVA 2.5% sur invest. et autres ch. (TR)"
     msgstr "IVA 2.5% Investimenti e altri costi (TR)"
 
+#: model:account.tax.template,name:l10n_ch.vat_25_invest_ttc
+    msgid "TVA incl. 2.5% sur invest. et autres ch. (TR)"
+    msgstr "IVA incl. 2.5% Investimenti e altri costi (TR)"
+
 #: model:account.tax.template,name:l10n_ch.vat_38
     msgid "TVA due a 3.8% (TS)"
     msgstr "IVA Vendite 3.8% (TS)"
 
 #: model:account.tax.template,name:l10n_ch.vat_38_purchase
-    msgid "TVA 3.8% sur achat B&amp;S (TS)"
+    msgid "TVA 3.8% sur achat B&S (TS)"
     msgstr "IVA 3.8% Merci e servizi  (TS)"
 
+#: model:account.tax.template,name:l10n_ch.vat_38_purchase_ttc
+    msgid "TVA incl. 3.8% sur achat B&S (TS)"
+    msgstr "IVA incl. 3.8% Merci e servizi  (TS)"
+
 #: model:account.tax.template,name:l10n_ch.vat_38_invest
     msgid "TVA 3.8% sur invest. et autres ch. (TS)"
     msgstr "IVA 3.8% Investimenti e altri costi (TS)"
 
+#: model:account.tax.template,name:l10n_ch.vat_38_invest_ttc
+    msgid "TVA incl. 3.8% sur invest. et autres ch. (TS)"
+    msgstr "IVA incl. 3.8% Investimenti e altri costi (TS)"
+
 #: model:account.tax.template,name:l10n_ch.vat_80
     msgid "TVA due a 8.0% (TN)"
     msgstr "IVA Vendite 8.0% (TN)"
 
 #: model:account.tax.template,name:l10n_ch.vat_80_purchase
-    msgid "TVA 8.0% sur achat B&amp;S (TN)"
+    msgid "TVA 8.0% sur achat B&S (TN)"
     msgstr "IVA 8.0% Merci e servizi  (TN)"
 
+#: model:account.tax.template,name:l10n_ch.vat_80_purchase_ttc
+    msgid "TVA incl. 8.0% sur achat B&S (TN)"
+    msgstr "IVA incl. 8.0% Merci e servizi  (TN)"
+
 #: model:account.tax.template,name:l10n_ch.vat_80_invest
     msgid "TVA 8.0% sur invest. et autres ch. (TN)"
     msgstr "IVA 8.0%  Investimenti e altri costi (TN)"
 
+#: model:account.tax.template,name:l10n_ch.vat_80_invest_ttc
+    msgid "TVA incl. 8.0% sur invest. et autres ch. (TN)"
+    msgstr "IVA incl. 8.0%  Investimenti e altri costi (TN)"
+
 #: model:account.tax.template,name:l10n_ch.vat_XO
     msgid "TVA due a 0% (Exportations)"
     msgstr "IVA Vendite 0% (Export)"
@@ -6125,4 +6149,3 @@
 #: model:account.tax.template,name:l10n_ch.vat_100_import
     msgid "100% sur import"
     msgstr "100% IVA Import"
-
diff --git a/l10n_ch/sterchi_chart/vat2011.xml b/l10n_ch/sterchi_chart/vat2011.xml
@@ -132,7 +132,7 @@
             <field name="parent_id" ref="vat_code_receivable_base_invest"/>
         </record>
         <!--
-        #  TVA - Taxe sur la Valeur Ajoutée
+        #  VAT excluded only for sell taxes, excluded and included for purchase taxes
         -->
         <record model="account.tax.template" id="vat_25">
             <field name="name">TVA due a 2.5% (TR)</field>
@@ -172,6 +172,27 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
+        <record model="account.tax.template" id="vat_25_purchase_ttc">
+            <field name="name">TVA incl. 2.5% sur achat B&amp;S (TR)</field>
+            <field name="description">2.5% achat TTC</field>
+            <field name="amount" eval="0.025"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_receivable_base_25"/>
+            <field name="tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_25"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="python_compute">result = round((price_unit * 0.025) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.025))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_25_invest">
             <field name="name">TVA 2.5% sur invest. et autres ch. (TR)</field>
             <field name="description">2.5% invest.</field>
@@ -192,7 +213,27 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
-
+        <record model="account.tax.template" id="vat_25_invest_ttc">
+            <field name="name">TVA incl. 2.5% sur invest. et autres ch. (TR)</field>
+            <field name="description">2.5% invest. TTC</field>
+            <field name="amount" eval="0.025"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_receivable_base_invest25"/>
+            <field name="tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_invest25"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="python_compute">result = round((price_unit * 0.025) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.025))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_38">
             <field name="name">TVA due a 3.8% (TS)</field>
             <field name="description">3.8%</field>
@@ -233,6 +274,27 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
+        <record model="account.tax.template" id="vat_38_purchase_ttc">
+            <field name="name">TVA incl. 3.8% sur achat B&amp;S (TS)</field>
+            <field name="description">3.8% achat TTC</field>
+            <field name="amount" eval="0.038"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_receivable_base_38"/>
+            <field name="tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_38"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="python_compute">result = round((price_unit * 0.038) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.038))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_38_invest">
             <field name="name">TVA 3.8% sur invest. et autres ch. (TS)</field>
             <field name="description">3.8% invest</field>
@@ -253,6 +315,27 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
+        <record model="account.tax.template" id="vat_38_invest_ttc">
+            <field name="name">TVA incl. 3.8% sur invest. et autres ch. (TS)</field>
+            <field name="description">3.8% invest TTC</field>
+            <field name="amount" eval="0.038"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_receivable_base_invest38"/>
+            <field name="tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_invest38"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="python_compute">result = round((price_unit * 0.038) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.038))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_80">
             <field name="name">TVA due a 8.0% (TN)</field>
             <field name="description">8.0%</field>
@@ -295,6 +378,28 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
+        <record model="account.tax.template" id="vat_80_purchase_ttc">
+            <field name="name">TVA incl. 8.0% sur achat B&amp;S (TN)</field>
+            <field name="description">8.0% achat TTC</field>
+            <field name="amount" eval="0.080"/>
+            <field name="type">percent</field>
+            <field name="sequence" eval="0"/>
+            <field name="base_code_id" ref="vat_code_receivable_base_80"/>
+            <field name="tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_80"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_bs"/>
+            <field name="python_compute">result = round((price_unit * 0.080) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.080))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_80_invest">
             <field name="name">TVA 8.0% sur invest. et autres ch. (TN)</field>
             <field name="description">8.0% invest.</field>
@@ -315,6 +420,27 @@
             <field name="account_collected_id" ref="ch_1171"/>
             <field name="account_paid_id" ref="ch_1171"/>
         </record>
+        <record model="account.tax.template" id="vat_80_invest_ttc">
+            <field name="name">TVA incl. 8.0% sur invest. et autres ch. (TN)</field>
+            <field name="description">8.0% invest. TTC</field>
+            <field name="amount" eval="0.080"/>
+            <field name="type">percent</field>
+            <field name="base_code_id" ref="vat_code_receivable_base_invest80"/>
+            <field name="tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="ref_base_code_id" ref="vat_code_receivable_base_invest80"/>
+            <field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
+            <field name="python_compute">result = round((price_unit * 0.080) / 0.05) * 0.05</field>
+            <field name="python_compute_inv">result = round((price_unit * ( 1 - (1 / 1.080))) /0.05) * 0.05</field>
+            <field name="base_sign" eval="-1.0"/>
+            <field name="tax_sign" eval="-1.0"/>
+            <field name="ref_base_sign" eval="1.0"/>
+            <field name="ref_tax_sign" eval="1.0"/>
+            <field name="chart_template_id" ref="l10nch_chart_template"/>
+            <field name="type_tax_use">purchase</field>
+            <field name="price_include" eval="True"/>
+            <field name="account_collected_id" ref="ch_1171"/>
+            <field name="account_paid_id" ref="ch_1171"/>
+        </record>
         <record model="account.tax.template" id="vat_XO">
             <field name="name">TVA due a 0% (Exportations)</field>
             <field name="amount" eval="0.00"/>