Unifield Server

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

  1. us-884
  2. Merge into trunk
Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 3658
Proposed branch: lp:~unifield-team/unifield-server/us-884
Merge into: lp:unifield-server
Diff against target: 80 lines (+11/-4)
5 files modified
bin/addons/msf_supply_doc_export/msf_supply_doc_export.py (+1/-1)
bin/addons/sales_followup/report/sale_follow_up_report_multi.py (+1/-1)
bin/addons/specific_rules/report/report_stock_inventory.py (+1/-0)
bin/addons/stock_override/report/report_stock_move.py (+1/-0)
bin/osv/expression.py (+7/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-884
Reviewer Review Type Date Requested Status
Quentin THEURET @Amaris Pending
Review via email: mp+288941@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_supply_doc_export/msf_supply_doc_export.py'
2--- bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2016-03-04 12:51:23 +0000
3+++ bin/addons/msf_supply_doc_export/msf_supply_doc_export.py 2016-03-15 06:39:39 +0000
4@@ -410,7 +410,7 @@
5
6 def yieldPoLines(self, po_line_ids):
7 for pol_id in po_line_ids:
8- yield self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id)
9+ yield self.pool.get('purchase.order.line').browse(self.cr, self.uid, pol_id, context=self.localcontext)
10
11 raise StopIteration
12
13
14=== modified file 'bin/addons/sales_followup/report/sale_follow_up_report_multi.py'
15--- bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2016-01-22 15:01:50 +0000
16+++ bin/addons/sales_followup/report/sale_follow_up_report_multi.py 2016-03-15 06:39:39 +0000
17@@ -74,7 +74,7 @@
18 def _get_order_line(self, order_id):
19 order_line_ids = self.pool.get('sale.order.line').search(self.cr, self.uid, [('order_id', '=', order_id)])
20 for order_line_id in order_line_ids:
21- yield self.pool.get('sale.order.line').browse(self.cr, self.uid, order_line_id)
22+ yield self.pool.get('sale.order.line').browse(self.cr, self.uid, order_line_id, context=self.localcontext)
23
24 raise StopIteration
25
26
27=== modified file 'bin/addons/specific_rules/report/report_stock_inventory.py'
28--- bin/addons/specific_rules/report/report_stock_inventory.py 2015-11-23 16:52:52 +0000
29+++ bin/addons/specific_rules/report/report_stock_inventory.py 2016-03-15 06:39:39 +0000
30@@ -268,6 +268,7 @@
31 self.cr,
32 self.uid,
33 self.datas['lines'],
34+ context=self.localcontext
35 ):
36 if not line.product_id.default_code in res:
37 res[line.product_id.default_code] = {
38
39=== modified file 'bin/addons/stock_override/report/report_stock_move.py'
40--- bin/addons/stock_override/report/report_stock_move.py 2015-11-03 12:55:51 +0000
41+++ bin/addons/stock_override/report/report_stock_move.py 2016-03-15 06:39:39 +0000
42@@ -548,6 +548,7 @@
43 self.cr,
44 self.uid,
45 self.datas['moves'],
46+ context=self.localcontext
47 ):
48 move_vals = {
49 'product_code': move.product_id.default_code,
50
51=== modified file 'bin/osv/expression.py'
52--- bin/osv/expression.py 2013-03-07 16:39:07 +0000
53+++ bin/osv/expression.py 2016-03-15 06:39:39 +0000
54@@ -371,19 +371,24 @@
55 ') UNION (' \
56 ' SELECT id' \
57 ' FROM "' + working_table._table + '"' \
58- ' WHERE "' + left + '" ' + operator + ' ' +" (" + instr + "))"
59+ ' WHERE "' + left + '" ' + operator + ' ' +" (" + instr + ")" \
60+ ' AND id NOT IN ' + query1 + "))"
61 else:
62 query1 += ' AND value ' + operator + instr + \
63 ') UNION (' \
64 ' SELECT id' \
65 ' FROM "' + working_table._table + '"' \
66- ' WHERE "' + left + '" ' + operator + instr + ")"
67+ ' WHERE "' + left + '" ' + operator + instr + "" \
68+ ' AND id NOT IN ' + query1 + '))'
69
70 query2 = [working_table._name + ',' + left,
71 context.get('lang', False) or 'en_US',
72 'model',
73 right,
74 right,
75+ working_table._name + ',' + left,
76+ context.get('lang', False) or 'en_US',
77+ 'model',
78 ]
79
80 self.__exp[i] = ('id', 'inselect', (query1, query2))

Subscribers

People subscribed via source and target branches

to all changes: