Merge lp:~dorian-kemps/unifield-server/US-6622 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5778
Proposed branch: lp:~dorian-kemps/unifield-server/US-6622
Merge into: lp:unifield-server
Diff against target: 30 lines (+6/-1)
1 file modified
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+6/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-6622
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+385467@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_doc_import/wizard/wizard_po_simulation_screen.py'
2--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2020-02-17 11:35:43 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2020-06-10 07:55:34 +0000
4@@ -1908,6 +1908,7 @@
5 nb_lines = float(len(ids))
6 line_treated = 0.00
7 percent_completed = 0.00
8+ lines_to_cancel = []
9 for line in self.browse(cr, uid, ids, context=context):
10 context['purchase_id'] = line.simu_id.order_id.id
11 line_treated += 1
12@@ -1934,7 +1935,7 @@
13 })
14
15 if line.type_change == 'del' and line.po_line_id:
16- wf_service.trg_validate(uid, 'purchase.order.line', line.po_line_id.id, 'cancel', cr)
17+ lines_to_cancel.append(line.po_line_id.id) # Delay the cancel to prevent the PO's cancellation
18 simu_obj.write(cr, uid, [line.simu_id.id], {'percent_completed': percent_completed}, context=context)
19 cr.commit()
20 continue
21@@ -2068,6 +2069,10 @@
22 simu_obj.write(cr, uid, [line.simu_id.id], {'percent_completed': percent_completed}, context=context)
23 cr.commit()
24
25+ # Cancel the lines at the end
26+ for line_id in lines_to_cancel:
27+ wf_service.trg_validate(uid, 'purchase.order.line', line_id, 'cancel', cr)
28+
29 if ids:
30 return simu_obj.go_to_simulation(cr, uid, line.simu_id.id, context=context)
31

Subscribers

People subscribed via source and target branches