diff --git a/docsource/modules130-140.rst b/docsource/modules130-140.rst index 4edca824295e..67727584f0cf 100644 --- a/docsource/modules130-140.rst +++ b/docsource/modules130-140.rst @@ -150,7 +150,7 @@ Module coverage 13.0 -> 14.0 +--------------------------------------------+-------------------------------------------------+ |google_spreadsheet | | +--------------------------------------------+-------------------------------------------------+ -|hr | | +|hr | Done | +--------------------------------------------+-------------------------------------------------+ |hr_attendance | | +--------------------------------------------+-------------------------------------------------+ diff --git a/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml b/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml index 4316bb75c645..6f68b8ed3bb7 100644 --- a/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml +++ b/openupgrade_scripts/scripts/hr/14.0.1.1/noupdate_changes.xml @@ -4,15 +4,15 @@ - + - + - + - + diff --git a/openupgrade_scripts/scripts/hr/14.0.1.1/post-migrate.py b/openupgrade_scripts/scripts/hr/14.0.1.1/post-migrate.py index b37056f2d40b..dcd12b293fe1 100644 --- a/openupgrade_scripts/scripts/hr/14.0.1.1/post-migrate.py +++ b/openupgrade_scripts/scripts/hr/14.0.1.1/post-migrate.py @@ -2,20 +2,40 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from openupgradelib import openupgrade + def fill_hr_employee_company_id(env): openupgrade.logged_query( - env.cr, """ + env.cr, + """ UPDATE hr_employee hr SET company_id = ru.company_id FROM res_users ru - WHERE ru.id = hr.create_uid AND - hr.company_id is NULL + WHERE ru.id = hr.create_uid AND hr.company_id is NULL """, ) +def update_new_private_admin_partner(env): + public_partner = env.ref("hr.res_partner_admin_private_address") + private_partner = env.ref("hr.employee_admin").address_home_id + private_partner.update( + { + "name": public_partner.name, + "company_id": public_partner.company_id, + "email": public_partner.email, + "image_1920": public_partner.image_1920, + } + ) + + @openupgrade.migrate() def migrate(env, version): fill_hr_employee_company_id(env) - # Load noupdate changes + update_new_private_admin_partner(env) openupgrade.load_data(env.cr, "hr", "14.0.1.1/noupdate_changes.xml") + openupgrade.delete_record_translations( + env.cr, "hr", ["mail_template_data_unknown_employee_email_address"] + ) + openupgrade.delete_records_safely_by_xml_id( + env.cr, ["hr.mail_template_data_unknown_employee_email_address"] + ) diff --git a/openupgrade_scripts/scripts/hr/14.0.1.1/openupgrade_analysis_work.txt b/openupgrade_scripts/scripts/hr/14.0.1.1/upgrade_analysis_work.txt similarity index 90% rename from openupgrade_scripts/scripts/hr/14.0.1.1/openupgrade_analysis_work.txt rename to openupgrade_scripts/scripts/hr/14.0.1.1/upgrade_analysis_work.txt index 299b063d851e..6fdf256a0f52 100644 --- a/openupgrade_scripts/scripts/hr/14.0.1.1/openupgrade_analysis_work.txt +++ b/openupgrade_scripts/scripts/hr/14.0.1.1/upgrade_analysis_work.txt @@ -3,14 +3,19 @@ hr / hr.employee / address_id (many2one) : now a function hr / hr.employee / certificate (selection) : selection_keys is now '['bachelor', 'doctor', 'graduate', 'master', 'other']' ('['bachelor', 'master', 'other']') hr / hr.employee / coach_id (many2one) : now a function +# NOTHING TO DO + hr / hr.employee / company_id (many2one) : now required, req_default: function # DONE: Post-migration: Filled with Create user company_id + hr / hr.employee / departure_date (date) : NEW hr / hr.employee / job_title (char) : now a function hr / hr.employee / parent_id (many2one) : now a function hr / hr.employee / work_phone (char) : now a function hr / hr.plan.activity.type / summary (char) : now a function hr / res.users / barcode (char) : module is now 'base' ('hr') +# NOTHING TO DO + ---XML records in module 'hr'--- NEW ir.actions.act_window: hr.hr_department_kanban_action NEW ir.actions.act_window: hr.hr_department_tree_action @@ -20,7 +25,10 @@ NEW ir.model.access: hr.access_hr_plan_wizard DEL ir.model.access: hr.access_ir_property_hr_user NEW ir.ui.menu: hr.menu_hr_department_kanban NEW ir.ui.view: hr.qunit_suite +# NOTHING TO DO + DEL mail.template: hr.mail_template_data_unknown_employee_email_address (noupdate) +# DONE: post-migration: deleted xmlid safely (and its translations) + NEW res.partner: hr.res_partner_admin_private_address (noupdate) -hr.employee: hr.employee_admin (noupdate) -# DONE: post-migration: noupdate changed to "res_partner_admin_private_address" +# DONE: post-migration: update this partner with actual admin data