Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[16.0][OU-IMP] account, hr_holidays: update multi-company ir_rule #4361

Merged
merged 1 commit into from
Mar 28, 2024
+23 −1
Merged

[16.0][OU-IMP] account, hr_holidays: update multi-company ir_rule #4361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions openupgrade_scripts/scripts/account/16.0.1.2/noupdate_changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="account_bank_statement_comp_rule" model="ir.rule">
<field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
</record>
<record id="account_bank_statement_line_comp_rule" model="ir.rule">
<field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
</record>
<!-- Don't recreate this, as they are usually touched by users and in fact the changes are only to use Command syntax
<record id="account_payment_term_15days" model="account.payment.term">
<field name="line_ids" eval="[Command.clear(), Command.create({'value': 'balance', 'value_amount': 0.0, 'days': 15})]"/>
Expand Down
16 changes: 16 additions & 0 deletions ...hr_holidays/16.0.1.5/noupdate_changes.xml → ...hr_holidays/16.0.1.6/noupdate_changes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,20 @@
('employee_id.leave_manager_id', '=', user.id),
]</field>
</record>
<record id="hr_leave_allocation_rule_multicompany" model="ir.rule">
<field name="domain_force">[
'|',
('employee_id', '=', False),
('employee_id.company_id', 'in', company_ids),
('holiday_status_id.company_id', 'in', company_ids + [False])
]</field>
</record>
<record id="hr_leave_rule_multicompany" model="ir.rule">
<field name="domain_force">[
'|',
('employee_id', '=', False),
('employee_id.company_id', 'in', company_ids),
('holiday_status_id.company_id', 'in', company_ids + [False])
]</field>
</record>
</odoo>
2 changes: 1 addition & 1 deletion ...ts/hr_holidays/16.0.1.5/post-migration.py → ...ts/hr_holidays/16.0.1.6/post-migration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ def _set_allocation_validation_type(env):
@openupgrade.migrate()
def migrate(env, version):
_set_allocation_validation_type(env)
openupgrade.load_data(env.cr, "hr_holidays", "16.0.1.5/noupdate_changes.xml")
openupgrade.load_data(env.cr, "hr_holidays", "16.0.1.6/noupdate_changes.xml")
0 ...hr_holidays/16.0.1.5/upgrade_analysis.txt → ...hr_holidays/16.0.1.6/upgrade_analysis.txt
View file
Open in desktop
File renamed without changes.
0 ...lidays/16.0.1.5/upgrade_analysis_work.txt → ...lidays/16.0.1.6/upgrade_analysis_work.txt
View file
Open in desktop
File renamed without changes.
Loading