Unifield Server

Merge lp:~mukunde/unifield-server/US-12074 into lp:unifield-server

  1. US-12074
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6252
Proposed branch: lp:~mukunde/unifield-server/US-12074
Merge into: lp:unifield-server
Diff against target: 57 lines (+23/-0) (has conflicts)
2 files modified
bin/addons/msf_profile/data/patches.xml (+7/-0)
bin/addons/msf_profile/msf_profile.py (+16/-0)
Text conflict in bin/addons/msf_profile/data/patches.xml
Text conflict in bin/addons/msf_profile/msf_profile.py
To merge this branch: bzr merge lp:~mukunde/unifield-server/US-12074
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+457061@code.launchpad.net
To post a comment you must log in.
lp:~mukunde/unifield-server/US-12074 updated
6150. By Gaël Mukunde

US-12074 [IMP] Fix patch script code, replace hr.employee by resource.resource

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_profile/data/patches.xml'
2--- bin/addons/msf_profile/data/patches.xml 2024-02-08 12:59:45 +0000
3+++ bin/addons/msf_profile/data/patches.xml 2024-02-27 11:22:58 +0000
4@@ -1016,6 +1016,7 @@
5 <field name="method">us_9321_2_remove_location_colors</field>
6 </record>
7
8+<<<<<<< TREE
9 <!-- UF32.0 -->
10 <record id="us_12071_gdpr_patch" model="patch.scripts">
11 <field name="method">us_12071_gdpr_patch</field>
12@@ -1045,5 +1046,11 @@
13 </record>
14
15
16+=======
17+ <record id="us_12074_gdpr_remove_personal_data_from_track_changess" model="patch.scripts">
18+ <field name="method">us_12074_gdpr_remove_personal_data_from_track_changes</field>
19+ </record>
20+
21+>>>>>>> MERGE-SOURCE
22 </data>
23 </openerp>
24
25=== modified file 'bin/addons/msf_profile/msf_profile.py'
26--- bin/addons/msf_profile/msf_profile.py 2024-02-08 12:59:45 +0000
27+++ bin/addons/msf_profile/msf_profile.py 2024-02-27 11:22:58 +0000
28@@ -57,6 +57,7 @@
29 'model': lambda *a: 'patch.scripts',
30 }
31
32+<<<<<<< TREE
33 # UF32.0
34 def us_12273_remove_never_exp_password(self, cr, uid, *a, **b):
35 instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
36@@ -156,6 +157,21 @@
37 if instance and instance.level == 'section':
38 self.pool.get('sync.trigger.something').create(cr, uid, {'name': 'US-12110-Sup_Fin_Read'})
39 return True
40+=======
41+ def us_12074_gdpr_remove_personal_data_from_track_changes(self, cr, uid, *a, **b):
42+ '''
43+ GDPR - Remove from staff track changes the fields removed from US-7791
44+ '''
45+ cr.execute(
46+ """
47+ DELETE FROM audittrail_log_line
48+ WHERE
49+ name IN ('birthday', 'gender', 'marital', 'mobile_phone', 'notes', 'private_phone', 'work_email',
50+ 'work_phone', 'country_id', 'ssnid', 'bank_name', 'bank_account_number') AND
51+ object_id = (SELECT id FROM ir_model WHERE model = 'resource.resource')
52+ """)
53+ return True
54+>>>>>>> MERGE-SOURCE
55
56 # python 3
57 def us_9321_2_remove_location_colors(self, cr, uid, *a, **b):

Subscribers

People subscribed via source and target branches