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

remove extra code

This commit is contained in:
Pawan Kumar 2021-02-18 23:37:36 +05:30
parent beef044d91
commit 1f53a2712d
4 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cor_custom/models/analytic.py
View File

@ -26,8 +26,8 @@ class AccountAnalyticLine(models.Model):
def _default_end_datetime(self):
return fields.Datetime.to_string(datetime.combine(fields.Datetime.now(), datetime.max.time()))
start_datetime = fields.Datetime("Start Time", required=True)
end_datetime = fields.Datetime("End Time", required=True)
start_datetime = fields.Datetime("Start Time", required=True, default=_default_start_datetime)
end_datetime = fields.Datetime("End Time", required=True, default=_default_end_datetime)
@api.onchange('project_id')
@ -104,27 +104,17 @@ class AccountAnalyticLine(models.Model):
if rec.end_time < rec.start_time:
raise exceptions.ValidationError(_('End time cannot be earlier than Start time'))
@api.onchange('start_time', 'end_time')
@api.onchange('start_time', 'end_time', 'start_datetime', 'end_datetime')
def _onchange_start_end_time(self):
if self.start_time > 0 and self.end_time > 0:
res = self.end_time - self.start_time
if res <= 0:
raise ValidationError(_("End time cannot be earlier than Start time"))
self.unit_amount = res
@api.onchange('start_datetime', 'end_datetime')
def _onchange_start_end_date_time(self):
if self.start_datetime and self.end_datetime:
total_hours = (self.end_datetime - self.start_datetime).total_seconds() / 3600
self.unit_amount = total_hours
# @api.onchange('start_time', 'end_time')
# def _onchange_start_end_time(self):
# if self.start_time > 0:
# dt = datetime.strptime('26 Sep 2012', '%d %b %Y')
# print('HHHHHHHH', dt)
# newdatetime = dt.replace(hour=11, minute=59)
# print('GGGGGGGGGGGGG', newdatetime)
# if self.start_datetime and self.end_datetime:
# res1 = self.end_datetime - self.start_datetime
# print('ressssssssss', res1)
# self.unit_amount = res1
@api.model
def export_data(self, fields):

1
cor_custom/report/project_hours_report.py
View File

@ -13,7 +13,6 @@ class BudgetHrsAnalysis(models.Model):
_auto = False
project_id = fields.Many2one('project.project', string='Project', readonly=True)
user_id = fields.Many2one('res.users', related='project_id.user_id', store=True)
employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
start_date = fields.Date(string='Start Date', readonly=True)
end_date = fields.Date(string='End Date', readonly=True)

4
cor_custom/report/project_hours_report_view.xml
View File

@ -8,7 +8,6 @@
<form string="Consultant Allocation" create="false" edit="false" delete="0">
<group>
<field name="project_id"/>
<field name="user_id"/>
<field name="employee_id"/>
<field name="start_date"/>
<field name="end_date"/>
@ -26,7 +25,6 @@
<field name="arch" type="xml">
<tree string="Consultant Allocation" create="false" edit="false" delete="0">
<field name="project_id"/>
<field name="user_id"/>
<field name="employee_id"/>
<field name="start_date"/>
<field name="end_date"/>
@ -86,7 +84,7 @@
<field name="name">Consultant Allocation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">project.consultant.hrs.report</field>
<field name="view_mode">tree,calendar,graph</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_project_consultant_hrs_report_search"/>
<field name="context">{
'search_default_project': 1,

3
cor_custom/views/analytic_view.xml
View File

@ -192,8 +192,7 @@
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="start_datetime" string="Start date"/>
<field name="end_datetime" string="End date"/>
<field name="start_time"/>
</calendar>
</field>
</record>