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

Merge branch 'cor_cr' into 'master' 

view allocation all report display

See merge request prakash.jain/cor-odoo!242
This commit is contained in:
prakash.jain 2022-09-13 14:17:38 +05:30
parent 276abbd79b 6de9a9fff2
commit 147fb3598a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
project_report/report/project_revenue_custom_report3.py
View File

@ -236,8 +236,8 @@ SELECT
0 as budgeted_revenue,
0 as budgeted_hours,
0 as overall_hourly_rate,
AAL.unit_amount,
pro_data.pro_hourly_rate,
AAL.unit_amount as unit_amount,
pro_data.pro_hourly_rate as pro_hourly_rate,
((AAL.amount * -1)/NULLIF(AAL.unit_amount, 0)) as timesheet_cost,
(AAL.unit_amount * pro_data.pro_hourly_rate) AS actual_revenue,
(AAL.amount * -1) as actual_cost,

2
project_report/views/project_view.xml
View File

@ -10,10 +10,10 @@
<div name="button_box" position="inside">
<button class="oe_stat_button" type="object" name="action_view_allocation_custom_report3"
icon="fa-tasks"
attrs="{'invisible':['|',('pricing_type','!=','employee_rate'),('project_type','!=','hours_in_consultant')]}"
string="View Allocation" widget="statinfo">
</button>
</div>
<!--attrs="{'invisible':['|',('pricing_type','!=','employee_rate'),('project_type','!=','hours_in_consultant')]}"-->
<!--<div name="button_box" position="inside">
<button class="oe_stat_button" type="action" name="%(project_report.project_project_action_multi_create_project_expense)d" icon="fa-usd"
attrs="{'invisible': [('allow_billable','=',False)]}" string="Create Expense" widget="statinfo">