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

Merge branch 'pawan_branch' into 'development' 

change parent to sub-project in project report

See merge request prakash.jain/cor-odoo!96
This commit is contained in:
pawan.sharma 2021-01-27 23:39:30 -08:00
parent aae9c7c950 16b82141ff
commit b9ac23e9a1
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
project_report/report/project_budget_amt_analysis.py
View File

@ -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,

2
project_report/report/project_budget_amt_analysis_views.xml
View File

@ -39,7 +39,7 @@
<field name="amount_type"/>
<field name="revenue"/>
<field name="is_sub_project" optional="hide"/>
<field name="parent_project" optional="hide"/>
<field name="sub_project" optional="hide"/>
</tree>
</field>
</record>

12
project_report/report/project_budget_hrs_analysis.py
View File

@ -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,

2
project_report/report/project_budget_hrs_analysis_views.xml
View File

@ -38,7 +38,7 @@
<field name="hours_type"/>
<field name="hours"/>
<field name="is_sub_project" optional="hide"/>
<field name="parent_project" optional="hide"/>
<field name="sub_project" optional="hide"/>
</tree>
</field>
</record>