fix

2024-08-29 13:07:07 +03:00 · 2024-08-29 13:07:07 +03:00 · a4bf0e153d
parent 75ddba35ec
commit a4bf0e153d
5 changed files with 105 additions and 82 deletions
--- a/odex25_hr/exp_payroll_custom/models/hr_salary_rules.py
+++ b/odex25_hr/exp_payroll_custom/models/hr_salary_rules.py
@ -117,7 +117,7 @@ class HrSalaryRules(models.Model):
                                            total_percent -= calc_line
                                            total_percent += total
                                    else:
-                                        if cstr(con.date_from) < str(datetime.now().date()):
+                                        if str(con.date_from) < str(datetime.now().date()):
                                            if con.date_to:
                                                if datetime.strptime(str(con.date_to), "%Y-%m-%d").date().month \
                                                        >= datetime.now().date().month or not con.date_to:
--- a/odex25_hr/hr_contract_custom/i18n/ar_001.po
+++ b/odex25_hr/hr_contract_custom/i18n/ar_001.po
@ -1372,15 +1372,6 @@ msgstr "مطار الوجهة"
 msgid "Direct Manager"
 msgstr "المدير مباشر"

-#. module: hr_contract_custom
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__displaced
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__displaced
-#, python-format
-msgid "Displaced Tribes"
-msgstr "قبائل نازحة"
-
 #. module: hr_contract_custom
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_children_allowance__display_name
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__display_name
@ -1532,7 +1523,6 @@ msgstr "إسم الموظف"

 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__emp_type
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__employee_type
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_employee__employee_type_id
 #: model_terms:ir.ui.view,arch_db:hr_contract_custom.hr_employee_form_view_inherit
@ -1540,6 +1530,13 @@ msgstr "إسم الموظف"
 msgid "Employee Type"
 msgstr "نوع الموظف"

+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__emp_type
+#, python-format
+msgid "Holiday Type"
+msgstr "ترصيد الاجازة"
+
 #. module: hr_contract_custom
 #: model:ir.actions.server,name:hr_contract_custom.contracts_mail_reminder_ir_actions_server
 #: model:ir.cron,cron_name:hr_contract_custom.contracts_mail_reminder
@ -1706,15 +1703,6 @@ msgstr "نوع بدل وجبات"
 msgid "For Human Resources Department"
 msgstr ""

-#. module: hr_contract_custom
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__other
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__foreign
-#, python-format
-msgid "Foreign"
-msgstr "مقييم"
-
 #. module: hr_contract_custom
 #: model_terms:ir.ui.view,arch_db:hr_contract_custom.employee_contract_report_template
 msgid "G by and between:"
@ -2304,12 +2292,6 @@ msgstr ""
 msgid "Number of unread messages"
 msgstr ""

-#. module: hr_contract_custom
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#, python-format
-msgid "Other"
-msgstr "اخرى"
-
 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
@ -2317,7 +2299,7 @@ msgstr "اخرى"
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__other_allowance_temp
 #, python-format
 msgid "Other Allowances"
-msgstr "Other Allowances"
+msgstr "بدلات اخرى"

 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
@ -2343,21 +2325,38 @@ msgstr "نوع الاستقطاعات الأخرى"

 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__external
 #: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__external
 #, python-format
 msgid "Outsource1"
-msgstr ""
+msgstr "خارجي1"

 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__external2
 #: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__external2
 #, python-format
 msgid "Outsource2"
-msgstr ""
+msgstr "خارجي2"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__displaced
+#, python-format
+msgid "Displaced Tribes"
+msgstr "قبائل نازحة"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__foreign
+#, python-format
+msgid "Foreign"
+msgstr "مقييم"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__saudi
+#, python-format
+msgid "Saudi"
+msgstr "مواطن"

 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
@ -2618,15 +2617,6 @@ msgstr "سلم الرواتب"
 msgid "Salary Type"
 msgstr "نوع الراتب"

-#. module: hr_contract_custom
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: code:addons/hr_contract_custom/models/hr_contract.py:0
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__saudi
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__employee_type__saudi
-#, python-format
-msgid "Saudi"
-msgstr "مواطن"
-
 #. module: hr_contract_custom
 #: code:addons/hr_contract_custom/models/hr_contract.py:0
 #: model:ir.model.fields,field_description:hr_contract_custom.field_hr_contract__saudi_com_expiry_date
@ -3498,11 +3488,6 @@ msgstr ""
 msgid "عقـــــــد عمل"
 msgstr ""

-#. module: hr_contract_custom
-#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__religion__other
-msgid "Other"
-msgstr "غير ذلك"
-
 #. module: hr_contract_custom
 #: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__air_ticket_eligible__no
 #: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__exit_and_return__no
@ -3734,3 +3719,39 @@ msgstr "لدية بدل مواصلات؟"
 #: model_terms:ir.ui.view,arch_db:hr_contract_custom.contract_search_view
 msgid "Employee Number"
 msgstr "رقم الموظف"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__saudi
