Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/us-1208 into lp:unifield-server

  1. us-1208
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3702
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/us-1208
Merge into: lp:unifield-server
Diff against target: 43 lines (+12/-2)
2 files modified
bin/addons/sale_override/sale.py (+7/-2)
bin/osv/orm.py (+5/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/us-1208
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+291643@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/sale_override/sale.py'
2--- bin/addons/sale_override/sale.py 2016-03-31 10:17:58 +0000
3+++ bin/addons/sale_override/sale.py 2016-04-12 15:35:43 +0000
4@@ -808,6 +808,9 @@
5 get function values
6 '''
7 result = {}
8+ if context is None:
9+ context = {}
10+
11 for obj in self.browse(cr, uid, ids, context=context):
12 result[obj.id] = {}
13 for f in fields:
14@@ -818,8 +821,10 @@
15 if obj.state == 'done' and obj.split_type_sale_order == 'original_sale_order' and not obj.procurement_request:
16 result[obj.id]['state_hidden_sale_order'] = 'split_so'
17
18- if obj.state_hidden_sale_order != result[obj.id]['state_hidden_sale_order']:
19- self.add_audit_line(cr, uid, obj.id,
20+ if obj.state_hidden_sale_order != result[obj.id]['state_hidden_sale_order'] and \
21+ (not obj.original_so_id_sale_order or obj.state_hidden_sale_order not in (False, 'draft')):
22+ real_uid = context.get('computed_for_uid', uid)
23+ self.add_audit_line(cr, real_uid, obj.id,
24 obj.state_hidden_sale_order,
25 result[obj.id]['state_hidden_sale_order'],
26 context=context)
27
28=== modified file 'bin/osv/orm.py'
29--- bin/osv/orm.py 2016-04-01 12:58:43 +0000
30+++ bin/osv/orm.py 2016-04-12 15:35:43 +0000
31@@ -4173,7 +4173,12 @@
32 val = todo[key]
33 if key:
34 # uid == 1 for accessing objects having rules defined on store fields
35+ if hasattr(uid, 'realUid'):
36+ context['computed_for_uid'] = uid.realUid
37+ else:
38+ context['computed_for_uid'] = uid
39 result = self._columns[val[0]].get(cr, self, ids, val, 1, context=context)
40+ del context['computed_for_uid']
41 for id, value in result.items():
42 if field_flag:
43 for f in value.keys():

Subscribers

People subscribed via source and target branches