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

Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into development

This commit is contained in:
projectsodoo 2021-02-26 14:33:37 +05:30
parent 61a50a1582 fdbee801df
commit b1c43e3780
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cor_custom/views/analytic_view.xml
View File

@ -114,7 +114,7 @@
<calendar string="Timesheet" date_start="start_datetime" date_stop="end_datetime" date_delay="unit_amount"
form_view_id="%(hr_timesheet.hr_timesheet_line_form)d" event_open_popup="true" quick_add="False">
<field name="project_id"/>
<field name="name"/>
<field name="name" />
</calendar>
</field>
</record>
@ -157,7 +157,7 @@
<form string="Analytic Entry">
<sheet string="Analytic Entry">
<group>
<field name="name"/>
<field name="name" required="0"/>
</group>
<group>
<group>

6
cor_custom/views/project_view.xml
View File

@ -232,6 +232,12 @@
<xpath expr="//field[@name='effective_hours']" position="before">
<field name="start_date"/>
</xpath>
<xpath expr="//field[@name='effective_hours']" position="before">
<field name="planned_hours"/>
</xpath>
<xpath expr="//field[@name='effective_hours']" position="after">
<field name="remaining_hours"/>
</xpath>
</field>
</record>

6
sub_project/models/sub_project.py
View File

@ -12,6 +12,11 @@ class SubProject(models.Model):
@api.onchange('parent_project', 'sub_project')
def onchange_parent_project_sub_project(self):
user_list = []
if self.parent_project.sub_project:
user_list = self.parent_project.sub_project.ids
user_list.append(self._origin.id)
self.parent_project.sub_project = user_list
if self.sub_project:
for rec in self.sub_project:
#print('AAAAAAAAAAA', rec, rec._origin.id)
@ -22,6 +27,7 @@ class SubProject(models.Model):
class InheritProjectTask(models.Model):
_inherit = 'project.task'