Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-8120 into lp:unifield-server

  1. US-8120
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5902
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-8120
Merge into: lp:unifield-server
Diff against target: 21 lines (+2/-3)
1 file modified
bin/addons/product_attributes/product_attributes.py (+2/-3)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-8120
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+395540@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/product_attributes/product_attributes.py'
2--- bin/addons/product_attributes/product_attributes.py 2020-11-24 14:11:46 +0000
3+++ bin/addons/product_attributes/product_attributes.py 2020-12-28 10:52:15 +0000
4@@ -2878,7 +2878,7 @@
5 'secondary_qty', 'secondary_val',
6 'cu_qty', 'cu_val',
7 'cross_qty', 'cross_val',
8- 'wh_qty', 'internal_qty'
9+ 'wh_qty', 'internal_qty',
10 'quarantine_qty', 'input_qty', 'opdd_qty'
11 ]
12 cr.execute('''
13@@ -2887,8 +2887,7 @@
14 mission_report_id in (select id from stock_mission_report where full_view='f' and instance_id=%(local_instance_id)s) and
15 product_id in %(product_ids)s
16 ''', {'zero': 0, 'local_instance_id': self.pool.get('res.company')._get_instance_id(cr, uid), 'product_ids': (nsl_prod_id, local_id)}) # not_a_user_entry
17- cr.execute("delete from mission_line_move_rel where move_id in (select id from stock_move where product_id = %s)", (nsl_prod_id,))
18- cr.execute("delete from mission_move_rel where move_id in (select id from stock_move where product_id = %s)", (nsl_prod_id,))
19+ cr.execute("update stock_move set included_in_mission_stock='f' where product_id=%s", (nsl_prod_id, ))
20
21 return True
22

Subscribers

People subscribed via source and target branches