Skip to content

Commit 56a93d4

Browse files
committed
Updated changes for rgs module
Update exclude modules in test scripts
1 parent acbc9f1 commit 56a93d4

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
run: oca_init_test_database
4242
env:
4343
ADDONS_DIR: .,oca,third-party
44-
EXCLUDE: mail_tracking,website_sale_subscription_restrict_cart,l10n_nl_rgs,l10n_nl_rgs_account_financial_report,l10n_nl_rgs_asset,l10n_nl_rgs_mis_report,connector_jira_servicedesk,connector_jira,account_statement_import_file_reconcile_oca,membership_subscription_prorate_variable_period,membership_subscription,membership_prorate,web_leaflet_technical,website_cache_control,account_reconcile_oca,membership_variable_period,base_user_role,account_invoice_constraint_chronology,queue_job,auth_signup_verify_email,base_municipality,argocd_capacity,membership_prorate_variable_period,argocd_website,l10n_nl_account_tax_unece,auditlog,product_contract,subscription_oca,account_banking_mandate_contact,account_banking_sepa_credit_transfer,hr_expense_remove_mobile_link,website_sale_analytics_matomo,mrp_multi_level,mrp_planned_order_matrix,mrp_warehouse_calendar,partner_country_default_nl,partner_external_map,base_menu_visibility_restriction,partner_firstname,password_security,contract,l10n_nl_tax_statement,l10n_nl_xaf_auditfile_export,mass_mailing_partner,mis_builder,website_local_font,helpdesk_mgmt,base_vat_optional_vies,mis_builder_budget,nextcloud_odoo_sync,membership_report,sale_timesheet_approval,sale_timesheet_approval_non_billable,sale_timesheet_approval_sheet,account_invoice_hour_report,account_invoice_hour_report_non_billable,web_pwa_oca,mail_composer_cc_bcc,mail_composer_cc_bcc_account,account_invoice_pricelist,account_reconcile_oca,purchase_sign,project_forecast_line,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,account_chart_update
44+
EXCLUDE: mail_tracking,website_sale_subscription_restrict_cart,l10n_nl_rgs,l10n_nl_rgs_account_financial_report,l10n_nl_rgs_asset,l10n_nl_rgs_mis_report,l10n_nl_rgs_xaf_auditfile_export,connector_jira_servicedesk,connector_jira,account_statement_import_file_reconcile_oca,membership_subscription_prorate_variable_period,membership_subscription,membership_prorate,web_leaflet_technical,website_cache_control,account_reconcile_oca,membership_variable_period,base_user_role,account_invoice_constraint_chronology,queue_job,auth_signup_verify_email,base_municipality,argocd_capacity,membership_prorate_variable_period,argocd_website,l10n_nl_account_tax_unece,auditlog,product_contract,subscription_oca,account_banking_mandate_contact,account_banking_sepa_credit_transfer,hr_expense_remove_mobile_link,website_sale_analytics_matomo,mrp_multi_level,mrp_planned_order_matrix,mrp_warehouse_calendar,partner_country_default_nl,partner_external_map,base_menu_visibility_restriction,partner_firstname,password_security,contract,l10n_nl_tax_statement,l10n_nl_xaf_auditfile_export,mass_mailing_partner,mis_builder,website_local_font,helpdesk_mgmt,base_vat_optional_vies,mis_builder_budget,nextcloud_odoo_sync,membership_report,sale_timesheet_approval,sale_timesheet_approval_non_billable,sale_timesheet_approval_sheet,account_invoice_hour_report,account_invoice_hour_report_non_billable,web_pwa_oca,mail_composer_cc_bcc,mail_composer_cc_bcc_account,account_invoice_pricelist,account_reconcile_oca,purchase_sign,project_forecast_line,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,account_chart_update,document_page_access_group,document_page_access_group_user_role,account_in_payment
4545
ODOO_VERSION: "16.0"
4646
- name: Run tests
4747
run: oca_run_tests
4848
env:
4949
ADDONS_DIR: .,oca,third-party
50-
EXCLUDE: mail_tracking,website_sale_subscription_restrict_cart,l10n_nl_rgs,l10n_nl_rgs_account_financial_report,l10n_nl_rgs_asset,l10n_nl_rgs_mis_report,connector_jira_servicedesk,connector_jira,account_statement_import_file_reconcile_oca,membership_subscription_prorate_variable_period,membership_subscription,membership_prorate,web_leaflet_technical,website_cache_control,account_reconcile_oca,membership_variable_period,base_user_role,account_invoice_constraint_chronology,queue_job,auth_signup_verify_email,base_municipality,argocd_capacity,membership_prorate_variable_period,argocd_website,l10n_nl_account_tax_unece,auditlog,product_contract,subscription_oca,account_banking_mandate_contact,account_banking_sepa_credit_transfer,hr_expense_remove_mobile_link,website_sale_analytics_matomo,mrp_multi_level,mrp_planned_order_matrix,mrp_warehouse_calendar,partner_country_default_nl,partner_external_map,base_menu_visibility_restriction,partner_firstname,password_security,contract,l10n_nl_tax_statement,l10n_nl_xaf_auditfile_export,mass_mailing_partner,mis_builder,website_local_font,helpdesk_mgmt,base_vat_optional_vies,mis_builder_budget,nextcloud_odoo_sync,membership_report,sale_timesheet_approval,sale_timesheet_approval_non_billable,sale_timesheet_approval_sheet,account_invoice_hour_report,account_invoice_hour_report_non_billable,web_pwa_oca,mail_composer_cc_bcc,mail_composer_cc_bcc_account,account_invoice_pricelist,account_reconcile_oca,purchase_sign,project_forecast_line,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,account_chart_update
50+
EXCLUDE: mail_tracking,website_sale_subscription_restrict_cart,l10n_nl_rgs,l10n_nl_rgs_account_financial_report,l10n_nl_rgs_asset,l10n_nl_rgs_mis_report,l10n_nl_rgs_xaf_auditfile_export,connector_jira_servicedesk,connector_jira,account_statement_import_file_reconcile_oca,membership_subscription_prorate_variable_period,membership_subscription,membership_prorate,web_leaflet_technical,website_cache_control,account_reconcile_oca,membership_variable_period,base_user_role,account_invoice_constraint_chronology,queue_job,auth_signup_verify_email,base_municipality,argocd_capacity,membership_prorate_variable_period,argocd_website,l10n_nl_account_tax_unece,auditlog,product_contract,subscription_oca,account_banking_mandate_contact,account_banking_sepa_credit_transfer,hr_expense_remove_mobile_link,website_sale_analytics_matomo,mrp_multi_level,mrp_planned_order_matrix,mrp_warehouse_calendar,partner_country_default_nl,partner_external_map,base_menu_visibility_restriction,partner_firstname,password_security,contract,l10n_nl_tax_statement,l10n_nl_xaf_auditfile_export,mass_mailing_partner,mis_builder,website_local_font,helpdesk_mgmt,base_vat_optional_vies,mis_builder_budget,nextcloud_odoo_sync,membership_report,sale_timesheet_approval,sale_timesheet_approval_non_billable,sale_timesheet_approval_sheet,account_invoice_hour_report,account_invoice_hour_report_non_billable,web_pwa_oca,mail_composer_cc_bcc,mail_composer_cc_bcc_account,account_invoice_pricelist,account_reconcile_oca,purchase_sign,project_forecast_line,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,agreement_legal,agreement_legal_portal,agreement_legal_portal_tier_validation,agreement_legal_portal_tier_validation_sign,agreement_legal_tier_validation_sign,agreement_tier_validation,account_chart_update,document_page_access_group,document_page_access_group_user_role,account_in_payment
5151
ODOO_VERSION: "16.0"
5252
- name: Prepare report
5353
run: coverage xml -o coverage.xml --data-file .coverage

l10n_nl_rgs/data/account_chart_template_post_data.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<field name="property_stock_account_input_categ_id" ref="1210010"/>
1313
<field name="property_stock_account_output_categ_id" ref="1104030"/>
1414
<field name="property_stock_valuation_account_id" ref="3002010"/>
15-
<!-- <field name="property_tax_payable_account_id" ref="?"/> -->
16-
<!-- <field name="property_tax_receivable_account_id" ref="?"/> -->
15+
<field name="property_tax_payable_account_id" ref="pay"/>
16+
<field name="property_tax_receivable_account_id" ref="pay"/>
1717
<!-- <field name="property_account_expense_id" ref="?"/> -->
1818
<!-- <field name="property_account_income_id" ref="?"/> -->
1919
<!-- <field name="property_advance_tax_payment_account_id" ref="?"/> -->

l10n_nl_rgs/data/account_tax_template.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@
798798
(0,0, {
799799
'factor_percent': 100,
800800
'repartition_type': 'base',
801-
'plus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3b_tag')],
801+
'plus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3bg_tag')],
802802
}),
803803
(0,0, {
804804
'factor_percent': 100,
@@ -809,7 +809,7 @@
809809
(0,0, {
810810
'factor_percent': 100,
811811
'repartition_type': 'base',
812-
'minus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3b_tag')],
812+
'minus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3bg_tag')],
813813
}),
814814
(0,0, {
815815
'factor_percent': 100,
@@ -831,7 +831,7 @@
831831
(0,0, {
832832
'factor_percent': 100,
833833
'repartition_type': 'base',
834-
'plus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3b_tag')],
834+
'plus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3bs_tag')],
835835
}),
836836
(0,0, {
837837
'factor_percent': 100,
@@ -842,7 +842,7 @@
842842
(0,0, {
843843
'factor_percent': 100,
844844
'repartition_type': 'base',
845-
'minus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3b_tag')],
845+
'minus_report_expression_ids': [ref('l10n_nl.tax_report_rub_3bs_tag')],
846846
}),
847847
(0,0, {
848848
'factor_percent': 100,

0 commit comments

Comments
 (0)