Lint for Travis

pull/859/head
Graeme Gellatly 2019-05-21 18:41:06 +12:00 committed by mariadforgeflow
parent 42ead8d0cf
commit 6a641a37be
4 changed files with 15 additions and 9 deletions

View File

@ -67,7 +67,7 @@ Usage
To use this module, you need to:
#. Go to Invoicing > Sales > Master Data > Customers or Invoicing > Purchases > Master Data > Vendors and select one or more
#. Go to a list of Partners, Contacts, Customer or Vendors and select one or more.
#. Press 'Action > Partner Activity Statement' or 'Action > Partner Outstanding Statement' respectively.
#. Indicate if you want to display receivables or payables, and if you want to display aging buckets and the aging type.
#. Optionally complete advanced options such as filtering non due or negative balance partners.

View File

@ -1,6 +1,6 @@
To use this module, you need to:
#. Go to Invoicing > Sales > Master Data > Customers or Invoicing > Purchases > Master Data > Vendors and select one or more
#. Go to a list of Partners, Contacts, Customer or Vendors and select one or more.
#. Press 'Action > Partner Activity Statement' or 'Action > Partner Outstanding Statement' respectively.
#. Indicate if you want to display receivables or payables, and if you want to display aging buckets and the aging type.
#. Optionally complete advanced options such as filtering non due or negative balance partners.

View File

@ -68,7 +68,7 @@ class ActivityStatement(models.AbstractModel):
WHEN (aj.type in ('bank', 'cash'))
THEN 'Payment'
ELSE ''
END as ref,
END as ref,
l.blocked, l.currency_id, l.company_id,
CASE WHEN (l.currency_id is not null AND l.amount_currency > 0.0)
THEN sum(l.amount_currency)

View File

@ -345,12 +345,18 @@ class ReportStatementCommon(models.AbstractModel):
partners_to_remove = set()
for partner_id in partner_ids:
res[partner_id] = {
'today': format_date(today,
date_formats.get(partner_id, default_fmt)),
'start': format_date(date_start,
date_formats.get(partner_id, default_fmt)),
'end': format_date(date_end,
date_formats.get(partner_id, default_fmt)),
'today': format_date(
today,
date_formats.get(partner_id, default_fmt)
),
'start': format_date(
date_start,
date_formats.get(partner_id, default_fmt)
),
'end': format_date(
date_end,
date_formats.get(partner_id, default_fmt)
),
'currencies': {},
}
currency_dict = res[partner_id]['currencies']