Merge pull request #246 from expsa/dev_odex25_hr
fix loan.payment.suspension trans
This commit is contained in:
AbuzarExp
GitHub
commit
3045f49072
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@
|
|||
|
||||
'wizards/holidays_public_next_year_wizard.xml',
|
||||
'wizards/holiday_public_leave_report_view.xml',
|
||||
'wizards/hr_reject_wizard_view.xml',
|
||||
|
||||
'report/public_leave_report_template.xml',
|
||||
'report/public_leave_cost_template.xml',
|
||||
|
|
|
|||
|
|
@ -3583,57 +3583,3 @@ msgstr ""
|
|||
msgid "وفـاة"
|
||||
msgstr ""
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: code:addons/hr_holidays_public/models/hr_holidays.py:0
|
||||
#, python-format
|
||||
msgid "Specify Reject Reason"
|
||||
msgstr "سبب الرفض"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.pubic_leave_report_wizard_view
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.reject_wizard
|
||||
msgid "or"
|
||||
msgstr "او"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: code:addons/hr_holidays_public/wizards/hr_reject_wizard.py:0
|
||||
#, python-format
|
||||
msgid "Sorry This object have no field named Selection Reason"
|
||||
msgstr "لابد من ادخال سبب الرفض"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.reject_wizard
|
||||
msgid "Reject"
|
||||
msgstr "رفض"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_holidays__reject_reason
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_reject_wizard__reject_reason
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.hr_holidays_ext_form_view
|
||||
msgid "Reject Reason"
|
||||
msgstr "سبب الرفض"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_reject_wizard__origin
|
||||
msgid "Origin"
|
||||
msgstr "الاصل"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model.fields,field_description:hr_holidays_public.field_hr_reject_wizard__origin_name
|
||||
msgid "Origin Name"
|
||||
msgstr "اسم الحقل"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model:ir.model,name:hr_holidays_public.model_hr_reject_wizard
|
||||
msgid "HR Reject Wizard"
|
||||
msgstr "سبب الرفض للاجازات"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.reject_wizard
|
||||
msgid "Close"
|
||||
msgstr "إغلاق"
|
||||
|
||||
#. module: hr_holidays_public
|
||||
#: model_terms:ir.ui.view,arch_db:hr_holidays_public.hr_holidays_ext_form_view
|
||||
msgid "Are you sure to Refuse This Record?"
|
||||
msgstr "هل أنت متأكد من إلغاء هذا الطلب؟"
|
||||
|
|
|
|||
|
|
@ -28,4 +28,3 @@ access_hr_holidays_status_duration,access_hr_holidays_duration,model_holiday_sta
|
|||
access_public_leave_report_user,access_public_leave_report,model_public_leave_report,base.group_user,1,1,1,0
|
||||
access_public_holidays_next_year_wizard_user,access_public_holidays_next_year_wizard,model_public_holidays_next_year_wizard,base.group_user,1,1,1,0
|
||||
access_zfp_hr_custom_buy_vacation,zfp_hr_custom.buy_vacation,model_buy_vacation,base.group_user,1,1,1,1
|
||||
access_hr_reject_wizard,access_hr_reject_wizard,model_hr_reject_wizard,base.group_user,1,1,1,1
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
from . import holidays_public_next_year_wizard
|
||||
from . import holiday_public_leave_report_wiz
|
||||
from . import hr_reject_wizard
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# Expert Co. Ltd.
|
||||
# Copyright (C) 2018 (<http://www.exp-sa.com/>).
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
|
||||
from odoo import api, fields, models, _
|
||||
from odoo.exceptions import Warning, ValidationError
|
||||
|
||||
|
||||
|
||||
class RejectWizard(models.TransientModel):
|
||||
_name = 'hr.reject.wizard'
|
||||
_description = 'HR Reject Wizard'
|
||||
origin = fields.Integer('')
|
||||
reject_reason = fields.Text(string='Reject Reason')
|
||||
origin_name = fields.Char('')
|
||||
|
||||
def action_reject(self):
|
||||
origin_rec = self.env[self.origin_name].sudo().browse(self.origin)
|
||||
if dict(self._fields).get('reject_reason') is None:
|
||||
raise ValidationError(_('Sorry This object have no field named Selection Reason'))
|
||||
else:
|
||||
return origin_rec.action_refuse(self.reject_reason)
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<odoo>
|
||||
<data>
|
||||
<record id="reject_wizard" model="ir.ui.view">
|
||||
<field name="name">Reject Reason</field>
|
||||
<field name="model">hr.reject.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<field name="origin" invisible="1"/>
|
||||
<field name="reject_reason" required="1"/>
|
||||
<footer>
|
||||
<div>
|
||||
<button name="action_reject" string="Reject" type="object" default_focus="1" class="btn-primary"/>
|
||||
or
|
||||
<button string="Close" special="cancel" class="btn-secondary"/>
|
||||
</div>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</odoo>
|
||||
|
|
@ -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 "إرجاع للمسودة"
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
||||
|
|
|
|||
|
|
@ -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 & Rescheduling">
|
||||
|
|
|
|||
Loading…
Reference in New Issue