24-06-2025

Merge branch 'develop'
This commit is contained in:
administrator 2025-06-24 15:24:08 +05:30
commit d8f9a766f7
4 changed files with 371 additions and 350 deletions

View File

@ -247,17 +247,16 @@ class website_hr_recruitment_applications(http.Controller):
}) for education in education_data }) for education in education_data
] ]
# employer details
employer_history_data_json = post.get('employer_history_data_json', '[]') employer_history_data_json = post.get('employer_history_data_json', '[]')
employer_data = json.loads(employer_history_data_json) if employer_history_data_json else [] employer_data = json.loads(employer_history_data_json) if employer_history_data_json else []
if employer_data: if employer_data:
applicant_data['employer_history'] = [ applicant_data['employer_history'] = [
(0, 0, { (0, 0, {
'company_name': company.get('company_name', ''), 'company_name': company.get('company_name', ''),
'designation': company.get('designation', ''), 'designation': company.get('designation', ''),
'date_of_joining': datetime.strptime(company.get('date_of_joining'), '%Y-%m-%d').date() if company.get('date_of_joining') else '', 'date_of_joining': self.safe_date_parse(company.get('date_of_joining')),
'last_working_day': datetime.strptime(company.get('last_working_day'), '%Y-%m-%d').date() if company.get('last_working_day') else '', 'last_working_day': self.safe_date_parse(company.get('last_working_day')),
'ctc': company.get('ctc', ''), 'ctc': company.get('ctc', ''),
}) for company in employer_data }) for company in employer_data
] ]
@ -284,6 +283,11 @@ class website_hr_recruitment_applications(http.Controller):
return request.render("hr_recruitment_extended.thank_you_template") return request.render("hr_recruitment_extended.thank_you_template")
def safe_date_parse(self,date_str):
try:
return datetime.strptime(date_str, '%Y-%m-%d').date() if date_str else None
except (ValueError, TypeError):
return None

View File

@ -7,5 +7,41 @@
<field name="type">binary</field> <field name="type">binary</field>
</record> </record>
<!--Skill Types-->
<record id="hr_skill_type_additional" model="hr.skill.type">
<field name="name">Others</field>
</record>
<!--Skill Levels-->
<!--Programming-->
<record id="hr_skill_level_additional_beginner" model="hr.skill.level">
<field name="name">Beginner</field>
<field name="default_level">1</field>
<field name="level_progress">15</field>
<field name="skill_type_id" ref="hr_skill_type_additional"/>
</record>
<record id="hr_skill_level_additional_elementary" model="hr.skill.level">
<field name="name">Elementary</field>
<field name="level_progress">25</field>
<field name="skill_type_id" ref="hr_skill_type_additional"/>
</record>
<record id="hr_skill_level_additional_intermediate" model="hr.skill.level">
<field name="name">Intermediate</field>
<field name="level_progress">50</field>
<field name="skill_type_id" ref="hr_skill_type_additional"/>
</record>
<record id="hr_skill_level_additional_advanced" model="hr.skill.level">
<field name="name">Advanced</field>
<field name="level_progress">80</field>
<field name="skill_type_id" ref="hr_skill_type_additional"/>
</record>
<record id="hr_skill_level_additional_expert" model="hr.skill.level">
<field name="name">Expert</field>
<field name="level_progress">100</field>
<field name="skill_type_id" ref="hr_skill_type_additional"/>
</record>
</data> </data>
</odoo> </odoo>

View File

@ -1,43 +1,9 @@
<odoo> <odoo>
<!-- <template id="joining_form_custom_external_layout_standard">-->
<!-- <div t-attf-class="header">-->
<!-- </div>-->
<!-- <div t-attf-class="footer o_company_#{company.id}_layout {{report_type != 'pdf' and 'mt-auto'}}">-->
<!-- <div class="o_footer_content d-flex border-top pt-2">-->
<!-- <div class="flex-grow-1 text-start me-2" t-field="company.report_footer"/>-->
<!-- <div class="text-end text-muted">-->
<!-- <div t-if="report_type == 'pdf' and display_name_in_footer" t-out="o.name">(document name)</div>-->
<!-- <div t-if="report_type == 'pdf'">Page <span class="page"/> / <span class="topage"/></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
<!-- <template id="joining_form_custom_external_layout">-->
<!-- <t t-if="not o" t-set="o" t-value="doc"/>-->
<!-- <t t-if="not company">-->
<!-- &lt;!&ndash; Multicompany &ndash;&gt;-->
<!-- <t t-if="company_id">-->
<!-- <t t-set="company" t-value="company_id"/>-->
<!-- </t>-->
<!-- <t t-elif="o and 'company_id' in o and o.company_id.sudo()">-->
<!-- <t t-set="company" t-value="o.company_id.sudo()"/>-->
<!-- </t>-->
<!-- <t t-else="else">-->
<!-- <t t-set="company" t-value="res_company"/>-->
<!-- </t>-->
<!-- </t>-->
<!-- <t t-if="company.external_report_layout_id" t-call="{{company.external_report_layout_id.sudo().key}}"><t t-out="0"/></t>-->
<!-- <t t-else="else" t-call="hr_recruitment_extended.joining_form_custom_external_layout_standard"><t t-out="0"/></t>-->
<!-- </template>-->
<odoo> <odoo>
<template id="employee_joining_form_template"> <template id="employee_joining_form_template">
<t t-call="web.external_layout"> <t t-call="web.external_layout">
<main class="page" style="margin: 0px; padding: 0px; font-size: 16px; font-family: 'Arial', sans-serif;"> <main class="page"
style="margin: 0px; padding: 0px; font-size: 16px; font-family: 'Arial', sans-serif;">
<t t-foreach="docs" t-as="doc"> <t t-foreach="docs" t-as="doc">
<!-- Candidate Image --> <!-- Candidate Image -->

View File

@ -401,6 +401,18 @@
</field> </field>
</record> </record>
<record id="custom_paper_format" model="report.paperformat">
<field name="name">No Margin</field>
<field name="default" eval="False"/>
<field name="format">A4</field>
<field name="margin_top">20</field>
<field name="margin_bottom">20</field>
<field name="margin_left">15</field>
<field name="margin_right">15</field>
<field name="header_line" eval="False"/>
<field name="header_spacing">0</field>
<field name="orientation">Portrait</field>
</record>
<record id="action_download_joining_form" model="ir.actions.report"> <record id="action_download_joining_form" model="ir.actions.report">
<field name="name">Download Joining Form</field> <field name="name">Download Joining Form</field>
@ -410,7 +422,10 @@
<field name="report_file">hr_recruitment_extended.employee_joining_form_template</field> <field name="report_file">hr_recruitment_extended.employee_joining_form_template</field>
<field name="binding_model_id" ref="hr_recruitment.model_hr_applicant"/> <field name="binding_model_id" ref="hr_recruitment.model_hr_applicant"/>
<field name="print_report_name">'JOD - %s' % (object.display_name)</field> <field name="print_report_name">'JOD - %s' % (object.display_name)</field>
<field name="paperformat_id" ref="hr_recruitment_extended.custom_paper_format"/>
<field name="binding_type">report</field> <field name="binding_type">report</field>
</record> </record>
</odoo> </odoo>