Unifield Server

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

  1. US-12350
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6275
Proposed branch: lp:~mukunde/unifield-server/US-12350
Merge into: lp:unifield-server
Diff against target: 68 lines (+22/-0) (has conflicts)
3 files modified
bin/addons/account/__init__.py (+2/-0)
bin/addons/msf_profile/data/patches.xml (+6/-0)
bin/addons/msf_profile/msf_profile.py (+14/-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-12350
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+465673@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/__init__.py'
2--- bin/addons/account/__init__.py 2022-02-22 10:38:22 +0000
3+++ bin/addons/account/__init__.py 2024-05-07 10:17:04 +0000
4@@ -39,6 +39,8 @@
5 ('ODM', 'correction_manual'),
6 ('ODHQ', 'correction_hq'),
7 ('ISI', 'purchase'),
8+ ('EOY', 'system'),
9+ ('IB', 'system')
10 ]
11
12 from . import account
13
14=== modified file 'bin/addons/msf_profile/data/patches.xml'
15--- bin/addons/msf_profile/data/patches.xml 2024-05-02 13:19:58 +0000
16+++ bin/addons/msf_profile/data/patches.xml 2024-05-07 10:17:04 +0000
17@@ -1044,6 +1044,7 @@
18 <field name="method">us_12294_force_email_popup</field>
19 </record>
20
21+<<<<<<< TREE
22 <!-- UF33.0 -->
23 <record id="us_12074_gdpr_remove_personal_data_from_track_changess" model="patch.scripts">
24 <field name="method">us_12074_gdpr_remove_personal_data_from_track_changes</field>
25@@ -1053,6 +1054,11 @@
26 <field name="method">us_11135_set_pol_confirmation_date</field>
27 </record>
28
29+=======
30+ <record id="us_12350_is_default_update" model="patch.scripts">
31+ <field name="method">us_12350_is_default_update</field>
32+ </record>
33+>>>>>>> MERGE-SOURCE
34
35 </data>
36 </openerp>
37
38=== modified file 'bin/addons/msf_profile/msf_profile.py'
39--- bin/addons/msf_profile/msf_profile.py 2024-05-02 13:19:58 +0000
40+++ bin/addons/msf_profile/msf_profile.py 2024-05-07 10:17:04 +0000
41@@ -57,6 +57,7 @@
42 'model': lambda *a: 'patch.scripts',
43 }
44
45+<<<<<<< TREE
46 # UF33.0
47 def us_12074_gdpr_remove_personal_data_from_track_changes(self, cr, uid, *a, **b):
48 '''
49@@ -180,6 +181,19 @@
50 return True
51
52
53+=======
54+ def us_12350_is_default_update(self, cr, uid, *a, **b):
55+ # update is_default field of journals EOY and IB
56+ cr.execute("""
57+ UPDATE account_journal
58+ SET is_default = 't'
59+ WHERE
60+ code IN ('EOY', 'IB') AND
61+ type = 'system'
62+ """)
63+ return True
64+
65+>>>>>>> MERGE-SOURCE
66 # UF32.0
67 def us_12273_remove_never_exp_password(self, cr, uid, *a, **b):
68 instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id

Subscribers

People subscribed via source and target branches