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

Report tree and timesheet date updated

This commit is contained in:
projectsodoo 2021-01-24 19:38:34 +05:30
parent 3519bc45ed
commit b02030d36e
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
project_report/report/project_budget_amt_analysis.py
View File

@ -16,14 +16,14 @@ class BudgetAmtAnalysis(models.Model):
partner_id = fields.Many2one('res.partner', string='Client', readonly=True)
amount_type = fields.Char(string="Amount Type")
revenue = fields.Float("Revenue", digits=(16, 2), readonly=True, group_operator="sum")
project_type = fields.Selection([
('hours_in_consultant', 'Hours are budgeted according to a consultant'),
('hours_no_limit', 'Total hours are budgeted without division to consultant'),
], string="Project Type", readonly=True)
pricing_type = fields.Selection([
('fixed_rate', 'Fixed rate'),
('employee_rate', 'Consultant rate')
], string="Pricing", readonly=True)
project_type = fields.Selection([
('hours_in_consultant', 'Hours are budgeted according to a consultant'),
('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)
start_date = fields.Date(string='Start Date', readonly=True)
end_date = fields.Date(string='End Date', readonly=True)

19
project_report/report/project_budget_amt_analysis_views.xml
View File

@ -26,6 +26,23 @@
</field>
</record>
<record id="project_budget_amt_report_view_tree" model="ir.ui.view">
<field name="name">project.budget.amt.report.tree</field>
<field name="model">project.budget.amt.report</field>
<field name="arch" type="xml">
<tree string="Budget Analysis" create="false" edit="false" delete="false">
<field name="project_id"/>
<field name="start_date"/>
<field name="end_date"/>
<field name="employee_id"/>
<field name="timesheet_date" optional="hide"/>
<field name="amount_type"/>
<field name="revenue"/>
</tree>
</field>
</record>
<record id="project_budget_amt_report_view_search" model="ir.ui.view">
<field name="name">project.budget.amt.report.search</field>
@ -57,7 +74,7 @@
<record id="project_budget_amt_report_view_action" model="ir.actions.act_window">
<field name="name">Projects Revenue Acutal Vs Budget</field>
<field name="res_model">project.budget.amt.report</field>
<field name="view_mode">graph,pivot</field>
<field name="view_mode">graph,tree,pivot</field>
<field name="search_view_id" ref="project_budget_amt_report_view_search"/>
<field name="context">{'search_default_group_by_project': 1,'search_default_group_by_amount_type': 1}</field>
</record>

4
project_report/report/project_budget_hrs_analysis.py
View File

@ -19,6 +19,10 @@ class BudgetHrsAnalysis(models.Model):
employee_id = fields.Many2one('hr.employee', string='Consultant', readonly=True)
hours_type = fields.Char(string="Hours Type", readonly=True)
hours = fields.Float("Hours", digits=(16, 2), readonly=True, group_operator="sum")
pricing_type = fields.Selection([
('fixed_rate', 'Fixed rate'),
('employee_rate', 'Consultant rate')
], string="Pricing", readonly=True)
project_type = fields.Selection([
('hours_in_consultant', 'Hours are budgeted according to a consultant'),
('hours_no_limit', 'Total hours are budgeted without division to consultant'),

1
project_report/report/project_budget_hrs_analysis_views.xml
View File

@ -34,6 +34,7 @@
<field name="start_date"/>
<field name="end_date"/>
<field name="employee_id"/>
<field name="timesheet_date" optional="hide"/>
<field name="hours_type"/>
<field name="hours"/>
</tree>