From f91db8ea9137ec300ba41099d9a1b4d7c467260d Mon Sep 17 00:00:00 2001
From: projectsodoo <prakash.jain@sunarctechnologies.com>
Date: Sun, 20 Dec 2020 18:45:29 +0530
Subject: [PATCH] report file uncomment

---
 cor_custom/__init__.py                        |   2 +-
 cor_custom/__manifest__.py                    |   2 +-
 cor_custom/report/__init__.py                 |   2 +-
 .../__pycache__/__init__.cpython-36.pyc       | Bin 214 -> 200 bytes
 .../__pycache__/__init__.cpython-36.pyc       | Bin 227 -> 213 bytes
 .../__pycache__/maintenance.cpython-36.pyc    | Bin 1079 -> 1065 bytes
 .../models/__pycache__/project.cpython-36.pyc | Bin 2363 -> 2349 bytes
 .../__pycache__/__init__.cpython-36.pyc       | Bin 204 -> 190 bytes
 .../maintenance_report.cpython-36.pyc         | Bin 1758 -> 1744 bytes
 .../report/project_budget_hrs_analysis.py     |   2 +-
 10 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cor_custom/__init__.py b/cor_custom/__init__.py
index 1099cf8..a41b57f 100755
--- a/cor_custom/__init__.py
+++ b/cor_custom/__init__.py
@@ -3,4 +3,4 @@
 from . import controllers
 from . import models
 from . import wizard
-from . import report
\ No newline at end of file
+#from . import report
\ No newline at end of file
diff --git a/cor_custom/__manifest__.py b/cor_custom/__manifest__.py
index 8b17674..137710f 100755
--- a/cor_custom/__manifest__.py
+++ b/cor_custom/__manifest__.py
@@ -30,7 +30,7 @@
         'views/project_view.xml',
         'views/hr_timesheet_templates.xml',
         # 'views/analytic_view.xml',
-        'report/project_profitability_report_analysis_views.xml',
+        #'report/project_profitability_report_analysis_views.xml',
         'views/views.xml',
         'views/templates.xml',
         'wizard/project_create_sale_order_views.xml',
