subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add date conditions

This commit is contained in:
pawan.sharma 2022-08-31 11:56:13 +05:30
parent 0741dcd989
commit ce93a93f1f
4 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cor_custom/models/project.py
View File

@ -438,6 +438,20 @@ class InheritProjectProductEmployeeMap(models.Model):
return {
'type': 'ir.actions.act_window_close'}
@api.onchange('start_date', 'end_date')
def _onchange_start_date(self):
# if self.start_date:
# self.end_date = self.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(days=1)
if self.start_date and self.end_date and (self.start_date > self.end_date):
raise AccessError('End date could not be greater than start date')
if self.project_id:
if self.start_date and not self.project_id.date_start <= self.start_date <= self.project_id.date:
raise AccessError(_('Allocation Start date must be between %s to %s') % (
self.project_id.date_start.strftime('%d-%b-%Y'), self.project_id.date.strftime('%d-%b-%Y')))
if self.end_date and not (self.project_id.date_start <= self.end_date <= self.project_id.date):
raise AccessError(_('Allocation Start date must be between %s to %s') % (
self.project_id.date_start.strftime('%d-%b-%Y'), self.project_id.date.strftime('%d-%b-%Y')))
class CustomProjectTags(models.Model):
""" Tags of project's tasks """

2
cor_custom/views/project_view.xml
View File

@ -101,7 +101,7 @@
<field name="actual_revenue"/>
<field name="budgeted_hour_week" invisible="1"/>
<button type="object" name="edit_sale_line_employee_record" string="Edit" class="oe_highlight"/>
<button name="unlink" type="object" icon="fa-trash-o"/>
<!--<button name="unlink" type="object" icon="fa-trash-o"/>-->
</tree>
</field>
<!--<field name="consultant_timesheet_hrs" readonly="1" attrs="{'invisible': [('pricing_type','!=','fixed_rate')]}">-->

32
cor_custom/wizard/project_resource_wizard.py
View File

@ -3,6 +3,7 @@ from odoo.exceptions import UserError, AccessError, ValidationError
from datetime import datetime, timedelta
from dateutil import relativedelta
class ProjectResourceWizard(models.TransientModel):
_name = 'project.resource.wizard'
@ -17,7 +18,8 @@ class ProjectResourceWizard(models.TransientModel):
resource_rec = {}
if rec.employee_id and rec.employee_id.id not in emp_id:
emp_id.append(rec.employee_id.id)
resource_rec.update({'employee_id':rec.employee_id.id, 'project_id': res_id, 'employee_price': rec.employee_id.timesheet_cost})
resource_rec.update({'employee_id': rec.employee_id.id, 'project_id': res_id,
'employee_price': rec.employee_id.timesheet_cost})
lines.append((0, 0, resource_rec))
res.update({'add_project_resource': lines})
return res
@ -45,9 +47,10 @@ class ProjectResourceWizard(models.TransientModel):
############
for emp in self.project_id.sale_line_employee_ids:
if emp.employee_id == val.employee_id and emp.end_date == False and val.start_date:
emp.write({'end_date' : val.start_date - relativedelta.relativedelta(days=1)})
emp.write({'end_date': val.start_date - relativedelta.relativedelta(days=1)})
return True
class ProjectResourceLine(models.Model):
_name = "project.resource.line"
_description = "Project Resource Line"
@ -56,7 +59,7 @@ class ProjectResourceLine(models.Model):
project_id = fields.Many2one('project.project')
employee_id = fields.Many2one('hr.employee')
employee_ids = fields.Many2many('hr.employee', compute='_compute_allow_employee_ids')
role = fields.Selection([('Manager', 'Manager'),('Employee', 'Employee'), ], string="Role", default="Employee")
role = fields.Selection([('Manager', 'Manager'), ('Employee', 'Employee'), ], string="Role", default="Employee")
start_date = fields.Date()
end_date = fields.Date()
price_unit = fields.Float("Hourly Rate")
@ -88,23 +91,22 @@ class ProjectResourceLine(models.Model):
@api.onchange('price_unit', 'budgeted_qty')
def _calculate_total_cost(self):
#if self.env.context.get('active_model') == 'project.project' and self.env.context.get('active_id'):
#pro = self.env['project.project'].browse(self.env.context.get('active_id'))
# if self.env.context.get('active_model') == 'project.project' and self.env.context.get('active_id'):
# pro = self.env['project.project'].browse(self.env.context.get('active_id'))
if self.project_id.project_type == 'hours_in_consultant':
if self.hour_distribution == 'Manual':
self.cost = self.price_unit * self.budgeted_qty
@api.onchange('start_date')
def onchange_start_date(self):
if self.start_date:
self.end_date = self.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(days=1)
if self.start_date and self.end_date and (self.end_date > self.start_date):
raise AccessError('End date could not be greater than start date')
@api.onchange('start_date', 'end_date')
def _onchange_start_date(self):
def _onchange_start_end_date(self):
# if self.start_date:
# self.end_date = self.start_date + relativedelta.relativedelta(months=1) - relativedelta.relativedelta(days=1)
if self.start_date and self.end_date and (self.start_date > self.end_date):
raise AccessError('End date could not be greater than start date')
if self.project_id:
if self.start_date and not self.project_id.date_start <= self.start_date <= self.project_id.date:
raise AccessError(_('Allocation Start date must be between %s to %s') % (self.project_id.date_start,self.project_id.date))
raise AccessError(_('Allocation Start date must be between %s to %s') % (
self.project_id.date_start.strftime('%d-%b-%Y'), self.project_id.date.strftime('%d-%b-%Y')))
if self.end_date and not (self.project_id.date_start <= self.end_date <= self.project_id.date):
raise AccessError(_('Allocation Start date must be between %s to %s') % (self.project_id.date_start,self.project_id.date))
raise AccessError(_('Allocation Start date must be between %s to %s') % (
self.project_id.date_start.strftime('%d-%b-%Y'), self.project_id.date.strftime('%d-%b-%Y')))

2
cor_custom/wizard/project_resource_wizard.xml
View File

@ -10,7 +10,7 @@
</group>
<field name="add_project_resource" context="{'default_project_id': active_id}">
<tree editable="bottom">
<field name="employee_id" domain="[('id', 'in', employee_ids)]"/>
<field name="employee_id" domain="[('id', 'in', employee_ids)]" required="1"/>
<field name="employee_ids" widget="many2many_tags" invisible="1"/>
<field name="role"/>
<field name="start_date" required="1"/>