Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-10858 into lp:unifield-server

  1. US-10858
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6457
Proposed branch: lp:~dorian-kemps/unifield-server/US-10858
Merge into: lp:unifield-server
Diff against target: 60 lines (+8/-12)
2 files modified
bin/addons/base/res/res_user.py (+8/-6)
bin/addons/msf_profile/i18n/fr_MF.po (+0/-6)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-10858
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+439697@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/base/res/res_user.py'
2--- bin/addons/base/res/res_user.py 2022-11-18 14:13:27 +0000
3+++ bin/addons/base/res/res_user.py 2023-03-27 07:59:23 +0000
4@@ -791,8 +791,7 @@
5 raise osv.except_osv(_('Warning'), _('You can not deactivate this user, %d documents have to be signed\n%s') % (len(open_sign_ids), ', '.join(list_of_doc)))
6 for xuser in self.browse(cr, uid, ids, fields_to_fetch=['name', 'has_valid_signature'], context=context):
7 if xuser.has_valid_signature:
8- raise osv.except_osv(_('Warning'), _('You can not deactivate %s: the signature is active') % (xuser['name'], ))
9-
10+ values.update(self.reset_signature(cr, uid, ids, context=context, from_write_user=True))
11
12
13 res = super(users, self).write(cr, uid, ids, values, context=context)
14@@ -1057,7 +1056,7 @@
15 def get_admin_profile(self, cr, uid, context=None):
16 return uid == 1
17
18- def _archive_signature(self, cr, uid, ids, new_from=None, new_to=None, context=None):
19+ def _archive_signature(self, cr, uid, ids, new_from=None, new_to=None, from_write_user=None, context=None):
20 sign_line_obj = self.pool.get('signature.line')
21 for user in self.browse(cr, uid, ids, fields_to_fetch=['esignature_id', 'signature_from', 'signature_to', 'name'] , context=context):
22 if user.esignature_id:
23@@ -1080,14 +1079,17 @@
24 new_data['signature_from'] = new_from
25 if user.signature_to and new_from >= user.signature_to:
26 new_data['signature_to'] = False
27- self.write(cr, uid, [user.id], new_data, context=context)
28+ if from_write_user:
29+ return new_data
30+ else:
31+ self.write(cr, uid, [user.id], new_data, context=context)
32 return True
33
34 def delete_signature(self, cr, uid, ids, context=None):
35 return self._archive_signature(cr, uid, ids, context=context)
36
37- def reset_signature(self, cr, uid, ids, context=None):
38- return self._archive_signature(cr, uid, ids, new_from=fields.date.today(), context=context)
39+ def reset_signature(self, cr, uid, ids, context=None, from_write_user=False):
40+ return self._archive_signature(cr, uid, ids, new_from=fields.date.today(), from_write_user=from_write_user, context=context)
41
42 def add_signature(self, cr, uid, ids, context=None):
43 real_uid = hasattr(uid, 'realUid') and uid.realUid or uid
44
45=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
46--- bin/addons/msf_profile/i18n/fr_MF.po 2023-03-10 09:18:31 +0000
47+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-03-27 07:59:23 +0000
48@@ -118050,12 +118050,6 @@
49 msgstr "Vous ne pouvez pas désactiver cet utilisateur, %d documents doivent être signés\n"
50 "%s"
51
52-#. module: base
53-#: code:addons/base/res/res_user.py:794
54-#, python-format
55-msgid "You can not deactivate %s: the signature is active"
56-msgstr "Vous ne pouvez pas désactiver %s: la signature est active"
57-
58 #. module: msf_currency_revaluation
59 #: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:750
60 #: code:addons/msf_currency_revaluation/wizard/wizard_currency_revaluation.py:747

Subscribers

People subscribed via source and target branches