Changeset 9169 for main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/widgets

Timestamp:

10 Sep 2012, 11:05:07 (12 years ago)

Author:

uli

Message:

Merge changes from trunk, r8786-HEAD

Location:

main/waeup.kofa/branches/uli-async-update

Files:

• . (modified) (1 prop)
• src/waeup/kofa/widgets/datetimewidget.py (modified) (1 diff)
• src/waeup/kofa/widgets/phonewidget.py (modified) (1 diff)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/widgets/datetimewidget.py

@@ -66 +66 @@
 
         """
+        # In import files we can use the hash symbol at the end of a
+        # datetime and date strings to avoid annoying automatic date
+        # transformation by Excel or Calc.
+        string = string.strip('#')
         if string == self._missing:
             return self.context.missing_value

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/widgets/phonewidget.py

@@ -112 +112 @@
         For the extension line we silently allow slashes as well.
         """
+        # In import files we can use the hash symbol at the end of a
+        # date string to avoid annoying automatic number transformation
+        # by Excel or Calc
+        input = input.strip('#')
         result = super(PhoneWidget, self)._toFieldValue(input)
         parts = input.split('-', 2)