Merge branch 'development' of http://103.74.223.20:8085/prakash.jain/cor-odoo into pawan_branch

cor_custom/models/analytic.py

@@ -132,23 +132,34 @@ class AccountAnalyticLine(models.Model):
         fields_name = dict(zip(fields, index))
         res = super(AccountAnalyticLine, self).export_data(fields)
         for index, val in enumerate(res['datas']):
-            if fields_name.get('date') >= 0:
+            #print("task_id", fields_name)
+            if fields_name.get('date') and fields_name.get('date') >= 0:
                 tdateindex = fields_name.get('date')
                 tdate = res['datas'][index][tdateindex]
                 if tdate:
                     res['datas'][index][tdateindex] = datetime.strftime(tdate, "%d/%m/%Y")
-            if fields_name.get('task_id') >= 0:
+            if fields_name.get('start_datetime') and fields_name.get('start_datetime') >= 0:
+                start_datetime_index = fields_name.get('start_datetime')
+                start_datetime = res['datas'][index][start_datetime_index]
+                if start_datetime:
+                    res['datas'][index][start_datetime_index] = datetime.strftime(start_datetime, "%d/%m/%Y %H:%M")
+            if fields_name.get('end_datetime') and fields_name.get('end_datetime') >= 0:
+                end_datetime_index = fields_name.get('end_datetime')
+                end_datetime= res['datas'][index][end_datetime_index]
+                if end_datetime:
+                    res['datas'][index][end_datetime_index] = datetime.strftime(end_datetime, "%d/%m/%Y %H:%M")
+            if fields_name.get('task_id') and fields_name.get('task_id') >= 0:
                 taskindex = fields_name.get('task_id')
                 ttask = res['datas'][index][taskindex]
                 if type(ttask) == bool:
                     res['datas'][index][taskindex] = ''
-            if fields_name.get('start_time') >= 0:
+            if fields_name.get('start_time') and fields_name.get('start_time') >= 0:
                 starttimeindex = fields_name.get('start_time')
                 starttime = float(res['datas'][index][starttimeindex])
                 if starttime:
                     start_time = tools.format_duration(starttime)
                     res['datas'][index][starttimeindex] = start_time
-            if fields_name.get('end_time') >= 0:
+            if fields_name.get('end_time') and fields_name.get('end_time') >= 0:
                 endtimeindex = fields_name.get('end_time')
                 endtime = float(res['datas'][index][endtimeindex])
                 if endtime:

cor_custom/report/project_hours_report_view.xml

@@ -70,17 +70,15 @@
         <field name="model">project.consultant.hrs.report</field>
         <field name="arch" type="xml">
             <calendar string="Consultant Allocation"
-                create="0"
                 date_start="start_date"
-                date_stop="end_date"
-                mode="month"
-                quick_add="False"
-                color="project_id">
+                date_stop="end_date" create="0" quick_add="False"
+                mode="month">
                 <field name="project_id"/>
                 <field name="employee_id"/>
             </calendar>
         </field>
     </record>
+    <!--  create="0" quick_add="False" color="project_id" -->
 
     <record id="action_project_consultant_hrs_report" model="ir.actions.act_window">
         <field name="name">Consultant Allocation</field>