Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,14 @@ def _convert_account_tax_description(env):
openupgrade.add_columns(
env, [(False, "invoice_label", "char", None, "account_tax")]
)
convert_column_translatable(env.cr, "account_tax", "invoice_label", "jsonb")
openupgrade.logged_query(
env.cr,
"""UPDATE account_tax
SET invoice_label = description
WHERE description IS NOT NULL;""",
)
convert_column_translatable(env.cr, "account_tax", "description", "jsonb")
convert_column_translatable(env.cr, "account_tax", "invoice_label", "jsonb")


def _am_create_delivery_date_column(env):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
<td valign="middle" align="left" style="opacity: 0.7;">
<t t-out="object.company_id.phone or ''">+1 650-123-4567</t>
<t t-if="object.company_id.email">
| <a t-attf-href="'mailto:%s' % {{ object.company_id.email }}" style="text-decoration:none; color: #454748;"><t t-out="object.company_id.email or ''">info@yourcompany.com</t></a>
| <a t-attf-href="mailto:{{object.company_id.email}}" style="text-decoration:none; color: #454748;" t-out="object.company_id.email or ''">info@yourcompany.com</a>
</t>
<t t-if="object.company_id.website">
| <a t-attf-href="'%s' % {{ object.company_id.website }}" style="text-decoration:none; color: #454748;"><t t-out="object.company_id.website or ''">http://www.example.com</t></a>
| <a t-att-href="object.company_id.website" style="text-decoration:none; color: #454748;" t-out="object.company_id.website or ''">http://www.example.com</a>
</t>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,8 @@
<div t-if="is_sale"><br/>
The order for this ticket has reference <t t-out="object.sale_order_id.name"/>
and was placed on <t t-out="object.sale_order_id.date_order.date()"/>
<t t-if="object.sale_order_line_id.price_unit"> for an amount of
<t t-out="object.sale_order_line_id.price_unit" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
<t t-if="object.sale_order_line_id.price_total"> for an amount of
<t t-out="object.sale_order_line_id.price_total" t-options="{'widget': 'monetary', 'display_currency': object.sale_order_line_id.currency_id}"/>
</t>.
</div>
<div>
Expand Down
4 changes: 2 additions & 2 deletions openupgrade_scripts/scripts/hr/17.0.1.1/noupdate_changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<record id="departure_retired" model="hr.departure.reason">
<field name="reason_code">340</field>
</record>
<record id="employee_admin" model="hr.employee">
<!-- <record id="employee_admin" model="hr.employee" forcecreate="0">
<field name="private_email">admin@example.com</field>
</record>
</record> -->
<record id="ir_cron_data_check_work_permit_validity" model="ir.cron">
<field name="type"/>
</record>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ def _compute_already_accrued(env):

