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

remove conflict

This commit is contained in:
Pawan Kumar 2021-03-09 01:04:56 +05:30
parent 79df1fb760 0964d5378c
commit 5b21582bb0
1 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cor_custom/views/analytic_view.xml
View File

@ -21,8 +21,6 @@
<field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='timesheet_ids']//tree//field[@name='name']" position="after">
<!--<field name="start_time" widget="float_time" invisible="1"/>
<field name="end_time" widget="float_time" invisible="1"/>-->
<field name="start_datetime" string="Start date"/>
<field name="end_datetime" string="End date"/>
</xpath>
@ -181,6 +179,44 @@
</field>
</record>
<<<<<<< HEAD
=======
<record id="timesheet_view_inherit1_search" model="ir.ui.view">
<field name="name">account.analytic.line.search</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date']" position="replace">
<field name="start_datetime"/>
</xpath>
<xpath expr="//filter[@name='month']" position="replace">
<filter name="month" string="Start Time" date="start_datetime"/>
</xpath>
<xpath expr="//filter[@name='groupby_date']" position="replace">
<filter string="Start Time" name="groupby_startdate" domain="[]" context="{'group_by': 'start_datetime'}" help="Timesheet by Start Date"/>
</xpath>
</field>
</record>
<!--<record id="view_account_analytic_line_inherit1_filter" model="ir.ui.view">
<field name="name">account.analytic.line.search2</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_filter"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='date']" position="replace">
<field name="start_datetime"/>
</xpath>
<xpath expr="//filter[@name='date']" position="replace">
<filter string="Start Time" name="start_datetime" date="date"/>
</xpath>
<xpath expr="//group[@name='groupby']//filter[@name='group_date']" position="replace">
<filter string="Start Time" name="group_startdate" context="{'group_by': 'start_datetime'}"/>
</xpath>
</field>
</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>