From 6d5b74dd57265ead3ca20c08e46ddc98c752653c Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Fri, 25 Dec 2020 20:23:11 +0530 Subject: [PATCH] weekly hours --- cor_custom/__manifest__.py | 1 + cor_custom/models/__init__.py | 1 + cor_custom/models/hr_employee.py | 9 +++++++++ cor_custom/models/project.py | 10 +++++++++- cor_custom/views/hr_employee_views.xml | 20 ++++++++++++++++++++ cor_custom/views/project_view.xml | 6 +++++- 6 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 cor_custom/models/hr_employee.py create mode 100755 cor_custom/views/hr_employee_views.xml diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py index e279c04..5a94307 100755 --- a/cor_custom/__manifest__.py +++ b/cor_custom/__manifest__.py @@ -29,6 +29,7 @@ 'views/crm_view.xml', 'views/sale_views.xml', 'views/project_view.xml', + 'views/hr_employee_views.xml', 'views/hr_timesheet_templates.xml', 'views/analytic_view.xml', 'report/project_profitability_report_analysis_views.xml', diff --git a/cor_custom/models/__init__.py b/cor_custom/models/__init__.py index 481bcbc..26b5d89 100755 --- a/cor_custom/models/__init__.py +++ b/cor_custom/models/__init__.py @@ -6,3 +6,4 @@ from . import project from . import project_overview from . import analytic from . import product +from . import hr_employee diff --git a/cor_custom/models/hr_employee.py b/cor_custom/models/hr_employee.py new file mode 100755 index 0000000..e07c35d --- /dev/null +++ b/cor_custom/models/hr_employee.py @@ -0,0 +1,9 @@ +# -*- coding: utf-8 -*- + +from odoo import api, fields, models, _ + + +class HrEmployee(models.Model): + _inherit = 'hr.employee' + + budgeted_hour_week = fields.Integer("Budgeted Hours") \ No newline at end of file diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 0421303..9e9d176 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -46,6 +46,7 @@ class InheritProjectProductEmployeeMap(models.Model): budgeted_qty = fields.Float(string='Budgeted Qty', related='sale_line_id.product_uom_qty', readonly=True) budgeted_uom = fields.Many2one('uom.uom', string='Budgeted UOM', related='sale_line_id.product_uom', readonly=True) timesheet_hour = fields.Float("Timesheet Hour", compute='_compute_timesheet_hour', default=0.0) + budgeted_hour_week = fields.Float("Budgeted Hours per week", compute='_compute_budgeted_hour_week') def _compute_timesheet_hour(self): for val in self: @@ -56,4 +57,11 @@ class InheritProjectProductEmployeeMap(models.Model): if res and res[2]: val.timesheet_hour = res[2] else: - val.timesheet_hour = 0.0 \ No newline at end of file + val.timesheet_hour = 0.0 + + def _compute_budgeted_hour_week(self): + for val in self: + if val.employee_id and val.employee_id.budgeted_hour_week and val.budgeted_qty: + val.budgeted_hour_week = (val.budgeted_qty /val.employee_id.budgeted_hour_week) + else: + val.budgeted_hour_week = 0 diff --git a/cor_custom/views/hr_employee_views.xml b/cor_custom/views/hr_employee_views.xml new file mode 100755 index 0000000..0bcaeef --- /dev/null +++ b/cor_custom/views/hr_employee_views.xml @@ -0,0 +1,20 @@ + + + + + hr.employee.form.inherit + hr.employee + + + + + + + + + diff --git a/cor_custom/views/project_view.xml b/cor_custom/views/project_view.xml index f5236ec..7a9b29d 100755 --- a/cor_custom/views/project_view.xml +++ b/cor_custom/views/project_view.xml @@ -12,7 +12,8 @@ - + @@ -69,6 +70,9 @@ + + +