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

Merge branch 'pawan_branch' into 'development' 

add total timesheet hours

See merge request prakash.jain/cor-odoo!92
This commit is contained in:
pawan.sharma 2021-01-26 22:55:50 -08:00
parent 8eb1632e4e 76059a1af3
commit 60968b66f0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cor_custom/models/project.py
View File

@ -41,6 +41,7 @@ class Project(models.Model):
date_start = fields.Date(string='Start Date')
date = fields.Date(string='End Date', index=True, tracking=True)
timesheet_hour = fields.Float(string='Total Timesheet Hours', compute='_compute_calc', store=True)
budgeted_hours = fields.Float(string='Total Budgeted Hours', compute='_compute_calc')
budgeted_hours2 = fields.Float(string='Total Budgeted Hours')
budgeted_revenue = fields.Float(string='Budgeted Revenue', digits=(16, 2))
@ -112,16 +113,20 @@ class Project(models.Model):
consultant_cost = 0.0
actual_revenue = 0.0
hour = 0.0
timesheet_hour = 0.0
for rec in record.sale_line_employee_ids:
consultant_cost = consultant_cost + rec.consultant_cost
actual_revenue = actual_revenue + rec.actual_revenue
hour = hour + rec.budgeted_qty
timesheet_hour = timesheet_hour + rec.timesheet_hour
if record.pricing_type == 'fixed_rate':
for rec in record.consultant_timesheet_hrs:
consultant_cost = consultant_cost + rec.consultant_cost
timesheet_hour = timesheet_hour + rec.timesheet_hour
record.consultant_cost = consultant_cost
record.actual_revenue = actual_revenue
record.budgeted_hours = hour
record.timesheet_hour = timesheet_hour
total_exp = record.consultant_cost + record.expenses_amt
record.total_expenses = total_exp
profit_amt = record.budgeted_revenue - total_exp

1
cor_custom/views/project_view.xml
View File

@ -157,6 +157,7 @@
attrs="{'invisible': [('project_type','!=','hours_in_consultant')]}"/>
<field name="budgeted_hours2" attrs="{'invisible': [('project_type','!=','hours_no_limit')],
'required': [('project_type','=','hours_no_limit')]}"/>
<field name="timesheet_hour"/>
<field name="hourly_rate" attrs="{'readonly': [('project_type','!=','hours_no_limit')]}"/>
<field name="budgeted_hour_week" invisible="1"/>
</group>