Merge pull request #1423 from expsa/bakry_mobile

fix attendance

odex25_mobile/odex_mobile/controllers/attendance.py

@@ -196,7 +196,6 @@ class AttendanceController(http.Controller):
                     'zone':zone.zone if zone else "%s,%s" % (body.get('longitude'), body.get('latitude')),
                     'longitude': body.get('longitude'),
                     'latitude':body.get('latitude'),
-                    'zone_name':zone.id if zone else False,
                 })
                 if attendance:
                     if body.get('action') == 'sign_out' and system_checkout == True:
@@ -213,7 +212,6 @@ class AttendanceController(http.Controller):
                         "longitude": attendance.longitude,
                         "latitude": attendance.latitude,
                         "range": zone.allowed_range if zone else False,
-                        #"zone_name":attendance.zone_name if zone_name else False,
                     }
                     msg = (_("Check Out successfully")) if body.get('action') == 'sign_out' else (_("Check in successfully"))
             else:

odex25_mobile/odex_mobile/controllers/rest_api_v2/attendance.py

@@ -212,7 +212,6 @@ class AttendanceController(http.Controller):
                         'zone':zone.zone if zone else "%s,%s" % (body.get('longitude'), body.get('latitude')),
                         'longitude': body.get('longitude'),
                         'latitude':body.get('latitude'),
-                        'zone_name':zone.id if zone else False,
                     })
                     if attendance:
                         if body.get('action') == 'sign_out' and system_checkout == True:
@@ -230,7 +229,6 @@ class AttendanceController(http.Controller):
                             "longitude": attendance.longitude,
                             "latitude": attendance.latitude,
                             "range": zone.allowed_range if zone else False,
-                            #"zone_name":attendance.zone_name if zone_name else False,
                         }
                         msg = (_("Check Out successfully")) if body.get('action') == 'sign_out' else (_("Check in successfully"))
                 else:

odex25_mobile/odex_mobile/i18n/ar_001.po

@@ -2183,11 +2183,6 @@ msgstr ""
 msgid "Zone"
 msgstr "منطقة"
 
-#. module: odex_mobile
-#: model:ir.model.fields,field_description:odex_mobile.field_attendance_attendance__zone_name
-msgid "Zone Name"
-msgstr "إسم المنطقة"
-
 #. module: odex_mobile
 #: model:ir.actions.server,name:odex_mobile.hr_zone_archive_ir_actions_server
 #: model:ir.cron,cron_name:odex_mobile.hr_zone_archive

odex25_mobile/odex_mobile/views/hr_employee_view.xml

@@ -26,10 +26,7 @@
             <field name="priority">100</field>
             <field name="arch" type="xml">
                 <field name="action_type" position="after">
-                    <field name="zone_name" readonly="1"/>
                     <field name="zone" readonly="1"/>
-                    <!--button name="open_url" string="Open Location" class="oe_highlight" type="object"
-                            attrs="{'invisible':[('zone','=',False)]}"/-->
                 </field>
             </field>
         </record>