Merge branch 'pawan_branch' into 'development'
Pawan branch See merge request prakash.jain/cor-odoo!81
This commit is contained in:
commit
574b8a4ddf
|
@ -163,7 +163,6 @@ class Project(models.Model):
|
|||
create_timesheet = val.consultant_timesheet_hrs.create({'project_id': res[0],
|
||||
'employee_id': res[1],
|
||||
'timesheet_hour': res[2]})
|
||||
for rec in create_timesheet:
|
||||
else:
|
||||
val.consultant_timesheet_hrs = False
|
||||
# val.consultant_timesheet_hrs = False
|
||||
|
|
|
@ -105,7 +105,7 @@
|
|||
<field name="budgeted_hour_week"/>
|
||||
</tree>
|
||||
</field>
|
||||
<field name="consultant_timesheet_hrs" attrs="{'invisible': [('pricing_type','!=','fixed_rate')]}">
|
||||
<field name="consultant_timesheet_hrs" readonly="1" attrs="{'invisible': [('pricing_type','!=','fixed_rate')]}">
|
||||
<tree editable="top">
|
||||
<field name="project_id" invisible="1"/>
|
||||
<field name="employee_id" invisible="0"/>
|
||||
|
|
Loading…
Reference in New Issue