Merge branch 'b-3.6.1' into mebil

[mfinanz.git] / SL / Controller / CsvImport / Base.pm

diff --git a/SL/Controller/CsvImport/Base.pm b/SL/Controller/CsvImport/Base.pm
index 4f718f72903d8db0c236c70c922b085c048e982c..1aaec79c9555cc7681596f4d4f8365f19c613aa3 100644 (file)
--- a/SL/Controller/CsvImport/Base.pm
+++ b/SL/Controller/CsvImport/Base.pm
@@ -293,6 +293,7 @@ sub handle_cvars {
 
   my %type_to_column = ( text      => 'text_value',
                          textfield => 'text_value',
+                         htmlfield => 'text_value',
                          select    => 'text_value',
                          date      => 'timestamp_value_as_date',
                          timestamp => 'timestamp_value_as_date',
@@ -610,7 +611,7 @@ sub save_additions_always {
   # Can be overridden by derived specialized importer classes to save
   # additional tables always.
   # This sub is called before the object is saved. Therefore this
-  # hook will always be executed wether or not the import entry can be saved successfully.
+  # hook will always be executed whether or not the import entry can be saved successfully.
 
   return;
 }