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

add changes in project

This commit is contained in:
pawan.sharma 2022-03-25 12:25:50 +05:30
parent 92ecd78859
commit 53fc6ccd52
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
project_report/report/cor_project_report.py
View File

@ -13,7 +13,12 @@ class CorProjectReport(models.Model):
project_id = fields.Many2one('project.project', string='Project', readonly=True)
employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
#hours_type = fields.Char(string="Hours Type", readonly=True)
price_unit = fields.Float("Hourly Rate")
budgeted_qty = fields.Float(string='Budgeted Hours', digits=(16, 2))
hours = fields.Float("Number of Hours", digits=(16, 2), readonly=True, group_operator="sum")
employee_price = fields.Float(string="Consultant Price")
consultant_cost = fields.Float("Actual Cost")
actual_revenue = fields.Float("Actual Revenue")
# pricing_type = fields.Selection([
# ('fixed_rate', 'Fixed rate'),
# ('employee_rate', 'Consultant rate')
@ -31,8 +36,13 @@ class CorProjectReport(models.Model):
SELECT ROW_NUMBER() OVER() as id,
aa.project_id AS project_id,
aa.employee_id AS employee_id,
SUM(aa.unit_amount) AS hours
bb.price_unit AS price_unit,
bb.budgeted_qty AS budgeted_qty,
bb.employee_price AS employee_price,
SUM(aa.unit_amount) AS hours,
bb.consultant_cost AS consultant_cost
FROM account_analytic_line aa
Left JOIN project_sale_line_employee_map bb ON bb.project_id = aa.project_id
GROUP BY aa.project_id, aa.employee_id, aa.amount
Left JOIN project_sale_line_employee_map bb ON bb.project_id = aa.project_id and bb.employee_id = aa.employee_id
where aa.project_id = 21
GROUP BY aa.project_id, aa.employee_id,bb.price_unit,bb.budgeted_qty,bb.employee_price,bb.consultant_cost
)""" % (self._table,))

11
project_report/report/cor_project_report_views.xml
View File

@ -32,7 +32,10 @@
<tree string="COR Project Report" create="false" edit="false" delete="false">
<field name="project_id"/>
<field name="employee_id"/>
<field name="price_unit"/>
<field name="budgeted_qty"/>
<field name="hours"/>
<field name="consultant_cost"/>
</tree>
</field>
</record>
@ -46,6 +49,10 @@
<field name="project_id"/>
<field name="employee_id"/>
<field name="hours"/>
<group expand="1" string="Group By">
<filter string="Project" name="group_by_project" context="{'group_by':'project_id'}"/>
<filter string="Consultant" name="group_by_employee_id" context="{'group_by':'employee_id'}"/>
</group>
</search>
</field>
</record>
@ -53,9 +60,9 @@
<record id="cor_project_report_view_action" model="ir.actions.act_window">
<field name="name">COR Project Report</field>
<field name="res_model">cor.project.report</field>
<field name="view_mode">graph,tree,pivot</field>
<field name="view_mode">tree,pivot,graph</field>
<field name="search_view_id" ref="cor_project_report_view_search"/>
<field name="context">{}</field>
<field name="context">{'search_default_group_by_project': 1, 'default_res_model': 'cor.project.report'}</field>
</record>
<menuitem id="menu_cor_project_report"