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

[jftempo]

=== modified file 'spreadsheet_xml/report/spreadsheet_writer_xls.mako'
--- spreadsheet_xml/report/spreadsheet_writer_xls.mako	2013-05-22 07:12:03 +0000
+++ spreadsheet_xml/report/spreadsheet_writer_xls.mako	2013-11-06 13:03:52 +0000
@@ -76,7 +76,9 @@
             % if h[1] == 'bool':
                 <Data ss:Type="Boolean">${result=='True' and '1' or '0'}</Data>
             % elif h[1] in ('number', 'int', 'float'):
-                % if not isinstance(result, bool): 
+                % if isinstance(result, tuple) and len(result) > 1:
+                    <Data ss:Type="${result[1]}">${result[0]}</Data>
+                % elif not isinstance(result, bool): 
                     <Data ss:Type="Number">${result}</Data>
                 % else:
                     <Data ss:Type="String"></Data>
 
=== modified file 'supplier_catalogue/supplier_catalogue.py'
--- supplier_catalogue/supplier_catalogue.py	2013-07-09 07:16:03 +0000
+++ supplier_catalogue/supplier_catalogue.py	2013-11-06 13:03:52 +0000
@@ -35,6 +35,12 @@
 from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetCreator
 
+_HEADER_TYPE = {type('char'): 'string',
+                type(1): 'number',
+                type(1.00): 'number',
+                type(long(1)): 'number',
+                type(now()): 'datetime'}
+
 class supplier_catalogue(osv.osv):
     _name = 'supplier.catalogue'
     _description = 'Supplier catalogue'
@@ -336,11 +342,23 @@
                           ('Min Quantity*', 'number'), ('Unit Price*', 'number'), ('Rounding', 'number'), ('Min Order Qty', 'number'),
                           ('Comment', 'string')]
         lines_not_imported = [] # list of list
+        t_dt = type(now())
         for line in kwargs.get('line_with_error'):
+            for f in line:
+                if type(f) == t_dt:
+                    new_f = f.strftime('%Y-%m-%dT%H:%M:%S.000')
+                    line[line.index(f)] = (new_f, 'DateTime')
+                elif isinstance(f, str) and columns_header[line.index(f)][1] != 'string':
+                    try:
+                        line[line.index(f)] = (float(f), 'Number')
+                    except:
+                        line[line.index(f)] = (f, 'String')
+
             if len(line) < len(columns_header):
                 lines_not_imported.append(line + ['' for x in range(len(columns_header)-len(line))])
             else:
                 lines_not_imported.append(line)
+
         files_with_error = SpreadsheetCreator('Lines with errors', columns_header, lines_not_imported)
         vals = {'data': base64.encodestring(files_with_error.get_xml(['decode.utf8'])),
                 'filename': 'Lines_Not_Imported.xls',
@@ -400,30 +418,33 @@
                         if not code_ids:
                             default_code = obj_data.get_object_reference(cr, uid, 'msf_doc_import','product_tbd')[1]
                             to_correct_ok = True
-                            error_list_line.append(_("The product was not found."))
+                            error_list_line.append(_("The product '%s' was not found.") % product_code)
                         else:
                             default_code = code_ids[0]
                     except Exception:
                          default_code = obj_data.get_object_reference(cr, uid, 'msf_doc_import','product_tbd')[1]
                          to_correct_ok = True
-                         error_list_line.append(_("The product was not found."))
+                         error_list_line.append(_("The product '%s' was not found.") % product_code)
 
                 #Product UoM
                 p_uom = len(row.cells)>=3 and row.cells[2].data
                 if not p_uom:
                     uom_id = obj_data.get_object_reference(cr, uid, 'msf_doc_import','uom_tbd')[1]
                     to_correct_ok = True
+                    error_list_line.append(_("The UoM '%s' was not found.") % p_uom)
                 else:
                     try:
                         uom_name = p_uom.strip()
                         uom_ids = uom_obj.search(cr, uid, [('name', '=', uom_name)], context=context)
                         if not uom_ids:
                             uom_id = obj_data.get_object_reference(cr, uid, 'msf_doc_import','uom_tbd')[1]
+                            error_list_line.append(_("The UoM '%s' was not found.") % uom_name)
                             to_correct_ok = True
                         else:
                             uom_id = uom_ids[0]
                     except Exception:
                          uom_id = obj_data.get_object_reference(cr, uid, 'msf_doc_import','uom_tbd')[1]
+                         error_list_line.append(_("The UoM '%s' was not found.") % p_uom)
                          to_correct_ok = True
                 #[utp-129]: check consistency of uom
                 # I made the check on uom_id according to the constraint _check_uom in unifield-addons/product/product.py (l.744) so that we keep the consistency even when we create a supplierinfo directly from the product
@@ -504,7 +525,8 @@
                 vals['line_ids'].append((0, 0, to_write))
             # in case of lines ignored, we notify the user and create a file with the lines ignored
             vals.update({'text_error': _('Lines ignored: %s \n ----------------------\n') % (ignore_lines,) +
-                         '\n'.join(error_list), 'data': False, 'import_error_ok': False})
+                         '\n'.join(error_list), 'data': False, 'import_error_ok': False,
+                         'file_to_import': False})
             if line_with_error:
                 file_to_export = self.export_file_with_error(cr, uid, ids, line_with_error=line_with_error)
                 vals.update(file_to_export)
@@ -520,6 +542,13 @@
             
         return self.log(cr, uid, obj.id, msg_to_return,)
 
+    def clear_error(self, cr, uid, ids, context=None):
+        '''
+        Remove the error list and the file with lines in error
+        '''
+        vals = {'data': False, 'text_error': '', 'import_error_ok': False}
+        return self.write(cr, uid, ids, vals, context=context)
+
     def check_lines_to_fix(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
 
=== modified file 'supplier_catalogue/supplier_catalogue_view.xml'
--- supplier_catalogue/supplier_catalogue_view.xml	2013-05-13 13:36:18 +0000
+++ supplier_catalogue/supplier_catalogue_view.xml	2013-11-06 13:03:52 +0000
@@ -45,6 +45,7 @@
                         <button name="check_lines_to_fix" string="Check Lines" icon="gtk-dialog-warning" colspan="1" type="object" />
                         <field name="filename" invisible="1"/>
                         <field name="data" filename="filename" attrs="{'invisible': [('import_error_ok', '=', False)]}"/>
+                        <button name="clear_error" string="Clear errors" icon="gtk-clear" colspan="1" type="object" attrs="{'invisible': [('import_error_ok', '=', False)]}" />
                         <field name="import_error_ok" invisible="1"/>
                         <field name="text_error" colspan="4" attrs="{'invisible': [('import_error_ok', '=', False)]}" nolabel="1"/>
                     </group>