Merge 2686794 into e8c2896

open-synergy · Feb 21, 2019 · d20a437 · d20a437
2 parents e8c2896 + 2686794
commit d20a437
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/hr_attendance_import_from_machine/__openerp__.py b/hr_attendance_import_from_machine/__openerp__.py
@@ -4,7 +4,7 @@
 # pylint: disable=locally-disabled, manifest-required-author
 {
     "name": "Import Attendance Data From Machine",
-    "version": "8.0.1.4.2",
+    "version": "8.0.1.5.0",
     "website": "https://opensynergy-indonesia.com",
     "author": "OpenSynergy Indonesia",
     "license": "AGPL-3",

diff --git a/hr_attendance_import_from_machine/models/hr_attendance_machine.py b/hr_attendance_import_from_machine/models/hr_attendance_machine.py
@@ -13,25 +13,12 @@ class HrAttendanceMachine(models.Model):
         string="Name",
         required=True,
     )
-    date_format = fields.Selection(
+    date_format = fields.Char(
         string="Date Format",
-        selection=[
-            ("%d/%m/%Y", "dd/mm/yyyy"),
-            ("%m/%d/%Y", "mm/dd/yyyy"),
-            ("%Y/%m/%d", "yyyy/mm/dd"),
-            ("%d-%m-%Y", "dd-mm-yyyy"),
-            ("%m-%d-%Y", "mm-dd-yyyy"),
-            ("%Y-%m-%d", "yyyy-mm-dd")
-        ],
         required=True,
     )
-    time_format = fields.Selection(
+    time_format = fields.Char(
         string="Time Format",
-        selection=[
-            ("%H:%M:%S", "HH:MM:SS"),
-            ("%H:%M", "HH:MM"),
-            ("%H%M", "HHMM")
-        ],
         required=True,
     )
     sign_in_code = fields.Char(

diff --git a/hr_attendance_import_from_machine/views/hr_attendance_machine_views.xml b/hr_attendance_import_from_machine/views/hr_attendance_machine_views.xml
@@ -23,8 +23,8 @@
                         <page string="CSV Details">
                             <group>
                                 <group string="Date/Time Format">
-                                    <field name="date_format"/>
-                                    <field name="time_format"/>
+                                    <field name="date_format" placeholder="e.g %d/%m/%Y"/>
+                                    <field name="time_format" placeholder="e.g %H:%M:%S"/>
                                 </group>
                                 <group string="Sign In/Out Code">
                                     <field name="sign_in_code"/>