Merge branch 'pawan_branch' into 'development'
Pawan branch See merge request prakash.jain/cor-odoo!136
This commit is contained in:
commit
fdbee801df
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in New Issue