@openupgrade.migrate()
def migrate(env, version):
openupgrade.load_data(env, "hr_holidays", "17.0.1.6/noupdate_changes.xml")
_leave_type_responsible_convert_field_m2o_to_m2m(env)
_compute_already_accrued(env)
openupgrade.load_data(env, "hr_holidays", "17.0.1.6/noupdate_changes.xml")
openupgrade.delete_records_safely_by_xml_id(
env,
[
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="timesheet_analysis_report_approver" model="ir.rule">
<field name="domain_force">[
'|', '|',
('project_id.privacy_visibility', '!=', 'followers'),
('project_id.message_partner_ids', 'in', [user.partner_id.id]),
('task_id.message_partner_ids', 'in', [user.partner_id.id])
]</field>
</record>
<record id="timesheet_line_rule_approver" model="ir.rule">
<field name="domain_force">[
('project_id', '!=', False),
'|', '|',
('project_id.privacy_visibility', '!=', 'followers'),
('project_id.message_partner_ids', 'in', [user.partner_id.id]),
('task_id.message_partner_ids', 'in', [user.partner_id.id])
]</field>
</record>
</odoo>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from openupgradelib import openupgrade


@openupgrade.migrate()
def migrate(env, version):
openupgrade.load_data(env, "hr_timesheet", "17.0.1.1/noupdate_changes.xml")
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---Models in module 'hr_timesheet'---
new model hr.employee.delete.wizard [transient]
---Fields in module 'hr_timesheet'---
hr_timesheet / account.analytic.line / ancestor_task_id (many2one) : DEL relation: project.task
hr_timesheet / account.analytic.line / parent_task_id (many2one) : NEW relation: project.task, isrelated: related, stored
hr_timesheet / project.project / timesheet_encode_uom_id (many2one): not related anymore
hr_timesheet / project.project / timesheet_encode_uom_id (many2one): now a function
hr_timesheet / project.update / allocated_time (integer) : NEW
hr_timesheet / project.update / timesheet_time (integer) : NEW
hr_timesheet / project.update / uom_id (many2one) : NEW relation: uom.uom
---XML records in module 'hr_timesheet'---
DEL ir.actions.act_window.view: hr_timesheet.timesheet_action_view_from_employee_list
NEW ir.actions.server: hr_timesheet.unlink_employee_action
NEW ir.model.access: hr_timesheet.access_hr_employee_delete_wizard
DEL ir.model.access: hr_timesheet.access_project_task
NEW ir.ui.view: hr_timesheet.hr_employee_delete_wizard_form
NEW ir.ui.view: hr_timesheet.hr_timesheet_line_portal_tree
NEW ir.ui.view: hr_timesheet.portal_my_task_allocated_hours_template
NEW ir.ui.view: hr_timesheet.project_update_view_kanban_inherit
NEW ir.ui.view: hr_timesheet.timesheet_view_form_portal_user
NEW ir.ui.view: hr_timesheet.view_employee_tree_inherit_timesheet
NEW ir.ui.view: hr_timesheet.view_kanban_account_analytic_line_portal_user
DEL ir.ui.view: hr_timesheet.portal_my_task_planned_hours_template
DEL ir.ui.view: hr_timesheet.project_sharing_inherit_project_task_view_tree
DEL ir.ui.view: hr_timesheet.project_sharing_project_task_view_search_inherit_timesheet
DEL ir.ui.view: hr_timesheet.rating_rating_view_search_project_inherited
DEL ir.ui.view: hr_timesheet.report_project_task_user_view_search
DEL ir.ui.view: hr_timesheet.report_project_task_user_view_tree
DEL ir.ui.view: hr_timesheet.view_task_search_form_hr_extended
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---Models in module 'hr_timesheet'---
new model hr.employee.delete.wizard [transient]
---Fields in module 'hr_timesheet'---
hr_timesheet / account.analytic.line / ancestor_task_id (many2one) : DEL relation: project.task
hr_timesheet / account.analytic.line / parent_task_id (many2one) : NEW relation: project.task, isrelated: related, stored
hr_timesheet / project.project / timesheet_encode_uom_id (many2one): not related anymore
hr_timesheet / project.project / timesheet_encode_uom_id (many2one): now a function
hr_timesheet / project.update / allocated_time (integer) : NEW
hr_timesheet / project.update / timesheet_time (integer) : NEW
hr_timesheet / project.update / uom_id (many2one) : NEW relation: uom.uom
---XML records in module 'hr_timesheet'---
DEL ir.actions.act_window.view: hr_timesheet.timesheet_action_view_from_employee_list
NEW ir.actions.server: hr_timesheet.unlink_employee_action
NEW ir.model.access: hr_timesheet.access_hr_employee_delete_wizard
DEL ir.model.access: hr_timesheet.access_project_task
NEW ir.ui.view: hr_timesheet.hr_employee_delete_wizard_form
NEW ir.ui.view: hr_timesheet.hr_timesheet_line_portal_tree
NEW ir.ui.view: hr_timesheet.portal_my_task_allocated_hours_template
NEW ir.ui.view: hr_timesheet.project_update_view_kanban_inherit
NEW ir.ui.view: hr_timesheet.timesheet_view_form_portal_user
NEW ir.ui.view: hr_timesheet.view_employee_tree_inherit_timesheet
NEW ir.ui.view: hr_timesheet.view_kanban_account_analytic_line_portal_user
DEL ir.ui.view: hr_timesheet.portal_my_task_planned_hours_template
DEL ir.ui.view: hr_timesheet.project_sharing_inherit_project_task_view_tree
DEL ir.ui.view: hr_timesheet.project_sharing_project_task_view_search_inherit_timesheet
DEL ir.ui.view: hr_timesheet.rating_rating_view_search_project_inherited
DEL ir.ui.view: hr_timesheet.report_project_task_user_view_search
DEL ir.ui.view: hr_timesheet.report_project_task_user_view_tree
DEL ir.ui.view: hr_timesheet.view_task_search_form_hr_extended
# NOTHING TO DO: No change since 17.0.1.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<odoo>
<record id="ir_rule_sms_template_project_manager" model="ir.rule">
<field name="domain_force">[('model', 'in', ('project.task', 'project.project'))]</field>
</record>
</odoo>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from openupgradelib import openupgrade


@openupgrade.migrate()
def migrate(env, version):
openupgrade.load_data(env, "project_sms", "17.0.1.1/noupdate_changes.xml")
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---Models in module 'project_sms'---
---Fields in module 'project_sms'---
---XML records in module 'project_sms'---
---nothing has changed in this module--
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---Models in module 'project_sms'---
---Fields in module 'project_sms'---
---XML records in module 'project_sms'---
---nothing has changed in this module--
# NOTHING TO DO