remove conflict

cor_custom/__manifest__.py

@@ -29,7 +29,7 @@
         'views/sale_views.xml',
         'views/project_view.xml',
         'views/hr_timesheet_templates.xml',
-        # 'views/analytic_view.xml',
+        'views/analytic_view.xml',
         'report/project_profitability_report_analysis_views.xml',
         'views/views.xml',
         'views/templates.xml',

cor_custom/models/analytic.py

@@ -8,6 +8,9 @@ from odoo.osv import expression
 class AccountAnalyticLine(models.Model):
     _inherit = 'account.analytic.line'
 
+    start_time = fields.Float('Start Time', digits=(16, 2))
+    end_time = fields.Float('End Time', digits=(16, 2))
+
     @api.model
     def create(self, vals):
         if vals.get('unit_amount') == 0.0:

cor_custom/views/analytic_view.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="view_account_analytic_line_inherit_percentage" model="ir.ui.view">
+    <!--<record id="view_account_analytic_line_inherit_percentage" model="ir.ui.view">
         <field name="name">Percentage Analytic</field>
         <field name="model">account.analytic.line</field>
         <field name="inherit_id" ref="analytic.view_account_analytic_line_form"/>
@@ -13,6 +13,30 @@
                     <field name="per_from_amt" attrs="{'invisible':[('ispercentage','=',False)]}"/>
             </xpath>
         </field>
+    </record>-->
+
+    <record id="hr_timesheet_line_tree_inherit1" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree.hr_timesheet_inherit1</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="start_time"/>
+                <field name="end_time"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="timesheet_view_tree_user_inherit1" model="ir.ui.view">
+        <field name="name">account.analytic.line.tree.hr_timesheet_inherit1</field>
+        <field name="model">account.analytic.line</field>
+        <field name="inherit_id" ref="hr_timesheet.timesheet_view_tree_user"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='name']" position="after">
+                <field name="start_time"/>
+                <field name="end_time"/>
+            </xpath>
+        </field>
     </record>
 
 </odoo>