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

Updated budgeted report

This commit is contained in:
projectsodoo 2020-12-20 17:46:32 +05:30
parent 452913d6dd
commit aaa73b04e9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
project_report/report/project_budget_hrs_analysis.py
View File

@ -27,9 +27,12 @@ class BudgetHrsAnalysis(models.Model):
PRO.id AS project_id,
PRO.partner_id AS partner_id,
AAL.employee_id AS employee_id,
PRO.budgeted_hours AS budgeted_hours,
sum(SOL.product_uom_qty) As budgeted_hours,
--PRO.budgeted_hours AS budgeted_hours,
sum(AAL.unit_amount) AS actual_hours
FROM project_project PRO
LEFT JOIN sale_order_line SOL ON PRO.sale_line_id = SOL.id
LEFT JOIN sale_order SO ON PRO.sale_order_id = SO.id
LEFT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id
LEFT JOIN account_analytic_line AAL ON AAL.account_id = AA.id
WHERE AAL.amount < 0.0 AND AAL.project_id IS NOT NULL AND PRO.active = 't' AND PRO.allow_timesheets = 't'

4
project_report/views/project_view.xml
View File

@ -12,10 +12,10 @@
attrs="{'invisible': [('allow_billable','=',False)]}" string="Create Expense" widget="statinfo">
</button>
</div>
<xpath expr="//field[@name='analytic_account_id']" position="after">
<!-- <xpath expr="//field[@name='analytic_account_id']" position="after">
<field name="budgeted_hours"/>
<field name="budgeted_revenue"/>
</xpath>
</xpath> -->
</field>
</record>