diff --git a/partner_statement/README.rst b/partner_statement/README.rst index fc0d16ef..0520050a 100644 --- a/partner_statement/README.rst +++ b/partner_statement/README.rst @@ -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. diff --git a/partner_statement/readme/USAGE.rst b/partner_statement/readme/USAGE.rst index 0c0c0828..53eb8572 100644 --- a/partner_statement/readme/USAGE.rst +++ b/partner_statement/readme/USAGE.rst @@ -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. diff --git a/partner_statement/report/activity_statement.py b/partner_statement/report/activity_statement.py index c0fc8635..58242392 100644 --- a/partner_statement/report/activity_statement.py +++ b/partner_statement/report/activity_statement.py @@ -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) diff --git a/partner_statement/report/report_statement_common.py b/partner_statement/report/report_statement_common.py index ab6b13aa..d1b0564e 100644 --- a/partner_statement/report/report_statement_common.py +++ b/partner_statement/report/report_statement_common.py @@ -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']