Merge lp:~fabien-morin/unifield-server/fm-us-2629 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2017-04-19 12:17:27 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2017-04-25 09:19:48 +0000
@@ -799,13 +799,17 @@
                 We generate the message which will be displayed on the simulation
                 screen. This message is a merge between all errors.
                 '''
+
+                import_error_ok = False
                 # Generate the message
                 if len(values_header_errors):
+                    import_error_ok = True
                     message += '\n## Error on header values ##\n\n'
                     for err in values_header_errors:
                         message += '%s\n' % err
 
                 if len(values_line_errors):
+                    import_error_ok = True
                     message += '\n## Error on line values ##\n\n'
                     for err in values_line_errors:
                         message += '%s\n' % err
@@ -813,6 +817,7 @@
                 header_values['message'] = message
                 header_values['state'] = 'simu_done'
                 header_values['percent_completed'] = 100.0
+                header_values['import_error_ok'] = import_error_ok
                 self.write(cr, uid, [wiz.id], header_values, context=context)
 
                 res = self.go_to_simulation(cr, uid, [wiz.id], context=context)

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2016-04-05 08:15:29 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen_view.xml	2017-04-25 09:19:48 +0000
@@ -38,6 +38,9 @@
                     </group>
 
                     <notebook colspan="4">
+                        <page string="Information" attrs="{'invisible': [('import_error_ok', '=', False), ('state', '!=', 'error')]}">
+                            <field name="message" colspan="4" nolabel="1" readonly="1" widget="full_text" />
+                        </page>
 
                         <page string="Incoming shipment">
                             <separator colspan="2" string="Origin values"/>
@@ -58,10 +61,6 @@
                             <field name="line_ids" mode="tree" colspan="4" nolabel="1" readonly="1" />
                         </page>
 
-                        <page string="Information">
-                            <field name="message" colspan="4" nolabel="1" readonly="1" />
-                        </page>
-
                     </notebook>
 
                 </form>

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2016-06-06 13:30:57 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2017-04-25 09:19:48 +0000
@@ -41,6 +41,11 @@
                         </html>
                     </group>
                     <notebook colspan="4">
+                        <page string="Information" attrs="{'invisible': [('import_error_ok', '=', False), ('state', '!=', 'error')]}">
+                            <field name="nb_file_lines" />
+                            <field name="nb_treated_lines" />
+                            <field name="message" nolabel="1" colspan="4" readonly="1" widget="full_text" />
+                        </page>
                         <page string="Purchase Order">
                             <field name="in_dest_addr" />
                             <newline />
@@ -114,11 +119,6 @@
                                 </tree>
                             </field>
                         </page>
-                        <page string="Information">
-                            <field name="nb_file_lines" />
-                            <field name="nb_treated_lines" />
-                            <field name="message" nolabel="1" colspan="4" readonly="1" />
-                        </page>
                         <!--<page string="Previous simulations">
                         </page>-->
                     </notebook>