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

Compare commits

base: subh_pal_org:550d7e353f7ef663aca9b048829b27f3c682e8e9
Branches Tags
subh_pal_org:master
..
compare: subh_pal_org:c6e5160cf9288d24d87c7545e303b84666df6c06
Branches Tags
subh_pal_org:master

No commits in common. "550d7e353f7ef663aca9b048829b27f3c682e8e9" and "c6e5160cf9288d24d87c7545e303b84666df6c06" have entirely different histories.
550d7e353f ... c6e5160cf9

2 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
project_report/report/project_revenue_custom_report3.py
View File

@ -27,7 +27,7 @@ class ProjectRevenueCustomReport3(models.Model):
('hours_no_limit', 'Total hours are budgeted without division to consultant'),
], string="Project Type", readonly=True)
employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
timesheet_sdatetime = fields.Datetime(string='Timesheet Start Time', readonly=True)
timesheet_sdatetime = fields.Date(string='Timesheet Start Date', readonly=True)
unit_amount = fields.Float('Timesheet Hours', digits=(16, 2))
timesheet_cost = fields.Float('Hourly Cost', digits=(16, 2))
profit_per = fields.Float(string='Profit (%)', digits=(16, 2))

3
project_report/report/project_revenue_custom_report3_views.xml
View File

@ -62,7 +62,7 @@
<field name="timesheet_cost" optional="show" sum="Total Of Hourly Cost"/>
<field name="start_date" optional="show"/>
<field name="end_date" optional="show"/>
<field name="timesheet_sdatetime" widget="date" optional="show"/>
<field name="timesheet_sdatetime" optional="show"/>
</tree>
</field>
</record>
@ -82,7 +82,6 @@
<filter string="Total hours are budgeted without division to consultant" name="limit" domain="[('pricing_type','=','employee_rate'),('project_type','=','hours_no_limit')]"/>
<filter string="Start Date" name="filter_start_date" date="start_date"/>
<filter string="Timesheet Start Time" name="filter_timesheet_sdatetime" date="timesheet_sdatetime"/>
<filter name="group_by_day" string="Timesheet Start Time : DAY" context="{'group_by': 'timesheet_sdatetime:day'}"/>
<filter string="Actual/Budgeted" name="custom_bhrs" domain="['|','|',('overall_budgeted_revenue','>',0),('budgeted_hours','>',0),('budgeted_revenue','>',0)]"/>
<!-- <filter string="Actual/Budgeted" name="custom_bhrs" domain="[('timesheet_sdatetime','=',False)]"/>-->
<!-- <filter string="End Date" name="filter_end_date" date="end_date"/> -->