diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-14 16:48:10 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-14 16:48:10 +0200 |
| commit | 140ee6b8f0b0de7ddcc816496269963612c5d0c6 (patch) | |
| tree | 7bdaa065d215b88fea4fa56adbfa79cdc24deb69 /addons/l10n_pl | |
| parent | 839696d2d7dd574fd8958d17726379926e94d590 (diff) | |
| parent | 98a55917a602c0c47093b4270ebc4e8b416ecf32 (diff) | |
[MERGE] forward port branch saas-12.4 up to 98a55917a60
Diffstat (limited to 'addons/l10n_pl')
| -rw-r--r-- | addons/l10n_pl/data/account_tax_data.xml | 26 | ||||
| -rw-r--r-- | addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py | 6 |
2 files changed, 11 insertions, 21 deletions
diff --git a/addons/l10n_pl/data/account_tax_data.xml b/addons/l10n_pl/data/account_tax_data.xml index 61d64d30648..e92ba5d5aad 100644 --- a/addons/l10n_pl/data/account_tax_data.xml +++ b/addons/l10n_pl/data/account_tax_data.xml @@ -592,7 +592,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -604,7 +603,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -626,7 +624,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -638,7 +635,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_uslug_pozostalych')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -870,7 +866,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')], + 'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -889,7 +885,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')], + 'plus_report_line_ids': [ref('account_tax_report_line_podatek_podatnik_nabywca')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -953,7 +949,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')], + 'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -972,7 +968,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')], + 'plus_report_line_ids': [ref('account_tax_report_line_podatek_nabycie_towarow')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -1033,7 +1029,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')], + 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1052,7 +1048,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')], + 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_28b')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -1117,7 +1113,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')], + 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1136,7 +1132,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')], + 'plus_report_line_ids': [ref('account_tax_report_line_podatek_art_33a')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> @@ -1160,7 +1156,7 @@ 'repartition_type': 'tax', }), ]"/> - <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', @@ -1197,7 +1193,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')], + 'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1216,7 +1212,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('chart22030400'), - 'minus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')], + 'plus_report_line_ids': [ref('account_tax_report_line_podatek_import_uslug')], }), ]"/> <field name="tax_group_id" ref="tax_group_vat_0"/> diff --git a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index fa56fd00dfa..00000000000 --- a/addons/l10n_pl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,6 +0,0 @@ -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) |