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

Merge branch 'pawan_branch' into 'development' 

remove conflict

See merge request prakash.jain/cor-odoo!144
This commit is contained in:
pawan.sharma 2021-03-08 22:05:29 -08:00
parent 6410ece7fa cc70afeb4b
commit c92b75c546
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cor_custom/views/analytic_view.xml
View File

@ -179,8 +179,6 @@
</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>