From 19c49ebd5fb9d6a42034b9f5c8150eb3234a32d2 Mon Sep 17 00:00:00 2001 From: Sudhir Arya Date: Wed, 19 Jul 2017 09:56:50 +0530 Subject: [PATCH] [FIX] tavis --- business_requirement_deliverable/README.rst | 1 + .../report/br_deliverable_sale_report.py | 5 +++-- .../security/ir.model.access.csv | 2 +- .../report/br_deliverable_cost_report.py | 13 +++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/business_requirement_deliverable/README.rst b/business_requirement_deliverable/README.rst index 2b5680c9d..18e80c3d4 100644 --- a/business_requirement_deliverable/README.rst +++ b/business_requirement_deliverable/README.rst @@ -186,3 +186,4 @@ mission is to support the collaborative development of Odoo features and promote its widespread use. To contribute to this module, please visit https://odoo-community.org. + diff --git a/business_requirement_deliverable/report/br_deliverable_sale_report.py b/business_requirement_deliverable/report/br_deliverable_sale_report.py index 5e440da56..0a6a7d712 100644 --- a/business_requirement_deliverable/report/br_deliverable_sale_report.py +++ b/business_requirement_deliverable/report/br_deliverable_sale_report.py @@ -75,7 +75,7 @@ def _select(self): (dlv.sale_price_unit * dlv.qty) as total_revenue """ return select_str - + def _from(self): from_str = """ FROM @@ -98,4 +98,5 @@ def init(self, cr): tools.drop_view_if_exists(cr, self._table) cr.execute("""CREATE or REPLACE VIEW %s as ( %s %s %s - )""" % (self._table, self._select(), self._from(), self._group_by())) + )""" % (self._table, self._select(), self._from(), + self._group_by())) diff --git a/business_requirement_deliverable/security/ir.model.access.csv b/business_requirement_deliverable/security/ir.model.access.csv index b75aa3947..fadd8e9e3 100644 --- a/business_requirement_deliverable/security/ir.model.access.csv +++ b/business_requirement_deliverable/security/ir.model.access.csv @@ -6,4 +6,4 @@ access_business_requirement_resource_manager,business.requirement.resource.manag access_business_requirement_deliverable_sale_report_user,business.requirement.deliverable.user,model_business_requirement_deliverable_sale_report,business_requirement.group_business_requirement_user,1,0,0,0 access_business_requirement_deliverable_sale_report_manager,business.requirement.deliverable.manager,model_business_requirement_deliverable_sale_report,business_requirement.group_business_requirement_manager,1,0,0,0 access_business_requirement_deliverable_report_user,business.requirement.deliverable.user,model_business_requirement_deliverable_report,business_requirement.group_business_requirement_user,1,0,0,0 -access_business_requirement_deliverable_report_manager,business.requirement.deliverable.manager,model_business_requirement_deliverable_report,business_requirement.group_business_requirement_manager,1,0,0,0 \ No newline at end of file +access_business_requirement_deliverable_report_manager,business.requirement.deliverable.manager,model_business_requirement_deliverable_report,business_requirement.group_business_requirement_manager,1,0,0,0 diff --git a/business_requirement_deliverable_cost/report/br_deliverable_cost_report.py b/business_requirement_deliverable_cost/report/br_deliverable_cost_report.py index 6953f30ae..98002ccea 100644 --- a/business_requirement_deliverable_cost/report/br_deliverable_cost_report.py +++ b/business_requirement_deliverable_cost/report/br_deliverable_cost_report.py @@ -91,6 +91,11 @@ def _select(self): ((dlv.sale_price_unit * dlv.qty) - ((select sum(unit_price) from business_requirement_resource) * (select sum(qty) from business_requirement_resource))) as gross_profit + """ + return select_str + + def _from(self): + from_str = """ FROM business_requirement br, business_requirement_deliverable dlv, @@ -98,7 +103,7 @@ def _select(self): where br.id = dlv.business_requirement_id and br.id = res.business_requirement_id """ - return select_str + return from_str def _group_by(self): group_by_str = """ @@ -110,6 +115,6 @@ def _group_by(self): def init(self, cr): tools.drop_view_if_exists(cr, self._table) cr.execute("""CREATE or REPLACE VIEW %s as ( - %s - %s - )""" % (self._table, self._select(), self._group_by())) + %s %s %s + )""" % (self._table, self._select(), self._from(), + self._group_by()))