odoo-addon-openupgrade-scripts 17.0.1.0.1.349__py3-none-any.whl → 17.0.1.0.1.350__py3-none-any.whl

odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/post-migration.py

@@ -13,39 +13,29 @@ _deleted_xml_records = [
 
 
 def _transfer_employee_private_data(env):
-    """On v17, there's no more private res.partner records, so we should transfer the
-    information to the dedicated employee fields, and then anonymize the remaining data
-    in the res.partner record.
+    """On v17, there's no more private res.partner records, and the base migration
+    has copied private partners to table ou_res_partner_private, so we transfer the
+    information to the dedicated employee fields from the copy containing private
+    data if it exists, and from res.partner otherwise
     """
     openupgrade.logged_query(
         env.cr,
         """
         UPDATE hr_employee he
         SET lang = rp.lang,
-            private_city = rp.city,
-            private_country_id = rp.country_id,
-            private_email = rp.email,
-            private_phone = rp.phone,
-            private_state_id = rp.state_id,
-            private_street = rp.street,
-            private_street2 = rp.street2,
-            private_zip = rp.zip
+            private_city = COALESCE(he.private_city, rpp.city, rp.city),
+            private_country_id = COALESCE(
+                he.private_country_id, rpp.country_id, rp.country_id
+            ),
+            private_email = COALESCE(he.private_email, rpp.email, rp.email),
+            private_phone = COALESCE(he.private_phone, rpp.phone, rp.phone),
+            private_state_id = COALESCE(he.private_state_id, rpp.state_id, rp.state_id),
+            private_street = COALESCE(he.private_street, rpp.street, rp.street),
+            private_street2 = COALESCE(he.private_street2, rpp.street2, rp.street2),
+            private_zip = COALESCE(he.private_zip, rpp.zip, rp.zip)
         FROM res_partner rp
-        WHERE he.address_home_id = rp.id""",
-    )
-    openupgrade.logged_query(
-        env.cr,
-        """
-        UPDATE res_partner rp
-        SET city = '***',
-            country_id = NULL,
-            email = '***',
-            phone = '***',
-            state_id = NULL,
-            street = '***',
-            street2 = '***',
-            zip = '***'
-        FROM hr_employee he
+        LEFT JOIN ou_res_partner_private rpp
+        ON rp.id=rpp.id
         WHERE he.address_home_id = rp.id""",
     )
 

{odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info → odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-openupgrade_scripts
-Version: 17.0.1.0.1.349
+Version: 17.0.1.0.1.350
 Requires-Python: >=3.10
 Requires-Dist: odoo>=17.0a,<17.1dev
 Requires-Dist: openupgradelib

{odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info → odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info}/RECORD

@@ -142,7 +142,7 @@ odoo/addons/openupgrade_scripts/scripts/google_calendar/17.0.1.0/upgrade_analysi
 odoo/addons/openupgrade_scripts/scripts/google_gmail/17.0.1.2/upgrade_analysis.txt,sha256=az3DyzT1W7a0qBw78ZDiO5mC3K2ESONVyPJwtakQgIU,296
 odoo/addons/openupgrade_scripts/scripts/google_gmail/17.0.1.2/upgrade_analysis_work.txt,sha256=tX0LBNEJlJYsiyAa1lGRVgFgFOBh1U8acpkMI8qo6nA,359
 odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/noupdate_changes.xml,sha256=3rM2MOVM3CYPWAqDknVf_qOwifBhfjjUPFFZWQdmMTI,1792
-odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/post-migration.py,sha256=bi1GN6iyyef5gjibYq094qiUkZX-PHUO241MfVmlKaM,1784
+odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/post-migration.py,sha256=qunFmNhmScMEgx8qfaB02O2VnCq3SlfGH78JKvtFKj4,1921
 odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/pre-migration.py,sha256=YdaFkte3iGFhb5sbxw2V6U1R9zscVDD6gOrF0tII8_s,4335
 odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/upgrade_analysis.txt,sha256=-4tW82_F8u5kdrEaP2aWHSY29ar5qI0uKWK5QZI4Zws,8063
 odoo/addons/openupgrade_scripts/scripts/hr/17.0.1.1/upgrade_analysis_work.txt,sha256=IhX4TMtbhnrPG2FrbO_otRpduBtJViyXMtBLf290aYs,9437
@@ -766,7 +766,7 @@ odoo/addons/openupgrade_scripts/scripts/website_twitter/17.0.1.0/upgrade_analysi
 odoo/addons/openupgrade_scripts/static/description/banner.png,sha256=KTIBu4gfxeZVw9zjs_fivTgFEOeaAorlBxajmCA1p6k,26859
 odoo/addons/openupgrade_scripts/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
 odoo/addons/openupgrade_scripts/static/description/index.html,sha256=iV41-zYBM4uvZPuunpcr7bQeRgBaojVsKo_gkeyJyA4,12639
-odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info/METADATA,sha256=_smMaeRgvEWZyRXcJMnt4U18RPs4eusgMhitf1XHdu8,3786
-odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
-odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_openupgrade_scripts-17.0.1.0.1.349.dist-info/RECORD,,
+odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info/METADATA,sha256=9KPIfdAT7smxh6l0nSRoup8X8UGUvfKfdlpA89VYPgA,3786
+odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info/WHEEL,sha256=9fEMia4zL7ZuZbnCOrcYogUhmn4XFIVaJ8G4YGI31xc,81
+odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_openupgrade_scripts-17.0.1.0.1.350.dist-info/RECORD,,