administrator
/
odoo18
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'feature/share_module' (#25) from feature/share_module into srivyn_test 

Reviewed-on: https://gitea.ftprotech.in/administrator/odoo18/pulls/25
This commit is contained in:
pranay 2026-07-16 10:05:05 +05:30
parent 4a8452ae5f dfca6bf90b
commit 3cfba75a0a
3 changed files with 53 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
addons_extensions/hr_payroll/views/report_payslip_templates.xml
View File

@ -1,20 +1,32 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<odoo> <odoo>
<template id="report_payslip"> <template id="report_payslip">
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<div class="page"> <div class="page">
<h2 id="payslip_name"><span t-field="o.name">August 2023 Payslip</span></h2> <div class="row mb-3">
<t t-set="is_invalid" t-value="o._is_invalid()"/> <div class="col-6">
<div t-if="is_invalid"> <img t-if="o.company_id.logo"
<strong id="invalid_warning"><span t-out="is_invalid">This payslip is not validated. This is not a legal document.</span></strong> t-att-src="image_data_uri(o.company_id.logo)"
</div> style="max-height:80px; max-width:220px;"
<div t-else=""> alt="Company Logo"/>
<div class="oe_structure"></div> </div>
</div> </div>
<div id="infos_table"> <h2 id="payslip_name">
<table class="table table-sm table-borderless"> <span t-field="o.name">August 2023 Payslip</span>
<thead class="o_black_border"> </h2>
<tr> <t t-set="is_invalid" t-value="o._is_invalid()"/>
<div t-if="is_invalid">
<strong id="invalid_warning">
<span t-out="is_invalid">This payslip is not validated. This is not a legal document.</span>
</strong>
</div>
<div t-else="">
<div class="oe_structure"></div>
</div>
<div id="infos_table">
<table class="table table-sm table-borderless">
<thead class="o_black_border">
<tr>
<th>Employee Information</th> <th>Employee Information</th>
<th>Other Information</th> <th>Other Information</th>
</tr> </tr>
@ -28,7 +40,7 @@
</div> </div>
<div id="employee_id"> <div id="employee_id">
<strong class="me-2">ID:</strong> <strong class="me-2">ID:</strong>
<span t-if="o.employee_id.identification_id" t-field="o.employee_id.identification_id"/> <span t-if="o.employee_id.employee_id" t-field="o.employee_id.identification_id"/>
<span t-else="" style="color:#875A7B" class="fw-bold">No ID number on the employee !!!</span> <span t-else="" style="color:#875A7B" class="fw-bold">No ID number on the employee !!!</span>
</div> </div>
<div id="employee_email" t-if="o.employee_id.work_email"> <div id="employee_email" t-if="o.employee_id.work_email">

25
addons_extensions/hr_payroll/wizard/hr_payroll_payslips_by_employees_views.xml
View File

@ -10,7 +10,7 @@
<separator string="Employees Selection"/> <separator string="Employees Selection"/>
<div class="o_row ms-2"> <div class="o_row ms-2">
<group> <group>
<field name="department_id" class="w-75" <field name="department_id" class="w-75" placeholder="All"
help="Set a specific department if you wish to select all the employees from this department (and subdepartments) at once."/> help="Set a specific department if you wish to select all the employees from this department (and subdepartments) at once."/>
<field name="job_id" class="w-75" invisible="not department_id" domain="[('department_id', 'child_of', department_id)]" <field name="job_id" class="w-75" invisible="not department_id" domain="[('department_id', 'child_of', department_id)]"
help="Set a specific job if you wish to select all the employees from this job at once."/> help="Set a specific job if you wish to select all the employees from this job at once."/>
@ -95,4 +95,27 @@
action = env['hr.payslip.employees'].create({}).compute_sheet() action = env['hr.payslip.employees'].create({}).compute_sheet()
</field> </field>
</record> </record>
<record id="hr_hr_employee_view_form3_inherit_salary_contract" model="ir.ui.view">
<field name="name">hr.hr.employee.view.form3.inherit.salary.contract</field>
<field name="model">hr.employee</field>
<field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form3"/>
<field name="arch" type="xml">
<xpath expr="//button[@name='action_open_contract']" position="replace">
<button name="action_open_contract"
type="object"
class="oe_stat_button"
icon="fa-book"
string="Employee Salary"
groups="hr_contract.group_hr_contract_manager"
context="{
'default_employee_id': id,
'default_resource_calendar_id': resource_calendar_id.id or False,
'from_action_open_contract': True
}"
invisible="employee_type not in ['employee', 'student', 'trainee']"/>
</xpath>
</field>
</record>
</odoo> </odoo>

2
addons_extensions/hr_payroll_extended/views/menus.xml
View File

@ -2,7 +2,7 @@
<odoo> <odoo>
<menuitem <menuitem
id="hr_payroll.menu_hr_payroll_employees_root" id="hr_payroll.menu_hr_payroll_employees_root"
name="Contracts" name="Employee Salary Contract"
parent="hr_payroll.menu_hr_payroll_root" parent="hr_payroll.menu_hr_payroll_root"
sequence="1" sequence="1"
action="hr_contract.action_hr_contract" action="hr_contract.action_hr_contract"