Merge lp:~unifield-team/unifield-server/US-5343-5790-6099 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/purchase_order.py'
--- bin/addons/msf_doc_import/purchase_order.py	2019-05-17 09:46:15 +0000
+++ bin/addons/msf_doc_import/purchase_order.py	2019-06-07 07:31:09 +0000
@@ -427,19 +427,18 @@
                 # create tmp file
                 tmp_file = tempfile.NamedTemporaryFile(mode='w', delete=False)
                 tmp_file.write(base64.decodestring(file_res['result']))
+                tmpname = tmp_file.name
                 tmp_file.close()
-                new_tmp_file_name = os.path.join(os.path.dirname(tmp_file.name), filename)
-                os.rename(tmp_file.name, new_tmp_file_name)
 
                 # transfer tmp file on SFTP server
                 try:
                     with sftp.cd(export_wiz.dest_path):
-                        sftp.put(new_tmp_file_name, preserve_mtime=True)
+                        sftp.put(tmpname, filename, preserve_mtime=True)
                 except:
                     raise osv.except_osv(_('Error'), _('Unable to write on SFTP server at location %s') % export_wiz.dest_path)
 
                 # now we can remove tmp file
-                os.remove(new_tmp_file_name)
+                os.remove(tmpname)
             else:
                 # write export in local file
                 with open(path_to_file, 'w') as fich:
 
=== modified file 'bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako'
--- bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2018-08-10 09:51:23 +0000
+++ bin/addons/msf_doc_import/report/po_simulation_screen_xls_report.mako	2019-06-07 07:31:09 +0000
@@ -323,7 +323,7 @@
 
     <Row>
         <Cell ss:StyleID="header" ><Data ss:Type="String">${_('Information (Line numbers refer to the line numbers of the PO confirmation import file)')}</Data></Cell>
-        <Cell ss:StyleID="line" MergeAcross="3" ><Data ss:Type="String">${(o.message or '')|x}</Data></Cell>
+        <Cell ss:StyleID="line" ss:MergeAcross="2" ><Data ss:Type="String">${(o.message or '')|x}</Data></Cell>
     </Row>
 
 </Table>
 
=== modified file 'bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-05-28 07:30:48 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py	2019-06-07 07:31:09 +0000
@@ -734,7 +734,9 @@
                 lines_to_ignored = []   # Bad formatting lines
                 file_format_errors = []
                 values_header_errors = []
+                values_header_warnings = []
                 values_line_errors = []
+                values_line_warnings = []
                 message = ''
                 header_values = {}
 
@@ -803,10 +805,10 @@
                     message = '''## IMPORT STOPPED ##
 
     LINE 1 OF THE IMPORTED FILE: THE ORDER REFERENCE \
-    IN THE FILE IS NOT THE SAME AS THE ORDER REFERENCE OF THE SIMULATION SCREEN.\
+IN THE FILE IS NOT THE SAME AS THE ORDER REFERENCE OF THE SIMULATION SCREEN. \
 
-    YOU SHOULD IMPORT A FILE THAT HAS THE SAME ORDER REFERENCE THAN THE SIMULATION\
-    SCREEN !'''
+    YOU SHOULD IMPORT A FILE THAT HAS THE SAME ORDER REFERENCE THAN THE SIMULATION \
+SCREEN !'''
                     self.write(cr, uid, [wiz.id], {'message': message, 'state': 'error'}, context)
                     res = self.go_to_simulation(cr, uid, [wiz.id], context=context)
                     cr.commit()
@@ -941,7 +943,10 @@
                     for manda_field in LINES_COLUMNS:
                         if manda_field[2] == 'mandatory' and not values.get(x, [])[manda_field[0]]:
                             not_ok = True
-                            err1 = _('The column \'%s\' mustn\'t be empty%s') % (manda_field[1], manda_field[0] == 0 and ' - Line not imported' or '')
+                            if manda_field[0] == 4:  # Product Qty
+                                err1 = _('You can not have an order line with a negative or zero quantity. Updated quantity is ignored')
+                            else:
+                                err1 = _('The column \'%s\' mustn\'t be empty%s') % (manda_field[1], manda_field[0] == 0 and ' - Line not imported' or '')
                             err = _('Line %s of the PO: %s') % (line_number, err1)
                             values_line_errors.append(err)
                             file_line_error.append(err1)
@@ -976,9 +981,6 @@
                     if not ext_ref and line_number and line_number in EXT_REF_BY_LN[wiz.id].keys():
                         ext_ref = EXT_REF_BY_LN[wiz.id][line_number][0]
 
-                    if not_ok:
-                        not_ok_file_lines[x] = ' - '.join(err for err in file_line_error)
-
 #                    if not line_number and not ext_ref:
 #                        continue
 
@@ -1005,12 +1007,20 @@
                                 uom_id = uom_ids[0]
                                 UOM_NAME_ID.setdefault(vals[5], uom_id)
                     # Qty
+                    qty = 0
                     if vals[4]:
-                        qty = float(vals[4])
+                        try:
+                            qty = float(vals[4])
+                        except Exception:
+                            qty = 0
 
                     # AD on line
                     file_lines[x] = (line_number, product_id, uom_id, qty, ext_ref, vals[20:])
 
+                    # If error(s)
+                    if not_ok:
+                        not_ok_file_lines[x] = ' - '.join(err for err in file_line_error)
+
                 '''
                 Get the best matching line :
                     1/ Within lines with same line number, same product, same UoM and same qty
