Merge pull request #4166 from expsa/dev_odex25_hr

Dev odex25 hr

odex25_hr/exp_hr_payroll/i18n/ar_001.po

@@ -967,7 +967,7 @@ msgstr "عدد الأيام"
 #. module: exp_hr_payroll
 #: model:ir.model.fields,field_description:exp_hr_payroll.field_hr_payslip_worked_days__number_of_hours
 msgid "Number of Hours"
-msgstr "عدد الساعات"
+msgstr "النسبة"
 
 #. module: exp_hr_payroll
 #: model:res.groups,name:exp_hr_payroll.group_hr_payroll_user
@@ -1553,12 +1553,12 @@ msgstr "أيام العمل"
 #. module: exp_hr_payroll
 #: model_terms:ir.ui.view,arch_db:exp_hr_payroll.view_hr_payslip_form
 msgid "Worked Days"
-msgstr "الأيام التي تم العمل بها"
+msgstr "الأيام التي لم يتم العمل بها"
 
 #. module: exp_hr_payroll
 #: model_terms:ir.ui.view,arch_db:exp_hr_payroll.view_hr_payslip_form
 msgid "Worked Days & Inputs"
-msgstr "أيام العمل و الدخول"
+msgstr "أيام الغياب"
 
 #. module: exp_hr_payroll
 #: model:ir.model.fields,field_description:exp_hr_payroll.field_hr_contract__resource_calendar_id

odex25_hr/exp_payroll_custom/i18n/ar_001.po

@@ -812,7 +812,7 @@ msgstr " رقم الموظف"
 #: model:ir.model.fields,field_description:exp_payroll_custom.field_hr_payslip__employee_insurnce
 #: model_terms:ir.ui.view,arch_db:exp_payroll_custom.view_hr_payslip_inherit_tree
 msgid "Employee Insurnce"
-msgstr "خصم التأمينات الإجتماعية للموظق"
+msgstr "خصم التامينات الاجتماعية للموظف"
 
 #. module: exp_payroll_custom
 #: model:ir.model.fields,field_description:exp_payroll_custom.field_contract_advantage__employee_id

odex25_hr/exp_payroll_custom/models/hr_advance_payslip.py

@@ -827,12 +827,6 @@ class SalaryRuleInput(models.Model):
                                             'leave_request_case': True,
                                             'amount': -amount
                                         })
-            payslip.allowance_ids._compute_total()
-            payslip.deduction_ids._compute_total()
-            for pay in payslip:
-                if pay.total_sum < 0:
-                    raise exceptions.Warning(_("Salary is less than 0 this month for the following employees \n %s") % (
-                        pay.employee_id.name))
 
             lines = [(0, 0, line) for line in self._get_payslip_lines(contract_ids, payslip.id)]
             payslip.write({'line_ids': lines, 'number': number, 'level_id': payslip.contract_id.salary_level.id,
@@ -888,6 +882,12 @@ class SalaryRuleInput(models.Model):
                         loan.state = 'closed'
 
                 payslip.loan_ids = [(0, 0, loan_item) for loan_item in payslip_loans]
+            payslip.allowance_ids._compute_total()
+            payslip.deduction_ids._compute_total()
+            for pay in payslip:
+                if pay.total_sum < 0:
+                    raise exceptions.Warning(_("Salary is less than 0 this month for the following employees \n %s") % (
+                        pay.employee_id.name))
 
         self.write({'state': 'computed'})
         return True

odex25_hr/exp_payroll_custom/views/payslip_view.xml

@@ -78,9 +78,9 @@
                                 <field name="code"/>
                                 <field name="category_id"  string="Allowance"/>
                                 <field name="sequence" invisible="1"/>
-                                <field name="quantity"/>
+                                <field name="quantity" invisible="1"/>
                                 <field name="rate"/>
-                                <field name="salary_rule_id"/>
+                                <field name="salary_rule_id" invisible="1"/>
                                 <field name="amount"/>
                                 <!--field name="percentage" string="Percentage"/-->
                                 <field name="total"/>
@@ -213,7 +213,7 @@
             <field name="arch" type="xml">
                 <tree position="replace">
                     <tree decoration-success="state=='transfered'" decoration-info="state == 'draft'">
-<!--                        <field name="name"/>-->
+                        <field name="name"/>
                         <field name="date_start"/>
                         <field name="date_end"/>
                         <field name="credit_note" invisible="1"/>

odex25_hr/hr_holidays_public/models/hr_holidays.py

@@ -457,7 +457,7 @@ class HRHolidays(models.Model):
                             _('Sorry The Employee %s Actually On Permission For this Period') % rec.employee_id.name)
 
                 if rec.replace_by:
-                    if not rec.canceled_duration:
+                    if rec.state != 'validate1':
                         holiday_dfrm = self.env['hr.holidays'].search(
                             [('employee_id', '=', rec.replace_by.id), ('type', '=', 'remove'), ('state', '!=', 'refuse'),
                              ('date_from', '<=', rec.date_from), ('date_to', '>=', rec.date_from)], order='id desc',