unifield-wm

Merge lp:~unifield-team/unifield-wm/utp-1216 into lp:unifield-wm

  1. utp-1216
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2325
Proposed branch: lp:~unifield-team/unifield-wm/utp-1216
Merge into: lp:unifield-wm
Diff against target: 51 lines (+17/-3)
2 files modified
msf_doc_import/wizard/wizard_po_simulation_screen.py (+9/-3)
msf_doc_import/wizard/wizard_po_simulation_screen_view.xml (+8/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/utp-1216
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+238665@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 'msf_doc_import/wizard/wizard_po_simulation_screen.py'
2--- msf_doc_import/wizard/wizard_po_simulation_screen.py 2014-04-11 12:12:57 +0000
3+++ msf_doc_import/wizard/wizard_po_simulation_screen.py 2014-10-17 07:39:37 +0000
4@@ -920,19 +920,25 @@
5 screen. This message is a merge between all errors.
6 '''
7 # Generate the message
8+ import_error_ok = False
9 if len(values_header_errors):
10+ import_error_ok = True
11 message += '\n## Error on header values ##\n\n'
12 for err in values_header_errors:
13 message += '%s\n' % err
14
15 if len(values_line_errors):
16+ import_error_ok = True
17 message += '\n## Error on line values ##\n\n'
18 for err in values_line_errors:
19 message += '%s\n' % err
20
21- header_values['message'] = message
22- header_values['state'] = 'simu_done'
23- header_values['percent_completed'] = 100.0
24+ header_values.update({
25+ 'message': message,
26+ 'state': 'simu_done',
27+ 'percent_completed': 100.0,
28+ 'import_error_ok': import_error_ok,
29+ })
30 self.write(cr, uid, [wiz.id], header_values, context=context)
31
32 # res = self.go_to_simulation(cr, uid, [wiz.id], context=context)
33
34=== modified file 'msf_doc_import/wizard/wizard_po_simulation_screen_view.xml'
35--- msf_doc_import/wizard/wizard_po_simulation_screen_view.xml 2014-04-08 09:42:43 +0000
36+++ msf_doc_import/wizard/wizard_po_simulation_screen_view.xml 2014-10-17 07:39:37 +0000
37@@ -31,6 +31,14 @@
38 <button name="go_to_simulation" string="Update" icon="gtk-execute" type="object" states="simu_progress,import_progress" />
39 <button name="print_simulation_report" string="Print report" icon="gtk-print" type="object" states="simu_done,import_progress,done" />
40 </group>
41+ <group name="errors" colspan="4" attrs="{'invisible': [('import_error_ok', '=', False)]}">
42+ <html>
43+ <p id="view_error_msg"
44+ style="text-align:center; color:red; font-weight: bold; font-size: 1.2.em;">
45+ WARNING: There are problems with the import file. Please see the 'Information' tab.
46+ </p>
47+ </html>
48+ </group>
49 <notebook colspan="4">
50 <page string="Purchase Order">
51 <field name="in_dest_addr" />

Subscribers

People subscribed via source and target branches