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

Merge branch 'pawan_branch' into 'development' 

Pawan branch

See merge request prakash.jain/cor-odoo!95
This commit is contained in:
pawan.sharma 2021-01-27 23:24:25 -08:00
parent a39756f0cb 81dd401362
commit aae9c7c950
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cor_custom/models/analytic.py
View File

@ -16,7 +16,7 @@ class AccountAnalyticLine(models.Model):
start_time = fields.Float(string='Start Time', digits=(16, 2))
end_time = fields.Float(string='End Time', digits=(16, 2))
unit_amount = fields.Float('Duration', default=0.0)
parent_project = fields.Many2one('project.project', string='Parent Project', related='project_id.parent_project', readonly=True)
sub_project = fields.Many2one('project.project', string='Sub Project', related='project_id.sub_project', readonly=True)
@api.onchange('employee_id')
def _onchange_employee_id(self):

2
cor_custom/models/project.py
View File

@ -202,7 +202,7 @@ class ProjectConsultantTimesheetHrs(models.Model):
_description = 'Project Consultant Timesheet Hrs'
project_id = fields.Many2one('project.project', "Project")
employee_id = fields.Many2one('hr.employee')
employee_id = fields.Many2one('hr.employee', string="Consultant")
employee_price = fields.Float(string="Consultant Price", default=0.0)
timesheet_hour = fields.Float("Timesheet Hour", default=0.0)
consultant_cost = fields.Float("Actual Cost", compute='_compute_consultant_timesheet_cost', default=0.0)

2
cor_custom/views/analytic_view.xml
View File

@ -51,7 +51,7 @@
<field name="end_time" widget="float_time"/>
</xpath>
<xpath expr="//field[@name='unit_amount']" position="after">
<field name="parent_project"/>
<field name="sub_project"/>
</xpath>
</field>
</record>

2
sub_project/models/sub_project.py
View File

@ -6,4 +6,4 @@ class SubProject(models.Model):
_description = "Sub Project"
is_sub_project = fields.Boolean("Is Sub Project")
parent_project = fields.Many2one('project.project', string='Parent Project')
sub_project = fields.Many2one('project.project', string='Sub Project')

2
sub_project/views/sub_project.xml
View File

@ -14,7 +14,7 @@
<field name="is_sub_project"/>
</group>
<group>
<field name="parent_project" attrs="{'invisible': [('is_sub_project', '=', False)], 'required': [('is_sub_project', '=', True)]}"
<field name="sub_project" attrs="{'invisible': [('is_sub_project', '=', False)], 'required': [('is_sub_project', '=', True)]}"
options="{'no_open': True, 'no_create': True, 'no_create_edit': True}"/>
</group>
</page>