diff --git a/cor_custom/report/__init__.py b/cor_custom/report/__init__.py
index 22d6147..666c524 100755
--- a/cor_custom/report/__init__.py
+++ b/cor_custom/report/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import project_profitability_report_analysis
+#from . import project_profitability_report_analysis
diff --git a/project_maintenance/__pycache__/__init__.cpython-36.pyc b/project_maintenance/__pycache__/__init__.cpython-36.pyc
index 3e046b7b4a9eaae2393788f4c4180ac7b1b7cd8c..4e19977e045a7c193914c2a1fbb582597834cced 100644
GIT binary patch
delta 45
zcmcb{c!H7Ln3tC;)%Vmy_97`u{rrLw{rr^td_xoc<kI4j{9N6{l$89u;)x4Q0Y^Cx
Ab^rhX

delta 59
zcmX@Xc#V<Wn3tE!`^<%j>_r;x`uPPV`uQpO`GzK7N;kQ*xFkPUH!&q8Kd)FnIlo93
JBs+1kDF9gb6&?Tp

diff --git a/project_maintenance/models/__pycache__/__init__.cpython-36.pyc b/project_maintenance/models/__pycache__/__init__.cpython-36.pyc
index 0869ca3e246c7f76facc054dc4e91e28986a3b49..cf21510776c7e1b4113a7b8fc7d69186a59b448f 100644
GIT binary patch
delta 45
zcmaFNc$Jaen3tD}QTNnD_6jKn{rrLw{rr^td_xoc<kI4j{9N6{l$89u;)%;`06N(Z
ACIA2c

delta 59
zcmcc0_?VI1n3tE!`^<%j>=hb*`uPPV`uQpO`GzK7N;kQ*xFkPUH!&q8Kd)FnIlo93
JBs+1Y4FF*(6;c2I

diff --git a/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc b/project_maintenance/models/__pycache__/maintenance.cpython-36.pyc
index ab5335876c5edc49b1ff62302ae9e8e4df10d750..1113ea1e1bcbcafe771e14aa6eb2c77a1fb5fec0 100644
GIT binary patch
delta 48
zcmdnav66$`n3tE!gXjE4c3vhaXZ`$w68-#?{Cq<b{p8Z(lKfoV#FUi$yyDF^Ourcc
DO?D4D

delta 62
zcmZ3<v7Lk6n3tE!`^<%n?7U1Gf%^FcCHna(`T2$>U`jW+w74WcS2r;wB|ooNKRLfh
M7bLq`kLfof0CI{II{*Lx

diff --git a/project_maintenance/models/__pycache__/project.cpython-36.pyc b/project_maintenance/models/__pycache__/project.cpython-36.pyc
index 0f811bb5c5b26c0ca1cf2cb779b5dda8c20151ba..8988166eb4c52a9d726ba3263aed381c5d74bae4 100644
GIT binary patch
delta 48
zcmdljv{s1Sn3tE!llSyS_I^ewd;R=^68-#?{Cq<b{p8Z(lKfoV#FUi$yyDIK7;D)9
DWAzW(

delta 62
zcmZ20v|EVXn3tE!`^<%n?EQ=yzWVtECHna(`T2$>U`jW+w74WcS2r;wB|ooNKRLfh
M7bLrR17j^a0Fka0-2eap

diff --git a/project_maintenance/report/__pycache__/__init__.cpython-36.pyc b/project_maintenance/report/__pycache__/__init__.cpython-36.pyc
index 21cd559ffda421bd31f1ea04d46fdadaeecd596f..20d98416b30a424851e206f6f40ecc61dfb7f9db 100644
GIT binary patch
delta 45
zcmX@ZxQ~(Dn3tC;)%Vmy_GBps{rrLw{rr^td_xoc<kI4j{9N6{l$89u;)#>2079w{
APyhe`

delta 59
zcmdnTc!rVPn3tE!`^<%j?8zE_`uPPV`uQpO`GzK7N;kQ*xFkPUH!&q8Kd)FnIlo93
JBs;Oi3II~!6!-uD

diff --git a/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc b/project_maintenance/report/__pycache__/maintenance_report.cpython-36.pyc
index 356ee8c8ed8e9e9568b6abc1d187c330237e171f..87adda01174632129620227203c8cf1ecf32ac57 100644
GIT binary patch
delta 48
zcmcb|dx4kTn3tDJMf>zdc2!m>Fa7+268-#?{Cq<b{p8Z(lKfoV#FUi$yyDFvtX+%%
DU=a^h

delta 62
zcmcb>dykjhn3tE!`^<%n?5eC95&HQBCHna(`T2$>U`jW+w74WcS2r;wB|ooNKRLfh
M7bLscjkSvr0F6f#UjP6A

diff --git a/project_report/report/project_budget_hrs_analysis.py b/project_report/report/project_budget_hrs_analysis.py
index 6b62f34..d8c04ec 100755
--- a/project_report/report/project_budget_hrs_analysis.py
+++ b/project_report/report/project_budget_hrs_analysis.py
@@ -36,7 +36,7 @@ class BudgetHrsAnalysis(models.Model):
             LEFT JOIN account_analytic_account AA ON PRO.analytic_account_id = AA.id
             LEFT JOIN account_analytic_line AAL ON AAL.account_id = AA.id
             WHERE AAL.amount < 0.0 AND AAL.project_id IS NOT NULL AND PRO.active = 't' AND PRO.allow_timesheets = 't'
-            group by Pro.id, PRO.partner_id, AAL.employee_id, Pro.budgeted_hours, AAL.unit_amount
+            group by Pro.id, PRO.partner_id, AAL.employee_id, AAL.unit_amount,SOL.product_uom_qty
         )""" % (self._table,))