Unifield Server

Merge lp:~unifield-team/unifield-server/us-479 into lp:unifield-server

  1. us-479
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3881
Proposed branch: lp:~unifield-team/unifield-server/us-479
Merge into: lp:unifield-server
Diff against target: 66 lines (+14/-4)
3 files modified
bin/addons/msf_button_access_rights/osv_override.py (+4/-0)
bin/addons/purchase/purchase.py (+7/-2)
bin/addons/purchase_override/purchase.py (+3/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-479
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300708@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/msf_button_access_rights/osv_override.py'
2--- bin/addons/msf_button_access_rights/osv_override.py 2015-12-07 14:33:24 +0000
3+++ bin/addons/msf_button_access_rights/osv_override.py 2016-07-22 12:29:25 +0000
4@@ -124,6 +124,10 @@
5 def __init__(self, fakeUid, realUid):
6 self.realUid = realUid
7
8+ def __reduce__(self):
9+ res = super(fakeUid, self).__reduce__()
10+ return (res[0], (res[1][1], res[1][1], self.realUid))
11+
12 super_execute_cr = osv.object_proxy.execute_cr
13
14 def execute_cr(self, cr, uid, obj, method, *args, **kw):
15
16=== modified file 'bin/addons/purchase/purchase.py'
17--- bin/addons/purchase/purchase.py 2015-05-12 07:21:37 +0000
18+++ bin/addons/purchase/purchase.py 2016-07-22 12:29:25 +0000
19@@ -566,6 +566,7 @@
20 @return: new purchase order id
21
22 """
23+ line_obj = self.pool.get('purchase.order.line')
24 wf_service = netsvc.LocalService("workflow")
25 def make_key(br, fields):
26 list_key = []
27@@ -615,6 +616,7 @@
28 order_infos['origin'] = (order_infos['origin'] or '') + ' ' + porder.origin
29 order_infos = self._hook_order_infos(cr, uid, order_infos=order_infos, order_id=porder)
30
31+ no_proc_ids = []
32 for order_line in porder.order_line:
33 line_key = make_key(order_line, ('id', 'order_id', 'name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
34 o_line = order_infos['order_line'].setdefault(line_key, {})
35@@ -631,8 +633,11 @@
36 o_line[field] = field_val
37 o_line['uom_factor'] = order_line.product_uom and order_line.product_uom.factor or 1.0
38 o_line = self._hook_o_line_value(cr, uid, o_line=o_line, order_line=order_line)
39-
40-
41+ if order_line.procurement_id:
42+ no_proc_ids.append(order_line.id)
43+
44+ if no_proc_ids:
45+ line_obj.write(cr, uid, no_proc_ids, {'procurement_id': False}, context=context)
46
47 allorders = []
48 orders_info = {}
49
50=== modified file 'bin/addons/purchase_override/purchase.py'
51--- bin/addons/purchase_override/purchase.py 2016-06-01 08:29:43 +0000
52+++ bin/addons/purchase_override/purchase.py 2016-07-22 12:29:25 +0000
53@@ -2384,10 +2384,11 @@
54 'confirmed_delivery_date', 'nomenclature_description', 'default_code',
55 'nomen_manda_0', 'nomen_manda_1', 'nomen_manda_2', 'nomen_manda_3',
56 'nomenclature_code', 'name', 'default_name', 'comment', 'date_planned',
57- 'to_correct_ok', 'text_error',
58+ 'to_correct_ok', 'text_error', 'select_fo', 'project_ref', 'external_ref',
59 'nomen_sub_0', 'nomen_sub_1', 'nomen_sub_2', 'nomen_sub_3', 'nomen_sub_4',
60 'nomen_sub_5', 'procurement_id', 'change_price_manually', 'old_price_unit',
61- 'origin', 'account_analytic_id', 'product_id', 'company_id', 'notes', 'taxes_id']
62+ 'origin', 'account_analytic_id', 'product_id', 'company_id', 'notes', 'taxes_id',
63+ 'link_so_id', 'from_fo', 'sale_order_line_id', 'tender_line_id', 'dest_partner_id']
64
65 for field in fields:
66 field_val = getattr(order_line, field)

Subscribers

People subscribed via source and target branches

to all changes: