Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/us-5014 into lp:unifield-server

  1. us-5014
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5077
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/us-5014
Merge into: lp:unifield-server
Diff against target: 22 lines (+5/-4)
1 file modified
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+5/-4)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/us-5014
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+354237@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 2018-08-21 13:13:08 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2018-09-04 12:11:55 +0000
4@@ -1425,13 +1425,14 @@
5 for line in self.browse(cr, uid, ids, context=context):
6 write_vals = {}
7
8- if line.po_line_id.state in ('confirmed', 'done', 'cancel', 'cancel_r'):
9- write_vals['type_change'] = 'error'
10- errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
11-
12 # Comment
13 write_vals['imp_comment'] = values[15] and values[15].strip()
14
15+ if line.po_line_id.state in ('confirmed', 'done') or ( line.po_line_id.state in ('cancel', 'cancel_r') and write_vals['imp_comment'] != '[DELETE]'):
16+ write_vals['type_change'] = 'error'
17+ errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
18+
19+
20 # External Ref.
21 write_vals['imp_external_ref'] = values[1]
22 pol_ids = None

Subscribers

People subscribed via source and target branches