diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py
index d79d1b3..03af6a0 100755
--- a/project_report/report/project_budget_amt_analysis.py
+++ b/project_report/report/project_budget_amt_analysis.py
@@ -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)
diff --git a/project_report/report/project_budget_amt_analysis_views.xml b/project_report/report/project_budget_amt_analysis_views.xml
index 9857fb1..e29f9f4 100755
--- a/project_report/report/project_budget_amt_analysis_views.xml
+++ b/project_report/report/project_budget_amt_analysis_views.xml
@@ -26,6 +26,23 @@
+
+ project.budget.amt.report.tree
+ project.budget.amt.report
+
+
+
+
+
+
+
+
+
+
+
+
+
+
project.budget.amt.report.search
@@ -57,7 +74,7 @@
Projects Revenue Acutal Vs Budget
project.budget.amt.report
- graph,pivot
+ graph,tree,pivot
{'search_default_group_by_project': 1,'search_default_group_by_amount_type': 1}
diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py
index 1eb993e..460e94a 100755
--- a/project_report/report/project_budget_hrs_analysis.py
+++ b/project_report/report/project_budget_hrs_analysis.py
@@ -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'),
diff --git a/project_report/report/project_budget_hrs_analysis_views.xml b/project_report/report/project_budget_hrs_analysis_views.xml
index 81678b7..e830e06 100755
--- a/project_report/report/project_budget_hrs_analysis_views.xml
+++ b/project_report/report/project_budget_hrs_analysis_views.xml
@@ -34,6 +34,7 @@
+