devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix loan.payment.suspension trans

This commit is contained in:
Bakry 2024-07-16 16:53:37 +03:00
parent 49c5bda3de
commit 38cabe06a9
4 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
odex25_hr/hr_contract_custom/models/hr_contract.py
View File

@ -535,9 +535,10 @@ class Contract(models.Model):
@api.depends('wage', 'house_allowance', 'transport_allowance', 'communication_allowance')
def _compute_monthly_salary(self):
self.monthly_salary = self.wage + self.house_allowance_temp + self.transport_allowance_temp + \
self.communication_allowance_temp + self.field_allowance_temp + \
self.special_allowance_temp + self.other_allowance_temp
for rec in self:
rec.monthly_salary = rec.wage + rec.house_allowance_temp + rec.transport_allowance_temp + \
rec.communication_allowance_temp + rec.field_allowance_temp + \
rec.special_allowance_temp + rec.other_allowance_temp
@api.depends()
def _cal_allowance(self):

49
odex25_hr/hr_loans_salary_advance/i18n/ar_001.po
View File

@ -127,12 +127,6 @@ msgstr "موظف آخر"
msgid "Approve"
msgstr "إعتماد"
#. module: hr_loans_salary_advance
#: code:addons/hr_loans_salary_advance/models/loan_payment_suspension.py:0
#, python-format
msgid "Approved"
msgstr "معتمدة"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
@ -247,13 +241,6 @@ msgstr "تاريخ بداية الاقساط الشهرية"
msgid "Department"
msgstr "الهيكل الإداري"
#. module: hr_loans_salary_advance
#: code:addons/hr_loans_salary_advance/models/loan_payment_suspension.py:0
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__submit
#, python-format
msgid "Direct Manager"
msgstr "المدير المباشر"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_installment_line_form_view
msgid "Discard"
@ -443,13 +430,6 @@ msgstr "المبلغ المصدق من المديرالعام"
msgid "Gm Propos Amount"
msgstr "قيمة السلفه حسب المدير"
#. module: hr_loans_salary_advance
#: code:addons/hr_loans_salary_advance/models/loan_payment_suspension.py:0
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__confirm
#, python-format
msgid "HR Manager"
msgstr "تصديق الموارد البشرية"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_hr_loan_salary_advance__emp_hiring_date
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
@ -1057,11 +1037,6 @@ msgstr "إعادة جدولة"
msgid "Rescheduling Details"
msgstr "تفاصيل إعادة الجدولة"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
msgid "Reset to Draft"
msgstr "إعادة التعيين لمسودة"
#. module: hr_loans_salary_advance
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_hr_loan_payment_suspension__activity_user_id
#: model:ir.model.fields,field_description:hr_loans_salary_advance.field_hr_loan_salary_advance__activity_user_id
@ -1254,13 +1229,6 @@ msgid ""
"Planned: Future activities."
msgstr ""
#. module: hr_loans_salary_advance
#: code:addons/hr_loans_salary_advance/models/hr_loan_salary_advance.py:0
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
#, python-format
msgid "Submit"
msgstr "المدير المباشر"
#. module: hr_loans_salary_advance
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__loan_request_type__refund_from__termination
msgid "Termination"
@ -1624,12 +1592,6 @@ msgstr "غير محدد"
msgid "working duration(months)"
msgstr "فترة خدمة الموظف(شهر)"
#. module: hr_loans_salary_advance
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__approve
msgid "معتمد"
msgstr ""
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
msgid "Employee Name"
@ -1661,11 +1623,13 @@ msgstr "مسودة"
#. module: hr_loans_salary_advance
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_salary_advance__state__submit
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__submit
msgid "Waiting Payroll Officer"
msgstr "إنتظار مسؤول الرواتب"
#. module: hr_loans_salary_advance
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_salary_advance__state__direct_manager
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__confirm
msgid "Wait HR Department"
msgstr "إنتظار الموارد البشرية"
@ -1696,18 +1660,26 @@ msgstr "مغلق"
msgid "Refused"
msgstr "مرفوض"
#. module: hr_loans_salary_advance
#: model:ir.model.fields.selection,name:hr_loans_salary_advance.selection__hr_loan_payment_suspension__state__approve
msgid "Approved"
msgstr "تم التصديق"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
msgid "Submit"
msgstr "إرســـال"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
msgid "Payroll Officer Approve"
msgstr "تصديق مسؤول الرواتب"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
msgid "HR Manager Approve"
msgstr "تصديق الموارد البشرية"
@ -1723,5 +1695,6 @@ msgstr "ترحيل للمالية"
#. module: hr_loans_salary_advance
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.employee_loan_salary_form_view
#: model_terms:ir.ui.view,arch_db:hr_loans_salary_advance.loan_payment_suspension_form_view
msgid "RE-Draft"
msgstr "إرجاع للمسودة"

4
odex25_hr/hr_loans_salary_advance/models/loan_payment_suspension.py
View File

@ -30,8 +30,8 @@ class HrLoanPaymentSuspension(models.Model):
move_id = fields.Many2one('account.move', 'Payment Move', readonly=True)
state = fields.Selection([('draft', _('Draft')),
('submit', _('Direct Manager')),
('confirm', _('HR Manager')),
('submit', _('Waiting Payroll Officer')),
('confirm', _('Wait HR Department')),
('approve', _('Approved')),
('refuse', _('Refused'))], 'State', default='draft')

20
odex25_hr/hr_loans_salary_advance/views/loan_payment_suspension_view.xml
View File

@ -9,14 +9,20 @@
<header>
<button string="Submit" name="action_submit" states="draft" type="object" class="oe_highlight"
groups="base.group_user"/>
<button string="Confirm" name="action_confirm" states="submit" type="object" class="oe_highlight"
groups="hr_base.group_division_manager"/>
<button string="Approve" name="action_approve" states="confirm" type="object" class="oe_highlight"
groups="hr.group_hr_user"/>
<button string="Payroll Officer Approve" name="action_confirm" states="submit" type="object" class="oe_highlight"
groups="hr_loans_salary_advance.group_loan_manager"/>
<button string="Refuse" name="action_refuse" states="submit" type="object" class="oe_highlight"
groups="hr_loans_salary_advance.group_loan_manager"/>
<button string="HR Manager Approve" name="action_approve" states="confirm" type="object" class="oe_highlight"
groups="hr.group_hr_manager"/>
<button string="Refuse" name="action_refuse" states="confirm" type="object" class="oe_highlight"
groups="hr.group_hr_manager"/>
<button string="Reset to Draft" name="action_reset" states="refuse,approve" type="object" class="oe_highlight"
groups="hr.group_hr_user" confirm="Are you sure to Reset To Draft This Record?"/>
<button string="Refuse" name="action_refuse" states="submit,confirm" type="object"
groups="base.group_user,hr_base.group_division_manager,hr.group_hr_user"/>
groups="hr.group_hr_manager" confirm="Are you sure to Reset To Draft This Record?"/>
<field name="state" widget="statusbar" />
</header>
<sheet string="Loan Payment &amp; Rescheduling">