@@ -1117,7 +1127,7 @@
                                                        'percent_completed': percent_completed}, context=context)
                         vals = values.get(file_line[0], [])
                         if file_line[1] == 'match':
-                            err_msg = wl_obj.import_line(cr, uid, po_line, vals, cc_cache, context=context)
+                            err_msg, warn_msg = wl_obj.import_line(cr, uid, po_line, vals, cc_cache, context=context)
                             if file_line[0] in not_ok_file_lines:
                                 wl_obj.write(cr, uid, [po_line], {'type_change': 'error', 'error_msg': not_ok_file_lines[file_line[0]]}, context=context)
                         elif file_line[1] == 'split':
@@ -1127,7 +1137,7 @@
                                                      'parent_line_id': po_line,
                                                      'imp_dcd': False,
                                                      'po_line_id': False}, context=context)
-                            err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
+                            err_msg, warn_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
                             if file_line[0] in not_ok_file_lines:
                                 wl_obj.write(cr, uid, [new_wl_id], {'type_change': 'error', 'error_msg': not_ok_file_lines[file_line[0]]}, context=context)
                         # Commit modifications
@@ -1135,8 +1145,12 @@
 
                     if err_msg:
                         for err in err_msg:
-                            err = 'Line %s of the PO: %s' % (file_line[2], err)
+                            err = _('Line %s of the PO: %s') % (file_line[2], err)
                             values_line_errors.append(err)
+                    if warn_msg:
+                        for warn in warn_msg:
+                            warn = _('Line %s of the PO: %s') % (file_line[2], warn)
+                            values_line_errors.append(warn)
 
 
                 # Create new lines
@@ -1153,7 +1167,7 @@
                                                         'in_line_number': values.get(po_line, [])[0] and int(values.get(po_line, [])[0]) or False,
                                                         'in_ext_ref': values.get(po_line, [])[1] or False,
                                                         'simu_id': wiz.id}, context=context)
-                    err_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
+                    err_msg, warn_msg = wl_obj.import_line(cr, uid, new_wl_id, vals, cc_cache, context=context)
                     if po_line in not_ok_file_lines:
                         wl_obj.write(cr, uid, [new_wl_id], {'type_change': 'error', 'error_msg': not_ok_file_lines[po_line]}, context=context)
 
@@ -1161,10 +1175,17 @@
                     if err_msg:
                         for err in err_msg:
                             if line_n:
-                                err = 'Line %s of the PO: %s' % (line_n, err)
+                                err = _('Line %s of the PO: %s') % (line_n, err)
                             else:
-                                err = 'Line %s of the file: %s' % (po_line, err)
+                                err = _('Line %s of the file: %s') % (po_line, err)
                             values_line_errors.append(err)
