|
@ -35,6 +35,8 @@ class OpenItemsReport(models.TransientModel): |
|
|
inverse_name='report_id' |
|
|
inverse_name='report_id' |
|
|
) |
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
user_id = fields.Many2one('res.users', string='Salesman') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class OpenItemsReportAccount(models.TransientModel): |
|
|
class OpenItemsReportAccount(models.TransientModel): |
|
|
|
|
|
|
|
@ -215,7 +217,7 @@ WITH |
|
|
LEFT JOIN |
|
|
LEFT JOIN |
|
|
res_currency c ON a.currency_id = c.id |
|
|
res_currency c ON a.currency_id = c.id |
|
|
""" |
|
|
""" |
|
|
if self.filter_partner_ids: |
|
|
|
|
|
|
|
|
if self.filter_partner_ids or self.user_id: |
|
|
query_inject_account += """ |
|
|
query_inject_account += """ |
|
|
INNER JOIN |
|
|
INNER JOIN |
|
|
res_partner p ON ml.partner_id = p.id |
|
|
res_partner p ON ml.partner_id = p.id |
|
@ -240,6 +242,11 @@ WITH |
|
|
AND |
|
|
AND |
|
|
p.id IN %s |
|
|
p.id IN %s |
|
|
""" |
|
|
""" |
|
|
|
|
|
if self.user_id: |
|
|
|
|
|
query_inject_account += """ |
|
|
|
|
|
AND |
|
|
|
|
|
p.user_id = %s |
|
|
|
|
|
""" |
|
|
query_inject_account += """ |
|
|
query_inject_account += """ |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
a.id, c.id |
|
|
a.id, c.id |
|
@ -278,6 +285,10 @@ FROM |
|
|
query_inject_account_params += ( |
|
|
query_inject_account_params += ( |
|
|
tuple(self.filter_partner_ids.ids), |
|
|
tuple(self.filter_partner_ids.ids), |
|
|
) |
|
|
) |
|
|
|
|
|
if self.user_id: |
|
|
|
|
|
query_inject_account_params += ( |
|
|
|
|
|
self.user_id.id, |
|
|
|
|
|
) |
|
|
query_inject_account_params += ( |
|
|
query_inject_account_params += ( |
|
|
self.id, |
|
|
self.id, |
|
|
self.env.uid, |
|
|
self.env.uid, |
|
@ -331,6 +342,11 @@ WITH |
|
|
AND |
|
|
AND |
|
|
p.id IN %s |
|
|
p.id IN %s |
|
|
""" |
|
|
""" |
|
|
|
|
|
if self.user_id: |
|
|
|
|
|
query_inject_partner += """ |
|
|
|
|
|
AND |
|
|
|
|
|
p.user_id = %s |
|
|
|
|
|
""" |
|
|
query_inject_partner += """ |
|
|
query_inject_partner += """ |
|
|
GROUP BY |
|
|
GROUP BY |
|
|
ra.id, |
|
|
ra.id, |
|
@ -364,6 +380,10 @@ FROM |
|
|
query_inject_partner_params += ( |
|
|
query_inject_partner_params += ( |
|
|
tuple(self.filter_partner_ids.ids), |
|
|
tuple(self.filter_partner_ids.ids), |
|
|
) |
|
|
) |
|
|
|
|
|
if self.user_id: |
|
|
|
|
|
query_inject_partner_params += ( |
|
|
|
|
|
self.user_id.id, |
|
|
|
|
|
) |
|
|
query_inject_partner_params += ( |
|
|
query_inject_partner_params += ( |
|
|
self.env.uid, |
|
|
self.env.uid, |
|
|
) |
|
|
) |
|
|