diff --git a/project_report/report/project_budget_amt_analysis.py b/project_report/report/project_budget_amt_analysis.py
index 37b64aa..8061f96 100755
--- a/project_report/report/project_budget_amt_analysis.py
+++ b/project_report/report/project_budget_amt_analysis.py
@@ -14,7 +14,7 @@ class BudgetAmtAnalysis(models.Model):
#analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', readonly=True)
project_id = fields.Many2one('project.project', string='Project', readonly=True)
is_sub_project = fields.Boolean("Is Sub Project", readonly=True)
- parent_project = fields.Many2one('project.project', string='Parent Project', readonly=True)
+ sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True)
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")
@@ -38,11 +38,11 @@ class BudgetAmtAnalysis(models.Model):
tools.drop_view_if_exists(self._cr, self._table)
self._cr.execute("""
CREATE OR REPLACE VIEW %s AS (
- SELECT ROW_NUMBER() OVER() as id, project_id, is_sub_project, parent_project, start_date, end_date, timesheet_date, partner_id, employee_id, amount_type, pricing_type, project_type, revenue from (
+ SELECT ROW_NUMBER() OVER() as id, project_id, is_sub_project, sub_project, start_date, end_date, timesheet_date, partner_id, employee_id, amount_type, pricing_type, project_type, revenue from (
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
@@ -59,7 +59,7 @@ class BudgetAmtAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
@@ -78,7 +78,7 @@ class BudgetAmtAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
@@ -95,7 +95,7 @@ class BudgetAmtAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
@@ -119,7 +119,7 @@ class BudgetAmtAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
@@ -140,7 +140,7 @@ class BudgetAmtAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.partner_id AS partner_id,
diff --git a/project_report/report/project_budget_amt_analysis_views.xml b/project_report/report/project_budget_amt_analysis_views.xml
index 1ac245d..7c6c197 100755
--- a/project_report/report/project_budget_amt_analysis_views.xml
+++ b/project_report/report/project_budget_amt_analysis_views.xml
@@ -39,7 +39,7 @@
-
+
diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py
index cbdc478..f1b11fe 100755
--- a/project_report/report/project_budget_hrs_analysis.py
+++ b/project_report/report/project_budget_hrs_analysis.py
@@ -14,7 +14,7 @@ class BudgetHrsAnalysis(models.Model):
#analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', readonly=True)
project_id = fields.Many2one('project.project', string='Project', readonly=True)
is_sub_project = fields.Boolean("Is Sub Project", readonly=True)
- parent_project = fields.Many2one('project.project', string='Parent Project', readonly=True)
+ sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True)
start_date = fields.Date(string='Start Date', readonly=True)
end_date = fields.Date(string='End Date', readonly=True)
partner_id = fields.Many2one('res.partner', string='Client', readonly=True)
@@ -45,12 +45,12 @@ class BudgetHrsAnalysis(models.Model):
tools.drop_view_if_exists(self._cr, self._table)
self._cr.execute("""
CREATE OR REPLACE VIEW %s AS (
- SELECT ROW_NUMBER() OVER() as id, project_id, is_sub_project, parent_project, start_date, end_date, timesheet_date, pricing_type, project_type, partner_id, employee_id, hours_type,
+ SELECT ROW_NUMBER() OVER() as id, project_id, is_sub_project, sub_project, start_date, end_date, timesheet_date, pricing_type, project_type, partner_id, employee_id, hours_type,
hours from (
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.pricing_type as pricing_type,
@@ -70,7 +70,7 @@ class BudgetHrsAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.pricing_type as pricing_type,
@@ -90,7 +90,7 @@ class BudgetHrsAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.pricing_type as pricing_type,
@@ -111,7 +111,7 @@ class BudgetHrsAnalysis(models.Model):
SELECT
pro.id AS project_id,
pro.is_sub_project as is_sub_project,
- pro.parent_project as parent_project,
+ pro.sub_project as sub_project,
pro.date_start AS start_date,
pro.date AS end_date,
pro.pricing_type as pricing_type,
diff --git a/project_report/report/project_budget_hrs_analysis_views.xml b/project_report/report/project_budget_hrs_analysis_views.xml
index b998f6b..686b90e 100755
--- a/project_report/report/project_budget_hrs_analysis_views.xml
+++ b/project_report/report/project_budget_hrs_analysis_views.xml
@@ -38,7 +38,7 @@
-
+