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

Merge branch 'development' into 'master' 

Development

See merge request prakash.jain/cor-odoo!163
This commit is contained in:
prakash.jain 2021-03-24 23:36:04 -07:00
parent 700d9f2843 0141551d9c
commit 5dee9cbce6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cor_custom/views/analytic_view.xml
View File

@ -215,7 +215,6 @@
</record>-->
>>>>>>> 0964d5378c9e26188e9e977126bb2beb977992ea
<record id="view_hr_my_timesheet_line_calendar" model="ir.ui.view">
<field name="name">account.analytic.line.calendar</field>
<field name="model">account.analytic.line</field>

6
cor_custom/views/project_view.xml
View File

@ -213,6 +213,9 @@
<xpath expr="//field[@name='date_deadline']" position="before">
<field name="start_date"/>
</xpath>
<xpath expr="//field[@name='progress']" position="replace">
<field name="progress" widget="progressbar" string="% of hours quota"/>
</xpath>
</field>
</record>
@ -238,6 +241,9 @@
<xpath expr="//field[@name='effective_hours']" position="after">
<field name="remaining_hours"/>
</xpath>
<xpath expr="//field[@name='progress']" position="replace">
<field name="progress" widget="progressbar" string="% of hours quota"/>
</xpath>
</field>
</record>