+                    if warn_msg:
+                        for warn in warn_msg:
+                            if line_n:
+                                warn = _('Line %s of the PO: %s') % (line_n, warn)
+                            else:
+                                warn = _('Line %s of the file: %s') % (po_line, warn)
+                            values_line_warnings.append(warn)
                     # Commit modifications
                     cr.commit()
 
@@ -1176,27 +1197,41 @@
 
                 '''
                 We generate the message which will be displayed on the simulation
-                screen. This message is a merge between all errors.
+                screen. This message is a merge between all errors and warnings.
                 '''
                 # Generate the message
                 import_error_ok = False
+                import_warning_ok = False
                 if len(values_header_errors):
                     import_error_ok = True
-                    message += '\n## Error on header values ##\n\n'
+                    message += _('\n## Error on header values ##\n\n')
                     for err in values_header_errors:
                         message += '%s\n' % err
 
+                if len(values_header_warnings):
+                    import_warning_ok = True
+                    message += _('\n## Warning on header values ##\n\n')
+                    for warn in values_header_warnings:
+                        message += '%s\n' % warn
+
                 if len(values_line_errors):
                     import_error_ok = True
-                    message += '\n## Error on line values ##\n\n'
+                    message += _('\n## Error on line values ##\n\n')
                     for err in values_line_errors:
                         message += '%s\n' % err
 
+                if len(values_line_warnings):
+                    import_warning_ok = True
+                    message += _('\n## Warning on line values ##\n\n')
+                    for warn in values_line_warnings:
+                        message += '%s\n' % warn
+
                 header_values.update({
                     'message': message,
                     'state': 'simu_done',
                     'percent_completed': 100.0,
                     'import_error_ok': import_error_ok,
+                    'import_warning_ok': import_warning_ok,
                 })
                 self.write(cr, uid, [wiz.id], header_values, context=context)
 
@@ -1504,6 +1539,7 @@
         'change_ok': fields.function(_get_line_info, method=True, multi='line',
                                      type='boolean', string='Change', store=False),
         'error_msg': fields.text(string='Error message', readonly=True),
