From 95a321fd10e590674d93c44392b8b91a27224c09 Mon Sep 17 00:00:00 2001 From: Pranay Date: Tue, 24 Jun 2025 15:20:51 +0530 Subject: [PATCH 01/49] JOD FORM ISSUE --- .../controllers/controllers.py | 16 +- .../hr_recruitment_extended/data/data.xml | 36 + .../data/templates.xml | 654 +++++++++--------- .../views/hr_applicant_views.xml | 15 + 4 files changed, 371 insertions(+), 350 deletions(-) diff --git a/addons_extensions/hr_recruitment_extended/controllers/controllers.py b/addons_extensions/hr_recruitment_extended/controllers/controllers.py index 70391ede7..b81a52dd4 100644 --- a/addons_extensions/hr_recruitment_extended/controllers/controllers.py +++ b/addons_extensions/hr_recruitment_extended/controllers/controllers.py @@ -247,17 +247,16 @@ class website_hr_recruitment_applications(http.Controller): }) for education in education_data ] - - # employer details employer_history_data_json = post.get('employer_history_data_json', '[]') employer_data = json.loads(employer_history_data_json) if employer_history_data_json else [] + if employer_data: applicant_data['employer_history'] = [ - (0,0,{ - 'company_name': company.get('company_name',''), + (0, 0, { + 'company_name': company.get('company_name', ''), '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 '', - 'last_working_day': datetime.strptime(company.get('last_working_day'), '%Y-%m-%d').date() if company.get('last_working_day') else '', + 'date_of_joining': self.safe_date_parse(company.get('date_of_joining')), + 'last_working_day': self.safe_date_parse(company.get('last_working_day')), 'ctc': company.get('ctc', ''), }) 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") + 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 diff --git a/addons_extensions/hr_recruitment_extended/data/data.xml b/addons_extensions/hr_recruitment_extended/data/data.xml index 5cd46631b..36c5a8340 100644 --- a/addons_extensions/hr_recruitment_extended/data/data.xml +++ b/addons_extensions/hr_recruitment_extended/data/data.xml @@ -7,5 +7,41 @@ binary + + + + + Others + + + + + + Beginner + 1 + 15 + + + + Elementary + 25 + + + + Intermediate + 50 + + + + Advanced + 80 + + + + Expert + 100 + + + \ No newline at end of file diff --git a/addons_extensions/hr_recruitment_extended/data/templates.xml b/addons_extensions/hr_recruitment_extended/data/templates.xml index 93ec2987c..e0a476383 100644 --- a/addons_extensions/hr_recruitment_extended/data/templates.xml +++ b/addons_extensions/hr_recruitment_extended/data/templates.xml @@ -1,350 +1,316 @@ - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml b/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml index b680f0b0c..47acfbbd0 100644 --- a/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml +++ b/addons_extensions/hr_recruitment_extended/views/hr_applicant_views.xml @@ -401,6 +401,18 @@ + + No Margin + + A4 + 20 + 20 + 15 + 15 + + 0 + Portrait + Download Joining Form @@ -410,7 +422,10 @@ hr_recruitment_extended.employee_joining_form_template 'JOD - %s' % (object.display_name) + report + + \ No newline at end of file From db1e49c02630c328639764d0d2531457eedaa942 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 02/49] Initial commit From 9f8e5cd9461e08ac32bf608b667b131f6cb57f46 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 03/49] Initial commit From 93bd39a75f44a90b64bd8a8ef4578253e7960178 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 04/49] Initial commit From 0e5c58c8e4dc375d7a316f9ddde93525108e8156 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 05/49] Initial commit From 6ba601d534101cf24beacf248b9560a168579652 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 06/49] Initial commit From 8702da4957cd982d0d28de4d83969f421f1978eb Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 07/49] Initial commit From 928389524674d88166d6bc768b015393ba8e6159 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 08/49] Initial commit From 2e78e5c658f04c04b83a25709706fa2b3212f31b Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 09/49] Initial commit From dfed07a1dbf9ceb9084717306a843dc1ef7bbdeb Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 10/49] Initial commit From 7dda1e50b24db7e769e768622a33b8960f71f50c Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 11/49] Initial commit From 5212ae90c46928edc4a8a1a8c6049e47a9f43ca2 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 12/49] Initial commit From 7da2f09165f58865b43d977a99785d6c6ddffce9 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 13/49] Initial commit From 97fd24d58eb0b1fb6fc11df600bd6638d260cf3e Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 14/49] Initial commit From b006f5fc594bab8895923950d2299b21f7b7fbc8 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 15/49] Initial commit From a301468cb5b6f475f18e0cbe379b7b936f8eb0cf Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 16/49] Initial commit From 3929caa732f827d70d06402235155278a1c8d68f Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 17/49] Initial commit From 2fe0960f9cd1a3a1997984b629560411c4f499c0 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 18/49] Initial commit From cceabf3403b57409c8d89b0d922313f3d6ecf17a Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 19/49] Initial commit From 3a20f753c22b98f1ef35a3da3aaab78fe506fac0 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 20/49] Initial commit From 178e0522613845cf0d609116d4ef063a790f0395 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 21/49] Initial commit From 9859c253e5ce432de204e25be07e7e09e0c65418 Mon Sep 17 00:00:00 2001 From: Pranay Date: Mon, 24 Mar 2025 11:35:35 +0530 Subject: [PATCH 22/49] update whatsapp code --- addons_extensions/whatsapp/models/discuss_channel.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons_extensions/whatsapp/models/discuss_channel.py b/addons_extensions/whatsapp/models/discuss_channel.py index e2989c112..7fb18c9cf 100644 --- a/addons_extensions/whatsapp/models/discuss_channel.py +++ b/addons_extensions/whatsapp/models/discuss_channel.py @@ -201,8 +201,7 @@ class DiscussChannel(models.Model): subtype_xmlid='mail.mt_note', ) if partners_to_notify == channel.whatsapp_partner_id and wa_account_id.notify_user_ids.partner_id: - partners_to_notify += wa_account_id.notify_user_ids.partner_id - partners_to_notify = self.env['res.partner'].browse(list(set(partners_to_notify.ids))) + partners_to_notify |= wa_account_id.notify_user_ids.partner_id channel.channel_member_ids = [Command.clear()] + [Command.create({'partner_id': partner.id}) for partner in partners_to_notify] channel._broadcast(partners_to_notify.ids) return channel From b5e4b65936f8890f05884e5e88654e4f2eeb6d30 Mon Sep 17 00:00:00 2001 From: Pranay Date: Mon, 24 Mar 2025 12:54:38 +0530 Subject: [PATCH 23/49] fix whatsapp --- addons_extensions/whatsapp/models/discuss_channel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons_extensions/whatsapp/models/discuss_channel.py b/addons_extensions/whatsapp/models/discuss_channel.py index 7fb18c9cf..e2989c112 100644 --- a/addons_extensions/whatsapp/models/discuss_channel.py +++ b/addons_extensions/whatsapp/models/discuss_channel.py @@ -201,7 +201,8 @@ class DiscussChannel(models.Model): subtype_xmlid='mail.mt_note', ) if partners_to_notify == channel.whatsapp_partner_id and wa_account_id.notify_user_ids.partner_id: - partners_to_notify |= wa_account_id.notify_user_ids.partner_id + partners_to_notify += wa_account_id.notify_user_ids.partner_id + partners_to_notify = self.env['res.partner'].browse(list(set(partners_to_notify.ids))) channel.channel_member_ids = [Command.clear()] + [Command.create({'partner_id': partner.id}) for partner in partners_to_notify] channel._broadcast(partners_to_notify.ids) return channel From 1b1f3b9ced3a980230fbba6372fce0c344909906 Mon Sep 17 00:00:00 2001 From: Pranay Date: Mon, 24 Mar 2025 13:10:34 +0530 Subject: [PATCH 24/49] Recruitment Changes --- .../hr_recruitment_extended/models/hr_job_recruitment.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons_extensions/hr_recruitment_extended/models/hr_job_recruitment.py b/addons_extensions/hr_recruitment_extended/models/hr_job_recruitment.py index 97b114a76..d546a3cde 100644 --- a/addons_extensions/hr_recruitment_extended/models/hr_job_recruitment.py +++ b/addons_extensions/hr_recruitment_extended/models/hr_job_recruitment.py @@ -256,6 +256,8 @@ class HRJobRecruitment(models.Model): rec.submission_status = 'zero' + experience = fields.Many2one('candidate.experience', string="Experience") + @api.depends('application_ids.submitted_to_client') def _compute_no_of_submissions(self): counts = dict(self.env['hr.applicant']._read_group( From 6f58131b7bab2a1099f5f0b3f847af8954524750 Mon Sep 17 00:00:00 2001 From: Pranay Date: Mon, 7 Apr 2025 16:08:02 +0530 Subject: [PATCH 25/49] time-off FIX --- addons_extensions/hr_timeoff_extended/models/hr_timeoff.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py b/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py index 593c2a541..fea92e9e5 100644 --- a/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py +++ b/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py @@ -1,3 +1,4 @@ +from asyncore import write from calendar import month from dateutil.utils import today From c36a8016be5f2175d640d3de983f9776c8e6a81c Mon Sep 17 00:00:00 2001 From: Pranay Date: Mon, 7 Apr 2025 16:34:42 +0530 Subject: [PATCH 26/49] TimeOff Fix --- addons_extensions/hr_timeoff_extended/models/hr_timeoff.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py b/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py index fea92e9e5..593c2a541 100644 --- a/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py +++ b/addons_extensions/hr_timeoff_extended/models/hr_timeoff.py @@ -1,4 +1,3 @@ -from asyncore import write from calendar import month from dateutil.utils import today From 33112a0ab787ce2a66c54991196537b1a10fa680 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 27/49] Initial commit From 311bf1768e90e8b1e12ec3f30f1a8c66762d3341 Mon Sep 17 00:00:00 2001 From: administrator Date: Mon, 2 Jun 2025 15:19:52 +0530 Subject: [PATCH 28/49] pull commit --- addons_extensions/hr_employee_extended/__manifest__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons_extensions/hr_employee_extended/__manifest__.py b/addons_extensions/hr_employee_extended/__manifest__.py index ec27233ec..ee072e92c 100644 --- a/addons_extensions/hr_employee_extended/__manifest__.py +++ b/addons_extensions/hr_employee_extended/__manifest__.py @@ -18,8 +18,12 @@ 'version': '0.1', # any module necessary for this one to work correctly + 'depends': ['base','hr','account','mail','hr_skills', 'hr_contract'], + + + # always loaded 'data': [ 'security/security.xml', From de32d15005a138e03883137621f21a60a1dc3fa5 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 29/49] Initial commit From 36ca8544b77dc76fd74e1153e0020ea5e47f2d99 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 30/49] Initial commit From 4583286e995d5ce07b6d31495f64200b1d6313c8 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 31/49] Initial commit From cd1d3d5f7b22422bb3d7680382abbe1dcf124453 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 32/49] Initial commit From 88e2bfdd5703d34d050d9f2fb627532e9fee8519 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 33/49] Initial commit From b1a021aa57ffb44f08c099f13cd03731838278c0 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 34/49] Initial commit From 29231ebe69f984852c220a784148e26322b8921d Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 35/49] Initial commit From 10ec9c3f1f29d725ce77308fd3de4fc53a899861 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 36/49] Initial commit From c97d57c6792e037e246c9cfb40653dcbe8177c4f Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 37/49] Initial commit From 01a4b67c6dfbda0f990445d72ca7e797478b98bc Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 38/49] Initial commit From 7f7a47d2c7df095369d4888207ac5fa2b04db7a7 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 39/49] Initial commit From 1d00debd40726e7cc12e50bb3f4d58496a5f0741 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 40/49] Initial commit From f5e2787ce4c60c9229a0a377ccd6d857c9a1ae2c Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 41/49] Initial commit From aabb7e786d052482c638dabf611364941088f7df Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 42/49] Initial commit From 2fe5c74c63a4e56526df810969ec52ebaa97bd59 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 43/49] Initial commit From 728651278e822c1c1be21636bf08b802609ae263 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 44/49] Initial commit From 02e08b9dba49803085f2d65d08ec2ea8d80a2e5e Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 45/49] Initial commit From 7026a05260e765cfce5d811d3d2b3eec0c1eab48 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 46/49] Initial commit From 571d7ae9c931194108e852c986bec8a2af238650 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 47/49] Initial commit From a7110eff7e4f2e364c500c3fd29cbe8a21674507 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 48/49] Initial commit From 1b513a566696e705cc7d937b2bd6aa0c9037f387 Mon Sep 17 00:00:00 2001 From: administrator Date: Tue, 7 Jan 2025 09:29:28 +0530 Subject: [PATCH 49/49] Initial commit