Merge lp:~mallorymarcot/unifield-server/us-2054 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4101
Proposed branch: lp:~mallorymarcot/unifield-server/us-2054
Merge into: lp:unifield-server
Diff against target: 30 lines (+11/-4)
1 file modified
bin/addons/mission_stock/mission_stock.py (+11/-4)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-2054
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+312326@code.launchpad.net
To post a comment you must log in.
4098. By Mallory MARCOT

US-2054 [Fix] Stock mission report lines are created even if the product's state is empty

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/mission_stock/mission_stock.py'
2--- bin/addons/mission_stock/mission_stock.py 2016-11-21 13:42:33 +0000
3+++ bin/addons/mission_stock/mission_stock.py 2016-12-02 09:08:20 +0000
4@@ -547,15 +547,22 @@
5 line_obj = self.pool.get('stock.mission.report.line')
6 for report in self.read(cr, uid, report_ids, ['local_report', 'full_view'], context=context):
7 # Create one line by product
8- cr.execute('''SELECT p.id from product_product p
9- WHERE NOT EXISTS (
10+ cr.execute('''SELECT p.id, ps.code
11+ FROM product_product p, product_template pt
12+ LEFT JOIN product_status ps ON pt.state = ps.id
13+ WHERE p.product_tmpl_id = pt.id
14+ AND NOT EXISTS (
15 SELECT product_id
16 FROM
17 stock_mission_report_line smrl WHERE mission_report_id = %s
18 AND p.id = smrl.product_id)
19 ''' % report['id'])
20- for product in cr.fetchall():
21- line_obj.create(cr, uid, {'product_id': product, 'mission_report_id': report['id']}, context=context)
22+ for product, prod_state in cr.fetchall():
23+ line_obj.create(cr, uid, {
24+ 'product_id': product,
25+ 'mission_report_id': report['id'],
26+ 'product_state': prod_state,
27+ }, context=context)
28
29 # Don't update lines for full view or non local reports
30 if not report['local_report']:

Subscribers

People subscribed via source and target branches