Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
partner_statement/README.rst
View File

@ -67,7 +67,7 @@ Usage
To use this module, you need to: 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. #. 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. #. 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. #. Optionally complete advanced options such as filtering non due or negative balance partners.

2
partner_statement/readme/USAGE.rst
View File

@ -1,6 +1,6 @@
To use this module, you need to: 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. #. 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. #. 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. #. Optionally complete advanced options such as filtering non due or negative balance partners.

2
partner_statement/report/activity_statement.py
View File

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

18
partner_statement/report/report_statement_common.py
View File

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