fix
This commit is contained in:
parent
cfb174802a
commit
8efb6dccba
|
|
@ -2928,3 +2928,10 @@ msgstr ""
|
|||
#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.report_payroll_bank_pdf
|
||||
msgid "وصف الدفع"
|
||||
msgstr ""
|
||||
|
||||
#. module: exp_payroll_custom
|
||||
#: model:ir.model.fields,field_description:employee_requests.field_hr_payslip__employee_no
|
||||
#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.view_hr_payslip_inherit_tree
|
||||
#: model_terms:ir.ui.view,arch_db:exp_payroll_custom.view_hr_payslip_filter_inherit
|
||||
msgid "Employee Number"
|
||||
msgstr "رقم الموظف"
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ class SalaryRuleInput(models.Model):
|
|||
employee_insurnce = fields.Float(string='Employee Insurnce', compute='compute_allowances_',store=True)
|
||||
company_insurnce = fields.Float(string='Company Insurnce', compute='compute_allowances_',store=True)
|
||||
|
||||
employee_no = fields.Char(related='employee_id.emp_no', readonly=True,string='Employee Number', store=True)
|
||||
|
||||
def compute_allowances_(self):
|
||||
for item in self:
|
||||
item.basic_allowances, item.house_allowances, trans_allowances, employee_insurnce, company_insurnce = 0.0, 0.0, 0.0, 0.0, 0.0
|
||||
|
|
|
|||
|
|
@ -275,7 +275,8 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree position="replace">
|
||||
<tree decoration-success="state=='transfered'" decoration-info="state == 'draft'" create="false" edit="false" delete="false">
|
||||
<field name="number"/>
|
||||
<!--field name="number"/-->
|
||||
<field name="employee_no" string="Employee Number"/>
|
||||
<field name="employee_id"/>
|
||||
<field name="name"/>
|
||||
<field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
|
||||
|
|
@ -297,5 +298,54 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- hr.payslip.kanban -->
|
||||
|
||||
<record id="hr_payslip_view_kanban_inherit" model="ir.ui.view">
|
||||
<field name="name">hr.payslip.kanban</field>
|
||||
<field name="model">hr.payslip</field>
|
||||
<field name="inherit_id" ref="exp_hr_payroll.hr_payslip_view_kanban"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//kanban" position="attributes">
|
||||
<attribute name="edit">0</attribute>
|
||||
<attribute name="delete">0</attribute>
|
||||
<attribute name="create">0</attribute>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='employee_id']" position="after">
|
||||
<div class="col-12">
|
||||
<span>
|
||||
<field name="contract_id"/>
|
||||
</span>
|
||||
</div>
|
||||
</xpath>
|
||||
<xpath expr="//field[@name='name']" position="after">
|
||||
<div class="col-12">
|
||||
<span>
|
||||
<field name="total_sum"/>
|
||||
</span>
|
||||
</div>
|
||||
</xpath>
|
||||
|
||||
<xpath expr="//field[@name='name']" position="attributes">
|
||||
<attribute name="invisible">1</attribute>
|
||||
</xpath>
|
||||
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- hr.payslip.search -->
|
||||
|
||||
<record id="view_hr_payslip_filter_inherit" model="ir.ui.view">
|
||||
<field name="name">hr.payslip.select</field>
|
||||
<field name="model">hr.payslip</field>
|
||||
<field name="inherit_id" ref="exp_hr_payroll.view_hr_payslip_filter"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='employee_id']" position="after">
|
||||
<field name="employee_no" string="Employee Number"/>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
|
|
|||
Loading…
Reference in New Issue