diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-08-08 11:52:13 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-08-08 11:52:13 +0200 |
| commit | b792ba7d9a80e856e3c69c2852e6d44b78d0e13f (patch) | |
| tree | a3ee5b7ef9f9317866deeb2b3e5964020c87b8fb | |
| parent | 22e0f88bce5bf162a6c67e915a3c27b101f74f2b (diff) | |
| parent | 752b2553c6fad061ebf23e13585f7b7489b20840 (diff) | |
[MERGE] forward port branch saas-12.3 up to 752b2553c6f
168 files changed, 2689 insertions, 2244 deletions
diff --git a/addons/account/models/account.py b/addons/account/models/account.py index f204abb0091..940f0a25522 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -149,6 +149,13 @@ class AccountTaxReportLine(models.Model): if self.tag_ids and (len(neg_tags) !=1 or len(pos_tags) != 1): raise ValidationError(_("If tags are defined for a tax report line, only two are allowed on it: a positive and a negative one.")) + @api.constrains('tag_name', 'country_id') + def _validate_tag_name_unicity(self): + if self.tag_name: + other_lines_with_same_tag = self.env['account.tax.report.line'].search_count([('tag_name', '=', self.tag_name), ('id', '!=', self.id), ('country_id', '=', self.country_id.id)]) + if other_lines_with_same_tag: + raise ValidationError(_("Tag name %(tag)s is used by more than one tax report line in %(country)s. Each tag name should only be used once per country.") % {'tag': self.tag_name, 'country': self.country_id.name}) + @api.onchange('parent_id') def _onchange_parent_id(self): """ If the parent of a report line is changed, the sequence of this line @@ -1411,12 +1418,12 @@ class AccountTax(models.Model): subsequent_tags = subsequent_taxes.get_tax_tags(is_refund, 'base') # Compute the tax lines - tax_repartition_lines = is_refund and tax.refund_repartition_line_ids or tax.invoice_repartition_line_ids + tax_repartition_lines = (is_refund and tax.refund_repartition_line_ids or tax.invoice_repartition_line_ids).filtered(lambda x: x.repartition_type == 'tax') repartition_lines_to_treat = len(tax_repartition_lines) total_amount = 0 - for repartition_line in tax_repartition_lines.filtered(lambda x: x.repartition_type == 'tax'): + for repartition_line in tax_repartition_lines: # In case some rounding error occurs, we compensate for it on the last line - line_amount = round(sign * tax_amount * repartition_line.factor if repartition_lines_to_treat != 1 else tax_amount - total_amount, prec) + line_amount = round(sign * tax_amount * repartition_line.factor if repartition_lines_to_treat != 1 else sign * (tax_amount - total_amount), prec) taxes_vals.append({ 'id': tax.id, diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 0f164c9ece4..25f08790c9b 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -22,27 +22,6 @@ def migrate_set_tags_and_taxes_updatable(cr, registry, module): if xml_record_ids: cr.execute("update ir_model_data set noupdate = 'f' where id in %s", (tuple(xml_record_ids),)) -def migrate_tags_on_taxes(cr, registry): - ''' This is a utility function to help migrate the tags of taxes when the localization has been modified on stable version. If - called accordingly in a post_init_hooked function, it will reset the tags set on taxes as per their equivalent template. - - Note: This unusual decision has been made in order to help the improvement of VAT reports on version 9.0, to have them more flexible - and working out of the box when people are creating/using new taxes. - ''' - env = api.Environment(cr, SUPERUSER_ID, {}) - xml_records = env['ir.model.data'].search([ - ('model', '=', 'account.tax.template'), - ('module', 'like', 'l10n_%') - ]) - tax_template_ids = [x['res_id'] for x in xml_records.sudo().read(['res_id'])] - for tax_template in env['account.tax.template'].browse(tax_template_ids): - tax_id = env['account.tax'].search([ - ('name', '=', tax_template.name), - ('type_tax_use', '=', tax_template.type_tax_use), - ('description', '=', tax_template.description) - ]) - tax_id.sudo().write({'tag_ids': [(6, 0, tax_template.tag_ids.ids)]}) - def preserve_existing_tags_on_taxes(cr, registry, module): ''' This is a utility function used to preserve existing previous tags during upgrade of the module.''' env = api.Environment(cr, SUPERUSER_ID, {}) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index d63c997347f..70f608f8147 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -182,10 +182,9 @@ class ReportInvoiceWithPayment(models.AbstractModel): @api.model def _get_report_values(self, docids, data=None): - report = self.env['ir.actions.report']._get_report_from_name('account.report_invoice_with_payments') return { 'doc_ids': docids, - 'doc_model': report.model, - 'docs': self.env[report.model].browse(docids), + 'doc_model': 'account.invoice', + 'docs': self.env['account.invoice'].browse(docids), 'report_type': data.get('report_type') if data else '', } diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index dce3f3da4f1..9f926add834 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -68,7 +68,7 @@ <field name="perm_create" eval="1"/> <field name="perm_write" eval="1"/> <field name="perm_unlink" eval="1"/> - <field name="perm_read" eval="0"/> + <field name="perm_read" eval="1"/> </record> </data> diff --git a/addons/account/static/src/js/reconciliation/reconciliation_model.js b/addons/account/static/src/js/reconciliation/reconciliation_model.js index 985bcd15496..f7f29efb011 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_model.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_model.js @@ -932,7 +932,7 @@ var StatementModel = BasicModel.extend({ 'link': prop.id, 'tax_ids': [tax.id], 'amount': tax.amount, - 'label': tax.name, + 'label': prop.label ? prop.label + " " + tax.name : tax.name, 'date': prop.date, 'account_id': tax.account_id ? [tax.account_id, null] : prop.account_id, 'analytic': tax.analytic, diff --git a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js index e6be300714d..7103e3f7d71 100644 --- a/addons/account/static/src/js/reconciliation/reconciliation_renderer.js +++ b/addons/account/static/src/js/reconciliation/reconciliation_renderer.js @@ -794,6 +794,7 @@ var LineRenderer = Widget.extend(FieldManagerMixin, { */ _onSelectMoveLine: function (event) { var $el = $(event.target); + $el.prop('disabled', true); this._destroyPopover($el); var moveLineId = $el.closest('.mv_line').data('line-id'); this.trigger_up('add_proposition', {'data': moveLineId}); diff --git a/addons/account/static/tests/reconciliation_tests.js b/addons/account/static/tests/reconciliation_tests.js index 4f83c10cc67..5a7fa3db16b 100644 --- a/addons/account/static/tests/reconciliation_tests.js +++ b/addons/account/static/tests/reconciliation_tests.js @@ -1299,14 +1299,14 @@ QUnit.module('account', { await testUtils.dom.click(widget.$('.create .quick_add button:contains(ATOS)')); assert.strictEqual(widget.$('.accounting_view tbody .cell_label, .accounting_view tbody .cell_right').text().replace(/[\n\r\s$,]+/g, ' '), - " ATOS Banque 1145.62 ATOS Frais 26.71 Tax 20.00% 229.12 Tax 10.00% include 2.67 ", "should display 4 lines"); + " ATOS Banque 1145.62 ATOS Frais 26.71 ATOS Banque Tax 20.00% 229.12 ATOS Frais Tax 10.00% include 2.67 ", "should display 4 lines"); assert.strictEqual(widget.$('.accounting_view tfoot .cell_label, .accounting_view tfoot .cell_left').text().replace(/[\n\r\s$,]+/g, ' '), "Open balance229.12", "should display the 'Open balance' line with value in left column"); await testUtils.fields.editAndTrigger(widget.$('.create .create_amount input'), '100',['input']); assert.strictEqual(widget.$('.accounting_view tbody').text().replace(/[\n\r\s$,]+/g, ' '), - " 101120 New ATOS Banque 1075.00 101130 New ATOS Frais 90.91 101120 New Tax 20.00% 215.00 101300 New Tax 10.00% include 9.09 ", + " 101120 New ATOS Banque 1075.00 101130 New ATOS Frais 90.91 101120 New ATOS Banque Tax 20.00% 215.00 101300 New ATOS Frais Tax 10.00% include 9.09 ", "should update the value of the 4 lines (because the line must have 100% of the value)"); assert.strictEqual(widget.$('.accounting_view tfoot .cell_label, .accounting_view tfoot .cell_left').text().replace(/[\n\r\s$,]+/g, ' '), "Open balance215.00", "should change the 'Open balance' line because the 20.00% tax is not an include tax"); diff --git a/addons/account/wizard/account_invoice_send_views.xml b/addons/account/wizard/account_invoice_send_views.xml index 79aed600eaf..79378ed9a7a 100644 --- a/addons/account/wizard/account_invoice_send_views.xml +++ b/addons/account/wizard/account_invoice_send_views.xml @@ -14,7 +14,6 @@ <field name="invoice_ids" invisible="1"/> <field name="email_from" invisible="1" /> <field name="mail_server_id" invisible="1"/> - <field name="reply_to" invisible="1"/> <div name="option_print"> <field name="is_print" /> <b><label for="is_print"/></b> diff --git a/addons/account_analytic_default/models/account_analytic_default.py b/addons/account_analytic_default/models/account_analytic_default.py index 2cae7acb19b..67de19e0ced 100644 --- a/addons/account_analytic_default/models/account_analytic_default.py +++ b/addons/account_analytic_default/models/account_analytic_default.py @@ -78,5 +78,6 @@ class AccountMoveLine(models.Model): date=self.date_maturity, company_id=self.move_id.company_id.id ) - self.analytic_account_id = rec.analytic_id.id - self.analytic_tag_ids = rec.analytic_tag_ids.ids + if rec: + self.analytic_account_id = rec.analytic_id.id + self.analytic_tag_ids = rec.analytic_tag_ids.ids diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index d98717b7bb8..0fc78a8138d 100644 --- a/addons/crm/views/crm_lead_views.xml +++ b/addons/crm/views/crm_lead_views.xml @@ -109,7 +109,7 @@ <field name="zip" placeholder="ZIP" class="o_address_zip"/> <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> </div> - <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> + <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/> </group> <group> <label for="contact_name"/> @@ -642,7 +642,7 @@ <field name="zip" placeholder="ZIP" class="o_address_zip"/> <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> </div> - <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> + <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/> </group> <group class="mt48"> diff --git a/addons/digest/views/digest_templates.xml b/addons/digest/views/digest_templates.xml index 0010ad6a1c0..e7cd42d5df5 100644 --- a/addons/digest/views/digest_templates.xml +++ b/addons/digest/views/digest_templates.xml @@ -6,7 +6,7 @@ <div class="col-lg-6 offset-lg-3"> <h3>Digest Subscriptions</h3> <div class="alert alert-success text-center" role="status"> - <p>You have been successfully unsubscribed from <string t-field="digest.name"/></p> + <p>You have been successfully unsubscribed from <strong t-field="digest.name"/></p> </div> </div> </div> diff --git a/addons/google_drive/models/res_config_settings.py b/addons/google_drive/models/res_config_settings.py index 49d7ff7d86d..eff3d6c3f6f 100644 --- a/addons/google_drive/models/res_config_settings.py +++ b/addons/google_drive/models/res_config_settings.py @@ -28,10 +28,12 @@ class ResConfigSettings(models.TransientModel): params = self.env['ir.config_parameter'].sudo() authorization_code_before = params.get_param('google_drive_authorization_code') authorization_code = self.google_drive_authorization_code - refresh_token = False - if authorization_code and authorization_code != authorization_code_before: - refresh_token = self.env['google.service'].generate_refresh_token('drive', authorization_code) - params.set_param('google_drive_refresh_token', refresh_token) + if authorization_code != authorization_code_before: + refresh_token = ( + self.env['google.service'].generate_refresh_token('drive', authorization_code) + if authorization_code else False + ) + params.set_param('google_drive_refresh_token', refresh_token) @api.multi def action_setup_token(self): diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml index bbafaf7fb38..e3a33270e73 100644 --- a/addons/hr/security/hr_security.xml +++ b/addons/hr/security/hr_security.xml @@ -54,5 +54,12 @@ <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> </record> + <record id="hr_employee_comp_rule" model="ir.rule"> + <field name="name">Employee multi company rule</field> + <field name="model_id" ref="model_hr_employee"/> + <field name="global" eval="True"/> + <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> + </record> + </data> </odoo> diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 824fc566fab..d954e2e7dd9 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -553,6 +553,8 @@ class HolidaysRequest(models.Model): if not values.get('department_id'): values.update({'department_id': self.env['hr.employee'].browse(employee_id).department_id.id}) holiday = super(HolidaysRequest, self.with_context(mail_create_nosubscribe=True)).create(values) + if self._context.get('import_file'): + holiday._onchange_leave_dates() if not self._context.get('leave_fast_create'): holiday.add_follower(employee_id) if holiday.validation_type == 'hr': diff --git a/addons/hr_holidays/models/hr_leave_allocation.py b/addons/hr_holidays/models/hr_leave_allocation.py index 109a7aab456..9b357d8a817 100644 --- a/addons/hr_holidays/models/hr_leave_allocation.py +++ b/addons/hr_holidays/models/hr_leave_allocation.py @@ -378,7 +378,8 @@ class HolidaysAllocation(models.Model): holiday.message_subscribe(partner_ids=(holiday.employee_id.parent_id.user_id.partner_id | holiday.employee_id.leave_manager_id.partner_id).ids) if 'employee_id' in values: holiday._onchange_employee() - holiday.activity_update() + if not self._context.get('import_file'): + holiday.activity_update() return holiday @api.multi diff --git a/addons/hr_timesheet/views/res_config_settings_views.xml b/addons/hr_timesheet/views/res_config_settings_views.xml index ef7e4f9a401..a7934d9bb1c 100644 --- a/addons/hr_timesheet/views/res_config_settings_views.xml +++ b/addons/hr_timesheet/views/res_config_settings_views.xml @@ -105,5 +105,5 @@ </record> <menuitem id="hr_timesheet_config_settings_menu_action" name="Settings" parent="hr_timesheet_menu_configuration" - action="hr_timesheet_config_settings_action" sequence="0"/> + action="hr_timesheet_config_settings_action" sequence="0" groups="base.group_system"/> </odoo> diff --git a/addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report.py b/addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report.py index 572ba6d5ce9..166e6f23065 100644 --- a/addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report.py +++ b/addons/hr_timesheet_attendance/report/hr_timesheet_attendance_report.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models +from odoo import api, fields, models, tools class TimesheetAttendance(models.Model): @@ -17,7 +17,7 @@ class TimesheetAttendance(models.Model): @api.model_cr def init(self): - self._cr.execute("DROP VIEW IF EXISTS hr_timesheet_attendance_report") + tools.drop_view_if_exists(self.env.cr, self._table) self._cr.execute("""CREATE OR REPLACE VIEW %s AS ( SELECT max(id) AS id, diff --git a/addons/l10n_ae/data/account_tax_report_data.xml b/addons/l10n_ae/data/account_tax_report_data.xml index 1f89d63f8a2..de9ea315616 100644 --- a/addons/l10n_ae/data/account_tax_report_data.xml +++ b/addons/l10n_ae/data/account_tax_report_data.xml @@ -16,7 +16,7 @@ <record id="tax_report_line_standard_rated_supplies_base_abu_dhabi" model="account.tax.report.line"> <field name="name">a. Abu Dhabi</field> - <field name="tag_name">a. Abu Dhabi</field> + <field name="tag_name">a. Abu Dhabi (Base)</field> <field name="code">STD_RATE_SUPP_BASE_AB</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="1"/> @@ -25,7 +25,7 @@ <record id="tax_report_line_standard_rated_supplies_base_dubai" model="account.tax.report.line"> <field name="name">b. Dubai</field> - <field name="tag_name">b. Dubai</field> + <field name="tag_name">b. Dubai (Base)</field> <field name="code">STD_RATE_SUPP_BASE_DB</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="2"/> @@ -34,7 +34,7 @@ <record id="tax_report_line_standard_rated_supplies_base_sharjah" model="account.tax.report.line"> <field name="name">c. Sharjah</field> - <field name="tag_name">c. Sharjah</field> + <field name="tag_name">c. Sharjah (Base)</field> <field name="code">STD_RATE_SUPP_BASE_SJ</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="3"/> @@ -43,7 +43,7 @@ <record id="tax_report_line_standard_rated_supplies_base_ajman" model="account.tax.report.line"> <field name="name">d. Ajman</field> - <field name="tag_name">d. Ajman</field> + <field name="tag_name">d. Ajman (Base)</field> <field name="code">STD_RATE_SUPP_BASE_AJ</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="4"/> @@ -52,7 +52,7 @@ <record id="tax_report_line_standard_rated_supplies_base_umm_al_quwain" model="account.tax.report.line"> <field name="name">e. Umm Al Quwain</field> - <field name="tag_name">e. Umm Al Quwain</field> + <field name="tag_name">e. Umm Al Quwain (Base)</field> <field name="code">STD_RATE_SUPP_BASE_UM</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="5"/> @@ -61,7 +61,7 @@ <record id="tax_report_line_standard_rated_supplies_base_ras_al_khaima" model="account.tax.report.line"> <field name="name">f. Ras Al-Khaima</field> - <field name="tag_name">f. Ras Al-Khaima</field> + <field name="tag_name">f. Ras Al-Khaima (Base)</field> <field name="code">STD_RATE_SUPP_BASE_RA</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="6"/> @@ -70,7 +70,7 @@ <record id="tax_report_line_standard_rated_supplies_base_fujairah" model="account.tax.report.line"> <field name="name">g. Fujairah</field> - <field name="tag_name">g. Fujairah</field> + <field name="tag_name">g. Fujairah (Base)</field> <field name="code">STD_RATE_SUPP_BASE_FU</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_base"/> <field name="sequence" eval="7"/> @@ -87,7 +87,7 @@ <record id="tax_report_line_tax_refund_tourist_base" model="account.tax.report.line"> <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field> - <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field> + <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme (Base)</field> <field name="code">TAX_REF_TOUR_SCHEME_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_sales"/> <field name="sequence" eval="2"/> @@ -96,7 +96,7 @@ <record id="tax_report_line_supplies_reverse_charge_base" model="account.tax.report.line"> <field name="name">3. Supplies subject to reverse charge provisions</field> - <field name="tag_name">3. Supplies subject to reverse charge provisions</field> + <field name="tag_name">3. Supplies subject to reverse charge provisions (Base)</field> <field name="code">REVERSE_CHARGE_PRO_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_sales"/> <field name="sequence" eval="3"/> @@ -105,7 +105,7 @@ <record id="tax_report_line_zero_rated_supplies_base" model="account.tax.report.line"> <field name="name">4. Zero rated supplies</field> - <field name="tag_name">4. Zero rated supplies</field> + <field name="tag_name">4. Zero rated supplies (Base)</field> <field name="code">ZERO_RATE_SUPP_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_sales"/> <field name="sequence" eval="4"/> @@ -114,7 +114,7 @@ <record id="tax_report_line_exempt_supplies_base" model="account.tax.report.line"> <field name="name">5. Exempt supplies</field> - <field name="tag_name">5. Exempt supplies</field> + <field name="tag_name">5. Exempt supplies (Base)</field> <field name="code">EXAMPT_SUPP_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_sales"/> <field name="sequence" eval="5"/> @@ -131,7 +131,7 @@ <record id="tax_report_line_import_uae_base" model="account.tax.report.line"> <field name="name">7. Goods imported into the UAE</field> - <field name="tag_name">7. Goods imported into the UAE</field> + <field name="tag_name">7. Goods imported into the UAE (Base)</field> <field name="code">GOODS_IMPORT_IN_UAE_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_sales"/> <field name="sequence" eval="7"/> @@ -162,7 +162,7 @@ <record id="tax_report_line_standard_rated_expense_base" model="account.tax.report.line"> <field name="name">10. Standard rated expenses</field> - <field name="tag_name">10. Standard rated expenses</field> + <field name="tag_name">10. Standard rated expenses (Base)</field> <field name="code">STD_RATE_EXPENSES_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_expense"/> <field name="sequence" eval="1"/> @@ -171,7 +171,7 @@ <record id="tax_report_line_expense_supplies_reverse_base" model="account.tax.report.line"> <field name="name">11. Supplies subject to the reverse charge provisions</field> - <field name="tag_name">11. Supplies subject to the reverse charge provisions</field> + <field name="tag_name">11. Supplies subject to the reverse charge provisions (Base)</field> <field name="code">SUPP_REV_CHARGE_PRO_BASE</field> <field name="parent_id" ref="tax_report_line_base_all_expense"/> <field name="sequence" eval="2"/> @@ -209,7 +209,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_abu_dhabi" model="account.tax.report.line"> <field name="name">a. Abu Dhabi</field> - <field name="tag_name">a. Abu Dhabi</field> + <field name="tag_name">a. Abu Dhabi (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_AB</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="1"/> @@ -218,7 +218,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_dubai" model="account.tax.report.line"> <field name="name">b. Dubai</field> - <field name="tag_name">b. Dubai</field> + <field name="tag_name">b. Dubai (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_DB</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="2"/> @@ -227,7 +227,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_sharjah" model="account.tax.report.line"> <field name="name">c. Sharjah</field> - <field name="tag_name">c. Sharjah</field> + <field name="tag_name">c. Sharjah (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_SJ</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="3"/> @@ -236,7 +236,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_ajman" model="account.tax.report.line"> <field name="name">d. Ajman</field> - <field name="tag_name">d. Ajman</field> + <field name="tag_name">d. Ajman (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_AJ</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="4"/> @@ -245,7 +245,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_umm_al_quwain" model="account.tax.report.line"> <field name="name">e. Umm Al Quwain</field> - <field name="tag_name">e. Umm Al Quwain</field> + <field name="tag_name">e. Umm Al Quwain (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_UM</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="5"/> @@ -254,7 +254,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_ras_al_khaima" model="account.tax.report.line"> <field name="name">f. Ras Al-Khaima</field> - <field name="tag_name">f. Ras Al-Khaima</field> + <field name="tag_name">f. Ras Al-Khaima (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_RA</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="6"/> @@ -263,7 +263,7 @@ <record id="tax_report_line_standard_rated_supplies_vat_fujairah" model="account.tax.report.line"> <field name="name">g. Fujairah</field> - <field name="tag_name">g. Fujairah</field> + <field name="tag_name">g. Fujairah (Tax)</field> <field name="code">STD_RATE_SUPP_TAX_FU</field> <field name="parent_id" ref="tax_report_line_standard_rated_supplies_vat"/> <field name="sequence" eval="7"/> @@ -280,7 +280,7 @@ <record id="tax_report_line_tax_refund_tourist_vat" model="account.tax.report.line"> <field name="name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field> - <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme</field> + <field name="tag_name">2. Tax Refunds provided to Tourists under the Tax Refunds for Tourists Scheme (Tax)</field> <field name="code">TAX_REF_TOUR_SCHEME_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_sales"/> <field name="sequence" eval="2"/> @@ -289,7 +289,7 @@ <record id="tax_report_line_supplies_reverse_charge_vat" model="account.tax.report.line"> <field name="name">3. Supplies subject to reverse charge provisions</field> - <field name="tag_name">3. Supplies subject to reverse charge provisions</field> + <field name="tag_name">3. Supplies subject to reverse charge provisions (Tax)</field> <field name="code">REVERSE_CHARGE_PRO_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_sales"/> <field name="sequence" eval="3"/> @@ -298,7 +298,7 @@ <record id="tax_report_line_zero_rated_supplies_vat" model="account.tax.report.line"> <field name="name">4. Zero rated supplies</field> - <field name="tag_name">4. Zero rated supplies</field> + <field name="tag_name">4. Zero rated supplies (Tax)</field> <field name="code">ZERO_RATE_SUPP_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_sales"/> <field name="sequence" eval="4"/> @@ -307,7 +307,7 @@ <record id="tax_report_line_exempt_supplies_vat" model="account.tax.report.line"> <field name="name">5. Exempt supplies</field> - <field name="tag_name">5. Exempt supplies</field> + <field name="tag_name">5. Exempt supplies (Tax)</field> <field name="code">EXAMPT_SUPP_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_sales"/> <field name="sequence" eval="5"/> @@ -324,7 +324,7 @@ <record id="tax_report_line_import_uae_vat" model="account.tax.report.line"> <field name="name">7. Goods imported into the UAE</field> - <field name="tag_name">7. Goods imported into the UAE</field> + <field name="tag_name">7. Goods imported into the UAE (Tax)</field> <field name="code">GOODS_IMPORT_IN_UAE_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_sales"/> <field name="sequence" eval="7"/> @@ -355,7 +355,7 @@ <record id="tax_report_line_standard_rated_expense_vat" model="account.tax.report.line"> <field name="name">10. Standard rated expenses</field> - <field name="tag_name">10. Standard rated expenses</field> + <field name="tag_name">10. Standard rated expenses (Tax)</field> <field name="code">STD_RATE_EXPENSES_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_expense"/> <field name="sequence" eval="1"/> @@ -364,7 +364,7 @@ <record id="tax_report_line_expense_supplies_reverse_vat" model="account.tax.report.line"> <field name="name">11. Supplies subject to the reverse charge provisions</field> - <field name="tag_name">11. Supplies subject to the reverse charge provisions</field> + <field name="tag_name">11. Supplies subject to the reverse charge provisions (Tax)</field> <field name="code">SUPP_REV_CHARGE_PRO_TAX</field> <field name="parent_id" ref="tax_report_line_vat_all_expense"/> <field name="sequence" eval="2"/> diff --git a/addons/l10n_ae/data/account_tax_template_data.xml b/addons/l10n_ae/data/account_tax_template_data.xml index 5614c43941f..f95b45efa0e 100644 --- a/addons/l10n_ae/data/account_tax_template_data.xml +++ b/addons/l10n_ae/data/account_tax_template_data.xml @@ -262,7 +262,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3785'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -274,7 +273,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3785'), }), ]"/> </record> @@ -295,7 +293,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3785'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -307,7 +304,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3785'), }), ]"/> </record> @@ -402,7 +398,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -421,7 +417,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -448,7 +444,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -467,7 +463,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -494,7 +490,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -513,7 +509,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -540,7 +536,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -559,7 +555,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -586,7 +582,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -605,7 +601,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -632,7 +628,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -651,7 +647,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], + 'plus_report_line_ids': [ref('tax_report_line_supplies_reverse_charge_vat')], }), (0,0, { 'factor_percent': 100, @@ -747,8 +743,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -759,8 +753,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_exempt_supplies_vat')], }), ]"/> </record> @@ -780,8 +772,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -792,8 +782,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_zero_rated_supplies_vat')], }), ]"/> </record> @@ -852,7 +840,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')], + 'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')], }), (0,0, { 'factor_percent': -100, @@ -864,14 +852,14 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')], + 'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')], + 'minus_report_line_ids': [ref('tax_report_line_expense_supplies_reverse_base'),ref('tax_report_line_standard_rated_expense_base')], }), (0,0, { 'factor_percent': -100, @@ -883,7 +871,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('uae_account_3726'), - 'plus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')], + 'minus_report_line_ids': [ref('tax_report_line_standard_rated_expense_vat')], }), ]"/> </record> diff --git a/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_ar/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_at/data/account_tax_data.xml b/addons/l10n_at/data/account_tax_data.xml index 026c890d973..ee3ce61b822 100644 --- a/addons/l10n_at/data/account_tax_data.xml +++ b/addons/l10n_at/data/account_tax_data.xml @@ -234,6 +234,7 @@ 'factor_percent': 100, 'repartition_type': 'base', 'minus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')], + 'plus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')], }), (0,0, { 'factor_percent': 100, @@ -253,6 +254,7 @@ 'factor_percent': 100, 'repartition_type': 'base', 'plus_report_line_ids': [ref('tax_report_ust_steuern_innergemeinschaft_steu_bmg_20')], + 'minus_report_line_ids': [ref('tax_report_bemess_vorst_rechnungen_20')], }), (0,0, { 'factor_percent': 100, @@ -406,7 +408,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart3500'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -418,7 +419,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart3500'), }), ]"/> </record> @@ -440,7 +440,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart3500'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -452,7 +451,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart3500'), }), ]"/> </record> diff --git a/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_at/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_au/data/account_tax_template_data.xml b/addons/l10n_au/data/account_tax_template_data.xml index 4b604e1a6be..b43521d7fdb 100644 --- a/addons/l10n_au/data/account_tax_template_data.xml +++ b/addons/l10n_au/data/account_tax_template_data.xml @@ -98,7 +98,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[ @@ -110,7 +109,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g2')], }), ]"/> </record> @@ -133,7 +131,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')], }), ]"/> <field name="refund_repartition_line_ids" eval="[ @@ -145,7 +142,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g3')], }), ]"/> </record> @@ -168,7 +164,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')], }), ]"/> <field name="refund_repartition_line_ids" eval="[ @@ -180,7 +175,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g1'), ref('account_tax_report_gstrpt_g4')], }), ]"/> </record> @@ -353,7 +347,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')], }), ]"/> <field name="refund_repartition_line_ids" eval="[ @@ -365,7 +358,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')], }), ]"/> </record> @@ -388,7 +380,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')], }), ]"/> <field name="refund_repartition_line_ids" eval="[ @@ -400,7 +391,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_gstrpt_g11'), ref('account_tax_report_gstrpt_g14')], }), ]"/> </record> diff --git a/addons/l10n_be/data/account_tax_template_data.xml b/addons/l10n_be/data/account_tax_template_data.xml index 70c71a446b2..67ce4fc506f 100644 --- a/addons/l10n_be/data/account_tax_template_data.xml +++ b/addons/l10n_be/data/account_tax_template_data.xml @@ -266,7 +266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -279,7 +278,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -304,8 +302,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), - 'plus_report_line_ids': [], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -318,8 +314,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), - 'plus_report_line_ids': [], }), ]"/> </record> @@ -344,7 +338,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -357,7 +350,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -383,7 +375,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -396,7 +387,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -421,7 +411,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -434,7 +423,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -460,7 +448,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -473,7 +460,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -498,7 +484,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -511,7 +496,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451054'), }), ]"/> </record> @@ -659,7 +643,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -673,7 +656,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -992,7 +974,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1006,7 +987,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -1032,7 +1012,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1046,7 +1025,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -1198,7 +1176,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1212,7 +1189,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -1396,7 +1372,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1410,7 +1385,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -1595,7 +1569,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1609,7 +1582,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -1794,7 +1766,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451056'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1808,7 +1779,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a451056'), }), ]"/> </record> @@ -2048,7 +2018,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2062,7 +2031,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -2406,7 +2374,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2420,7 +2387,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -2499,7 +2465,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2513,7 +2478,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -2645,7 +2609,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2659,7 +2622,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -2843,7 +2805,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2857,7 +2818,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -3042,7 +3002,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -3056,7 +3015,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> @@ -3241,7 +3199,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -3255,7 +3212,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('a411059'), }), ]"/> </record> diff --git a/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_be/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_bo/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_br/data/account_tax_template_data.xml b/addons/l10n_br/data/account_tax_template_data.xml index 5515bb686ff..d5e90d15dfb 100644 --- a/addons/l10n_br/data/account_tax_template_data.xml +++ b/addons/l10n_br/data/account_tax_template_data.xml @@ -41,8 +41,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010301'), - 'plus_report_line_ids': [ref('tax_report_ipi_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -54,8 +52,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050502'), - 'minus_report_line_ids': [ref('tax_report_ipi_2')], }), ]"/> </record> @@ -1040,8 +1036,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050502'), - 'minus_report_line_ids': [ref('tax_report_ipi_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1053,8 +1047,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010301'), - 'plus_report_line_ids': [ref('tax_report_ipi_2')], }), ]"/> </record> @@ -2039,8 +2031,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010302'), - 'plus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2052,8 +2042,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050505'), - 'minus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> </record> @@ -2076,8 +2064,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010302'), - 'plus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2089,8 +2075,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050505'), - 'minus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> </record> @@ -2113,7 +2097,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2125,7 +2108,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> </record> @@ -2296,8 +2278,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050505'), - 'minus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2309,8 +2289,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010302'), - 'plus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> </record> @@ -2333,8 +2311,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050505'), - 'minus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2346,8 +2322,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010302'), - 'plus_report_line_ids': [ref('tax_report_icms_1')], }), ]"/> </record> @@ -2370,7 +2344,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2382,7 +2355,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_icmsst_1')], }), ]"/> </record> @@ -2553,8 +2525,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010500'), - 'plus_report_line_ids': [ref('tax_report_pis_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2566,8 +2536,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050503'), - 'minus_report_line_ids': [ref('tax_report_pis_1')], }), ]"/> </record> @@ -2627,8 +2595,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050503'), - 'minus_report_line_ids': [ref('tax_report_pis_1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2640,8 +2606,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010500'), - 'plus_report_line_ids': [ref('tax_report_pis_1')], }), ]"/> </record> @@ -2701,8 +2665,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010500'), - 'plus_report_line_ids': [ref('tax_report_cofins_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2714,8 +2676,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050503'), - 'minus_report_line_ids': [ref('tax_report_cofins_2')], }), ]"/> </record> @@ -2775,8 +2735,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_101050503'), - 'minus_report_line_ids': [ref('tax_report_cofins_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2788,8 +2746,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_201010500'), - 'plus_report_line_ids': [ref('tax_report_cofins_2')], }), ]"/> </record> @@ -2849,7 +2805,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_irpj_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2861,7 +2816,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_irpj_2')], }), ]"/> </record> @@ -2884,7 +2838,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_ir_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2896,7 +2849,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_ir_2')], }), ]"/> </record> @@ -2919,7 +2871,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_issqn_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -2931,7 +2882,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_issqn_2')], }), ]"/> </record> @@ -3163,7 +3113,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('tax_report_csll_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -3175,7 +3124,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('tax_report_csll_2')], }), ]"/> </record> diff --git a/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py b/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_br/migrations/9.0.1.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_ch/data/account_vat2011_data.xml b/addons/l10n_ch/data/account_vat2011_data.xml index f846e0e0378..9939461933a 100644 --- a/addons/l10n_ch/data/account_vat2011_data.xml +++ b/addons/l10n_ch/data/account_vat2011_data.xml @@ -622,7 +622,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -634,7 +633,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_2200'), }), ]"/> </record> @@ -656,7 +654,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -668,7 +665,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_2200'), }), ]"/> </record> @@ -701,7 +697,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_1171'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -713,7 +708,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('ch_coa_1171'), }), ]"/> </record> @@ -736,7 +730,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('ch_coa_1170'), - 'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')], + 'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -749,7 +743,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('ch_coa_1170'), - 'minus_report_line_ids': [ref('account_tax_report_line_chtax_382b')], + 'plus_report_line_ids': [ref('account_tax_report_line_chtax_382b')], }), ]"/> </record> diff --git a/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py b/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_ch/migrations/9.0.9.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_cl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_co/data/account_tax_template.xml b/addons/l10n_co/data/account_tax_template.xml index 388c9998230..7fe340bfd3a 100644 --- a/addons/l10n_co/data/account_tax_template.xml +++ b/addons/l10n_co/data/account_tax_template.xml @@ -116,7 +116,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('co_puc_236505'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -128,7 +127,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('co_puc_236505'), }), ]"/> </record> @@ -1424,7 +1422,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('co_puc_236805'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1436,7 +1433,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('co_puc_236805'), }), ]"/> </record> diff --git a/addons/l10n_de/__manifest__.py b/addons/l10n_de/__manifest__.py index 7e37ce44a10..74d6b1a1af7 100644 --- a/addons/l10n_de/__manifest__.py +++ b/addons/l10n_de/__manifest__.py @@ -21,6 +21,7 @@ German accounting chart and localization. 'data/account_account_tags_data.xml', 'data/res.country.state.csv', 'data/menuitem_data.xml', + 'views/account_view.xml', 'report/din5008_report.xml', 'data/report_layout.xml', ], diff --git a/addons/l10n_de/views/account_view.xml b/addons/l10n_de/views/account_view.xml index 04234468252..cb7f7d58e0d 100644 --- a/addons/l10n_de/views/account_view.xml +++ b/addons/l10n_de/views/account_view.xml @@ -5,7 +5,7 @@ <field name="model">account.tax</field> <field name="inherit_id" ref="account.view_tax_form"/> <field name="arch" type="xml"> - <field name="tag_ids" position="after"> + <field name="include_base_amount" position="after"> <field name="l10n_de_datev_code"/> </field> </field> diff --git a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml index 2bc8cfc4e67..c95fff75bf5 100644 --- a/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml +++ b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml @@ -923,7 +923,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_1770'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -936,7 +935,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_1770'), }), ]"/> <field name="tax_group_id" ref="tax_group_x"/> diff --git a/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_de_skr03/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml index 3d004e18c59..79295d820bd 100644 --- a/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml +++ b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml @@ -960,7 +960,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_skr04_3800'), }), ]"/> @@ -974,7 +973,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_skr04_3800'), }), ]"/> diff --git a/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_de_skr04/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_do/data/account.tax.template.xml b/addons/l10n_do/data/account.tax.template.xml index 7d970672e91..7aaf53e8cee 100644 --- a/addons/l10n_do/data/account.tax.template.xml +++ b/addons/l10n_do/data/account.tax.template.xml @@ -798,7 +798,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('do_niif_21030203'), - 'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], + 'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -811,7 +811,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('do_niif_21030203'), - 'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], + 'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], }), ]"/> </record> @@ -836,7 +836,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('do_niif_21030202'), - 'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], + 'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -849,7 +849,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('do_niif_21030202'), - 'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], + 'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')], }), ]"/> </record> @@ -1217,36 +1217,6 @@ <field name="tax_group_id" ref="group_ret"/> </record> - <record id="tax_group_moral_construction" model="account.tax.template"> - <field name="chart_template_id" ref="do_chart_template"/> - <field name="sequence">62</field> - <field name="name">Retención a Jurídica (Servicios Construcción con Materiales)</field> - <field name="amount_type">group</field> - <field eval="0" name="amount"/> - <field name="type_tax_use">none</field> - <field name="tax_group_id" ref="group_ret"/> - <field name="invoice_repartition_line_ids" eval="[(5,0,0), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'base', - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - }), - ]"/> - <field name="refund_repartition_line_ids" eval="[(5,0,0), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'base', - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - }), - ]"/> - </record> - <record id="tax_group_person_services" model="account.tax.template"> <field name="chart_template_id" ref="do_chart_template"/> <field name="sequence">58</field> diff --git a/addons/l10n_es/data/account.account.template-common.csv b/addons/l10n_es/data/account.account.template-common.csv index 21c952cf79c..4e5121d061e 100644 --- a/addons/l10n_es/data/account.account.template-common.csv +++ b/addons/l10n_es/data/account.account.template-common.csv @@ -276,7 +276,7 @@ "account_common_523","Proveedores de inmovilizado a corto plazo","523","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_523","True" "account_common_524","Acreedores por arrendamiento financiero a corto plazo","524","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_524","False" "account_common_525","Efectos a pagar a corto plazo","525","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_525","False" -"account_common_526","Dividendo activo a pagar","526","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_526","False" +"account_common_526","Dividendo activo a pagar","526","account.data_account_type_payable","l10n_es.account_chart_template_common","l10n_es.account_group_526","True" "account_common_527","Intereses a corto plazo de deudas con entidades de crédito","527","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_527","False" "account_common_528","Intereses a corto plazo de deudas","528","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_528","False" "account_common_5290","Provisión a corto plazo por retribuciones al personal","5290","account.data_account_type_current_liabilities","l10n_es.account_chart_template_common","l10n_es.account_group_5290","True" diff --git a/addons/l10n_es/data/account_tax_data.xml b/addons/l10n_es/data/account_tax_data.xml index 9461c865a72..dca71560db1 100644 --- a/addons/l10n_es/data/account_tax_data.xml +++ b/addons/l10n_es/data/account_tax_data.xml @@ -445,6 +445,7 @@ <field name="description">P_IVA21_SP_IN</field> <field name="type_tax_use">purchase</field> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/> <field name="amount_type">percent</field> <field name="amount" eval="21"/> <field name="tax_group_id" ref="tax_group_iva_21"/> @@ -550,6 +551,7 @@ <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount" eval="21"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> <field name="tax_group_id" ref="tax_group_iva_21"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), @@ -716,6 +718,7 @@ <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/> <field name="name">IVA 4% Adquisición de servicios extracomunitarios</field> <field name="tax_group_id" ref="tax_group_iva_4"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), @@ -767,6 +770,7 @@ <field name="description">P_IVA10_SP_EX</field> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> <field name="amount_type">percent</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/> <field name="type_tax_use">purchase</field> <field name="name">IVA 10% Adquisición de servicios extracomunitarios</field> <field name="tax_group_id" ref="tax_group_iva_10"/> @@ -820,6 +824,7 @@ <field name="type_tax_use">purchase</field> <field name="amount" eval="21"/> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_12_13'), ref('mod_303_14_15_purchase'), ref('mod_303_28_29'), ref('mod_303_40_41')])]"/> <field name="amount_type">percent</field> <field name="tax_group_id" ref="tax_group_iva_21"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), @@ -869,6 +874,7 @@ <field name="amount" eval="4"/> <field name="description">P_IVA4_IC_BC</field> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/> <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 4% Adquisición Intracomunitario. Bienes corrientes</field> @@ -924,6 +930,7 @@ <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 4% Adquisición Intracomunitario. Bienes de inversión</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/> <field name="tax_group_id" ref="tax_group_iva_4"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), (0,0, { @@ -972,6 +979,7 @@ <field name="amount" eval="10"/> <field name="description">P_IVA10_IC_BC</field> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_36_37'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/> <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 10% Adquisición Intracomunitario. Bienes corrientes</field> @@ -1026,6 +1034,7 @@ <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 10% Adquisición Intracomunitario. Bienes de inversión</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_38_39'), ref('mod_303_40_41'), ref('mod_303_10_11'), ref('mod_303_14_15_purchase')])]"/> <field name="tax_group_id" ref="tax_group_iva_10"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), (0,0, { @@ -3068,6 +3077,7 @@ <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 10% Adquisición de servicios intracomunitarios</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/> <field name="tax_group_id" ref="tax_group_iva_10"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), (0,0, { @@ -3119,6 +3129,7 @@ <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="name">IVA 4% Adquisición de servicios intracomunitarios</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_10_11'), ref('mod_303_14_15_purchase'), ref('mod_303_36_37'), ref('mod_303_40_41')])]"/> <field name="tax_group_id" ref="tax_group_iva_4"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), (0,0, { @@ -3392,6 +3403,7 @@ <field name="description">P_IVA4_ISP</field> <field name="name">IVA 4% Compra con Inversión del Sujeto Pasivo Nacional</field> <field name="type_tax_use">purchase</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/> <field name="amount_type">percent</field> <field name="amount" eval="4"/> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> @@ -3443,6 +3455,7 @@ <field name="description">P_IVA10_ISP</field> <field name="name">IVA 10% Compra con Inversión del Sujeto Pasivo Nacional</field> <field name="type_tax_use">purchase</field> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/> <field name="amount_type">percent</field> <field name="amount" eval="10"/> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> @@ -3496,6 +3509,7 @@ <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount" eval="21"/> + <field name="tag_ids" eval="[(6, False, [ref('mod_303_28_29'), ref('mod_303_40_41'), ref('mod_303_12_13'), ref('mod_303_14_15_purchase')])]"/> <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/> <field name="tax_group_id" ref="tax_group_iva_21"/> <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), diff --git a/addons/l10n_et/data/account_tax_data.xml b/addons/l10n_et/data/account_tax_data.xml index a21fa49b270..04a84a9627a 100644 --- a/addons/l10n_et/data/account_tax_data.xml +++ b/addons/l10n_et/data/account_tax_data.xml @@ -55,7 +55,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -67,7 +66,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> </record> @@ -89,7 +87,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -101,7 +98,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> </record> @@ -123,7 +119,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -135,7 +130,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et3007'), }), ]"/> </record> @@ -158,7 +152,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')], + 'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -171,7 +165,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')], + 'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_2')], }), ]"/> </record> @@ -194,7 +188,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')], + 'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -207,7 +201,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'plus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')], + 'minus_report_line_ids': [ref('account_tax_report_net_sale_witheld_35')], }), ]"/> </record> @@ -230,7 +224,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'minus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')], + 'plus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -243,7 +237,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et3006'), - 'plus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')], + 'minus_report_line_ids': [ref('account_tax_report_net_sale_vat_witheld')], }), ]"/> </record> @@ -301,7 +295,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -313,7 +306,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> </record> @@ -335,7 +327,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -347,7 +338,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> </record> @@ -369,7 +359,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -381,7 +370,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_et2212'), }), ]"/> </record> @@ -404,7 +392,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et2213'), - 'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')], + 'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -417,7 +405,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et2213'), - 'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')], + 'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_2')], }), ]"/> </record> @@ -440,7 +428,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et2213'), - 'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')], + 'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -453,7 +441,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('l10n_et2213'), - 'plus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')], + 'minus_report_line_ids': [ref('account_tax_report_net_purch_witholding_35')], }), ]"/> </record> diff --git a/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_et/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_fr/data/account_tax_data.xml b/addons/l10n_fr/data/account_tax_data.xml index a32488d9c33..f8938c2f145 100644 --- a/addons/l10n_fr/data/account_tax_data.xml +++ b/addons/l10n_fr/data/account_tax_data.xml @@ -985,13 +985,13 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')], 'account_id': ref('pcg_44566'), }), ]"/> @@ -999,13 +999,13 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_base_coll_5_5')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_base_acq_5_5')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_coll_5_5')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_acq_5_5')], 'account_id': ref('pcg_44566'), }), ]"/> @@ -1270,7 +1270,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')], 'account_id': ref('pcg_445201'), }), ]"/> @@ -1284,7 +1284,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_20')], 'account_id': ref('pcg_445201'), }), ]"/> @@ -1309,7 +1309,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1323,7 +1323,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_8_5')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1348,7 +1348,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')], 'account_id': ref('pcg_445202'), }), ]"/> @@ -1362,7 +1362,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_10')], 'account_id': ref('pcg_445202'), }), ]"/> @@ -1387,7 +1387,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1401,7 +1401,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_5_5')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1426,7 +1426,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')], + 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1440,7 +1440,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')], + 'minus_report_line_ids': [ref('l10n_fr.tax_report_tva_due_intra_2_1')], 'account_id': ref('pcg_445203'), }), ]"/> @@ -1734,7 +1734,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_445201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1747,7 +1746,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_445201'), }), ]"/> </record> @@ -1771,7 +1769,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_445663'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1784,7 +1781,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_445663'), }), ]"/> </record> diff --git a/addons/l10n_fr/data/tax_report_data.xml b/addons/l10n_fr/data/tax_report_data.xml index 71363f0b6cb..bf10b7c3a2f 100644 --- a/addons/l10n_fr/data/tax_report_data.xml +++ b/addons/l10n_fr/data/tax_report_data.xml @@ -569,8 +569,8 @@ </record> <record id="tax_report_base_ded_intra_20" model="account.tax.report.line"> - <field name="name">Base H.T. 20%</field> - <field name="tag_name">Base déductible intracom. 20%</field> + <field name="name">Base H.T. 20.0%</field> + <field name="tag_name">Base déductible intracom. 20.0%</field> <field name="country_id" ref="base.fr"/> <field name="parent_id" ref="tax_report_base_ded_intra"/> <field name="sequence">1</field> diff --git a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 44367687c8f..00000000000 --- a/addons/l10n_fr/migrations/2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,5 +0,0 @@ -# -*- coding: utf-8 -*- -from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - -def migrate(cr, version): - migrate_tags_on_taxes(cr, None) diff --git a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py b/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py deleted file mode 100644 index 6f933404f1d..00000000000 --- a/addons/l10n_fr/migrations/9.0.1.1/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,7 +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) - diff --git a/addons/l10n_gr/data/account_tax_data.xml b/addons/l10n_gr/data/account_tax_data.xml index 5b85ffadada..9598ccf3452 100644 --- a/addons/l10n_gr/data/account_tax_data.xml +++ b/addons/l10n_gr/data/account_tax_data.xml @@ -226,11 +226,13 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', + 'plus_report_line_ids': [ref('account_tax_report_line_357')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chartgr_54_00'), + 'plus_report_line_ids': [ref('account_tax_report_line_377')] }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -259,11 +261,13 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', + 'plus_report_line_ids': [ref('account_tax_report_line_357')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chartgr_54_00'), + 'plus_report_line_ids': [ref('account_tax_report_line_377')] }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -292,11 +296,13 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', + 'plus_report_line_ids': [ref('account_tax_report_line_357')] }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chartgr_54_00'), + 'plus_report_line_ids': [ref('account_tax_report_line_377')] }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), diff --git a/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py b/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_gr/migrations/9.0.1.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_hr/data/account_tax_report_data.xml b/addons/l10n_hr/data/account_tax_report_data.xml index 7d79e11fee6..282f7003b38 100644 --- a/addons/l10n_hr/data/account_tax_report_data.xml +++ b/addons/l10n_hr/data/account_tax_report_data.xml @@ -121,7 +121,7 @@ <record id="account_tax_report_line_izdani_10" model="account.tax.report.line"> <field name="name">II.1 Izdani računi po stopi 10%</field> - <field name="tag_name">II.1 Izdani računi po stopi 10%</field> + <field name="tag_name">II.1 Izdani računi po stopi 10% (osnovica)</field> <field name="code">izdani_10</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_line_oporezive"/> @@ -137,7 +137,7 @@ <record id="account_tax_report_line_izdani_25" model="account.tax.report.line"> <field name="name">II.3 Izdani računi po stopi 25%</field> - <field name="tag_name">II.3 Izdani računi po stopi 25%</field> + <field name="tag_name">II.3 Izdani računi po stopi 25% (osnovica)</field> <field name="code">izdani_25</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="account_tax_report_line_oporezive"/> @@ -168,7 +168,7 @@ <record id="account_tax_report_line_pretporez_10" model="account.tax.report.line"> <field name="name">III.1. Pretporez 10%</field> - <field name="tag_name">III.1. Pretporez 10%</field> + <field name="tag_name">III.1. Pretporez 10% (osnovica)</field> <field name="code">pretporez_10</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_line_obracunani"/> @@ -211,7 +211,7 @@ <record id="account_tax_report_line_placeni_uvozu" model="account.tax.report.line"> <field name="name">III.4. Plaćeni PP pri uvozu</field> - <field name="tag_name">III.4. Plaćeni PP pri uvozu</field> + <field name="tag_name">III.4. Plaćeni PP pri uvozu (osnovica)</field> <field name="code">placeni_uvozu</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="account_tax_report_line_obracunani"/> @@ -220,7 +220,7 @@ <record id="account_tax_report_line_placeni_usluge_10" model="account.tax.report.line"> <field name="name">III.5. Plaćeni PP na ino usluge 10%</field> - <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field> + <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (osnovica)</field> <field name="code">placeni_usluge_10</field> <field name="sequence" eval="5"/> <field name="parent_id" ref="account_tax_report_line_obracunani"/> @@ -237,7 +237,7 @@ <record id="account_tax_report_line_placeni_usluge_25" model="account.tax.report.line"> <field name="name">III.7. Plaćeni PP na ino usluge 25%</field> - <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field> + <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (osnovica)</field> <field name="code">placeni_usluge_25</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_line_obracunani"/> @@ -283,7 +283,7 @@ <record id="account_tax_report_line_izdani_racuni" model="account.tax.report.line"> <field name="name">II.1 Izdani računi po stopi 10%</field> - <field name="tag_name">II.1 Izdani računi po stopi 10%</field> + <field name="tag_name">II.1 Izdani računi po stopi 10% (porez)</field> <field name="code">izdani_racuni</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/> @@ -299,7 +299,7 @@ <record id="account_tax_report_line_izdani_racuni_25" model="account.tax.report.line"> <field name="name">II.3 Izdani računi po stopi 25%</field> - <field name="tag_name">II.3 Izdani računi po stopi 25%</field> + <field name="tag_name">II.3 Izdani računi po stopi 25% (porez)</field> <field name="code">izdani_racuni_25</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="account_tax_report_line_oporezive_isporuke"/> @@ -322,7 +322,7 @@ <record id="account_tax_report_line_pretporez_10_tax" model="account.tax.report.line"> <field name="name">III.1. Pretporez 10%</field> - <field name="tag_name">III.1. Pretporez 10%</field> + <field name="tag_name">III.1. Pretporez 10% (porez)</field> <field name="code">pretporez_10_tax</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/> @@ -347,7 +347,7 @@ <record id="account_tax_report_line_placeni_uvozu_tax" model="account.tax.report.line"> <field name="name">III.4. Plaćeni PP pri uvozu</field> - <field name="tag_name">III.4. Plaćeni PP pri uvozu</field> + <field name="tag_name">III.4. Plaćeni PP pri uvozu (porez)</field> <field name="code">placeni_uvozu_tax</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/> @@ -356,7 +356,7 @@ <record id="account_tax_report_line_placeni_usluge_10_tax" model="account.tax.report.line"> <field name="name">III.5. Plaćeni PP na ino usluge 10%</field> - <field name="tag_name">III.5. Plaćeni PP na ino usluge 10%</field> + <field name="tag_name">III.5. Plaćeni PP na ino usluge 10% (porez)</field> <field name="code">placeni_usluge_10_tax</field> <field name="sequence" eval="5"/> <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/> @@ -372,7 +372,7 @@ <record id="account_tax_report_line_placeni_usluge_25_tax" model="account.tax.report.line"> <field name="name">III.7. Plaćeni PP na ino usluge 25%</field> - <field name="tag_name">III.7. Plaćeni PP na ino usluge 25%</field> + <field name="tag_name">III.7. Plaćeni PP na ino usluge 25% (porez)</field> <field name="code">placeni_usluge_25_ta</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_line_obracunani_pretporez"/> diff --git a/addons/l10n_hr/data/account_tax_template_data.xml b/addons/l10n_hr/data/account_tax_template_data.xml index a3d8ce3f29c..242cae42c05 100644 --- a/addons/l10n_hr/data/account_tax_template_data.xml +++ b/addons/l10n_hr/data/account_tax_template_data.xml @@ -131,7 +131,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -143,7 +142,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -240,7 +238,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -252,7 +249,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -349,7 +345,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -361,7 +356,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -384,7 +378,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -396,7 +389,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -419,7 +411,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -431,7 +422,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -454,7 +444,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -466,7 +455,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -489,7 +477,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -501,7 +488,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -524,7 +510,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -536,7 +521,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -666,7 +650,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -678,7 +661,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -736,7 +718,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -748,7 +729,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> @@ -845,7 +825,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -857,7 +836,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('kp_rrif4199'), }), ]"/> </record> diff --git a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py b/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_hr/migrations/9.0.13.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_hu/data/account_tax_template_data.xml b/addons/l10n_hu/data/account_tax_template_data.xml index 46a16e9879c..0cde0b968b5 100644 --- a/addons/l10n_hu/data/account_tax_template_data.xml +++ b/addons/l10n_hu/data/account_tax_template_data.xml @@ -134,7 +134,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -146,7 +145,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> </record> @@ -170,7 +168,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -182,7 +179,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> </record> @@ -206,7 +202,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -218,7 +213,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> </record> @@ -242,7 +236,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -254,7 +247,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> </record> @@ -278,7 +270,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -290,7 +281,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_467'), }), ]"/> </record> @@ -428,7 +418,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -440,7 +429,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> @@ -464,7 +452,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -476,7 +463,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> @@ -499,7 +485,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -510,7 +495,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> @@ -534,7 +518,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -546,7 +529,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> @@ -570,7 +552,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -582,7 +563,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> @@ -606,7 +586,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -618,7 +597,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart_hu_466'), }), ]"/> </record> diff --git a/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_hu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_ie/data/account_tax_data.xml b/addons/l10n_ie/data/account_tax_data.xml index 91491dea46a..e7f10a3e60d 100644 --- a/addons/l10n_ie/data/account_tax_data.xml +++ b/addons/l10n_ie/data/account_tax_data.xml @@ -16,7 +16,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -27,7 +26,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> </record> @@ -78,7 +76,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -89,7 +86,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> </record> @@ -109,7 +105,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -120,7 +115,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> </record> @@ -171,7 +165,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -182,7 +175,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> </record> @@ -274,7 +266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -285,7 +276,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2200'), }), ]"/> </record> @@ -305,7 +295,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -316,7 +305,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('l10n_ie_a2201'), }), ]"/> </record> diff --git a/addons/l10n_in/data/account_tax_template_data.xml b/addons/l10n_in/data/account_tax_template_data.xml index 6e043599d86..6c0d3b8892e 100644 --- a/addons/l10n_in/data/account_tax_template_data.xml +++ b/addons/l10n_in/data/account_tax_template_data.xml @@ -185,7 +185,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -198,7 +197,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -224,7 +222,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -237,7 +234,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -506,7 +502,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -554,7 +550,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -602,7 +598,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -650,7 +646,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -698,7 +694,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -747,7 +743,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p10052'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -898,7 +894,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -910,7 +905,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> </record> @@ -935,7 +929,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p10056'), }), ]"/> @@ -948,7 +941,6 @@ if tax > result:result=tax</field> (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('p11236'), }), ]"/> @@ -1215,7 +1207,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -1263,7 +1255,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -1311,7 +1303,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -1359,7 +1351,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -1407,7 +1399,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> @@ -1456,7 +1448,7 @@ if tax > result:result=tax</field> 'factor_percent': 50, 'repartition_type': 'tax', 'account_id': ref('p11233'), - 'plus_report_line_ids': [ref('tax_report_line_cgst')], + 'minus_report_line_ids': [ref('tax_report_line_cgst')], }), ]"/> </record> diff --git a/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_in/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml b/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml index d1400e7ac07..502854e8eca 100644 --- a/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml +++ b/addons/l10n_in_schedule6/l10n_in_schedule6_tax_template.xml @@ -1,230 +1,243 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <record id="schedule6_sgst_tag_tax" model="account.account.tag"> - <field name="name">SGST</field> - <field name="applicability">taxes</field> - </record> - <record id="schedule6_cgst_tag_tax" model="account.account.tag"> - <field name="name">CGST</field> - <field name="applicability">taxes</field> - </record> - <record id="schedule6_igst_tag_tax" model="account.account.tag"> - <field name="name">IGST</field> - <field name="applicability">taxes</field> - </record> - <record id="schedule6_cess_tag_tax" model="account.account.tag"> - <field name="name">CESS</field> - <field name="applicability">taxes</field> - </record> - <!-- Account Tax Templates --> <!-- Sale Taxes --> - <record id="schedule6_sgst_sale_0_5" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 0.5%</field> - <field name="description">SGST 0.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">0.5</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - - </record> - - <record id="schedule6_cgst_sale_0_5" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 0.5%</field> - <field name="description">CGST 0.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">0.5</field> - <field name="account_id" ref="c114211"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> - </record> - <record id="schedule6_sgst_sale_1" model="account.tax.template"> <field name="name">(schedule6)GST 1%</field> <field name="description">GST 1%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_0_5'), ref('schedule6_cgst_sale_0_5'),])]"/> - </record> - - <record id="schedule6_sgst_sale_1_2" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 1%</field> - <field name="description">SGST 1%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">1</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_sale_1_2" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 1%</field> - <field name="description">CGST 1%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> <field name="amount">1</field> - <field name="account_id" ref="c114211"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_sale_2" model="account.tax.template"> <field name="name">(schedule6)GST 2%</field> <field name="description">GST 2%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_1_2'), ref('schedule6_cgst_sale_1_2'),])]"/> - </record> - - <record id="schedule6_sgst_sale_2_5" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 2.5%</field> - <field name="description">SGST 2.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">2.5</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_sale_2_5" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 2.5%</field> - <field name="description">CGST 2.5%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">2.5</field> - <field name="account_id" ref="c114211"/> + <field name="amount">2</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_sale_5" model="account.tax.template"> <field name="name">(schedule6)GST 5%</field> <field name="description">GST 5%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_2_5'), ref('schedule6_cgst_sale_2_5'),])]"/> - </record> - - <record id="schedule6_sgst_sale_6" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 6%</field> - <field name="description">SGST 6%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">6</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_sale_6" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 6%</field> - <field name="description">CGST 6%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">6</field> - <field name="account_id" ref="c114211"/> + <field name="amount">5</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_sale_12" model="account.tax.template"> <field name="name">(schedule6)GST 12%</field> <field name="description">GST 12%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_6'),ref('schedule6_cgst_sale_6'),])]"/> - </record> - - <record id="schedule6_sgst_sale_9" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 9%</field> - <field name="description">SGST 9%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">9</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_sale_9" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 9%</field> - <field name="description">CGST 9%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">9</field> - <field name="account_id" ref="c114211"/> + <field name="amount">12</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_sale_18" model="account.tax.template"> <field name="name">(schedule6)GST 18%</field> <field name="description">GST 18%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_9'),ref('schedule6_cgst_sale_9'),])]"/> - </record> - - <record id="schedule6_sgst_sale_14" model="account.tax.template"> - <field name="name">(schedule6)SGST Sale 14%</field> - <field name="description">SGST 14%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">14</field> - <field name="account_id" ref="c114210"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_sale_14" model="account.tax.template"> - <field name="name">(schedule6)CGST Sale 14%</field> - <field name="description">CGST 14%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">14</field> - <field name="account_id" ref="c114211"/> + <field name="amount">18</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_sale_28" model="account.tax.template"> <field name="name">(schedule6)GST 28%</field> <field name="description">GST 28%</field> <field name="type_tax_use">sale</field> - <field name="amount_type">group</field> - <field name="amount">0</field> + <field name="amount_type">percent</field> + <field name="amount">28</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_sale_14'),ref('schedule6_cgst_sale_14'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114210'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c114211'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> + </record> <record id="schedule6_igst_sale_1" model="account.tax.template"> @@ -233,9 +246,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">1</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -245,9 +277,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">2</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -257,9 +308,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">5</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -269,9 +339,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">12</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -281,9 +370,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">18</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -293,9 +401,28 @@ <field name="type_tax_use">sale</field> <field name="amount_type">percent</field> <field name="amount">28</field> - <field name="account_id" ref="c114212"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c114212'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -307,7 +434,26 @@ <field name="amount">5</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_cess_sale_1591" model="account.tax.template"> @@ -318,7 +464,26 @@ <field name="amount">1.591</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_cess_5_plus_1591_sale" model="account.tax.template"> @@ -329,7 +494,6 @@ <field name="amount">0</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_cess_sale_5'),ref('schedule6_cess_sale_1591'),])]"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> </record> <record id="schedule6_cess_21_4170_higer_sale" model="account.tax.template"> @@ -343,213 +507,262 @@ tax=quantity * 4.17 if tax > result:result=tax</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <!-- Purchase Taxes --> - <record id="schedule6_sgst_purchase_0_5" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 0.5%</field> - <field name="description">SGST 0.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">0.5</field> - <field name="account_id" ref="c121611"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_0_5" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 0.5%</field> - <field name="description">CGST 0.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">0.5</field> - <field name="account_id" ref="c121612"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> - </record> - <record id="schedule6_sgst_purchase_1" model="account.tax.template"> <field name="name">(schedule6)GST 1%</field> <field name="description">GST 1%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_0_5'),ref('schedule6_cgst_purchase_0_5'),])]"/> - </record> - - <record id="schedule6_sgst_purchase_1_2" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 1%</field> - <field name="description">SGST 1%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> <field name="amount">1</field> - <field name="account_id" ref="c121611"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_1_2" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 1%</field> - <field name="description">CGST 1%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">1</field> - <field name="account_id" ref="c121612"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_purchase_2" model="account.tax.template"> <field name="name">(schedule6)GST 2%</field> <field name="description">GST 2%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_1_2'),ref('schedule6_cgst_purchase_1_2'),])]"/> - </record> - - <record id="schedule6_sgst_purchase_2_5" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 2.5%</field> - <field name="description">SGST 2.5%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">2.5</field> - <field name="account_id" ref="c121611"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_2_5" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 2.5%</field> - <field name="description">CGST 2.5%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">2.5</field> - <field name="account_id" ref="c121612"/> + <field name="amount">2</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_purchase_5" model="account.tax.template"> <field name="name">(schedule6)GST 5%</field> <field name="description">GST 5%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_2_5'),ref('schedule6_cgst_purchase_2_5'),])]"/> - </record> - - <record id="schedule6_sgst_purchase_6" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 6%</field> - <field name="description">SGST 6%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">6</field> - <field name="account_id" ref="c121611"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_6" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 6%</field> - <field name="description">CGST 6%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">6</field> - <field name="account_id" ref="c121612"/> + <field name="amount">5</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_purchase_12" model="account.tax.template"> <field name="name">(schedule6)GST 12%</field> <field name="description">GST 12%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_6'),ref('schedule6_cgst_purchase_6'),])]"/> - </record> - - <record id="schedule6_sgst_purchase_9" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 9%</field> - <field name="description">SGST 9%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">9</field> - <field name="account_id" ref="c121611"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_9" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 9%</field> - <field name="description">CGST 9%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">9</field> - <field name="account_id" ref="c121612"/> + <field name="amount">12</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_purchase_18" model="account.tax.template"> <field name="name">(schedule6)GST 18%</field> <field name="description">GST 18%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_9'),ref('schedule6_cgst_purchase_9'),])]"/> - </record> - - <record id="schedule6_sgst_purchase_14" model="account.tax.template"> - <field name="name">(schedule6)SGST Purchase 14%</field> - <field name="description">SGST 14%</field> - <field name="type_tax_use">none</field> <field name="amount_type">percent</field> - <field name="amount">14</field> - <field name="account_id" ref="c121611"/> - <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_sgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_sgst_group"/> - </record> - - <record id="schedule6_cgst_purchase_14" model="account.tax.template"> - <field name="name">(schedule6)CGST Purchase 14%</field> - <field name="description">CGST 14%</field> - <field name="type_tax_use">none</field> - <field name="amount_type">percent</field> - <field name="amount">14</field> - <field name="account_id" ref="c121612"/> + <field name="amount">18</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cgst_tag_tax'),])]"/> - <field name="tax_group_id" ref="schedule6_cgst_group"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_sgst_purchase_28" model="account.tax.template"> <field name="name">(schedule6)GST 28%</field> <field name="description">GST 28%</field> <field name="type_tax_use">purchase</field> - <field name="amount_type">group</field> - <field name="amount">0</field> + <field name="amount_type">percent</field> + <field name="amount">28</field> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="children_tax_ids" eval="[(6, 0, [ref('schedule6_sgst_purchase_14'),ref('schedule6_cgst_purchase_14'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121611'), + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + 'account_id': ref('c121612'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + (0, 0, { + 'factor_percent': 50, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_igst_purchase_1" model="account.tax.template"> @@ -558,9 +771,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">1</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -570,9 +802,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">2</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -582,9 +833,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">5</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -594,9 +864,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">12</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -606,9 +895,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">18</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -618,9 +926,28 @@ if tax > result:result=tax</field> <field name="type_tax_use">purchase</field> <field name="amount_type">percent</field> <field name="amount">28</field> - <field name="account_id" ref="c121613"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('c121613'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_igst_tag_tax'),])]"/> <field name="tax_group_id" ref="schedule6_igst_group"/> </record> @@ -632,7 +959,26 @@ if tax > result:result=tax</field> <field name="amount">5</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_cess_purchase_1591" model="account.tax.template"> @@ -643,7 +989,26 @@ if tax > result:result=tax</field> <field name="amount">1.591</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="schedule6_cess_5_plus_1591_purchase" model="account.tax.template"> @@ -667,7 +1032,26 @@ tax=quantity * 4.17 if tax > result:result=tax</field> <field name="tax_group_id" ref="schedule6_cess_group"/> <field name="chart_template_id" ref="indian_chart_template_schedule6"/> - <field name="tag_ids" eval="[(6,0,[ref('schedule6_cess_tag_tax'),])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> </odoo> diff --git a/addons/l10n_it/data/account_tax_template.xml b/addons/l10n_it/data/account_tax_template.xml index 0adb0478db4..36635b55b01 100644 --- a/addons/l10n_it/data/account_tax_template.xml +++ b/addons/l10n_it/data/account_tax_template.xml @@ -357,11 +357,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -372,11 +367,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -593,11 +583,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -608,11 +593,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -813,11 +793,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -828,11 +803,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -993,7 +963,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1004,7 +973,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> </record> @@ -1027,7 +995,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1038,7 +1005,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> </record> @@ -1061,7 +1027,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1072,7 +1037,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> </record> @@ -1095,7 +1059,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1106,7 +1069,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('1601'), }), ]"/> </record> @@ -1367,7 +1329,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -1378,7 +1339,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2601'), }), ]"/> </record> @@ -1525,11 +1485,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -1540,11 +1495,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -1735,11 +1685,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), @@ -1750,11 +1695,6 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 0, - 'repartition_type': 'tax', - 'account_id': ref('1601'), - }), - (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', }), diff --git a/addons/l10n_jp/data/account_tax_report_data.xml b/addons/l10n_jp/data/account_tax_report_data.xml index 02ec7767d09..a822b13da64 100644 --- a/addons/l10n_jp/data/account_tax_report_data.xml +++ b/addons/l10n_jp/data/account_tax_report_data.xml @@ -32,7 +32,7 @@ <record id="tax_report_to_pay_temp_tx_tax_free" model="account.tax.report.line"> <field name="name">不課税</field> - <field name="tag_name">不課税</field> + <field name="tag_name">不課税 (仮受税額)</field> <field name="parent_id" ref="tax_report_to_pay_temp_tx"/> <field name="sequence">3</field> <field name="country_id" ref="base.jp"/> @@ -63,7 +63,7 @@ <record id="tax_report_to_pay_temp_pmt_tax_free" model="account.tax.report.line"> <field name="name">不課税</field> - <field name="tag_name">不課税</field> + <field name="tag_name">不課税 (仮払税額)</field> <field name="parent_id" ref="tax_report_to_pay_temp_pmt"/> <field name="sequence">3</field> <field name="country_id" ref="base.jp"/> diff --git a/addons/l10n_jp/data/account_tax_template_data.xml b/addons/l10n_jp/data/account_tax_template_data.xml index c28e3319af5..fbb1a01406c 100644 --- a/addons/l10n_jp/data/account_tax_template_data.xml +++ b/addons/l10n_jp/data/account_tax_template_data.xml @@ -20,6 +20,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'account_id': ref('A21809'), 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')], }), ]"/> @@ -32,6 +33,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'account_id': ref('A21809'), 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')], }), ]"/> @@ -56,6 +58,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'account_id': ref('A21809'), 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')], }), ]"/> @@ -68,6 +71,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'account_id': ref('A21809'), 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_output_8')], }), ]"/> @@ -92,7 +96,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -104,7 +107,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_duty_free')], }), ]"/> <field name="tax_group_id" ref="tax_group_0"/> @@ -128,12 +130,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -145,12 +141,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_tax_free')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_tx_tax_free')], }), ]"/> <field name="tax_group_id" ref="tax_group_0"/> @@ -250,7 +240,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -262,7 +251,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('l10n_jp.tax_report_to_pay_temp_pmt_import_8')], }), ]"/> <field name="tax_group_id" ref="tax_group_0"/> diff --git a/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_jp/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_lu/data/account_tax_template_2015.xml b/addons/l10n_lu/data/account_tax_template_2015.xml index 20acaf701cd..e70d0cb53c8 100644 --- a/addons/l10n_lu/data/account_tax_template_2015.xml +++ b/addons/l10n_lu/data/account_tax_template_2015.xml @@ -51,7 +51,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -70,7 +70,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -100,7 +100,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -119,7 +119,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -149,7 +149,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -168,7 +168,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -198,7 +198,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -217,7 +217,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -280,7 +280,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -299,7 +299,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -329,7 +329,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -348,7 +348,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -378,7 +378,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -397,7 +397,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -427,7 +427,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -446,7 +446,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')] }), (0,0, { 'factor_percent': 100, @@ -509,7 +509,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -528,7 +528,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -558,7 +558,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -577,7 +577,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -607,7 +607,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -626,7 +626,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')] }), (0,0, { 'factor_percent': 100, @@ -656,7 +656,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -675,7 +675,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -920,7 +920,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -939,7 +939,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -969,7 +969,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -988,7 +988,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1018,7 +1018,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1037,7 +1037,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1067,7 +1067,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1086,7 +1086,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1149,7 +1149,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1168,7 +1168,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1198,7 +1198,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1217,7 +1217,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1247,7 +1247,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1266,7 +1266,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1296,7 +1296,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1315,7 +1315,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -1559,7 +1559,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1578,7 +1578,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1608,7 +1608,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1627,7 +1627,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1657,7 +1657,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1676,7 +1676,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1706,7 +1706,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1725,7 +1725,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1788,7 +1788,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1807,7 +1807,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1837,7 +1837,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1856,7 +1856,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1886,7 +1886,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1905,7 +1905,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1935,7 +1935,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -1954,7 +1954,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -2017,7 +2017,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2036,7 +2036,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2066,7 +2066,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2085,7 +2085,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2115,7 +2115,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2134,7 +2134,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2164,7 +2164,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2183,7 +2183,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -2427,7 +2427,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2446,7 +2446,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2476,7 +2476,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2495,7 +2495,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2525,7 +2525,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2544,7 +2544,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2574,7 +2574,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2593,7 +2593,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2656,7 +2656,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2675,7 +2675,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2705,7 +2705,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2724,7 +2724,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2754,7 +2754,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2773,7 +2773,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2803,7 +2803,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -2822,7 +2822,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -3066,7 +3066,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3085,7 +3085,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3115,7 +3115,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3134,7 +3134,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3164,7 +3164,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3183,7 +3183,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3213,7 +3213,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3232,7 +3232,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3295,7 +3295,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3314,7 +3314,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3344,7 +3344,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3363,7 +3363,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3393,7 +3393,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3412,7 +3412,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3442,7 +3442,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3461,7 +3461,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_3_importations_de_biens_taxe_declaree_ou_payee')], }), (0,0, { 'factor_percent': 100, @@ -3524,7 +3524,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3543,7 +3543,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3573,7 +3573,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3592,7 +3592,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3622,7 +3622,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3641,7 +3641,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3671,7 +3671,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3690,7 +3690,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_2_acquisitions_intracommunautaires_de_biens_art')], }), (0,0, { 'factor_percent': 100, @@ -3934,7 +3934,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -3953,7 +3953,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -3983,7 +3983,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4002,7 +4002,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4032,7 +4032,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4051,7 +4051,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4081,7 +4081,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4100,7 +4100,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614113'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4163,7 +4163,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4182,7 +4182,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4212,7 +4212,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4231,7 +4231,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4261,7 +4261,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4280,7 +4280,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4310,7 +4310,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, @@ -4329,7 +4329,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('lu_2011_account_4614112'), - 'minus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], + 'plus_report_line_ids': [ref('account_tax_report_line_3a_5_taxe_declaree_comme_debiteur_voir_points_ii_e')], }), (0,0, { 'factor_percent': 100, diff --git a/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_lu/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index fa56fd00dfa..00000000000 --- a/addons/l10n_lu/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) diff --git a/addons/l10n_ma/data/account_tax_data.xml b/addons/l10n_ma/data/account_tax_data.xml index f316c4d6b56..c112839f15b 100644 --- a/addons/l10n_ma/data/account_tax_data.xml +++ b/addons/l10n_ma/data/account_tax_data.xml @@ -334,7 +334,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')], + 'plus_report_line_ids': [ref('tax_report_achats_importation_ht_10')], }), (0,0, { 'factor_percent': 100, @@ -347,7 +347,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('tax_report_achats_interieur_ht_10')], + 'minus_report_line_ids': [ref('tax_report_achats_importation_ht_10')], }), (0,0, { 'factor_percent': 100, diff --git a/addons/l10n_ma/data/account_tax_report_data.xml b/addons/l10n_ma/data/account_tax_report_data.xml index b838d152ffe..220bad62380 100644 --- a/addons/l10n_ma/data/account_tax_report_data.xml +++ b/addons/l10n_ma/data/account_tax_report_data.xml @@ -145,7 +145,7 @@ <field name="country_id" ref="base.ma"/> </record> - <record id="tax_report_achats_interieur_ht_10" model="account.tax.report.line"> + <record id="tax_report_achats_importation_ht_10" model="account.tax.report.line"> <field name="name">Achats à l'importation (10%) (HT)</field> <field name="tag_name">Achats à l'importation (10%) (HT)</field> <field name="parent_id" ref="tax_report_biens_materiels_ht"/> diff --git a/addons/l10n_mn/__manifest__.py b/addons/l10n_mn/__manifest__.py index ba60ad4da0f..bd1a8436eb6 100644 --- a/addons/l10n_mn/__manifest__.py +++ b/addons/l10n_mn/__manifest__.py @@ -5,6 +5,7 @@ "name" : "Mongolia - Accounting", "version" : "1.0", 'category': 'Localization', + "author" : "BumanIT LLC, Odoo S.A", "description": """ This is the module to manage the accounting chart for Mongolia. =============================================================== diff --git a/addons/l10n_mn/data/account_tax_template_data.xml b/addons/l10n_mn/data/account_tax_template_data.xml index 8f5d16d9b75..95b5ec15261 100644 --- a/addons/l10n_mn/data/account_tax_template_data.xml +++ b/addons/l10n_mn/data/account_tax_template_data.xml @@ -96,7 +96,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_1204_0301'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -108,7 +107,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_1204_0301'), }), ]"/> </record> @@ -132,7 +130,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -144,7 +141,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> </record> @@ -168,7 +164,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -180,7 +175,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> </record> @@ -926,7 +920,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -938,7 +931,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> </record> @@ -962,7 +954,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -974,7 +965,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_template_3401_0201'), }), ]"/> </record> diff --git a/addons/l10n_mx/data/account.account.template.csv b/addons/l10n_mx/data/account.account.template.csv index b9cd4a41d36..316cab62337 100644 --- a/addons/l10n_mx/data/account.account.template.csv +++ b/addons/l10n_mx/data/account.account.template.csv @@ -8,7 +8,7 @@ "cuenta115_02","Materia prima y materiales","115.02.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_02","False" "cuenta115_03","Producción en proceso","115.03.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_03","False" "cuenta115_04","Productos terminados","115.04.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_04","False" -"cuenta115_05","Mercancías en tránsito","115.05.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_05","False" +"cuenta115_05","Mercancías en tránsito","115.05.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_05","True" "cuenta115_06","Mercancías en poder de terceros","115.06.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_115_06","False" "cuenta118_01","IVA acreditable pagado","118.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_118_01","False" "cuenta119_01","IVA pendiente de pago","119.01.01","account.data_account_type_current_assets","l10n_mx.mx_coa","l10n_mx.account_tag_119_01","False" diff --git a/addons/l10n_mx/data/account_tax_data.xml b/addons/l10n_mx/data/account_tax_data.xml index c1e520cd1dc..7d5a3faf852 100644 --- a/addons/l10n_mx/data/account_tax_data.xml +++ b/addons/l10n_mx/data/account_tax_data.xml @@ -1,6 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> <data> + <!-- Tag used only to generate the CFDI (Mexican e-invoice). --> + <record id="tag_iva" model="account.account.tag"> + <field name="name">IVA</field> + <field name="applicability">taxes</field> + </record> + <record id="tag_isr" model="account.account.tag"> + <field name="name">ISR</field> + <field name="applicability">taxes</field> + </record> + <record id="tag_ieps" model="account.account.tag"> + <field name="name">IEPS</field> + <field name="applicability">taxes</field> + </record> + <!-- Account Tags --> <record id="tag_diot_16" model="account.account.tag"> <field name="name">DIOT: 16%</field> @@ -55,7 +69,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('cuenta208_01'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -67,7 +80,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('cuenta209_01'), }), ]"/> </record> @@ -92,7 +104,9 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta208_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -104,7 +118,9 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta209_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> </record> @@ -354,7 +370,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('cuenta118_01'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -367,7 +382,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('cuenta119_01'), }), ]"/> </record> @@ -470,7 +484,9 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta208_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -482,7 +498,9 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', + 'tag_ids': [ref('l10n_mx.tag_iva')], 'account_id': ref('cuenta209_01'), + 'tag_ids': [ref('tag_iva')], }), ]"/> </record> diff --git a/addons/l10n_nl/data/account_tax_template.xml b/addons/l10n_nl/data/account_tax_template.xml index e56f1914288..db153988ede 100644 --- a/addons/l10n_nl/data/account_tax_template.xml +++ b/addons/l10n_nl/data/account_tax_template.xml @@ -21,7 +21,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -33,7 +32,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0'), }), ]"/> </record> @@ -200,7 +198,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_d'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -212,7 +209,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_d'), }), ]"/> </record> @@ -759,7 +755,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_v'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -771,7 +766,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_v'), }), ]"/> </record> @@ -800,7 +794,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_v'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -819,7 +813,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_v'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> </record> @@ -844,7 +838,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -863,7 +857,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -892,7 +886,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -911,7 +905,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -940,7 +934,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -959,7 +953,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -987,14 +981,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_h_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('vat_refund_h_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1006,14 +992,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_h_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('vat_refund_h_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> </record> @@ -1036,7 +1014,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1048,7 +1025,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> </record> @@ -1070,7 +1046,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1082,7 +1057,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> </record> @@ -1104,7 +1078,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1116,7 +1089,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_eu'), }), ]"/> </record> @@ -1140,7 +1112,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1159,7 +1131,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1188,7 +1160,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1207,7 +1179,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1236,7 +1208,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1255,7 +1227,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], }), (0,0, { 'factor_percent': 100, @@ -1283,14 +1255,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_h_d_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4b')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('vat_refund_h_d_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1302,14 +1266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_h_d_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4b')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('vat_refund_h_d_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_5b')], }), ]"/> </record> @@ -1335,7 +1291,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1354,7 +1310,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1383,7 +1339,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1402,7 +1358,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1431,7 +1387,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1450,7 +1406,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1479,7 +1435,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1498,7 +1454,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1527,7 +1483,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_non_eu'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1539,7 +1494,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_non_eu'), }), ]"/> </record> @@ -1561,7 +1515,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_non_eu'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -1573,7 +1526,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('vat_payable_0_non_eu'), }), ]"/> </record> @@ -1597,7 +1549,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1616,7 +1568,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1645,7 +1597,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1664,7 +1616,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_l_d_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1693,7 +1645,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1712,7 +1664,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1741,7 +1693,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_non_eu'), - 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, @@ -1760,7 +1712,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('vat_payable_h_d_non_eu'), - 'plus_report_line_ids': [ref('tax_report_rub_btw_4a')], + 'minus_report_line_ids': [ref('tax_report_rub_btw_4a')], }), (0,0, { 'factor_percent': 100, diff --git a/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index 404cdd185d4..00000000000 --- a/addons/l10n_nl/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- - -import odoo - -def migrate(cr, version): - registry = odoo.registry(cr.dbname) - from odoo.addons.account.models.chart_template import migrate_tags_on_taxes - migrate_tags_on_taxes(cr, registry) diff --git a/addons/l10n_no/data/account_tax_data.xml b/addons/l10n_no/data/account_tax_data.xml index 9eebd2dbe17..341f5207689 100644 --- a/addons/l10n_no/data/account_tax_data.xml +++ b/addons/l10n_no/data/account_tax_data.xml @@ -306,7 +306,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart2714'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -317,7 +316,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart2714'), }), ]"/> </record> @@ -339,7 +337,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart2704'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -351,7 +348,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart2704'), }), ]"/> </record> diff --git a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index a37770d2c1c..00000000000 --- a/addons/l10n_no/migrations/9.0.2.0/post-migrate_tags_on_taxes.py +++ /dev/null @@ -1,7 +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) diff --git a/addons/l10n_nz/data/account_tax_template_data.xml b/addons/l10n_nz/data/account_tax_template_data.xml index 272d267882e..d06eb0f1494 100644 --- a/addons/l10n_nz/data/account_tax_template_data.xml +++ b/addons/l10n_nz/data/account_tax_template_data.xml @@ -89,7 +89,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21310'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -101,7 +100,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21310'), }), ]"/> </record> @@ -194,7 +192,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -206,7 +203,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> </record> @@ -229,7 +225,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -241,7 +236,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('nz_21330'), }), ]"/> </record> 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) diff --git a/addons/l10n_ro/data/account_tax_data.xml b/addons/l10n_ro/data/account_tax_data.xml index b4551410427..3409d10ad0f 100644 --- a/addons/l10n_ro/data/account_tax_data.xml +++ b/addons/l10n_ro/data/account_tax_data.xml @@ -18,8 +18,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_0')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -31,8 +29,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_0')], }), ]"/> </record> @@ -236,8 +232,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -249,8 +243,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')], }), ]"/> </record> @@ -273,7 +265,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')], }), ]"/> @@ -286,7 +278,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')], }), ]"/> @@ -310,7 +302,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')], }), ]"/> @@ -323,7 +315,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')], }), ]"/> @@ -347,7 +339,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')], }), ]"/> @@ -360,7 +352,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')], }), ]"/> @@ -383,7 +375,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -394,7 +386,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), ]"/> </record> @@ -417,7 +409,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')], }), ]"/> @@ -430,7 +422,7 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')], }), ]"/> @@ -449,24 +441,22 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -484,36 +474,24 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')], - 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')], - 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> </record> @@ -531,40 +509,40 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'), - ref('account_tax_report_ro_baza_tva_tx2_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), + ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')], + 'account_id': ref('pcg_4426'), + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'), - ref('account_tax_report_ro_baza_tva_tx2_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), + ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), ]"/> </record> @@ -582,40 +560,40 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'), - ref('account_tax_report_baza_tva_tx3_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'), + ref('account_tax_report_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('pcg_4426'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'), - ref('account_tax_report_baza_tva_tx3_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'), + ref('account_tax_report_baza_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')], + 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), ]"/> </record> @@ -651,14 +629,14 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), + 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -694,14 +672,14 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), + 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -719,39 +697,39 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'), ref('account_tax_report_ro_baza_tva_tx4_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('pcg_4426'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')], + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'), - ref('account_tax_report_ro_baza_tva_tx4_invrsa')], + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), + ref('account_tax_report_ro_baza_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')], + 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')], }), ]"/> </record> @@ -774,7 +752,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -786,7 +763,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -810,7 +786,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -823,7 +798,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -846,7 +820,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -858,7 +831,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -881,7 +853,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -893,7 +864,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> </record> @@ -914,7 +884,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -925,7 +894,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -942,36 +910,24 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')], - 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')], + 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')], - 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')], - }), - (0,0, { - 'factor_percent': 100, - 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')], + 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), }), ]"/> </record> @@ -988,39 +944,42 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'), - ref('account_tax_report_baza_tva_intrcmtr2_bnr')], + 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'), + ref('account_tax_report_baza_tva_intrcmtr_bnr')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')], + 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')], + 'account_id': ref('pcg_4426'), + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'), - ref('account_tax_report_baza_tva_intrcmtr2_bnr')], + 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'), + ref('account_tax_report_baza_tva_intrcmtr_bnr')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')], + 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), + ]"/> </record> @@ -1036,40 +995,40 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'), - ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')], + 'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'), + ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('pcg_4427'), - 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')], + 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('pcg_4426'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')], + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'), - ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')], + 'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'), + ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), - 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')], + 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), ]"/> </record> @@ -1104,14 +1063,14 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), + 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -1121,7 +1080,7 @@ <field name="sequence">61</field> <field name="name">TVA Intracomunitara Achizitii 20%</field> <field name="amount">20</field> - <field name="amount_type">group</field> + <field name="amount_type">percent</field> <field name="type_tax_use">purchase</field> <field name="tax_group_id" ref="tax_group_tva_0"/> <field name="invoice_repartition_line_ids" eval="[(5,0,0), @@ -1146,14 +1105,14 @@ 'repartition_type': 'base', }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4427'), + 'account_id': ref('pcg_4426'), }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), + 'account_id': ref('pcg_4427'), }), ]"/> </record> @@ -1170,38 +1129,40 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'), - ref('account_tax_report_baza_tva_intrcmtr4_bnr')], + 'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'), + ref('account_tax_report_baza_tva_intrcmtr_bnr')], }), (0,0, { 'factor_percent': -100, 'repartition_type': 'tax', - 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')], + 'account_id': ref('pcg_4427'), + 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('pcg_4426'), - 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')], + 'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'), - ref('account_tax_report_baza_tva_intrcmtr4_bnr')], + 'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'), + ref('account_tax_report_baza_tva_intrcmtr_bnr')], }), (0,0, { - 'factor_percent': 100, + 'factor_percent': -100, 'repartition_type': 'tax', - 'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')], + 'account_id': ref('pcg_4426'), + 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')], }), (0,0, { - 'factor_percent': -100, + 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('pcg_4426'), - 'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')], + 'account_id': ref('pcg_4427'), + 'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')], }), ]"/> </record> diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml index c8fd6e4019d..a390419ef68 100644 --- a/addons/l10n_ro/data/account_tax_report_data.xml +++ b/addons/l10n_ro/data/account_tax_report_data.xml @@ -54,125 +54,28 @@ <record id="account_tax_report_baza_tva_intrcmtr_bnr" model="account.tax.report.line"> <field name="name">Baza TVA Intracomunitar Bunuri</field> + <field name="tag_name">Baza TVA Intracomunitar Bunuri</field> <field name="sequence" eval="6"/> <field name="parent_id" ref="account_tax_report_baza_tva_clt"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_baza_tva_intrcmtr1_bnr" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_00_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr2_bnr" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr3_bnr" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr4_bnr" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_baza_tva_intrcmtr_srvci" model="account.tax.report.line"> <field name="name">Baza TVA Intracomunitar Servicii</field> + <field name="tag_name">Baza TVA Intracomunitar Servicii</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_baza_tva_clt"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_baza_tva_intrcmtr1_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr2_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr3_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_intrcmtr4_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_baza_tva_tx_invrsa" model="account.tax.report.line"> <field name="name">Baza TVA Taxare Inversa</field> + <field name="tag_name">Baza TVA Taxare Inversa</field> <field name="sequence" eval="8"/> <field name="parent_id" ref="account_tax_report_baza_tva_clt"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_baza_tva_tx1_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_00_taxare_inversa_Baza</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_tx2_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_05_taxare_inversa_Baza</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_tx3_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_09_taxare_inversa_Baza</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_baza_tva_tx4_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_24_taxare_inversa_Baza</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_tva_colcta" model="account.tax.report.line"> <field name="name">TVA COLECTATA</field> <field name="sequence" eval="2"/> @@ -181,7 +84,7 @@ <record id="account_tax_report_tva_0" model="account.tax.report.line"> <field name="name">TVA 0%</field> - <field name="tag_name">TVA 0%</field> + <field name="tag_name">TVA 0% (TVA colectata)</field> <field name="code">ROTAX_TVA_colectata_0</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> @@ -190,7 +93,7 @@ <record id="account_tax_report_tva_19" model="account.tax.report.line"> <field name="name">TVA 19%</field> - <field name="tag_name">TVA 19%</field> + <field name="tag_name">TVA 19% (TVA colectata)</field> <field name="code">ROTAX_TVA_colectata_19</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> @@ -199,7 +102,7 @@ <record id="account_tax_report_tva_24" model="account.tax.report.line"> <field name="name">TVA 24%</field> - <field name="tag_name">TVA 24%</field> + <field name="tag_name">TVA 24% (TVA colectata)</field> <field name="code">ROTAX_TVA_colectata_24</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> @@ -208,7 +111,7 @@ <record id="account_tax_report_tva_5" model="account.tax.report.line"> <field name="name">TVA 5%</field> - <field name="tag_name">TVA 5%</field> + <field name="tag_name">TVA 5% (TVA colectata)</field> <field name="code">ROTAX_TVA_colectata_5</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> @@ -217,7 +120,7 @@ <record id="account_tax_report_tva_9" model="account.tax.report.line"> <field name="name">TVA 9%</field> - <field name="tag_name">TVA 9%</field> + <field name="tag_name">TVA 9% (TVA colectata)</field> <field name="code">ROTAX_TVA_colectata_9</field> <field name="sequence" eval="5"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> @@ -225,131 +128,38 @@ </record> <record id="account_tax_report_tva_intracmunitr_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> + <field name="name">TVA Intracomunitar Bunuri (TVA colectata)</field> + <field name="tag_name">TVA Intracomunitar Bunuri (TVA colectata)</field> <field name="sequence" eval="6"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_tva_intracmunitr1_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intracmunitr2_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intracmunitr3_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intracmunitr4_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_tva_intra_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> + <field name="name">TVA Intracomunitar Servicii (TVA colectata)</field> + <field name="tag_name">TVA Intracomunitar Servicii (TVA colectata)</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_tva_intra1_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intra2_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intra3_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_intra4_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_tva_tx_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> + <field name="name">TVA Taxare Inversa (TVA colectata)</field> + <field name="tag_name">TVA Taxare Inversa (TVA colectata)</field> <field name="sequence" eval="8"/> <field name="parent_id" ref="account_tax_report_tva_colcta"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_tva_tx1_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_tx2_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_05_taxare_inversa</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_tx3_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_09_taxare_inversa</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_tva_tx4_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_colectata_24_taxare_inversa</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_baza_tva_deducbl" model="account.tax.report.line"> - <field name="name">BAZA TVA DEDUCTIBIL</field> + <field name="name">BAZA TVA DEDUCTIBILA</field> <field name="sequence" eval="3"/> <field name="country_id" ref="base.ro"/> </record> <record id="account_tax_report_baza_tva_deducbl_0" model="account.tax.report.line"> <field name="name">Baza TVA 0%</field> - <field name="tag_name">Baza TVA 0%</field> + <field name="tag_name">Baza TVA 0% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_0_Baza</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> @@ -358,7 +168,7 @@ <record id="account_tax_report_baza_tva_deducbl_19" model="account.tax.report.line"> <field name="name">Baza TVA 19%</field> - <field name="tag_name">Baza TVA 19%</field> + <field name="tag_name">Baza TVA 19% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_19_Baza</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> @@ -367,7 +177,7 @@ <record id="account_tax_report_baza_tva_deducbl_24" model="account.tax.report.line"> <field name="name">Baza TVA 24%</field> - <field name="tag_name">Baza TVA 24%</field> + <field name="tag_name">Baza TVA 24% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_24_Baza</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> @@ -376,7 +186,7 @@ <record id="account_tax_report_baza_tva_deducbl_5" model="account.tax.report.line"> <field name="name">Baza TVA 5%</field> - <field name="tag_name">Baza TVA 5%</field> + <field name="tag_name">Baza TVA 5% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_5_Baza</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> @@ -385,7 +195,7 @@ <record id="account_tax_report_baza_tva_deducbl_9" model="account.tax.report.line"> <field name="name">Baza TVA 9%</field> - <field name="tag_name">Baza TVA 9%</field> + <field name="tag_name">Baza TVA 9% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_9_Baza</field> <field name="sequence" eval="5"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> @@ -393,126 +203,29 @@ </record> <record id="account_tax_report_ro_baza_tva_intracmunitr_bnuri" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri%</field> + <field name="name">Baza TVA Intracomunitar Bunuri (deductibila)</field> + <field name="tag_name">Baza TVA Intracomunitar Bunuri (deductibila)</field> <field name="sequence" eval="6"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_baza_tva_intracmunitr1_bnuri" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri%</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field> - <field name="code">ROTAX_TVA_deductibila_00_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr2_bnuri" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri%</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field> - <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr3_bnuri" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri%</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field> - <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr4_bnuri" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Bunuri%</field> - <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field> - <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri_Baza</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_baza_tva_intracmunitr_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii%</field> + <field name="name">Baza TVA Intracomunitar Servicii (deductibila)</field> + <field name="tag_name">Baza TVA Intracomunitar Servicii (deductibila)</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_baza_tva_intracmunitr1_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii%</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr2_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii%</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr3_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii%</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_intracmunitr4_srvci" model="account.tax.report.line"> - <field name="name">Baza TVA Intracomunitar Servicii%</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_baza_tva_tx_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> + <field name="name">Baza TVA Taxare Inversa (deductibila)</field> + <field name="tag_name">Baza TVA Taxare Inversa (deductibila)</field> <field name="sequence" eval="8"/> <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_baza_tva_tx1_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_00_taxare_inversa_Baza</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_tx2_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa_Baza</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_tx3_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa_Baza</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_baza_tva_tx4_invrsa" model="account.tax.report.line"> - <field name="name">Baza TVA Taxare Inversa</field> - <field name="tag_name">Baza TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa_Baza</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_tva_decucible" model="account.tax.report.line"> <field name="name">TVA DEDUCTIBILA</field> <field name="sequence" eval="4"/> @@ -529,8 +242,8 @@ </record> <record id="account_tax_report_ro_tva_decucible_19" model="account.tax.report.line"> - <field name="name">TVA 19%</field> - <field name="tag_name">TVA 19%</field> + <field name="name">TVA 19% (deductibila)</field> + <field name="tag_name">TVA 19% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_19</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> @@ -538,8 +251,8 @@ </record> <record id="account_tax_report_ro_tva_decucible_24" model="account.tax.report.line"> - <field name="name">TVA 24%</field> - <field name="tag_name">TVA 24%</field> + <field name="name">TVA 24% (deductibila)</field> + <field name="tag_name">TVA 24% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_24</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> @@ -547,8 +260,8 @@ </record> <record id="account_tax_report_ro_tva_decucible_5" model="account.tax.report.line"> - <field name="name">TVA 5%</field> - <field name="tag_name">TVA 5%</field> + <field name="name">TVA 5% (deductibila)</field> + <field name="tag_name">TVA 5% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_5</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> @@ -556,8 +269,8 @@ </record> <record id="account_tax_report_ro_tva_decucible_9" model="account.tax.report.line"> - <field name="name">TVA 9%</field> - <field name="tag_name">TVA 9%</field> + <field name="name">TVA 9% (deductibila)</field> + <field name="tag_name">TVA 9% (deductibila)</field> <field name="code">ROTAX_TVA_deductibila_9</field> <field name="sequence" eval="5"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> @@ -565,122 +278,29 @@ </record> <record id="account_tax_report_ro_tva_intracmunitr_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> + <field name="name">TVA Intracomunitar Bunuri (deductibila)</field> + <field name="tag_name">TVA Intracomunitar Bunuri (deductibila)</field> <field name="sequence" eval="6"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_tva_intracmunitr1_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr2_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr3_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr4_bunri" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Bunuri</field> - <field name="tag_name">TVA Intracomunitar Bunuri</field> - <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_tva_intracmunitr_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> + <field name="name">TVA Intracomunitar Servicii (deductibila)</field> + <field name="tag_name">TVA Intracomunitar Servicii (deductibila)</field> <field name="sequence" eval="7"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_tva_intracmunitr1_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr2_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr3_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_intracmunitr4_srvci" model="account.tax.report.line"> - <field name="name">TVA Intracomunitar Servicii</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_tva_tx_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> + <field name="name">TVA Taxare Inversa (deductibila)</field> + <field name="tag_name">TVA Taxare Inversa (deductibila)</field> <field name="sequence" eval="8"/> <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/> <field name="country_id" ref="base.ro"/> </record> - <record id="account_tax_report_ro_tva_tx1_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="sequence" eval="1"/> - <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_tx2_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa</field> - <field name="sequence" eval="2"/> - <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_tx3_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa</field> - <field name="sequence" eval="3"/> - <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - - <record id="account_tax_report_ro_tva_tx4_invrsa" model="account.tax.report.line"> - <field name="name">TVA Taxare Inversa</field> - <field name="tag_name">TVA Taxare Inversa</field> - <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa</field> - <field name="sequence" eval="4"/> - <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/> - <field name="country_id" ref="base.ro"/> - </record> - <record id="account_tax_report_ro_baza_tva_nxgibl" model="account.tax.report.line"> <field name="name">BAZA TVA NEEXIGIBILA</field> <field name="sequence" eval="5"/> diff --git a/addons/l10n_sg/data/account_tax_data.xml b/addons/l10n_sg/data/account_tax_data.xml index e6eda67eee5..706697d870c 100644 --- a/addons/l10n_sg/data/account_tax_data.xml +++ b/addons/l10n_sg/data/account_tax_data.xml @@ -20,7 +20,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_791'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -32,7 +31,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_791'), }), ]"/> </record> @@ -92,7 +90,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_793'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -104,7 +101,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_793'), }), ]"/> </record> @@ -126,7 +122,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_794'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -137,7 +132,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_794'), }), ]"/> </record> @@ -160,7 +154,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_795'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -172,7 +165,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_795'), }), ]"/> </record> @@ -232,7 +224,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_797'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -244,7 +235,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_797'), }), ]"/> </record> @@ -523,7 +513,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_744'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -534,7 +523,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_744'), }), ]"/> </record> @@ -557,8 +545,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_745'), - 'plus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -570,8 +556,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_745'), - 'minus_report_line_ids': [ref('account_tax_report_line_inp_tax_refund_claim')], }), ]"/> </record> @@ -593,7 +577,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_746'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -604,7 +587,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_746'), }), ]"/> </record> @@ -626,7 +608,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_747'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -637,7 +618,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_747'), }), ]"/> </record> @@ -660,7 +640,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_748'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -672,7 +651,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_account_748'), }), ]"/> </record> diff --git a/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_sg/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index fa56fd00dfa..00000000000 --- a/addons/l10n_sg/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) diff --git a/addons/l10n_si/data/account_tax_data.xml b/addons/l10n_si/data/account_tax_data.xml index 8d070c926be..bd7bbff6738 100644 --- a/addons/l10n_si/data/account_tax_data.xml +++ b/addons/l10n_si/data/account_tax_data.xml @@ -314,7 +314,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('gd_acc_260001'), - 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')], + 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -333,7 +333,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('gd_acc_260001'), - 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')], + 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_zni')], }), ]"/> </record> @@ -363,7 +363,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('gd_acc_260002'), - 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')], + 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -382,7 +382,7 @@ 'factor_percent': -100, 'repartition_type': 'tax', 'account_id': ref('gd_acc_260002'), - 'plus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')], + 'minus_report_line_ids': [ref('tax_report_zn_dvd_odb_izstopni_osn')], }), ]"/> </record> diff --git a/addons/l10n_si/data/account_tax_report_data.xml b/addons/l10n_si/data/account_tax_report_data.xml index 3405e736451..92366c3efd6 100644 --- a/addons/l10n_si/data/account_tax_report_data.xml +++ b/addons/l10n_si/data/account_tax_report_data.xml @@ -23,7 +23,7 @@ <record id="tax_report_zo_dvd_neo_sdtopni_osno" model="account.tax.report.line"> <field name="name">Nabave po osnovni stopnji DDV</field> - <field name="tag_name">Nabave po osnovni stopnji DDV</field> + <field name="tag_name">Nabave po osnovni stopnji DDV (Neodbitni)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/> <field name="country_id" ref="base.si"/> @@ -31,7 +31,7 @@ <record id="tax_report_zo_dvd_neo_sdtopni_zni" model="account.tax.report.line"> <field name="name">Nabave po znižani stopnji DDV</field> - <field name="tag_name">Nabave po znižani stopnji DDV</field> + <field name="tag_name">Nabave po znižani stopnji DDV (Neodbitni)</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="tax_report_zo_dvd_neo_sdtopni"/> <field name="country_id" ref="base.si"/> @@ -92,7 +92,7 @@ <record id="tax_report_zo_dvd_odb_vstopni_osn" model="account.tax.report.line"> <field name="name">Nabave po osnovni stopnji DDV</field> - <field name="tag_name">Nabave po osnovni stopnji DDV</field> + <field name="tag_name">Nabave po osnovni stopnji DDV (Vstopni)</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/> <field name="country_id" ref="base.si"/> @@ -100,7 +100,7 @@ <record id="tax_report_zo_dvd_odb_vstopni_zni" model="account.tax.report.line"> <field name="name">Nabave po znižani stopnji DDV</field> - <field name="tag_name">Nabave po znižani stopnji DDV</field> + <field name="tag_name">Nabave po znižani stopnji DDV (Vstopni)</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="tax_report_zo_dvd_odb_vstopni"/> <field name="country_id" ref="base.si"/> diff --git a/addons/l10n_th/data/account_tax_report_data.xml b/addons/l10n_th/data/account_tax_report_data.xml index 4977a0d8da6..66ce5a979b1 100644 --- a/addons/l10n_th/data/account_tax_report_data.xml +++ b/addons/l10n_th/data/account_tax_report_data.xml @@ -25,7 +25,7 @@ <record id="tax_report_tp_wht_per_service" model="account.tax.report.line"> <field name="name">Personal Withholding Tax (Service)</field> - <field name="tag_name">Personal Withholding Tax (Service)</field> + <field name="tag_name">Personal Withholding Tax (Service) (to be paid)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_tp_wht_per"/> <field name="country_id" ref="base.th"/> @@ -48,7 +48,7 @@ <record id="tax_report_tp_wht_cmp_service" model="account.tax.report.line"> <field name="name">Company Withholding Tax (Service)</field> - <field name="tag_name">Company Withholding Tax (Service)</field> + <field name="tag_name">Company Withholding Tax (Service) (to be paid)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_tp_wht_cmp"/> <field name="country_id" ref="base.th"/> @@ -56,7 +56,7 @@ <record id="tax_report_tp_wht_cmp_other" model="account.tax.report.line"> <field name="name">Company Withholding Tax (Other)</field> - <field name="tag_name">Company Withholding Tax (Other)</field> + <field name="tag_name">Company Withholding Tax (Other) (to be paid)</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="tax_report_tp_wht_cmp"/> <field name="country_id" ref="base.th"/> @@ -72,7 +72,7 @@ <record id="tax_report_tp_vat_out" model="account.tax.report.line"> <field name="name">Output VAT</field> - <field name="tag_name">Output VAT</field> + <field name="tag_name">Output VAT (to be paid)</field> <field name="code">tax_th_PP30_5</field> <field name="sequence" eval="3"/> <field name="parent_id" ref="tax_report_tp_vat"/> @@ -81,7 +81,7 @@ <record id="tax_report_tp_vat_in" model="account.tax.report.line"> <field name="name">Input VAT</field> - <field name="tag_name">Input VAT</field> + <field name="tag_name">Input VAT (to be paid)</field> <field name="code">tax_th_PP30_7</field> <field name="sequence" eval="4"/> <field name="parent_id" ref="tax_report_tp_vat"/> @@ -111,7 +111,7 @@ <record id="tax_report_ta_wht_per_service" model="account.tax.report.line"> <field name="name">Personal Withholding Tax (Service)</field> - <field name="tag_name">Personal Withholding Tax (Service)</field> + <field name="tag_name">Personal Withholding Tax (Service) (taxable)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_ta_wht_per"/> <field name="country_id" ref="base.th"/> @@ -133,7 +133,7 @@ <record id="tax_report_ta_wht_cmp_service" model="account.tax.report.line"> <field name="name">Company Withholding Tax (Service)</field> - <field name="tag_name">Company Withholding Tax (Service)</field> + <field name="tag_name">Company Withholding Tax (Service) (taxable)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_ta_wht_cmp"/> <field name="country_id" ref="base.th"/> @@ -141,7 +141,7 @@ <record id="tax_report_ta_wht_cmp_other" model="account.tax.report.line"> <field name="name">Company Withholding Tax (Other)</field> - <field name="tag_name">Company Withholding Tax (Other)</field> + <field name="tag_name">Company Withholding Tax (Other) (taxable)</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="tax_report_ta_wht_cmp"/> <field name="country_id" ref="base.th"/> @@ -156,7 +156,7 @@ <record id="tax_report_ta_vat_out" model="account.tax.report.line"> <field name="name">Output VAT</field> - <field name="tag_name">Output VAT</field> + <field name="tag_name">Output VAT (taxable)</field> <field name="sequence" eval="1"/> <field name="parent_id" ref="tax_report_ta_vat"/> <field name="country_id" ref="base.th"/> @@ -164,7 +164,7 @@ <record id="tax_report_ta_vat_in" model="account.tax.report.line"> <field name="name">Input VAT</field> - <field name="tag_name">Input VAT</field> + <field name="tag_name">Input VAT (taxable)</field> <field name="sequence" eval="2"/> <field name="parent_id" ref="tax_report_ta_vat"/> <field name="country_id" ref="base.th"/> diff --git a/addons/l10n_th/data/account_tax_template_data.xml b/addons/l10n_th/data/account_tax_template_data.xml index 67c3ba846e3..a3b4b2727ba 100644 --- a/addons/l10n_th/data/account_tax_template_data.xml +++ b/addons/l10n_th/data/account_tax_template_data.xml @@ -88,7 +88,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -101,7 +101,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> </record> @@ -123,7 +123,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -136,7 +136,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> </record> @@ -158,7 +158,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -171,7 +171,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_service')], }), ]"/> </record> @@ -193,7 +193,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -206,7 +206,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_cmp_other')], }), ]"/> </record> @@ -228,7 +228,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -241,7 +241,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> </record> @@ -263,7 +263,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -276,7 +276,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> </record> @@ -298,7 +298,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -311,7 +311,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_per_service')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_per_service')], }), ]"/> </record> @@ -333,7 +333,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -346,7 +346,7 @@ 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('a_wht'), - 'minus_report_line_ids': [ref('tax_report_tp_wht_per_other')], + 'plus_report_line_ids': [ref('tax_report_tp_wht_per_other')], }), ]"/> </record> diff --git a/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_th/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index fa56fd00dfa..00000000000 --- a/addons/l10n_th/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) diff --git a/addons/l10n_ua/__manifest__.py b/addons/l10n_ua/__manifest__.py index b2f451de461..b0cfadebb97 100644 --- a/addons/l10n_ua/__manifest__.py +++ b/addons/l10n_ua/__manifest__.py @@ -17,7 +17,6 @@ Ukraine - Chart of accounts. 'data/account_chart_template.xml', 'data/account.account.template.csv', 'data/account_account_tag_data.xml', - 'data/account_tax_tag_data.xml', 'data/account_tax_group_data.xml', 'data/account_tax_template.xml', 'data/account_chart_template_config.xml', diff --git a/addons/l10n_ua/data/account_tax_tag_data.xml b/addons/l10n_ua/data/account_tax_tag_data.xml deleted file mode 100644 index ce86c0f17b0..00000000000 --- a/addons/l10n_ua/data/account_tax_tag_data.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<odoo> - <data noupdate="1"> - <record id="tax_tag_vat20" model="account.account.tag"> - <field name="name">ПДВ 20%</field> - <field name="applicability">taxes</field> - </record> - <record id="tax_tag_vat7" model="account.account.tag"> - <field name="name">ПДВ 7%</field> - <field name="applicability">taxes</field> - </record> - <record id="tax_tag_vat0" model="account.account.tag"> - <field name="name">ПДВ 0%</field> - <field name="applicability">taxes</field> - </record> - <record id="tax_tag_vat_free" model="account.account.tag"> - <field name="name">Звільнено від ПДВ</field> - <field name="applicability">taxes</field> - </record> - <record id="tax_tag_vat_not" model="account.account.tag"> - <field name="name">Не є об'єктом ПДВ</field> - <field name="applicability">taxes</field> - </record> - </data> -</odoo> diff --git a/addons/l10n_ua/data/account_tax_template.xml b/addons/l10n_ua/data/account_tax_template.xml index e165b044002..0d7a221c744 100644 --- a/addons/l10n_ua/data/account_tax_template.xml +++ b/addons/l10n_ua/data/account_tax_template.xml @@ -13,9 +13,28 @@ <field name="description">+ ПДВ 20%</field> <field name="amount">20</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base' + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="sale_tax_template_vat20incl_psbo" model="account.tax.template"> @@ -26,9 +45,28 @@ <field name="amount">20</field> <field name="type_tax_use">sale</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="sale_tax_template_vat7_psbo" model="account.tax.template"> @@ -38,9 +76,28 @@ <field name="description">+ ПДВ 7%</field> <field name="amount">7</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="sale_tax_template_vat7incl_psbo" model="account.tax.template"> @@ -51,9 +108,28 @@ <field name="amount">7</field> <field name="type_tax_use">sale</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6431'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="sale_tax_template_vat0_psbo" model="account.tax.template"> @@ -63,9 +139,26 @@ <field name="description">ПДВ 0%</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="sale_tax_template_vat_free_psbo" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/> @@ -74,9 +167,26 @@ <field name="description">Звільнено від ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="sale_tax_template_vat_not_psbo" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/> @@ -85,9 +195,26 @@ <field name="description">Не є об'єктом ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_psbp_6431"/> - <field name="refund_account_id" ref="ua_psbp_6431"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat20_psbo" model="account.tax.template"> @@ -97,9 +224,28 @@ <field name="description">+ ПДВ 20%</field> <field name="amount">20</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="purchase_tax_template_vat20incl_psbo" model="account.tax.template"> @@ -110,9 +256,28 @@ <field name="amount">20</field> <field name="type_tax_use">purchase</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="purchase_tax_template_vat7_psbo" model="account.tax.template"> @@ -122,9 +287,28 @@ <field name="description">+ ПДВ 7%</field> <field name="amount">7</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="purchase_tax_template_vat7incl_psbo" model="account.tax.template"> @@ -135,9 +319,28 @@ <field name="amount">7</field> <field name="type_tax_use">purchase</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_psbp_6441'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="purchase_tax_template_vat0_psbo" model="account.tax.template"> @@ -147,9 +350,26 @@ <field name="description">ПДВ 0%</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat_free_psbo" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/> @@ -158,9 +378,26 @@ <field name="description">Звільнено від ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat_not_psbo" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_psbo_chart_template"/> @@ -169,9 +406,26 @@ <field name="description">Не є об'єктом ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_psbp_6441"/> - <field name="refund_account_id" ref="ua_psbp_6441"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <!-- Simplified tax system --> <!-- Sale taxes --> @@ -254,9 +508,28 @@ <field name="description">+ ПДВ 20%</field> <field name="amount">20</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="sale_tax_template_vat20incl" model="account.tax.template"> @@ -267,9 +540,28 @@ <field name="amount">20</field> <field name="type_tax_use">sale</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="sale_tax_template_vat7" model="account.tax.template"> @@ -279,9 +571,28 @@ <field name="description">+ ПДВ 7%</field> <field name="amount">7</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="sale_tax_template_vat7incl" model="account.tax.template"> @@ -292,9 +603,28 @@ <field name="amount">7</field> <field name="type_tax_use">sale</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1204'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="sale_tax_template_vat0" model="account.tax.template"> @@ -304,9 +634,26 @@ <field name="description">ПДВ 0%</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="sale_tax_template_vat_free" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/> @@ -315,9 +662,26 @@ <field name="description">Звільнено від ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="sale_tax_template_vat_not" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/> @@ -326,9 +690,26 @@ <field name="description">Не є об'єктом ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">sale</field> - <field name="account_id" ref="ua_ias_1204"/> - <field name="refund_account_id" ref="ua_ias_1204"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat20" model="account.tax.template"> @@ -338,9 +719,28 @@ <field name="description">+ ПДВ 20%</field> <field name="amount">20</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="purchase_tax_template_vat20incl" model="account.tax.template"> @@ -351,9 +751,28 @@ <field name="amount">20</field> <field name="type_tax_use">purchase</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat20')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat20"/> </record> <record id="purchase_tax_template_vat7" model="account.tax.template"> @@ -363,9 +782,28 @@ <field name="description">+ ПДВ 7%</field> <field name="amount">7</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="purchase_tax_template_vat7incl" model="account.tax.template"> @@ -376,9 +814,28 @@ <field name="amount">7</field> <field name="type_tax_use">purchase</field> <field name="price_include" eval="1"/> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat7')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + 'account_id': ref('ua_ias_1140'), + }), + ]"/> <field name="tax_group_id" ref="l10n_ua.tax_group_vat7"/> </record> <record id="purchase_tax_template_vat0" model="account.tax.template"> @@ -388,9 +845,26 @@ <field name="description">ПДВ 0%</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat0')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat_free" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/> @@ -399,9 +873,26 @@ <field name="description">Звільнено від ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_free')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <record id="purchase_tax_template_vat_not" model="account.tax.template"> <field name="chart_template_id" ref="l10n_ua_ias_chart_template"/> @@ -410,9 +901,26 @@ <field name="description">Не є об'єктом ПДВ</field> <field name="amount">0</field> <field name="type_tax_use">purchase</field> - <field name="account_id" ref="ua_ias_1140"/> - <field name="refund_account_id" ref="ua_ias_1140"/> - <field name="tag_ids" eval="[(6,0,[ref('l10n_ua.tax_tag_vat_not')])]"/> + <field name="invoice_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> + <field name="refund_repartition_line_ids" eval="[(5, 0, 0), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'base', + }), + (0, 0, { + 'factor_percent': 100, + 'repartition_type': 'tax', + }), + ]"/> </record> <!-- Simplified tax system --> <!-- Sale taxes --> diff --git a/addons/l10n_uk/data/account_tax_data.xml b/addons/l10n_uk/data/account_tax_data.xml index aede4a9750f..db1a6429c2e 100644 --- a/addons/l10n_uk/data/account_tax_data.xml +++ b/addons/l10n_uk/data/account_tax_data.xml @@ -18,8 +18,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), - 'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -31,8 +29,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), - 'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')], }), ]"/> </record> @@ -54,8 +50,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), - 'plus_report_line_ids': [ref('account_tax_report_line_vat_box1')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -67,8 +61,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), - 'minus_report_line_ids': [ref('account_tax_report_line_vat_box1')], }), ]"/> </record> @@ -90,8 +82,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), - 'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -103,8 +93,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), - 'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')], }), ]"/> </record> @@ -126,8 +114,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), - 'plus_report_line_ids': [ref('account_tax_report_line_vat_box4')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -139,8 +125,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), - 'minus_report_line_ids': [ref('account_tax_report_line_vat_box4')], }), ]"/> </record> @@ -282,7 +266,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -294,7 +277,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2200'), }), ]"/> </record> @@ -316,7 +298,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5,0,0), @@ -328,7 +309,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('2201'), }), ]"/> </record> diff --git a/addons/l10n_ve/data/account_tax_data.xml b/addons/l10n_ve/data/account_tax_data.xml index 348211df64d..1e68b59a4bc 100644 --- a/addons/l10n_ve/data/account_tax_data.xml +++ b/addons/l10n_ve/data/account_tax_data.xml @@ -18,7 +18,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_activa_account_2172003'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -29,7 +28,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_activa_account_2172003'), }), ]"/> </record> @@ -142,7 +140,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_activa_account_2172003'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -153,7 +150,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('account_activa_account_2172003'), }), ]"/> </record> diff --git a/addons/l10n_vn/data/account_tax_data.xml b/addons/l10n_vn/data/account_tax_data.xml index 134cb99d16b..c7c549f3544 100644 --- a/addons/l10n_vn/data/account_tax_data.xml +++ b/addons/l10n_vn/data/account_tax_data.xml @@ -14,26 +14,26 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')], + 'plus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chart1331'), - 'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')], + 'plus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')], + 'minus_report_line_ids': [ref('account_tax_report_line_03_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chart1331'), - 'plus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')], + 'minus_report_line_ids': [ref('account_tax_report_line_03_01_01_vn')], }), ]"/> </record> @@ -49,26 +49,26 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')], + 'plus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chart1331'), - 'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')], + 'plus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')], }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')], + 'minus_report_line_ids': [ref('account_tax_report_line_02_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', 'account_id': ref('chart1331'), - 'plus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')], + 'minus_report_line_ids': [ref('account_tax_report_line_02_01_01_vn')], }), ]"/> </record> @@ -84,24 +84,22 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')], + 'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart1331'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), (0,0, { 'factor_percent': 100, 'repartition_type': 'base', - 'plus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')], + 'minus_report_line_ids': [ref('account_tax_report_line_01_02_01_vn')], }), (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart1331'), }), ]"/> </record> @@ -194,7 +192,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart33311'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -206,7 +203,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('chart33311'), }), ]"/> </record> diff --git a/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py b/addons/l10n_vn/migrations/9.0.2.0/post-migrate_tags_on_taxes.py deleted file mode 100644 index fa56fd00dfa..00000000000 --- a/addons/l10n_vn/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) diff --git a/addons/l10n_za/data/account_tax_template_data.xml b/addons/l10n_za/data/account_tax_template_data.xml index 60c86758117..8c1622a2659 100644 --- a/addons/l10n_za/data/account_tax_template_data.xml +++ b/addons/l10n_za/data/account_tax_template_data.xml @@ -90,7 +90,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -102,7 +101,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> </record> @@ -124,7 +122,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -136,7 +133,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> </record> @@ -158,7 +154,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> <field name="refund_repartition_line_ids" eval="[(5, 0, 0), @@ -170,7 +165,6 @@ (0,0, { 'factor_percent': 100, 'repartition_type': 'tax', - 'account_id': ref('200060'), }), ]"/> </record> diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml index 1da0445b001..ba58056ff3d 100644 --- a/addons/lunch/security/lunch_security.xml +++ b/addons/lunch/security/lunch_security.xml @@ -40,6 +40,26 @@ <field name="groups" eval="[(4,ref('lunch.group_lunch_user'))]"/> </record> + <record id="lunch_order_rule_write" model="ir.rule"> + <field name="name">lunch.order: Don't change confirmed order</field> + <field name="model_id" ref="lunch.model_lunch_order"/> + <field name="domain_force">[('state', '!=', 'confirmed'), ('user_id', '=', user.id)]</field> + <field name="perm_read" eval="0"/> + <field name="perm_create" eval="0"/> + <field name="perm_unlink" eval="0"/> + <field name="groups" eval="[(4, ref('base.group_user'))]"/> + </record> + + <record id="lunch_order_rule_write_manager" model="ir.rule"> + <field name="name">manager can do whatever</field> + <field name="model_id" ref="lunch.model_lunch_order"/> + <field name="domain_force">[(1, '=', 1)]</field> + <field name="perm_read" eval="0"/> + <field name="perm_create" eval="0"/> + <field name="perm_unlink" eval="0"/> + <field name="groups" eval="[(4, ref('lunch.group_lunch_manager'))]"/> + </record> + <data noupdate="1"> <record id="base.default_user" model="res.users"> <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/> diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 1f04378e601..cbb655f6939 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -317,6 +317,12 @@ class MailActivity(models.Model): @api.model def create(self, values): activity = super(MailActivity, self).create(values) + need_sudo = False + try: # in multicompany, reading the partner might break + partner_id = activity.user_id.partner_id.id + except exceptions.AccessError: + need_sudo = True + partner_id = activity.user_id.sudo().partner_id.id # send a notification to assigned user; in case of manually done activity also check # target has rights on document otherwise we prevent its creation. Automated activities @@ -325,9 +331,12 @@ class MailActivity(models.Model): if not activity.automated: activity._check_access_assignation() if not self.env.context.get('mail_activity_quick_update', False): - activity.action_notify() + if need_sudo: + activity.sudo().action_notify() + else: + activity.action_notify() - self.env[activity.res_model].browse(activity.res_id).message_subscribe(partner_ids=[activity.user_id.partner_id.id]) + self.env[activity.res_model].browse(activity.res_id).message_subscribe(partner_ids=[partner_id]) if activity.date_deadline <= fields.Date.today(): self.env['bus.bus'].sendone( (self._cr.dbname, 'res.partner', activity.user_id.partner_id.id), diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 77018787e82..3536c4e6001 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -432,7 +432,7 @@ class MailThread(models.AbstractModel): # ------------------------------------------------------ def with_lang(self): - if 'lang' not in self._context: + if not self._context.get("lang"): return self.with_context(lang=self.env.user.lang) return self diff --git a/addons/mail/static/src/js/emojis.js b/addons/mail/static/src/js/emojis.js index 54b995f3bb6..f8684cde541 100644 --- a/addons/mail/static/src/js/emojis.js +++ b/addons/mail/static/src/js/emojis.js @@ -73,6 +73,7 @@ var data = { "<3": "❤️", ":heart": "❤️", // alt. "</3": "💔", + "</3": "💔", ":heart_eyes": "😍", ":turban": "👳", ":+1": "👍", diff --git a/addons/mail/static/src/js/services/mail_notification_manager.js b/addons/mail/static/src/js/services/mail_notification_manager.js index c22276867b1..8b9b10b2de5 100644 --- a/addons/mail/static/src/js/services/mail_notification_manager.js +++ b/addons/mail/static/src/js/services/mail_notification_manager.js @@ -506,7 +506,7 @@ MailManager.include({ } this._removeChannel(channel); this._mailBus.trigger('unsubscribe_from_channel', data.id); - this.do_notify(_("Unsubscribed"), message); + this.do_notify(_t("Unsubscribed"), message); } }, /** diff --git a/addons/mail/static/src/scss/composer.scss b/addons/mail/static/src/scss/composer.scss index c4373e98cd2..90793c91e95 100644 --- a/addons/mail/static/src/scss/composer.scss +++ b/addons/mail/static/src/scss/composer.scss @@ -227,6 +227,8 @@ .o_mail_emoji_container { @include o-position-absolute(auto, 0, 100%, 0); border-bottom-width: 1px; + max-height: calc(100vh - 100%); + overflow-y: auto; } } .o_composer_input { diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml index 15cd3f50e60..4b3c61dcdb6 100644 --- a/addons/mail/views/mail_templates.xml +++ b/addons/mail/views/mail_templates.xml @@ -146,7 +146,7 @@ </template> <template id="message_origin_link"> - <p>This <t t-esc="self._description.lower()"/> has been <span t-if="edit">modified</span><span t-if="not edit">created</span> from: + <p>This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been <span t-if="edit">modified</span><span t-if="not edit">created</span> from: <t t-foreach="origin" t-as="o"> <a href="#" t-att-data-oe-model="o._name" t-att-data-oe-id="o.id"> <t t-esc="o.display_name"/></a><span t-if="origin.ids[-1:] != o.ids">, </span> </t> diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index a968bb80cd9..35370c00243 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -331,7 +331,6 @@ class MailComposer(models.TransientModel): 'attachment_ids': [attach.id for attach in self.attachment_ids], 'author_id': self.author_id.id, 'email_from': self.email_from, - 'reply_to': self.reply_to, 'record_name': self.record_name, 'no_auto_thread': self.no_auto_thread, 'mail_server_id': self.mail_server_id.id, diff --git a/addons/mass_mailing/static/src/scss/themes/theme_basic.scss b/addons/mass_mailing/static/src/scss/themes/theme_basic.scss index 00f3a6304bc..d65ea077f5f 100644 --- a/addons/mass_mailing/static/src/scss/themes/theme_basic.scss +++ b/addons/mass_mailing/static/src/scss/themes/theme_basic.scss @@ -1,3 +1,32 @@ + +// TODO remove in master +// Themes scss have to use bg-variant and text-emphasis-variant mixins of BS4 +// to properly work. That use was introduced as a fix in 12.0... but the BS4 +// mixins are unavailable in the mailing assets. As a stable fix cannot +// introduce static code which requires an XML update to not crash, the mixins +// were duplicated here instead. +@mixin bg-variant($parent, $color) { + #{$parent} { + background-color: $color !important; + } + a#{$parent}, + button#{$parent} { + &:hover, &:focus { + background-color: darken($color, 10%) !important; + } + } +} +@mixin text-emphasis-variant($parent, $color) { + #{$parent} { + color: $color !important; + } + a#{$parent} { + &:hover, &:focus { + color: darken($color, 10%) !important; + } + } +} + // ============================ // Mass Mailing "Theme Basic" // ============================ diff --git a/addons/mass_mailing/static/src/scss/themes/theme_default.scss b/addons/mass_mailing/static/src/scss/themes/theme_default.scss index afd4057cfc9..4d49a7ef22c 100644 --- a/addons/mass_mailing/static/src/scss/themes/theme_default.scss +++ b/addons/mass_mailing/static/src/scss/themes/theme_default.scss @@ -24,19 +24,10 @@ $o-mm-def-btn-bg : $o-mm-def-color-gamma; $o-mm-def-btn-text : $o-mm-def-color-beta; // ===== Colors ===== -.bg-beta { - background-color: $o-mm-def-color-zeta; - color: $o-mm-def-color-beta; -} -.text-beta { - color: $o-mm-def-color-zeta; -} -.bg-delta { - background-color: $o-mm-def-color-eta; -} -.bg-gray-lighter { - background-color: $o-mm-def-color-alpha; -} +@include bg-variant(".bg-beta", $o-mm-def-color-zeta); +@include text-emphasis-variant(".text-beta", $o-mm-def-color-zeta); +@include bg-variant(".bg-delta", $o-mm-def-color-eta); +@include bg-variant(".bg-gray-lighter", $o-mm-def-color-alpha); td:not([align]) { // Default browser style but needed so that alignment works on some mail diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 67615885259..d590f366dec 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -396,7 +396,6 @@ <t t-if="record.active.raw_value">Archive</t> <t t-if="!record.active.raw_value">Restore</t> </a> - <ul class="oe_kanban_colorpicker" data-field="color"/> </div> </div> </div> diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py index 37415fb16d4..93db2240207 100644 --- a/addons/mrp/models/mrp_production.py +++ b/addons/mrp/models/mrp_production.py @@ -208,7 +208,7 @@ class MrpProduction(models.Model): def _compute_picking_ids(self): for order in self: order.picking_ids = self.env['stock.picking'].search([ - ('group_id', '=', order.procurement_group_id.id), + ('group_id', '=', order.procurement_group_id.id), ('group_id', '!=', False), ]) order.delivery_count = len(order.picking_ids) diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index 5d933ee00f8..e637133c27d 100644 --- a/addons/mrp/wizard/change_production_qty.py +++ b/addons/mrp/wizard/change_production_qty.py @@ -62,7 +62,8 @@ class ChangeProductionQty(models.TransientModel): continue move = production.move_raw_ids.filtered(lambda x: x.bom_line_id.id == line.id and x.state not in ('done', 'cancel')) if move: - old_qty = move[0].product_uom_qty + move = move[0] + old_qty = move.product_uom_qty else: old_qty = 0 iterate_key = production._get_document_iterate_key(move) diff --git a/addons/partner_autocomplete/models/res_partner.py b/addons/partner_autocomplete/models/res_partner.py index e0ed09a799d..8395223380f 100644 --- a/addons/partner_autocomplete/models/res_partner.py +++ b/addons/partner_autocomplete/models/res_partner.py @@ -95,7 +95,7 @@ class ResPartner(models.Model): }) try: return jsonrpc(url=url, params=params, timeout=timeout), False - except (ConnectionError, HTTPError, exceptions.AccessError) as exception: + except (ConnectionError, HTTPError, exceptions.AccessError, exceptions.UserError) as exception: _logger.error('Autocomplete API error: %s' % str(exception)) return False, str(exception) except InsufficientCreditError as exception: diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index e6f9109bbc2..ba2e4db2cd3 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -291,7 +291,7 @@ class PosOrder(models.Model): res.append({'data_type': 'tax', 'values': data}) return res - def _create_account_move_line(self, session=None): + def _prepare_account_move_and_lines(self, session=None): # Tricky, via the workflow, we only have one id in the ids variable """Create a account move line of order grouped by products or not.""" @@ -437,6 +437,17 @@ class PosOrder(models.Model): if self and order.company_id.anglo_saxon_accounting: add_anglosaxon_lines(grouped_data) + return { + 'grouped_data': grouped_data, + 'move': move, + } + + def _create_account_move_line(self, session=None): + vals = self._prepare_account_move_and_lines(session) + + grouped_data = vals['grouped_data'] + move = vals['move'] + all_lines = [] for group_key, group_data in grouped_data.items(): for value in group_data: @@ -1133,6 +1144,7 @@ class PosOrderLine(models.Model): class PosOrderLineLot(models.Model): _name = "pos.pack.operation.lot" _description = "Specify product lot/serial number in pos order line" + _rec_name = "lot_name" pos_order_line_id = fields.Many2one('pos.order.line') order_id = fields.Many2one('pos.order', related="pos_order_line_id.order_id", readonly=False) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 3192e7b714b..7a22aa34a9f 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -2612,9 +2612,36 @@ exports.Order = Backbone.Model.extend({ }), 0), this.pos.currency.rounding); }, get_total_tax: function() { - return round_pr(this.orderlines.reduce((function(sum, orderLine) { - return sum + orderLine.get_tax(); - }), 0), this.pos.currency.rounding); + if (this.pos.company.tax_calculation_rounding_method === "round_globally") { + // As always, we need: + // 1. For each tax, sum their amount across all order lines + // 2. Round that result + // 3. Sum all those rounded amounts + var groupTaxes = {}; + this.orderlines.each(function (line) { + var taxDetails = line.get_tax_details(); + var taxIds = Object.keys(taxDetails); + for (var t = 0; t<taxIds.length; t++) { + var taxId = taxIds[t]; + if (!(taxId in groupTaxes)) { + groupTaxes[taxId] = 0; + } + groupTaxes[taxId] += taxDetails[taxId]; + } + }); + + var sum = 0; + var taxIds = Object.keys(groupTaxes); + for (var j = 0; j<taxIds.length; j++) { + var taxAmount = groupTaxes[taxIds[j]]; + sum += round_pr(taxAmount, this.pos.currency.rounding); + } + return sum; + } else { + return round_pr(this.orderlines.reduce((function(sum, orderLine) { + return sum + orderLine.get_tax(); + }), 0), this.pos.currency.rounding); + } }, get_total_paid: function() { return round_pr(this.paymentlines.reduce((function(sum, paymentLine) { diff --git a/addons/point_of_sale/views/pos_order_view.xml b/addons/point_of_sale/views/pos_order_view.xml index 9fbf057e2eb..db39bd3f1f5 100644 --- a/addons/point_of_sale/views/pos_order_view.xml +++ b/addons/point_of_sale/views/pos_order_view.xml @@ -55,6 +55,7 @@ <field name="price_subtotal_incl" invisible="1" widget="monetary" force_save="1"/> <field name="tax_ids_after_fiscal_position" widget="many2many_tags" string="Taxes"/> <field name="tax_ids" widget="many2many_tags" invisible="1"/> + <field name="pack_lot_ids" widget="many2many_tags" groups="stock.group_production_lot"/> <field name="notice"/> </group> </form> diff --git a/addons/portal/models/mail_message.py b/addons/portal/models/mail_message.py index afe97f1b8ca..4a0d09580fb 100644 --- a/addons/portal/models/mail_message.py +++ b/addons/portal/models/mail_message.py @@ -20,6 +20,11 @@ class MailMessage(models.Model): message_values = self.read(fields_list) message_tree = dict((m.id, m) for m in self.sudo()) self._message_read_dict_postprocess(message_values, message_tree) + IrAttachmentSudo = self.env['ir.attachment'].sudo() + for message in message_values: + for attachment in message.get('attachment_ids', []): + if not attachment.get('access_token'): + attachment['access_token'] = IrAttachmentSudo.browse(attachment['id']).generate_access_token()[0] return message_values @api.model diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml index f090965bde2..7d80fc30410 100644 --- a/addons/portal/static/src/xml/portal_chatter.xml +++ b/addons/portal/static/src/xml/portal_chatter.xml @@ -72,7 +72,7 @@ <div class="o_portal_chatter_attachments"> <div class="col-lg-2 col-md-3 text-center" t-foreach='message.attachment_ids' t-as='attachment'> - <a t-attf-href="/web/content/#{attachment.id}?download=true" target="_blank"> + <a t-attf-href="/web/content/#{attachment.id}?download=true&access_token=#{attachment.access_token}" target="_blank"> <div class='oe_attachment_embedded o_image' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80"/> <div class='oe_attachment_name'><t t-raw='attachment.name'/></div> </a> diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml index 7b7ee87c423..40b595518ed 100644 --- a/addons/portal/views/portal_templates.xml +++ b/addons/portal/views/portal_templates.xml @@ -369,7 +369,7 @@ <input type="text" name="city" t-attf-class="form-control #{error.get('city') and 'is-invalid' or ''}" t-att-value="city or partner.city" /> </div> <div t-attf-class="form-group #{error.get('zip') and 'o_has_error' or ''} col-xl-6"> - <label class="col-form-label" for="zipcode">Zip / Postal Code</label> + <label class="col-form-label label-optional" for="zipcode">Zip / Postal Code</label> <input type="text" name="zipcode" t-attf-class="form-control #{error.get('zip') and 'is-invalid' or ''}" t-att-value="zipcode or partner.zip" /> </div> <div t-attf-class="form-group #{error.get('country_id') and 'o_has_error' or ''} col-xl-6"> diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index 82c5c2a4841..94998f98052 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -547,7 +547,6 @@ <field name="priority"/> <field name="stage_id" options='{"group_by_tooltip": {"legend_priority": "Use of stars"}}'/> <field name="user_id"/> - <field name="user_email"/> <field name="partner_id"/> <field name="sequence"/> <field name="date_deadline"/> diff --git a/addons/purchase_stock/models/stock_rule.py b/addons/purchase_stock/models/stock_rule.py index 77d571b9171..f0be24f5fc4 100644 --- a/addons/purchase_stock/models/stock_rule.py +++ b/addons/purchase_stock/models/stock_rule.py @@ -277,7 +277,7 @@ class StockRule(models.Model): 'user_id': False, 'picking_type_id': self.picking_type_id.id, 'company_id': company_id.id, - 'currency_id': partner.with_context(force_company=company_id.id).property_purchase_currency_id.id or self.env.company.currency_id.id, + 'currency_id': partner.with_context(force_company=company_id.id).property_purchase_currency_id.id or company_id.currency_id.id, 'dest_address_id': values.get('partner_id', False), 'origin': ', '.join(origins), 'payment_term_id': partner.with_context(force_company=company_id.id).property_supplier_payment_term_id.id, diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 2fe56bb5fd9..6c741044e78 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -1017,7 +1017,8 @@ class SaleOrderLine(models.Model): for line in self: fpos = line.order_id.fiscal_position_id or line.order_id.partner_id.property_account_position_id # If company_id is set, always filter taxes by the company - taxes = line.product_id.taxes_id.filtered(lambda r: not line.company_id or r.company_id == line.company_id) + line_company_id = line.company_id or line.order_id.company_id + taxes = line.product_id.taxes_id.filtered(lambda r: not line_company_id or r.company_id == line_company_id) line.tax_id = fpos.map_tax(taxes, line.product_id, line.order_id.partner_shipping_id) if fpos else taxes @api.model diff --git a/addons/sale/tests/test_sale_order.py b/addons/sale/tests/test_sale_order.py index f738d7c78b8..f694400d220 100644 --- a/addons/sale/tests/test_sale_order.py +++ b/addons/sale/tests/test_sale_order.py @@ -239,6 +239,59 @@ class TestSaleOrder(TestCommonSaleNoChart): self.sale_order.amount_untaxed + self.sale_order.amount_tax, 'Taxes should be applied') + def test_so_create_multicompany(self): + # Preparing test Data + user_demo = self.env.ref('base.user_demo') + company_1 = self.env.ref('base.main_company') + company_2 = self.env['res.company'].create({ + 'name': 'company 2', + 'parent_id': company_1.id, + }) + user_demo.write({ + 'groups_id': [(4, self.env.ref('sales_team.group_sale_manager').id, False)], + 'company_ids': [(6, False, [company_1.id])], + 'company_id': company_1.id, + }) + + so_partner = self.env.ref('base.res_partner_2') + so_partner.write({ + 'property_account_position_id': False, + }) + + tax_company_1 = self.env['account.tax'].create({ + 'name': 'T1', + 'amount': 90, + 'company_id': company_1.id, + }) + + tax_company_2 = self.env['account.tax'].create({ + 'name': 'T2', + 'amount': 90, + 'company_id': company_2.id, + }) + + product_shared = self.env['product.template'].create({ + 'name': 'shared product', + 'taxes_id': [(6, False, [tax_company_1.id, tax_company_2.id])], + }) + + # Use case + so_1 = self.env['sale.order'].sudo(user_demo.id).create({ + 'partner_id': so_partner.id, + 'company_id': company_1.id, + }) + so_1.invalidate_cache() + + # This is what is done when importing the csv lines (on sale.order): + # id,order_line/product_id + # __export__.sale_order_37_1bb960ba,Product name + so_1.write({ + 'order_line': [(0, False, {'product_id': product_shared.product_variant_id.id, 'order_id': so_1.id})], + }) + + self.assertEqual(set(so_1.order_line.tax_id.ids), set([tax_company_1.id]), + 'Only taxes from the right company are put by default') + def test_reconciliation_with_so(self): # create SO so = self.env['sale.order'].create({ diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index 3f0889fa3b8..86635a61804 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -466,12 +466,11 @@ <div t-if="line.discount >= 0" t-field="line.price_unit" - t-options='{"widget": "monetary", "display_currency": sale_order.pricelist_id.currency_id}' t-att-style="line.discount and 'text-decoration: line-through' or None" t-att-class="(line.discount and 'text-danger' or '') + ' text-right'" /> <div t-if="line.discount"> - <t t-esc="(1-line.discount / 100.0) * line.price_unit" t-options='{"widget": "monetary", "display_currency": sale_order.pricelist_id.currency_id}'/> + <t t-esc="(1-line.discount / 100.0) * line.price_unit" t-options='{"widget": "float", "decimal_precision": "Product Price"}'/> </div> </td> <td t-if="display_discount" t-attf-class="text-right {{ 'd-none d-sm-table-cell' if report_type == 'html' else '' }}"> diff --git a/addons/sale_purchase/models/sale_order.py b/addons/sale_purchase/models/sale_order.py index a055090c590..9a5388ab51b 100644 --- a/addons/sale_purchase/models/sale_order.py +++ b/addons/sale_purchase/models/sale_order.py @@ -114,8 +114,8 @@ class SaleOrderLine(models.Model): decreased_values = {} if 'product_uom_qty' in values: precision = self.env['decimal.precision'].precision_get('Product Unit of Measure') - increased_lines = self.sudo().filtered(lambda r: r.purchase_line_count and float_compare(r.product_uom_qty, values['product_uom_qty'], precision_digits=precision) == -1) - decreased_lines = self.sudo().filtered(lambda r: r.purchase_line_count and float_compare(r.product_uom_qty, values['product_uom_qty'], precision_digits=precision) == 1) + increased_lines = self.sudo().filtered(lambda r: r.product_id.service_to_purchase and r.purchase_line_count and float_compare(r.product_uom_qty, values['product_uom_qty'], precision_digits=precision) == -1) + decreased_lines = self.sudo().filtered(lambda r: r.product_id.service_to_purchase and r.purchase_line_count and float_compare(r.product_uom_qty, values['product_uom_qty'], precision_digits=precision) == 1) increased_values = {line.id: line.product_uom_qty for line in increased_lines} decreased_values = {line.id: line.product_uom_qty for line in decreased_lines} diff --git a/addons/stock/models/res_config_settings.py b/addons/stock/models/res_config_settings.py index c52262e9515..df325822e27 100644 --- a/addons/stock/models/res_config_settings.py +++ b/addons/stock/models/res_config_settings.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from odoo import api, fields, models +from odoo import api, fields, models, _ +from odoo.exceptions import UserError class ResConfigSettings(models.TransientModel): @@ -53,6 +54,13 @@ class ResConfigSettings(models.TransientModel): def _onchange_group_stock_production_lot(self): if not self.group_stock_production_lot: self.group_lot_on_delivery_slip = False + tracked_products = self.env['product.template'].search([('tracking', 'in', ['lot', 'serial']),]) + if not self.group_stock_production_lot and tracked_products: + names = ", ".join(tracked_products.mapped('display_name') if len(tracked_products) <= 10 + else tracked_products[:10].mapped('display_name') + ["..."]) + raise UserError(_("You should not remove the 'lots and serial numbers' " + "option while the following products are still tracked by lot " + "or serial number:\n %s") % names) @api.onchange('group_stock_adv_location') def onchange_adv_location(self): diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index cf204581e53..7003796bd55 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -99,7 +99,7 @@ <field name="name">stock_move multi-company</field> <field name="model_id" search="[('model','=','stock.move')]" model="ir.model"/> <field name="global" eval="True"/> - <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field> + <field name="domain_force">['|', '|', ('company_id','=',False), ('company_id', 'in', company_ids), ('location_dest_id.company_id', '=', False)]</field> </record> <record model="ir.rule" id="stock_move_line_rule"> diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml index e8e54d1b695..efbe443a689 100644 --- a/addons/stock/views/product_views.xml +++ b/addons/stock/views/product_views.xml @@ -193,6 +193,7 @@ <record model="ir.ui.view" id="product_form_view_procurement_button"> <field name="name">product.product.procurement</field> <field name="model">product.product</field> + <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/> <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> <data> @@ -283,6 +284,7 @@ <record model="ir.ui.view" id="product_template_form_view_procurement_button"> <field name="name">product.template_procurement</field> <field name="model">product.template</field> + <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/> <field name="inherit_id" ref="product.product_template_only_form_view"/> <field name="arch" type="xml"> <data> diff --git a/addons/stock_dropshipping/__manifest__.py b/addons/stock_dropshipping/__manifest__.py index de26d991087..9d092675cf2 100644 --- a/addons/stock_dropshipping/__manifest__.py +++ b/addons/stock_dropshipping/__manifest__.py @@ -21,7 +21,7 @@ internal transfer document is needed. """, 'depends': ['sale_purchase', 'sale_stock'], - 'data': ['data/stock_data.xml'], + 'data': ['data/stock_data.xml', 'views/sale_order_views.xml'], 'installable': True, 'auto_install': False, } diff --git a/addons/stock_dropshipping/tests/test_dropship.py b/addons/stock_dropshipping/tests/test_dropship.py index f70897f9eb8..9048fb2d009 100644 --- a/addons/stock_dropshipping/tests/test_dropship.py +++ b/addons/stock_dropshipping/tests/test_dropship.py @@ -45,7 +45,7 @@ class TestDropship(common.TransactionCase): self.assertAlmostEqual(po_line.product_qty, 1.00) # Update qty on SO and check PO - so.order_line.product_uom_qty = 2.00 + so.write({'order_line': [[1, so.order_line.id, {'product_uom_qty': 2.00}]]}) self.assertAlmostEqual(po_line.product_qty, 2.00) # Create a new so line diff --git a/addons/stock_dropshipping/views/sale_order_views.xml b/addons/stock_dropshipping/views/sale_order_views.xml new file mode 100644 index 00000000000..b06b48ccab9 --- /dev/null +++ b/addons/stock_dropshipping/views/sale_order_views.xml @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<odoo> + <data> + <record id="view_order_form_inherit_sale_stock" model="ir.ui.view"> + <field name="name">sale.order.form.sale.dropshipping</field> + <field name="model">sale.order</field> + <field name="inherit_id" ref="sale.view_order_form"/> + <field name="arch" type="xml"> + <xpath expr="//page/field[@name='order_line']/form//field[@name='product_updatable']" position="after"> + <field name="purchase_line_count" invisible="1"/> + </xpath> + <xpath expr="//page/field[@name='order_line']/form//field[@name='product_id']" position="attributes"> + <attribute name="attrs">{'readonly': ['|', ('product_updatable', '=', False), ('purchase_line_count', '>', 0)], 'required': [('display_type', '=', False)],}</attribute> + </xpath> + <xpath expr="//page/field[@name='order_line']/tree/field[@name='product_updatable']" position="after"> + <field name="purchase_line_count" invisible="1"/> + </xpath> + <xpath expr="//page/field[@name='order_line']/tree/field[@name='product_id']" position="attributes"> + <attribute name="attrs">{'readonly': ['|', ('product_updatable', '=', False), ('purchase_line_count', '>', 0)], 'required': [('display_type', '=', False)],}</attribute> + </xpath> + </field> + </record> + </data> +</odoo> diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 135af76deef..d03cd5cd89f 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -485,7 +485,7 @@ class TestHeavyMailPerformance(TransactionCase): 'user_id': self.env.uid, }) self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id) - with self.assertQueryCount(__system__=55, emp=58): # com runbot: 55 - 58 // test_mail only: 55 - 58 + with self.assertQueryCount(__system__=56, emp=58): # com runbot: 55 - 58 // test_mail only: 55 - 58 rec.write({'user_id': self.user_portal.id}) self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) # write tracking message diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 860cf454dd4..18a36885f5f 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -201,11 +201,11 @@ def concat_xml(file_list): :param list(str) file_list: list of files to check :returns: (concatenation_result, checksum) - :rtype: (str, str) + :rtype: (bytes, str) """ checksum = hashlib.new('sha1') if not file_list: - return '', checksum.hexdigest() + return b'', checksum.hexdigest() root = None for fname in file_list: diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 171a6da7735..160f445f1c4 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1603,8 +1603,8 @@ var FieldBinaryImage = AbstractFieldBinary.extend({ } this.$('> img').remove(); this.$el.prepend($img); + $img.one('error', function () { - self._clearFile(); $img.attr('src', self.placeholder); self.do_warn(_t("Image"), _t("Could not display the selected image.")); }); diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js index bc66594fee3..d3165420ef8 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -796,6 +796,7 @@ var BasicModel = AbstractModel.extend({ }); _.each(fields, function (field) { var dataPoint; + record.data[field.name] = null; if (field.type === 'many2one') { if (field.value) { var id = _.isArray(field.value) ? field.value[0] : field.value; diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js index b3a04ec9a2b..bbfcb02def5 100644 --- a/addons/web/static/src/js/views/calendar/calendar_controller.js +++ b/addons/web/static/src/js/views/calendar/calendar_controller.js @@ -55,6 +55,7 @@ var CalendarController = AbstractController.extend({ this.readonlyFormViewId = params.readonlyFormViewId; this.mapping = params.mapping; this.context = params.context; + this.previousOpen = null; // The quickCreating attribute ensures that we don't do several create this.quickCreating = false; }, @@ -271,7 +272,8 @@ var CalendarController = AbstractController.extend({ title += ': ' + this.renderer.arch.attrs.string; } if (this.eventOpenPopup) { - new dialogs.FormViewDialog(self, { + if (this.previousOpen) { this.previousOpen.close(); } + this.previousOpen = new dialogs.FormViewDialog(self, { res_model: this.modelName, context: context, title: title, @@ -283,7 +285,8 @@ var CalendarController = AbstractController.extend({ } self.reload(); }, - }).open(); + }); + this.previousOpen.open(); } else { this.do_action({ type: 'ir.actions.act_window', diff --git a/addons/web/static/src/js/views/control_panel/control_panel_model.js b/addons/web/static/src/js/views/control_panel/control_panel_model.js index f2e28858ba3..0229daa41ee 100644 --- a/addons/web/static/src/js/views/control_panel/control_panel_model.js +++ b/addons/web/static/src/js/views/control_panel/control_panel_model.js @@ -157,6 +157,9 @@ var ControlPanelModel = mvc.Model.extend({ if (filter.autoCompleteValues) { filter.autoCompleteValues = []; } + if (filter.currentOptionId) { + filter.currentOptionId = false; + } }); // TODO: use toggleFilter here group.activeFilterIds = []; diff --git a/addons/web/static/src/js/views/control_panel/search/groupby_menu.js b/addons/web/static/src/js/views/control_panel/search/groupby_menu.js index b67bf9ee75d..fac67beb3f4 100644 --- a/addons/web/static/src/js/views/control_panel/search/groupby_menu.js +++ b/addons/web/static/src/js/views/control_panel/search/groupby_menu.js @@ -41,6 +41,7 @@ var GroupByMenu = DropdownMenu.extend({ */ init: function (parent, groupBys, fields, options) { var self = this; + options = options || {}; this._super(parent, groupBys); this.fields = fields; // determines when the 'Add custom groupby' submenu is open @@ -65,9 +66,9 @@ var GroupByMenu = DropdownMenu.extend({ this.dropdownCategory = 'groupby'; this.dropdownTitle = _t('Group By'); this.dropdownIcon = 'fa fa-bars'; - this.dropdownSymbol = this.isMobile ? 'fa fa-chevron-right float-right mt4' : false; + this.dropdownSymbol = this.isMobile && !options.noSymbol ? 'fa fa-chevron-right float-right mt4' : false; // the default style of the groupby menu can be changed here using the options key 'headerStyle' - if (options && options.headerStyle === 'primary') { + if (options.headerStyle === 'primary') { this.dropdownStyle = { el: {class: 'btn-group o_group_by_menu o_dropdown', attrs: {'role': 'group'}}, mainButton: {class: 'btn btn-primary dropdown-toggle'}, diff --git a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js index dc7a5dc3cc8..c9a17d6225e 100644 --- a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js +++ b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js @@ -36,6 +36,7 @@ var GroupByMenuMixin = { * private * @param {jQuery} $node * @param {Object} groupableFields + * @param {Promise} */ _addGroupByMenu: function ($node, groupableFields) { this.sortedFieldNames = _.sortBy(Object.keys(groupableFields), function (fieldName) { @@ -43,8 +44,8 @@ var GroupByMenuMixin = { }); this.groupableFields = groupableFields; var groupBys = this._getGroupBys(this.model.get().groupBy); - this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields); - this.groupByMenu.insertAfter($node.find('div:first')); + this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields, {noSymbol: true}); + return this.groupByMenu.insertAfter($node.find('div:first')); }, /** * This method puts the active groupBys in a convenient form. diff --git a/addons/web/static/src/js/views/graph/graph_controller.js b/addons/web/static/src/js/views/graph/graph_controller.js index 9e2ebfc0a78..1c580a25bd6 100644 --- a/addons/web/static/src/js/views/graph/graph_controller.js +++ b/addons/web/static/src/js/views/graph/graph_controller.js @@ -96,8 +96,13 @@ var GraphController = AbstractController.extend(GroupByMenuMixin,{ this._updateButtons(); this.$buttons.appendTo($node); if (this.isEmbedded) { - this._addGroupByMenu($node, this.groupableFields); + this._addGroupByMenu($node, this.groupableFields).then(function(){ + var groupByButton = $node.find('.o_dropdown_toggler_btn'); + groupByButton.removeClass("o_dropdown_toggler_btn btn btn-secondary dropdown-toggle"); + groupByButton.addClass("btn dropdown-toggle btn-outline-secondary"); + }); } + } }, diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js index 02fdb102358..9c70811ed18 100644 --- a/addons/web/static/src/js/views/graph/graph_renderer.js +++ b/addons/web/static/src/js/views/graph/graph_renderer.js @@ -216,6 +216,24 @@ return AbstractRenderer.extend({ return this.state.origins[dataPt.originIndex]; }, /** + * Returns an object used to style chart elements independently from the datasets. + * + * @private + * @returns {Object} + */ + _getElementOptions: function () { + var elementOptions = {}; + if (this.state.mode === 'bar') { + elementOptions.rectangle = {borderWidth: 1}; + } else if (this.state.mode === 'line') { + elementOptions.line = { + tension: 0, + fill: false, + }; + } + return elementOptions; + }, + /** * Returns a DateClasses instance used to manage equivalence of dates. * * @private @@ -250,9 +268,8 @@ return AbstractRenderer.extend({ } else { return dataPt.labels.slice(0, 1); } - } else if (i >= 0) { + } else if (i === 0) { return Array.prototype.concat.apply([], [ - dataPt.labels.slice(0, i), this.dateClasses.dateClass(dataPt.originIndex, dataPt.labels[i]), dataPt.labels.slice(i+1) ]); @@ -563,6 +580,7 @@ return AbstractRenderer.extend({ scales: this._getScaleOptions(), legend: this._getLegendOptions(datasetsCount), tooltips: this._getTooltipOptions(datasetsCount), + elements: this._getElementOptions(), }; }, /** @@ -583,7 +601,7 @@ return AbstractRenderer.extend({ if (_.contains(['bar', 'line'], this.state.mode) && i === 0) { // here label is an array of length 1 and contains a number return this.dateClasses.representative(label, originIndex) || ''; - } else if (this.state.mode === 'pie' && i >= 0) { + } else if (this.state.mode === 'pie' && i === 0) { // here label is an array of length at least one containing string or numbers var labelCopy = label.slice(0); if (originIndex !== undefined) { @@ -637,7 +655,7 @@ return AbstractRenderer.extend({ this.$el.append($canvasContainer); var i = this.state.comparisonFieldIndex; - if (i === 0 || (i > 0 && this.state.mode === 'pie')) { + if (i === 0) { this.dateClasses = this._getDateClasses(dataPoints); } if (this.state.mode === 'bar') { @@ -661,9 +679,6 @@ return AbstractRenderer.extend({ _renderBarChart: function (dataPoints) { var self = this; - // style rectangles - Chart.defaults.global.elements.rectangle.borderWidth = 1; - // prepare data var data = this._prepareData(dataPoints); data.datasets.forEach(function (dataset, index) { @@ -694,10 +709,6 @@ return AbstractRenderer.extend({ _renderLineChart: function (dataPoints) { var self = this; - // style lines - Chart.defaults.global.elements.line.tension = 0; - Chart.defaults.global.elements.line.fill = false; - // prepare data var data = this._prepareData(dataPoints); data.datasets.forEach(function (dataset, index) { diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js index 2a8e44df4a2..afa8f09a857 100644 --- a/addons/web/static/src/js/views/list/list_renderer.js +++ b/addons/web/static/src/js/views/list/list_renderer.js @@ -761,7 +761,7 @@ var ListRenderer = BasicRenderer.extend({ } if (field.type === 'float' || field.type === 'integer' || field.type === 'monetary') { - $th.css({ textAlign: 'right' }); + $th.addClass('o_list_number_th'); } if (config.isDebug()) { diff --git a/addons/web/static/src/scss/list_view.scss b/addons/web/static/src/scss/list_view.scss index a18d9f70083..21743a75751 100644 --- a/addons/web/static/src/scss/list_view.scss +++ b/addons/web/static/src/scss/list_view.scss @@ -23,6 +23,9 @@ cursor: default; } } + &.o_list_number_th { + text-align: right; + } } tbody > tr > td:not(.o_list_record_selector) { @include o-text-overflow(table-cell); diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js index 16e304c14a6..8a5b8343208 100644 --- a/addons/web/static/tests/views/calendar_tests.js +++ b/addons/web/static/tests/views/calendar_tests.js @@ -5,6 +5,7 @@ var AbstractStorageService = require('web.AbstractStorageService'); var CalendarView = require('web.CalendarView'); var CalendarRenderer = require('web.CalendarRenderer'); var Dialog = require('web.Dialog'); +var ViewDialogs = require('web.view_dialogs'); var fieldUtils = require('web.field_utils'); var mixins = require('web.mixins'); var RamStorage = require('web.RamStorage'); @@ -482,6 +483,63 @@ QUnit.module('Views', { calendar.destroy(); }); + QUnit.test('open multiple event form at the same time', async function (assert) { + assert.expect(2); + + var prom = testUtils.makeTestPromise(); + var counter = 0; + testUtils.mock.patch(ViewDialogs.FormViewDialog, { + open: function () { + counter++; + this.options = _.omit(this.options, 'fields_view'); // force loadFieldView + return this._super.apply(this, arguments); + }, + loadFieldView: function () { + var self = this; + var args = arguments; + var _super = this._super; + return prom.then(function () { + return _super.apply(self, args); + }); + }, + }); + + var event = $.Event(); + var calendar = await createCalendarView({ + View: CalendarView, + model: 'event', + data: this.data, + arch: + '<calendar class="o_calendar_test" '+ + 'string="Events" ' + + 'event_open_popup="true" '+ + 'date_start="start" '+ + 'quick_add="False" '+ + 'date_stop="stop" '+ + 'all_day="allday" '+ + 'mode="month" '+ + 'readonly_form_view_id="1">'+ + '<field name="name"/>'+ + '</calendar>', + archs: archs, + viewOptions: { + initialDate: initialDate, + }, + }); + + var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)'); + for (var i = 0; i < 5; i++) { + await testUtils.dom.triggerMouseEvent($cell, "mousedown"); + await testUtils.dom.triggerMouseEvent($cell, "mouseup"); + } + prom.resolve(); + await testUtils.nextTick(); + assert.equal(counter, 5, "there should had been 5 attemps to open a modal"); + assert.containsOnce($('body'), '.modal', "there should be only one open modal"); + + calendar.destroy(); + }); + QUnit.test('create event with timezone in week mode European locale', async function (assert) { assert.expect(5); diff --git a/addons/web/static/tests/views/search_view_tests.js b/addons/web/static/tests/views/search_view_tests.js index 3fe15d661dd..ccf5bf5b50d 100644 --- a/addons/web/static/tests/views/search_view_tests.js +++ b/addons/web/static/tests/views/search_view_tests.js @@ -981,8 +981,8 @@ QUnit.module('Search View', { QUnit.module('Autocompletion'); - QUnit.test('selection via autocompletion modifies appropriately submenus', async function (assert) { - assert.expect(4); + QUnit.test('selection via autocompletion and deletion modifies appropriately submenus', async function (assert) { + assert.expect(6); var actionManager = await createActionManager({ actions: this.actions, @@ -1014,6 +1014,19 @@ QUnit.module('Search View', { assert.strictEqual($('.o_group_by_menu .o_item_option a.selected').text().trim(), "Day", "The item 'Day' should be selected in the groupby menu"); + await testUtils.dom.click($('div .o_searchview_facet .o_facet_remove').eq(0)); + await testUtils.dom.click($('div .o_searchview_facet .o_facet_remove').eq(0)); + + await testUtils.dom.click($('button .fa-filter')); + await testUtils.dom.click($('.o_filters_menu .o_menu_item').eq(0)); + assert.containsNone($('.o_filters_menu .o_item_option a.selected'), + "The item 'This Month' should have unselected in the filters menu"); + + await testUtils.dom.click($('button .fa-bars')); + await testUtils.dom.click($('.o_group_by_menu .o_menu_item').eq(0)); + assert.containsNone($('.o_group_by_menu .o_item_option a.selected'), + "The item 'Day' should have been unselected in the groupby menu"); + actionManager.destroy(); }); diff --git a/addons/web_editor/static/src/js/backend/convert_inline.js b/addons/web_editor/static/src/js/backend/convert_inline.js index b5c69102ff6..ef818762315 100644 --- a/addons/web_editor/static/src/js/backend/convert_inline.js +++ b/addons/web_editor/static/src/js/backend/convert_inline.js @@ -452,7 +452,7 @@ FieldHtml.include({ * @override */ _onLoadWysiwyg: function () { - if (this.nodeOptions['style-inline']) { + if (this.nodeOptions['style-inline'] && this.isRendered) { this._fromInline(); } this._super(); diff --git a/addons/web_editor/static/src/js/backend/field_html.js b/addons/web_editor/static/src/js/backend/field_html.js index 40456961aeb..5ba630edc89 100644 --- a/addons/web_editor/static/src/js/backend/field_html.js +++ b/addons/web_editor/static/src/js/backend/field_html.js @@ -179,6 +179,8 @@ var FieldHtml = basic_fields.DebouncedField.extend(TranslatableFieldMixin, { * @returns {Object} */ _getWysiwygOptions: function () { + var iPhone = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + return { recordInfo: { context: this.record.getContext(this.recordParams), @@ -197,6 +199,7 @@ var FieldHtml = basic_fields.DebouncedField.extend(TranslatableFieldMixin, { 'SHIFT+TAB': null, }, mac: { + 'ENTER': iPhone ? null : 'insertParagraph', 'TAB': null, 'SHIFT+TAB': null, }, diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js b/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js index 94ec9306f7d..9ac05220e45 100644 --- a/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js +++ b/addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js @@ -9,18 +9,27 @@ dom.isAnchor = function (node) { return (node.tagName === 'A' || node.tagName === 'BUTTON' || $(node).hasClass('btn')) && !$(node).hasClass('fa') && !$(node).hasClass('o_image'); }; +var keycode = ({ + '8': 'BACKSPACE', + '9': 'TAB', + '13': 'ENTER', + '46': 'DELETE', +}); -var KeyboardPlugin = AbstractPlugin.extend({ - events: { - 'summernote.keydown': '_onKeydown', - 'DOMNodeInserted .note-editable': '_removeGarbageSpans', - }, - - //-------------------------------------------------------------------------- - // Public - //-------------------------------------------------------------------------- - +var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); +var iPhone = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; +var KeyboardPlugin = AbstractPlugin.extend({ + events: iPhone ? + { + 'DOMNodeInserted .note-editable': '_removeGarbageSpans', + } : + { + 'summernote.keydown': '_onKeydown', + 'DOMNodeInserted .note-editable': '_removeGarbageSpans', + 'keypress .note-editable': '_onKeyPress', + 'textInput .note-editable': '_onTextInput', + }, //-------------------------------------------------------------------------- // Private @@ -818,7 +827,7 @@ var KeyboardPlugin = AbstractPlugin.extend({ } }, /** - * Remove the first unbreakable ancestor's next sibling if empty. + * Remove the first unbreakable ancestor's next sibling if not a block and empty. * * @private * @param {Node} node @@ -834,7 +843,7 @@ var KeyboardPlugin = AbstractPlugin.extend({ var isNextContainsOnlyInvisibleText = nextUnbreakable && _.all($(nextUnbreakable).contents(), function (n) { return dom.isText(n) && !self.context.invoke('HelperPlugin.isVisibleText', n); }); - if (isNextEmpty || isNextContainsOnlyInvisibleText) { + if (!dom.isBlock(nextUnbreakable) && (isNextEmpty || isNextContainsOnlyInvisibleText)) { $(nextUnbreakable).remove(); } }, @@ -1014,76 +1023,40 @@ var KeyboardPlugin = AbstractPlugin.extend({ * @returns {Boolean} true if case handled */ _onKeydown: function (se, e) { - var self = this; - var handled = false; - if (e.ctrlKey && e.key === 'a') { e.preventDefault(); this._selectAll(); return; } + if (!keycode[e.keyCode]) { + return; + } - if (e.key && - (e.key.length === 1 || e.key === "Dead" || e.key === "Unidentified") && - !e.ctrlKey && !e.altKey && !e.metaKey) { - - if (e.key === "Dead" || e.key === "Unidentified") { - this._accented = true; - } - - // Record undo only if either: - clearTimeout(this.lastCharIsVisibleTime); - // e.key is punctuation or space - var stopChars = [' ', ',', ';', ':', '?', '.', '!']; - if (stopChars.indexOf(e.key) !== -1) { - this.lastCharVisible = false; - } - // or not on top of history stack (record undo after undo) - var history = this.context.invoke('HistoryPlugin.getHistoryStep'); - if (history && history.stack.length && history.stackOffset < history.stack.length - 1) { - this.lastCharVisible = false; - } - // or no new char for 500ms - this.lastCharIsVisibleTime = setTimeout(function () { - self.lastCharIsVisible = false; - }, 500); - if (!this.lastCharIsVisible) { - this.lastCharIsVisible = true; - this.context.invoke('HistoryPlugin.recordUndo'); - } - - if (e.key !== "Dead") { - this._onVisibleChar(e, this._accented); - } - } else { - this.lastCharIsVisible = false; - this.context.invoke('editor.clearTarget'); - this.context.invoke('MediaPlugin.hidePopovers'); - this.context.invoke('editor.beforeCommand'); - switch (e.keyCode) { - case 8: // BACKSPACE - handled = this._onBackspace(e); - break; - case 9: // TAB - handled = this._onTab(e); - break; - case 13: // ENTER - handled = this._onEnter(e); - break; - case 46: // DELETE - handled = this._onDelete(e); - break; - } - if (handled) { - this._preventTextInEditableDiv(); - this.context.invoke('editor.saveRange'); - e.preventDefault(); - this.context.invoke('editor.afterCommand'); - } + this.context.invoke('editor.clearTarget'); + this.context.invoke('MediaPlugin.hidePopovers'); + this.context.invoke('editor.beforeCommand'); + var handled = false; + switch (keycode[e.keyCode]) { + case 'BACKSPACE': + handled = this._onBackspace(e); + break; + case 'TAB': + handled = this._onTab(e); + break; + case 'ENTER': + handled = this._onEnter(e); + break; + case 'DELETE': + handled = this._onDelete(e); + break; } - if (e.key !== "Dead") { - this._accented = false; + if (handled) { + e.preventDefault(); + this._preventTextInEditableDiv(); + this.context.invoke('editor.saveRange'); + this.context.invoke('editor.afterCommand'); } + return handled; }, /** * Handle BACKSPACE keydown event. @@ -1223,45 +1196,38 @@ var KeyboardPlugin = AbstractPlugin.extend({ return false; }, /** - * Handle visible char keydown event. + * Handle char input. * * @private * @param {jQueryEvent} e - * @returns {Boolean} true if case is handled and event default must be prevented */ - _onVisibleChar: function (e, accented) { - var self = this; - e.preventDefault(); - if (accented) { - this.editable.normalize(); - var baseRange = this.context.invoke('editor.createRange'); - - var $parent = $(baseRange.sc.parentNode); - var parentContenteditable = $parent.attr('contenteditable'); - $parent.attr('contenteditable', false); - - var accentPlaceholder = this.document.createElement('span'); - $(baseRange.sc).after(accentPlaceholder); - $(accentPlaceholder).attr('contenteditable', true); - - var range = this.context.invoke('editor.setRange', accentPlaceholder, 0); - range.select(); - - setTimeout(function () { - var accentedChar = accentPlaceholder.innerHTML; - $(accentPlaceholder).remove(); - if (parentContenteditable) { - $parent.attr('contenteditable', parentContenteditable); - } else { - $parent.removeAttr('contenteditable'); - } - baseRange.select(); - self.context.invoke('HelperPlugin.insertTextInline', accentedChar); - }); - } else { + _onKeyPress: function (e) { + console.log(e.originalEvent); + if (!isSafari || iPhone) { + e.preventDefault(); this.context.invoke('HelperPlugin.insertTextInline', e.key); } - return true; + }, + /** + * Handle char input. + * + * @private + * @param {jQueryEvent} e + */ + _onTextInput: function (e) { + if (isSafari && !iPhone) { + return; + } + e.originalEvent.preventDefault(); + + var text = e.originalEvent.data; + if (!text) { + return; + } + if (text === 'Spacebar') { + text = ' '; + } + this.context.invoke('HelperPlugin.insertTextInline', text); }, }); diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js index 71365e4348f..b8b4a7582fe 100644 --- a/addons/web_editor/static/src/js/wysiwyg/plugin/media.js +++ b/addons/web_editor/static/src/js/wysiwyg/plugin/media.js @@ -937,7 +937,7 @@ _.extend(wysiwygTranslation.image, { dom.isVideo = function (node) { node = node && !node.tagName ? node.parentNode : node; return (node.tagName === "IFRAME" || node.tagName === "DIV") && - (node.parentNode.className && node.parentNode.className.indexOf('media_iframe_video') !== -1 || + (node.parentNode && node.parentNode.className && node.parentNode.className.indexOf('media_iframe_video') !== -1 || node.className.indexOf('media_iframe_video') !== -1); }; diff --git a/addons/web_editor/static/src/js/wysiwyg/plugin/text.js b/addons/web_editor/static/src/js/wysiwyg/plugin/text.js index 5337661fa76..2b7d10d02fd 100644 --- a/addons/web_editor/static/src/js/wysiwyg/plugin/text.js +++ b/addons/web_editor/static/src/js/wysiwyg/plugin/text.js @@ -766,6 +766,11 @@ var TextPlugin = AbstractPlugin.extend({ * @param {jQueryEvent} e */ _onPaste: function (se, e) { + var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); + var iPhone = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + if (isSafari && !iPhone) { + return; + } se.preventDefault(); se.stopImmediatePropagation(); e.preventDefault(); diff --git a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js index d13ddf63038..4193aef5332 100644 --- a/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js +++ b/addons/web_editor/static/src/js/wysiwyg_snippets/snippets.editor.js @@ -678,6 +678,7 @@ var SnippetsMenu = Widget.extend({ // on text changes this.$document.on('click.snippets_menu', '.o_default_snippet_text', function (ev) { $(ev.target).selectContent(); + $(ev.target).removeClass('o_default_snippet_text'); }); this.$document.on('keyup.snippets_menu', function () { var range = Wysiwyg.getRange(this); @@ -746,6 +747,7 @@ var SnippetsMenu = Widget.extend({ }, }); this.cacheSnippetTemplate[this.options.snippets] = this._defLoadSnippets; + return this.cacheSnippetTemplate[this.options.snippets]; }, /** * Sets the instance variables $editor, $body and selectorEditableArea. @@ -1358,6 +1360,7 @@ var SnippetsMenu = Widget.extend({ if (!dropped) { dropped = true; $(this).first().after($toInsert).addClass('d-none'); + $toInsert.removeClass('oe_snippet_body'); } }, out: function () { @@ -1366,6 +1369,7 @@ var SnippetsMenu = Widget.extend({ dropped = false; $toInsert.detach(); $(this).removeClass('d-none'); + $toInsert.addClass('oe_snippet_body'); } }, }); diff --git a/addons/web_editor/static/tests/test_utils.js b/addons/web_editor/static/tests/test_utils.js index 99510bb3bae..c6d043a0722 100644 --- a/addons/web_editor/static/tests/test_utils.js +++ b/addons/web_editor/static/tests/test_utils.js @@ -508,9 +508,10 @@ var testKeyboard = function ($editable, assert, keyboardTests, addTests) { keypress.keyCode = keypress.keyCode; var event = $.Event("keydown", keypress); $target.trigger(event); + if (!event.isDefaultPrevented()) { if (keypress.key.length === 1) { - document.execCommand("insertText", 0, keypress.key); + textInput($target[0], keypress.key); } else { console.warn('Native "' + keypress.key + '" is not supported in test'); } @@ -773,8 +774,40 @@ var keydown = function (key, $editable, options) { var $target = $(target.tagName ? target : target.parentNode); var event = $.Event("keydown", keyPress); $target.trigger(event); + + if (!event.isDefaultPrevented()) { + if (keyPress.key.length === 1) { + textInput($target[0], keyPress.key); + } else { + console.warn('Native "' + keyPress.key + '" is not supported in test'); + } + } }; +var textInput = function (target, char) { + var ev = new CustomEvent('textInput', { + bubbles: true, + cancelBubble: false, + cancelable: true, + composed: true, + data: char, + defaultPrevented: false, + detail: 0, + eventPhase: 3, + isTrusted: true, + returnValue: true, + sourceCapabilities: null, + type: "textInput", + which: 0, + }); + ev.data = char; + target.dispatchEvent(ev); + + if (!ev.defaultPrevented) { + document.execCommand("insertText", 0, ev.data); + } +} + return { wysiwygData: wysiwygData, createWysiwyg: createWysiwyg, diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index a5e17c21628..a36bc717c7c 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -133,12 +133,8 @@ class View(models.Model): ('website_id', '!=', None), ]) for specific_parent_view in specific_parent_views: - record.copy({ - # Set key to avoid copy() to generate an unique key as - # we want the specific view to have the same key - 'key': record.key, + record.with_context(website_id=specific_parent_view.website_id.id).write({ 'inherit_id': specific_parent_view.id, - 'website_id': specific_parent_view.website_id.id, }) return records diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py index 202f6e19039..4afb9bd63e5 100644 --- a/addons/website/models/website_menu.py +++ b/addons/website/models/website_menu.py @@ -149,7 +149,12 @@ class Menu(models.Model): if menu_id.page_id: menu_id.page_id = None else: - page = self.env['website.page'].search(['|', ('url', '=', menu['url']), ('url', '=', '/' + menu['url'])], limit=1) + domain = self.env["website"].website_domain(website_id) + [ + "|", + ("url", "=", menu["url"]), + ("url", "=", "/" + menu["url"]), + ] + page = self.env["website.page"].search(domain, limit=1) if page: menu['page_id'] = page.id menu['url'] = page.url diff --git a/addons/website/static/src/js/widgets/theme.js b/addons/website/static/src/js/widgets/theme.js index d5a2997031d..fcdc8c5ad3b 100644 --- a/addons/website/static/src/js/widgets/theme.js +++ b/addons/website/static/src/js/widgets/theme.js @@ -547,6 +547,34 @@ var ThemeCustomizeDialog = Dialog.extend({ _setActive: function () { var self = this; + // First enforce that all input groups have only one element checked as + // it is supposed to be (it might not be the case on initialization, for + // exemple if we had data-xmlid="A" and data-xmlid="A,B" and if A and B + // are active, the 2 related inputs would be checked). + var $radioXMLInputs = this.$inputs.filter('[type="radio"][data-xmlid]'); + var optionNames = _.uniq(_.map($radioXMLInputs, function (option) { + return option.name; + })); + _.each(optionNames, function (optionName) { + var $inputs = $radioXMLInputs.filter('[name="' + optionName + '"]:checked'); + if ($inputs.length > 1) { + $inputs.prop('checked', false); + + var maxNbXMLIDs = -1; + var $maxInput = null; + _.each($inputs, function (input) { + var $input = $(input); + var xmlID = $input.data('xmlid'); + var nbXMLIDs = xmlID ? xmlID.split(',').length : 0; + if (nbXMLIDs >= maxNbXMLIDs) { + maxNbXMLIDs = nbXMLIDs; + $maxInput = $input; + } + }); + $maxInput.prop('checked', true); + } + }); + // Look at all options to see if they are enabled or disabled var $enable = this.$inputs.filter(':checked'); diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss index 5fb20b332c8..1c9792b91ab 100644 --- a/addons/website/static/src/scss/website.scss +++ b/addons/website/static/src/scss/website.scss @@ -534,8 +534,8 @@ table.table_desc tr td { // Default &.s_carousel_default { // Controls - chevron - .carousel-control-prev-icon:before { content: "\f053"; margin-left: 1.5rem; } - .carousel-control-next-icon:before { content: "\f054"; margin-right: 1.5rem; } + .carousel-control-prev-icon:before { content: "\f053" #{"/*rtl:'\f054'*/"}; margin-left: 1.5rem; } + .carousel-control-next-icon:before { content: "\f054" #{"/*rtl:'\f053'*/"}; margin-right: 1.5rem; } .carousel-control-prev-icon:before, .carousel-control-next-icon:before { background-color: rgba(0,0,0,0); diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py index b8262bb11b8..38b3311ecbd 100644 --- a/addons/website/tests/test_views.py +++ b/addons/website/tests/test_views.py @@ -811,6 +811,43 @@ class TestCowViewSaving(common.TransactionCase): all_title_updated = specific_view.website_meta_title == self.base_view.website_meta_title == "A bug got fixed by updating this field" self.assertEqual(all_title_updated, True, "Update on top level generic views should also be applied on specific views") + def test_module_new_inherit_view_on_parent_already_forked_xpath_replace(self): + """ Deeper, more specific test of above behavior. + A module install should add/update the COW view (if allowed fields, + eg not modified or prohibited (website_id, inherit_id..)). + This test ensure it does not crash if the child view is a primary view. + """ + View = self.env['ir.ui.view'] + + # Simulate layout views + base_view = View.create({ + 'name': 'Main Frontend Layout', + 'type': 'qweb', + 'arch': '<t t-call="web.layout"><t t-set="head_website"/></t>', + 'key': '_portal.frontend_layout', + }).with_context(load_all_views=True) + + inherit_view = View.create({ + 'name': 'Main layout', + 'mode': 'extension', + 'inherit_id': base_view.id, + 'arch': '<xpath expr="//t[@t-set=\'head_website\']" position="replace"><t t-call-assets="web_editor.summernote" t-js="false" groups="website.group_website_publisher"/></xpath>', + 'key': '_website.layout', + }) + + # Trigger cow on website_sale hierarchy for website 1 + base_view.with_context(website_id=1).write({'name': 'Main Frontend Layout (W1)'}) + + # Simulate website_sale_comparison install, that's the real test, it + # should not crash. + View._load_records([dict(xml_id='_website_forum.layout', values={ + 'name': 'Forum Layout', + 'mode': 'primary', + 'inherit_id': inherit_view.id, + 'arch': '<xpath expr="//t[@t-call-assets=\'web_editor.summernote\'][@t-js=\'false\']" position="attributes"><attribute name="groups"/></xpath>', + 'key': '_website_forum.layout', + })]) + def test_multiple_inherit_level(self): """ Test multi-level inheritance: Base diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml index 822678fa8d7..ff18d1f7bb5 100644 --- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml +++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml @@ -285,7 +285,7 @@ </div> <div class="form-group"> <label class="col-form-label hdd4" for="description">Description</label> - <textarea row="3" name="description" class="form-control description"></textarea> + <textarea rows="3" name="description" class="form-control description"></textarea> </div> </main> <footer class="modal-footer"> @@ -695,7 +695,7 @@ </div> <div class="form-group"> <label class="col-form-label" for="activity_summary">Details Next Activity</label> - <textarea row="3" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea> + <textarea rows="3" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea> </div> <div class="form-group"> <label class="col-form-label" for="activity_date_deadline">Next Activity Date</label> diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js index 43768144f82..f80ef36009c 100644 --- a/addons/website_forum/static/src/js/website_forum.js +++ b/addons/website_forum/static/src/js/website_forum.js @@ -25,6 +25,9 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ 'click .vote_up:not(.karma_required), .vote_down:not(.karma_required)': '_onVotePostClick', 'click .o_js_validation_queue a[href*="/validate"]': '_onValidationQueueClick', 'click .accept_answer:not(.karma_required)': '_onAcceptAnswerClick', + 'click .validate_answer [data-href]': '_onAcceptAnswerClick', + 'mouseenter .validate_answer [data-href]': '_onRemoveValidAnswerMouse', + 'mouseleave .validate_answer [data-href]': '_onRemoveValidAnswerMouse', 'click .favourite_question': '_onFavoriteQuestionClick', 'click .comment_delete': '_onDeleteCommentClick', 'click .notification_close': '_onCloseNotificationClick', @@ -355,6 +358,8 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ */ _onAcceptAnswerClick: function (ev) { ev.preventDefault(); + var self = this; + var $acceptAnswerLinks = this.$('.accept_answer'); var $link = $(ev.currentTarget); this._rpc({ route: $link.data('href'), @@ -373,19 +378,41 @@ publicWidget.registry.websiteForum = publicWidget.Widget.extend({ $link.parent().append($warning); } } else { + $acceptAnswerLinks.removeClass('oe_answer_true') + .addClass('oe_answer_false'); $link.toggleClass('oe_answer_true', !!data) .toggleClass('oe_answer_false', !data); + + // TODO in master, review the utility of this function... + self._onCheckAnswerStatus(ev); + + // If we are removing an accepted answer, reload the page as the + // design is quite different with or without an accepted answer. + if ($link.closest('.validate_answer').length) { + window.location.reload(); + } } }); - this._onCheckAnswerStatus(ev); + }, + /** + * @private + * @param {Event} ev + */ + _onRemoveValidAnswerMouse: function (ev) { + var hover = (ev.type === 'mouseenter'); + $(ev.currentTarget).find('.fa') + .toggleClass('fa-times-circle text-danger', hover) + .toggleClass('fa-check-circle text-success', !hover); }, /** * @private * @param {Event} ev */ _onCheckAnswerStatus: function (ev) { - var $link = $(ev.currentTarget); - $link.toggleClass('text-success', !$link.hasClass('oe_answer_true')); + _.each(this.$('.accept_answer'), function (link) { + var $link = $(link); + $link.toggleClass('text-success', $link.hasClass('oe_answer_true')); + }); }, /** * @private diff --git a/addons/website_forum/static/src/scss/website_forum.scss b/addons/website_forum/static/src/scss/website_forum.scss index 018bf679e8a..cae56912df5 100644 --- a/addons/website_forum/static/src/scss/website_forum.scss +++ b/addons/website_forum/static/src/scss/website_forum.scss @@ -47,16 +47,23 @@ $bronze: #eea91e; } .validate_answer { - @include o-position-absolute(0,0,0,0); + @include o-position-absolute(0, auto, 0, 0); + width: 4px; height: 100%; - .bg-success { - @include o-position-absolute(0,0,0,0); - height: 100%; - width: 4px; + z-index: 1; // On top of card content if an alert is displayed inside + + > .bg-success { + @include o-position-absolute(0, 0, 0, 0); } - span { - @include o-position-absolute(10px,0,0,-9px); + > span { + @include o-position-absolute(10px, 50%); + transform: translateX(50%); font-size: 20px; + + &[data-href] { + cursor: pointer; + } + i { padding: 2px 3px; border-radius: 100%; @@ -85,6 +92,10 @@ $bronze: #eea91e; .favourite_question { color: $gray-400 !important; + + &.forum_favourite_question { + color: $gold !important; + } } .oe_grey { @@ -186,10 +197,6 @@ img.o_forum_avatar_big { width: auto; } -.forum_favourite_question { - color: $gold !important; -} - .o_forum_user_bio_expand { position: absolute; display: none; diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml index f971c068f8e..95c1b46df41 100644 --- a/addons/website_forum/views/website_forum.xml +++ b/addons/website_forum/views/website_forum.xml @@ -846,7 +846,10 @@ <div class="card-body"> <div t-if="answer.is_correct" class="validate_answer"> <div class="bg-success"></div> - <span title="Question has accepted answer" role="img" aria-label="Question has accepted answer"><i class="fa fa-check-circle text-success bg-white"/></span> + <span title="Question has accepted answer" role="img" aria-label="Question has accepted answer" + t-attf-data-href="/forum/#{slug(question.forum_id)}/post/#{slug(answer)}/toggle_correct"> + <i class="fa fa-check-circle text-success bg-white"/> + </span> </div> <div class="row"> <div class="col-1"> diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml index c28712f06ac..458ba979ff8 100644 --- a/addons/website_profile/views/website_profile.xml +++ b/addons/website_profile/views/website_profile.xml @@ -272,7 +272,7 @@ </tr> <tr> <th><small class="font-weight-bold">Badges</small></th> - <td t-if="user.badge_ids" t-esc="len(user.badge_ids)"/> + <td t-if="user.badge_ids" t-esc="len(user.badge_ids.filtered(lambda b: b.badge_id.website_published))"/> <td t-else="">0</td> </tr> </tbody> @@ -362,20 +362,22 @@ <template id="user_badges" name="User Bagdes"> <div t-if="user.badge_ids" class="row mx-n1"> - <div class="col px-1 mb-2 col-xl-4" t-foreach="user.badge_ids" t-as="badge"> + <t t-foreach="user.badge_ids" t-as="badge"> <t t-if="badge.badge_id.website_published"> - <div class="card"> - <div class="card-body p-2 pr-3"> - <div class="media align-items-center"> - <img height="38" t-attf-src="/web/image/gamification.badge/#{badge.badge_id.id}/image_small" class="mr-2"/> - <div class="media-body text-nowrap"> - <h6 class="my-0" t-field="badge.badge_id.name"/> + <div class="col px-1 mb-2 col-xl-4"> + <div class="card"> + <div class="card-body p-2 pr-3"> + <div class="media align-items-center"> + <img height="38" t-attf-src="/web/image/gamification.badge/#{badge.badge_id.id}/image_small" class="mr-2"/> + <div class="media-body text-nowrap"> + <h6 class="my-0" t-field="badge.badge_id.name"/> + </div> </div> </div> </div> </div> </t> - </div> + </t> </div> <div class="mb-3" t-if="not user.badge_ids"> <p class="text-muted">No badge yet</p> diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py index f2fe650022e..d0a3630bc0f 100644 --- a/addons/website_sale/tests/test_sale_process.py +++ b/addons/website_sale/tests/test_sale_process.py @@ -149,3 +149,19 @@ class TestWebsiteSaleCheckoutAddress(odoo.tests.TransactionCase): self.default_address_values['partner_id'] = new_partner.id self.WebsiteSaleController.address(**self.default_address_values) self.assertEqual(new_partner.company_id, self.website.company_id, "Public user edited billing (the partner itself) should not get its company modified.") + + def test_04_apply_empty_pl(self): + ''' Ensure empty pl code reset the applied pl ''' + so = self._create_so(self.env.user.partner_id.id) + eur_pl = self.env['product.pricelist'].create({ + 'name': 'EUR_test', + 'website_id': self.website.id, + 'code': 'EUR_test', + }) + + with MockRequest(self.env, website=self.website, sale_order_id=so.id): + self.WebsiteSaleController.pricelist('EUR_test') + self.assertEqual(so.pricelist_id, eur_pl, "Ensure EUR_test is applied") + + self.WebsiteSaleController.pricelist('') + self.assertNotEqual(so.pricelist_id, eur_pl, "Pricelist should be removed when sending an empty pl code") diff --git a/addons/website_sale_wishlist/models/product_wishlist.py b/addons/website_sale_wishlist/models/product_wishlist.py index 1bcbe57baef..0a67caa597c 100644 --- a/addons/website_sale_wishlist/models/product_wishlist.py +++ b/addons/website_sale_wishlist/models/product_wishlist.py @@ -33,7 +33,7 @@ class ProductWishlist(models.Model): else: wish = self.search([("partner_id", "=", self.env.user.partner_id.id)]) - return wish.filtered('product_id.product_tmpl_id.website_published') + return wish.sudo().filtered('product_id.product_tmpl_id.website_published') @api.model def _add_to_wishlist(self, pricelist_id, currency_id, website_id, price, product_id, partner_id=False): diff --git a/doc/cla/individual/Tatider.md b/doc/cla/individual/Tatider.md new file mode 100644 index 00000000000..b2468a491de --- /dev/null +++ b/doc/cla/individual/Tatider.md @@ -0,0 +1,11 @@ +Finland, 2019-07-31 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Tatiana Deribina t.i.deribina@gmail.com https://github.com/Tatider diff --git a/doc/cla/individual/anhvu-sg.md b/doc/cla/individual/anhvu-sg.md new file mode 100644 index 00000000000..125880cbcd7 --- /dev/null +++ b/doc/cla/individual/anhvu-sg.md @@ -0,0 +1,11 @@ +Vietnam, 2019-07-27 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Anh Vu <vuna2004@gmail.com> https://github.com/anhvu-sg diff --git a/doc/cla/individual/karol1985.md b/doc/cla/individual/karol1985.md new file mode 100644 index 00000000000..b595b686368 --- /dev/null +++ b/doc/cla/individual/karol1985.md @@ -0,0 +1,11 @@ +Poland, 2019-07-31 + +I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + +I declare that I am authorized and able to make this agreement and sign this +declaration. + +Signed, + +Karol Rybak karolrybak85@gmail.com https://github.com/karol1985 diff --git a/doc/cla/individual/stfnndrsn.md b/doc/cla/individual/stfnndrsn.md new file mode 100644 index 00000000000..021aec0aca8 --- /dev/null +++ b/doc/cla/individual/stfnndrsn.md @@ -0,0 +1,11 @@ +Denmark, 2019-07-24 + + I hereby agree to the terms of the Odoo Individual Contributor License +Agreement v1.0. + + I declare that I am authorized and able to make this agreement and sign this +declaration. + + Signed, + + Stefan Andersen <stfnandersen@gmail.com> https://github.com/stfnndrsn diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index 5ee3d98b8aa..b3c1f9e8d07 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -674,9 +674,19 @@ actual arch. if node.getparent() is None: source = copy.deepcopy(spec[0]) else: + replaced_node_tag = None for child in spec: if child.get('position') == 'move': child = extract(child) + + if self._context.get('inherit_branding') and not replaced_node_tag and child.tag is not etree.Comment: + # To make a correct branding, we need to + # - know exactly which node has been replaced + # - store it before anything else has altered the Tree + # Do it exactly here :D + child.set('meta-oe-xpath-replacing', node.tag) + replaced_node_tag = node.tag # We just store the replaced node tag on the first child of the xpath replacing it + node.addprevious(child) node.getparent().remove(node) elif pos == 'attributes': @@ -1299,6 +1309,11 @@ actual arch. if child.get('data-oe-xpath'): # injected by view inheritance, skip otherwise # generated xpath is incorrect + # Also, if a node is known to have been replaced during applying xpath + # increment its index to compute an accurate xpath for susequent nodes + replaced_node_tag = child.attrib.pop('meta-oe-xpath-replacing', None) + if replaced_node_tag: + indexes[replaced_node_tag] += 1 self.distribute_branding(child) else: indexes[child.tag] += 1 diff --git a/odoo/addons/base/rng/gantt_view.rng b/odoo/addons/base/rng/gantt_view.rng index 2180800c8de..5183fd65744 100644 --- a/odoo/addons/base/rng/gantt_view.rng +++ b/odoo/addons/base/rng/gantt_view.rng @@ -60,7 +60,7 @@ </rng:optional> </rng:interleave> - <rng:empty/> + <rng:empty/> </rng:element> </rng:define> <rng:start> diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py index 6c371741855..e7f0d850ee2 100644 --- a/odoo/addons/base/tests/test_views.py +++ b/odoo/addons/base/tests/test_views.py @@ -674,6 +674,115 @@ class TestTemplating(ViewCase): second.get('data-oe-id'), "second should come from the extension view") + def test_branding_inherit_replace_node(self): + view1 = self.View.create({ + 'name': "Base view", + 'type': 'qweb', + 'arch': """<hello> + <world></world> + <world><t t-esc="hello"/></world> + <world></world> + </hello> + """ + }) + self.View.create({ + 'name': "Extension", + 'type': 'qweb', + 'inherit_id': view1.id, + 'arch': """<xpath expr="/hello/world[1]" position="replace"> + <world>Is a ghetto</world> + <world>Wonder when I'll find paradise</world> + </xpath> + """ + }) + + arch_string = view1.with_context(inherit_branding=True).read_combined(['arch'])['arch'] + + arch = etree.fromstring(arch_string) + self.View.distribute_branding(arch) + + # First world - has been replaced by inheritance + [initial] = arch.xpath('/hello[1]/world[1]') + self.assertEqual( + '/xpath/world[1]', + initial.get('data-oe-xpath'), + 'Inherited nodes have correct xpath') + + # Second world added by inheritance + [initial] = arch.xpath('/hello[1]/world[2]') + self.assertEqual( + '/xpath/world[2]', + initial.get('data-oe-xpath'), + 'Inherited nodes have correct xpath') + + # Third world - is not editable + [initial] = arch.xpath('/hello[1]/world[3]') + self.assertFalse( + initial.get('data-oe-xpath'), + 'node containing t-esc is not branded') + + # The most important assert + # Fourth world - should have a correct oe-xpath, which is 3rd in main view + [initial] = arch.xpath('/hello[1]/world[4]') + self.assertEqual( + '/hello[1]/world[3]', + initial.get('data-oe-xpath'), + "The node's xpath position should be correct") + + def test_branding_inherit_replace_node2(self): + view1 = self.View.create({ + 'name': "Base view", + 'type': 'qweb', + 'arch': """<hello> + <world></world> + <world><t t-esc="hello"/></world> + <world></world> + </hello> + """ + }) + self.View.create({ + 'name': "Extension", + 'type': 'qweb', + 'inherit_id': view1.id, + 'arch': """<xpath expr="/hello/world[1]" position="replace"> + <war>Is a ghetto</war> + <world>Wonder when I'll find paradise</world> + </xpath> + """ + }) + + arch_string = view1.with_context(inherit_branding=True).read_combined(['arch'])['arch'] + + arch = etree.fromstring(arch_string) + self.View.distribute_branding(arch) + + [initial] = arch.xpath('/hello[1]/war[1]') + self.assertEqual( + '/xpath/war', + initial.get('data-oe-xpath'), + 'Inherited nodes have correct xpath') + + # First world: from inheritance + [initial] = arch.xpath('/hello[1]/world[1]') + self.assertEqual( + '/xpath/world', + initial.get('data-oe-xpath'), + 'Inherited nodes have correct xpath') + + # Second world - is not editable + [initial] = arch.xpath('/hello[1]/world[2]') + self.assertFalse( + initial.get('data-oe-xpath'), + 'node containing t-esc is not branded') + + # The most important assert + # Third world - should have a correct oe-xpath, which is 3rd in main view + [initial] = arch.xpath('/hello[1]/world[3]') + self.assertEqual( + '/hello[1]/world[3]', + initial.get('data-oe-xpath'), + "The node's xpath position should be correct") + def test_branding_primary_inherit(self): view1 = self.View.create({ 'name': "Base view", diff --git a/odoo/addons/base/views/res_company_views.xml b/odoo/addons/base/views/res_company_views.xml index c835527c8c2..6eb7a57838f 100644 --- a/odoo/addons/base/views/res_company_views.xml +++ b/odoo/addons/base/views/res_company_views.xml @@ -30,7 +30,7 @@ </div> </group> <group> - <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> + <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/> <field name="phone"/> <field name="email"/> <field name="vat"/> diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml index 4b1828c8c22..f8c9ba3d7af 100644 --- a/odoo/addons/base/views/res_partner_views.xml +++ b/odoo/addons/base/views/res_partner_views.xml @@ -117,7 +117,7 @@ <field name="zip" placeholder="ZIP" class="o_address_zip"/> <field name="country_id" placeholder="Country" class="o_address_country" options='{"no_open": True, "no_create": True}'/> </div> - <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> + <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/> </group> <group> </group> @@ -263,7 +263,7 @@ <field name="mobile" widget="phone"/> <field name="user_ids" invisible="1"/> <field name="email" widget="email" context="{'gravatar_image': True}" attrs="{'required': [('user_ids','!=', [])]}"/> - <field name="website" widget="url" placeholder="e.g. www.odoo.com"/> + <field name="website" widget="url" placeholder="e.g. https://www.odoo.com"/> <field name="title" options='{"no_open": True}' attrs="{'invisible': [('is_company', '=', True)]}"/> <field name="lang"/> |