Unifield Server

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

  1. us-1563
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3909
Proposed branch: lp:~unifield-team/unifield-server/us-1563
Merge into: lp:unifield-server
Diff against target: 40 lines (+7/-6)
2 files modified
bin/addons/sale_override/sale.py (+1/-1)
bin/addons/sourcing/sale_order_line.py (+6/-5)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1563
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+302428@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-07-13 13:27:48 +0000
3+++ bin/addons/sale_override/sale.py 2016-08-09 15:06:08 +0000
4@@ -2910,7 +2910,7 @@
5 self.infolog(cr, uid, "The line id:%s (line number: %s) of the %s id:%s (%s) has been deleted." % ltl)
6
7 if lines_to_check:
8- self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context)
9+ self.check_confirm_order(cr, uid, lines_to_check, run_scheduler=False, context=context, update_lines=False)
10
11 return res
12
13
14=== modified file 'bin/addons/sourcing/sale_order_line.py'
15--- bin/addons/sourcing/sale_order_line.py 2016-06-09 13:56:58 +0000
16+++ bin/addons/sourcing/sale_order_line.py 2016-08-09 15:06:08 +0000
17@@ -1263,7 +1263,7 @@
18
19 return True
20
21- def check_confirm_order(self, cr, uid, ids, run_scheduler=False, context=None):
22+ def check_confirm_order(self, cr, uid, ids, run_scheduler=False, context=None, update_lines=True):
23 """
24 Run the confirmation of the FO/IR if all lines are confirmed
25 :param cr: Cursor to the database
26@@ -1290,10 +1290,11 @@
27 if order_data['state'] != 'validated':
28 continue
29 state_to_use = order_proc and 'confirmed' or 'sourced'
30- self.write(cr, uid, [line['id']], {
31- 'state': state_to_use,
32- 'cf_estimated_delivery_date': line['estimated_delivery_date'],
33- }, context=context)
34+ if update_lines:
35+ self.write(cr, uid, [line['id']], {
36+ 'state': state_to_use,
37+ 'cf_estimated_delivery_date': line['estimated_delivery_date'],
38+ }, context=context)
39 if line['order_id'][0] not in order_to_check:
40 order_to_check.update({line['order_id'][0]: state_to_use})
41

Subscribers

People subscribed via source and target branches

to all changes: