Fix portfolio zero currency display
This commit is contained in:
parent
2ca8373b19
commit
5667b847d5
@ -724,6 +724,7 @@ class McsOperatingDashboard(models.Model):
|
|||||||
continue
|
continue
|
||||||
currencies = invoices.mapped("currency_id") or partner.mcs_currency_id
|
currencies = invoices.mapped("currency_id") or partner.mcs_currency_id
|
||||||
currency_name = " / ".join(currencies.mapped("name")) if currencies else ""
|
currency_name = " / ".join(currencies.mapped("name")) if currencies else ""
|
||||||
|
default_currency_ids = currencies.ids
|
||||||
invoice_dates = [date for date in invoices.mapped("invoice_date") if date]
|
invoice_dates = [date for date in invoices.mapped("invoice_date") if date]
|
||||||
rows.append(
|
rows.append(
|
||||||
{
|
{
|
||||||
@ -735,15 +736,15 @@ class McsOperatingDashboard(models.Model):
|
|||||||
"revenue": sum(projects.mapped("mcs_monthly_revenue_target")),
|
"revenue": sum(projects.mapped("mcs_monthly_revenue_target")),
|
||||||
"total_invoiced": sum(invoices.mapped("amount_total_signed")),
|
"total_invoiced": sum(invoices.mapped("amount_total_signed")),
|
||||||
"total_invoiced_display": self._invoice_amount_display(
|
"total_invoiced_display": self._invoice_amount_display(
|
||||||
invoices, "amount_total"
|
invoices, "amount_total", default_currency_ids
|
||||||
),
|
),
|
||||||
"outstanding": sum(unpaid_invoices.mapped("amount_residual_signed")),
|
"outstanding": sum(unpaid_invoices.mapped("amount_residual_signed")),
|
||||||
"outstanding_display": self._invoice_amount_display(
|
"outstanding_display": self._invoice_amount_display(
|
||||||
unpaid_invoices, "amount_residual"
|
unpaid_invoices, "amount_residual", default_currency_ids
|
||||||
),
|
),
|
||||||
"overdue": sum(overdue_invoices.mapped("amount_residual_signed")),
|
"overdue": sum(overdue_invoices.mapped("amount_residual_signed")),
|
||||||
"overdue_display": self._invoice_amount_display(
|
"overdue_display": self._invoice_amount_display(
|
||||||
overdue_invoices, "amount_residual"
|
overdue_invoices, "amount_residual", default_currency_ids
|
||||||
),
|
),
|
||||||
"last_invoice_date": fields.Date.to_string(max(invoice_dates))
|
"last_invoice_date": fields.Date.to_string(max(invoice_dates))
|
||||||
if invoice_dates
|
if invoice_dates
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user