+        'warning_msg': fields.text(string='Warning message', readonly=True),
         'parent_line_id': fields.many2one('wizard.import.po.simulation.screen.line',
                                           string='Parent line id',
                                           help='Use to split the good PO line',
@@ -1522,6 +1558,19 @@
 
         for line in self.browse(cr, uid, ids, context=context):
             if line.error_msg:
+                raise osv.except_osv(_('Error'), line.error_msg)
+
+        return True
+
+    def get_warning_msg(self, cr, uid, ids, context=None):
+        '''
+        Display the warning message
+        '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.error_msg:
                 raise osv.except_osv(_('Warning'), line.error_msg)
 
         return True
@@ -1538,6 +1587,7 @@
             ids = [ids]
 
         errors = []
+        warnings = []
 
         for line in self.browse(cr, uid, ids, context=context):
             write_vals = {}
@@ -1545,10 +1595,9 @@
             # Comment
             write_vals['imp_comment'] = values[15] and values[15].strip()
 
-            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]'):
-                write_vals['type_change'] = 'error'
-                errors.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
-
+            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]'):
+                write_vals['type_change'] = 'warning'
+                warnings.append(_('PO line has been confirmed or cancelled and consequently is not editable'))
 
             # External Ref.
             write_vals['imp_external_ref'] = values[1]
@@ -1556,17 +1605,17 @@
             if line.in_line_number:
                 pol_ids = self.pool.get('purchase.order.line').search(cr, uid, [('order_id', '=', line.simu_id.order_id.id), ('line_number', '=', line.in_line_number)], context=context)
                 if not pol_ids and not (write_vals['imp_comment'] and write_vals['imp_comment'] == '[DELETE]'):
-                    errors.append(_('Line no is not consistent with validated PO.'))
+                    warnings.append(_('Line no is not consistent with validated PO.'))
                     write_vals['in_line_number'] = False
                     write_vals['type_change'] = 'warning'
 
-            if (write_vals['imp_comment'] and write_vals['imp_comment'] == '[DELETE]'):
+            if write_vals['imp_comment'] and write_vals['imp_comment'] == '[DELETE]':
                 if not pol_ids:
                     write_vals['type_change'] = 'warning'
                     if line.in_line_number:
-                        errors.append(_('The import file is inconsistent. Line no. %s is not existing or was previously deleted') % line.in_line_number)
+                        warnings.append(_('The import file is inconsistent. Line no. %s is not existing or was previously deleted') % line.in_line_number)
                     else:
-                        errors.append(_('The import file is inconsistent. The matching line is not existing or was previously deleted'))
+                        warnings.append(_('The import file is inconsistent. The matching line is not existing or was previously deleted'))
                 else:
                     if line.po_line_id.state in ('validated', 'validated_n'):
                         write_vals['type_change'] = 'del'
@@ -1617,12 +1666,19 @@
                     write_vals['ad_info'] = ad_info
 
             # Qty
-            err_msg = _('Incorrect float value for field \'Product Qty\'')
-            try:
-                qty = float(values[4])
-                write_vals['imp_qty'] = qty
-            except Exception:
-                errors.append(err_msg)
+            if values[4]:
+                try:
+                    qty = float(values[4])
+                    write_vals['imp_qty'] = qty
+                    if qty <= 0:
+                        errors.append(_('You can not have an order line with a negative or zero quantity. Updated quantity is ignored'))
+                        write_vals['type_change'] = 'error'
+                        write_vals['imp_qty'] = 0.00
+                except Exception:
+                    errors.append(_('Incorrect float value for field \'Product Qty\''))
+                    write_vals['type_change'] = 'error'
+                    write_vals['imp_qty'] = 0.00
+            else:
                 write_vals['type_change'] = 'error'
                 write_vals['imp_qty'] = 0.00
 
@@ -1776,18 +1832,26 @@
 
             if line.error_msg:
                 write_vals['type_change'] = 'error'
+            if line.warning_msg and write_vals.get('type_change') != 'error':
+                write_vals['type_change'] = 'warning'
 
-            if write_vals.get('type_change') in ['error', 'warning']:
+            if write_vals.get('type_change') in ['warning', 'error']:
                 err_msg = line.error_msg or ''
                 for err in errors:
                     if err_msg:
                         err_msg += ' - '
                     err_msg += err
                 write_vals['error_msg'] = err_msg
+                warn_msg = line.error_msg or ''
+                for warn in warnings:
+                    if warn_msg:
+                        warn_msg += ' - '
+                    warn_msg += warn
+                write_vals['warn_msg'] = warn_msg
 
             self.write(cr, uid, [line.id], write_vals, context=context)
 
-        return errors
+        return errors, warnings
 
     def update_po_line(self, cr, uid, ids, context=None):
         '''
 
=== 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	2019-03-29 17:02:16 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen_view.xml	2019-06-07 07:31:09 +0000
@@ -33,7 +33,7 @@
                         <button name="print_simulation_report" string="Print report" icon="gtk-print" type="object" states="simu_done,import_progress,done" />
                     </group>
                     <notebook colspan="4">
-                        <page string="Error" attrs="{'invisible': [('import_error_ok', '=', False), ('state', '!=', 'error')]}">
+                        <page string="Errors/Warnings" attrs="{'invisible': [('import_error_ok', '=', False), ('state', '!=', 'error')]}">
                             <field name="message" nolabel="1" colspan="4" readonly="1" widget="full_text" />
                         </page>
                         <page string="Purchase Order">
@@ -80,7 +80,7 @@
                         <page string="Details">
                             <!-- LINES -->
                             <field name="simu_line_ids" nolabel="1" colspan="4">
-                                <tree string="Lines" colors="grey: type_change == 'del'; red: type_change in ('warning', 'error'); orange: change_ok==True and type_change not in ('del', 'ignore', 'error', 'warning'); blue: type_change=='split'; green: type_change=='new'">
+                                <tree string="Lines" colors="grey: type_change == 'del'; red: type_change == 'error'; orange: type_change == 'warning'; darkgreen: change_ok==True and type_change not in ('del', 'ignore', 'error', 'warning'); green:type_change=='new'; blue: type_change=='split'">
                                     <field name="in_product_id" />
                                     <field name="in_nomen" />
                                     <field name="in_comment" />
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2019-06-04 19:13:17 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2019-06-07 07:31:09 +0000
@@ -28224,11 +28224,11 @@
 msgstr "Chercher champs"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:690
-#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:698
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:810
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:820
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:827
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:728
+#: code:addons/msf_doc_import/wizard/wizard_in_simulation_screen.py:736
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:964
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1172
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1179
 #, python-format
 msgid "Line %s of the file: %s"
 msgstr "Ligne %s du fichier: %s"
@@ -28386,12 +28386,13 @@
 msgid "Determines the percentage which will be applied on field price from the product form."
 msgstr "Détermine le pourcentage qui sera appliqué sur le champ du prix à partir du formulaire de produits."
 
-#. modules: stock_override, kit
+#. modules: stock_override, kit, msf_doc_import
 #: field:kit.mass.import,warning_import:0
 #: field:kit.mass.import,warning_message:0
+#: field:wizard.import.po.simulation.screen.line,warning_msg:0
 #: field:change.dest.location,warn_msg:0
 msgid "Warning message"
-msgstr "Warning message"
+msgstr "Message d'avertissement"
 
 #. modules: product_attributes, product
 #: selection:product.price.type,field:0
@@ -41986,10 +41987,10 @@
 msgstr "Nom de modèle facultatif des objets pour lesquels cette action doit être visible"
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1381
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1600
 #, python-format
 msgid "Line no is not consistent with validated PO."
-msgstr "Line no is not consistent with validated PO."
+msgstr "Le num de ligne n'est pas cohérent avec le BC validé."
 
 #. module: unifield_setup
 #: view:field.orders.setup:0
@@ -74683,7 +74684,6 @@
 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:329
 #: code:addons/msf_doc_import/wizard/wizard_import_po_line.py:331
 #: view:wizard.import.in.simulation.screen:0
-#: view:wizard.import.po.simulation.screen:0
 #: code:addons/msf_instance/account.py:57
 #: code:addons/msf_instance/account.py:60
 #: code:addons/msf_instance/add_instance.py:590
@@ -101894,8 +101894,12 @@
 msgstr "Vous ne pouvez avoir qu'une seule Expédition en brouillon pour la même adresse, veuillez vérifier %s "
 
 #. module: msf_doc_import
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:811
-#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:827
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:947
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:971
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1140
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1144
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1170
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1177
 #, python-format
 msgid "Line %s of the PO: %s"
 msgstr "Ligne %s du BC: %s"
@@ -106784,6 +106788,59 @@
 msgstr "Montant Estimé:"
 
 #. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1199
+#, python-format
+msgid "\n"
+"## Error on header values ##\n"
+"\n"
+""
+msgstr "\n"
+"## Erreur sur les valeurs de l'entête ##\n"
+"\n"
+""
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1205
+#, python-format
+msgid "\n"
+"## Warning on header values ##\n"
+"\n"
+""
+msgstr "\n"
+"## Avertissement sur les valeurs de l'entete ##\n"
+"\n"
+""
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1211
+#, python-format
+msgid "\n"
+"## Error on line values ##\n"
+"\n"
+""
+msgstr "\n"
+"## Erreur sur les valeurs des lignes ##\n"
+"\n"
+""
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1217
+#, python-format
+msgid "\n"
+"## Warning on line values ##\n"
+"\n"
+""
+msgstr "\n"
+"## Avertissement sur les valeurs des lignes ##\n"
+"\n"
+""
+
+#. module: msf_doc_import
+#: view:wizard.import.po.simulation.screen:0
+msgid "Errors/Warnings"
+msgstr "Erreurs/Avertissements"
+
+#. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1705
 #, python-format
 msgid "A PO with a Loan, Donation before expiry, Standard donation or In Kind Donation Order Type can't have an Source Document in its lines"
@@ -106795,6 +106852,7 @@
 #, python-format
 msgid "You can't change the Order Type to Loan, Donation before expiry, Standard donation or In Kind Donation if a line has a Source Document"
 msgstr "Vous ne pouvez pas changer le Type de Commande en Prêt, Donation avant expiration, Donation normale ou Donation en Nature si une des lignes a un Document d'Origine"
+<<<<<<< TREE
 
 #. module: stock
 #: report:addons/stock/report/products_situation_report_xls.mako:217
@@ -106827,3 +106885,12 @@
 msgid "Stop report"
 msgstr "Arrêter le rapport"
 
+=======
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:947
+#: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:1674
+#, python-format
+msgid "You can not have an order line with a negative or zero quantity. Updated quantity is ignored"
+msgstr "Vous ne pouvez pas avoir de ligne de commande avec une quantité négative ou nulle. La quantité mise à jour est ignorée"
+>>>>>>> MERGE-SOURCE
 
=== modified file 'bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako'
--- bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2018-08-10 10:21:43 +0000
+++ bin/addons/msf_supply_doc_export/report/report_validated_purchase_order_xml.mako	2019-06-07 07:31:09 +0000
@@ -12,7 +12,11 @@
         % endif
         <field name="partner_ref">${o.partner_ref or ''|x}</field>
         <field name="details">${o.details or ''|x}</field>
-        <field name="stock_take_date">${o.stock_take_date or ''|x}</field>
+        % if o.stock_take_date and o.stock_take_date not in (False, 'False'):
+        <field name="stock_take_date">${o.stock_take_date|n}</field>
+        % else:
+        <field name="stock_take_date"></field>
+        % endif
         % if o.delivery_requested_date and o.delivery_requested_date not in (False, 'False'):
         <field name="delivery_requested_date">${o.delivery_requested_date or ''|n}</field>
         % else:
@@ -77,7 +81,11 @@
                         <field name="name">${l.currency_id and l.currency_id.name or ''|x}</field>
                     </field>
                     <field name="origin">${l.origin or ''|x}</field>
-                    <field name="stock_take_date">${l.stock_take_date or ''|x}</field>
+                    % if l.stock_take_date and l.stock_take_date not in (False, 'False'):
+                    <field name="stock_take_date">${l.stock_take_date|n}</field>
+                    % else:
+                    <field name="stock_take_date"></field>
+                    % endif
                     % if l.date_planned and l.date_planned not in (False, 'False'):
                     <field name="date_planned">${l.date_planned|n}</field>
                     % else:
 
=== modified file 'bin/addons/msf_tools/automated_export_job.py'
--- bin/addons/msf_tools/automated_export_job.py	2019-03-21 11:29:45 +0000
+++ bin/addons/msf_tools/automated_export_job.py	2019-06-07 07:31:09 +0000
@@ -242,12 +242,9 @@
                 if not rep.startswith('2'):
                     raise osv.except_osv(_('Error'), _('Unable to write report on FTP server'))
         elif on_ftp and job_brw.export_id.ftp_protocol == 'sftp':
-            new_tmp_file_name = os.path.join(os.path.dirname(temp_path), filename)
-            os.rename(temp_path, new_tmp_file_name)
-            temp_path = new_tmp_file_name
             try:
                 with sftp.cd(job_brw.export_id.report_path):
-                    sftp.put(new_tmp_file_name, preserve_mtime=True)
+                    sftp.put(temp_path, filename, preserve_mtime=True)
             except:
                 raise osv.except_osv(_('Error'), _('Unable to write report on SFTP server'))
 
 
=== modified file 'bin/addons/msf_tools/automated_import_job.py'
--- bin/addons/msf_tools/automated_import_job.py	2019-04-15 12:49:45 +0000
+++ bin/addons/msf_tools/automated_import_job.py	2019-06-07 07:31:09 +0000
@@ -622,12 +622,9 @@
                 if not rep.startswith('2'):
                     raise osv.except_osv(_('Error'), _('Unable to write report on FTP server'))
         elif on_ftp and job_brw.import_id.ftp_protocol == 'sftp':
-            new_tmp_file_name = os.path.join(os.path.dirname(temp_path), filename)
-            os.rename(temp_path, new_tmp_file_name)
-            temp_path = new_tmp_file_name
             try:
                 with sftp.cd(job_brw.import_id.report_path):
-                    sftp.put(new_tmp_file_name, preserve_mtime=True)
+                    sftp.put(temp_path, filename, preserve_mtime=True)
             except:
                 raise osv.except_osv(_('Error'), _('Unable to write report on SFTP server'))