+#, python-format
+msgid "Holiday1"
+msgstr "ترصيد1"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__other
+#, python-format
+msgid "Holiday2"
+msgstr "ترصيد2"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__displaced
+#, python-format
+msgid "Holiday3"
+msgstr "ترصيد3"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__external
+#, python-format
+msgid "Holiday4"
+msgstr "ترصيد4"
+
+#. module: hr_contract_custom
+#: code:addons/hr_contract_custom/models/hr_contract.py:0
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__emp_type__external2
+#: model:ir.model.fields.selection,name:hr_contract_custom.selection__hr_contract__religion__other
+#, python-format
+msgid "Other"
+msgstr "اخـــرى"
--- a/odex25_hr/hr_contract_custom/models/hr_contract.py
+++ b/odex25_hr/hr_contract_custom/models/hr_contract.py
@ -258,12 +258,12 @@ class Contract(models.Model):
    category = fields.Char(_('Category'))
    effective_from = fields.Date(_('Effective From'))
    to_contact = fields.Text(_('To contact in case of Emergency'))
-    emp_type = fields.Selection([('saudi', _('Saudi')), 
-                                 ('other', _('Foreign')),
-                                 ('displaced', _('Displaced Tribes')),
-                                 ('external', _('Outsource1')),
-                                 ('external2', _('Outsource2'))
-                                 ], _('Employee Type'), tracking=True)
+
+    emp_type = fields.Selection([('saudi', _('Holiday1')), 
+                                 ('other', _('Holiday2')),
+                                 ('displaced', _('Holiday3')),
+                                 ('external', _('Holiday4')),
+                                 ('external2', _('Other'))], _('Holiday Type'), tracking=True)
    appraisal = fields.Boolean(_('Appraisal'))
    re_contract = fields.Boolean(_('re contract'))
    contract_draft = fields.Boolean(_('Contract Draft'))
--- a/odex25_hr/hr_holidays_public/i18n/ar_001.po
+++ b/odex25_hr/hr_holidays_public/i18n/ar_001.po
@ -3383,12 +3383,6 @@ msgstr "إنتظار التصديق"
 msgid "الغاء"
 msgstr ""

-#. module: hr_holidays_public
-#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__contract_duration__all
-#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__all
-msgid "الكل"
-msgstr ""
-
 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__payslip_type__percentage
 msgid "النسبة"
@ -3457,15 +3451,37 @@ msgstr ""
 msgid "حفظ لسنوات"
 msgstr ""

+
+#. module: hr_holidays_public
+#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__saudi
+msgid "Holiday1"
+msgstr "ترصيد1"
+
+#. module: hr_holidays_public
+#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__other
+msgid "Holiday2"
+msgstr "ترصيد2"
+
+#. module: hr_holidays_public
+#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__displaced
+msgid "Holiday3"
+msgstr "ترصيد3"
+
 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__external
-msgid "خارجي1"
-msgstr ""
+msgid "Holiday4"
+msgstr "ترصيد4"

 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__external2
-msgid "خارجي2"
-msgstr ""
+msgid "Other"
+msgstr "اخـــرى"
+
+#. module: hr_holidays_public
+#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__contract_duration__all
+#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__all
+msgid "All"
+msgstr "الكــل"

 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__return_from_leave__decision__deduct
@ -3497,21 +3513,11 @@ msgstr ""
 msgid "طوارئ"
 msgstr ""

-#. module: hr_holidays_public
-#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__other
-msgid "غير ذلك"
-msgstr ""
-
 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__payslip_type__unpaid
 msgid "غير مدفوعة"
 msgstr ""

-#. module: hr_holidays_public
-#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__displaced
-msgid "قبائل نازحة"
-msgstr ""
-
 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays__issuing_clearance_form__no
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays__issuing_deliver_custdy__no
@ -3578,11 +3584,6 @@ msgstr ""
 msgid "معتمدة"
 msgstr ""

-#. module: hr_holidays_public
-#: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__emp_type__saudi
-msgid "مواطن"
-msgstr ""
-
 #. module: hr_holidays_public
 #: model:ir.model.fields.selection,name:hr_holidays_public.selection__hr_holidays_status__leave_type__new_baby
 msgid "مولود جديد"
--- a/odex25_hr/hr_holidays_public/models/hr_holidays_status.py
+++ b/odex25_hr/hr_holidays_public/models/hr_holidays_status.py
@ -24,10 +24,11 @@ class HrHolidaysStatus(models.Model):
                                             ('emergency', _('Emergency')), ], tracking=True)
    duration = fields.Integer(tracking=True)
    used_once = fields.Boolean(string='Used Once', tracking=True)
-    emp_type = fields.Selection(selection=[('saudi', _('Saudi')),
-                                           ('other', _('Other')), ('displaced', _('Displaced Tribes')),
-                                           ('external', _('Outsource1')),
-                                           ('external2', _('Outsource2')), ('all', _('All'))], tracking=True)
+    emp_type = fields.Selection(selection=[('saudi', _('Holiday1')),
+                                           ('other', _('Holiday2')), 
+                                           ('displaced', _('Holiday3')),
+                                           ('external', _('Holiday4')),
+                                           ('external2', _('Other')), ('all', _('All'))], tracking=True)
    gender = fields.Selection(selection=[('male', _('Male')),
                                         ('female', _('Female')),
                                         ('both', _('Both'))], tracking=True)