diff --git a/cor_custom/models/project.py b/cor_custom/models/project.py index 676dd6c..dd4c0fa 100755 --- a/cor_custom/models/project.py +++ b/cor_custom/models/project.py @@ -374,9 +374,16 @@ class InheritProjectProductEmployeeMap(models.Model): #e_datetime1 = timezone(tz).localize(e_datetime).astimezone(UTC) date_clause += " and end_datetime at time zone 'utc' at time zone (select tz from res_partner where id=3) <= %s" query_params.append(e_datetime) - query = """SELECT project_id, employee_id, SUM(unit_amount) FROM account_analytic_line - where project_id = %s and employee_id = %s {date_clause} - GROUP BY project_id, employee_id""".format(date_clause=date_clause) + print('1111111111111', val.project_id) + print('222222222222222', query_params) + if val.project_id.is_sub_project == False: + query = """SELECT project_id, employee_id, SUM(unit_amount) FROM account_analytic_line + where project_id = %s and employee_id = %s {date_clause} + GROUP BY project_id, employee_id""".format(date_clause=date_clause) + else: + query = """SELECT sub_project, employee_id, SUM(unit_amount) FROM account_analytic_line + where sub_project = %s and employee_id = %s {date_clause} + GROUP BY sub_project, employee_id""".format(date_clause=date_clause) self.env.cr.execute(query, query_params) #self._cr.execute('''SELECT project_id, employee_id, SUM(unit_amount) FROM account_analytic_line #where project_id = %(project_id)s and employee_id = %(employee_id)s