Skip to content

Commit

Permalink
flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
MiquelRForgeFlow committed Mar 23, 2017
1 parent d94b977 commit cc21971
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 18 deletions.
38 changes: 21 additions & 17 deletions customer_activity_statement/report/customer_activity_statement.py
Expand Up @@ -48,8 +48,8 @@ def _get_account_initial_balance(self, partner_ids, date_start):
else:
partner_ids = tuple(partner_ids)
partner_ids = str(partner_ids)
date_start = datetime.strptime(
date_start, DEFAULT_SERVER_DATE_FORMAT).date()
date_start = datetime.strptime(date_start,
DEFAULT_SERVER_DATE_FORMAT).date()
self.env.cr.execute("""WITH Q1 AS (%s)
SELECT currency_id, debit-credit as balance
FROM Q1""" % (self._initial_balance_sql_q1(partner_ids, date_start)))
Expand Down Expand Up @@ -96,7 +96,8 @@ def _get_account_display_lines(self, partner_ids, date_start, date_end):
date()
self.env.cr.execute("""WITH Q1 AS (%s)
SELECT partner_id, move_id, date, date_maturity, name, ref, debit,
credit, debit-credit as amount, blocked, currency_id
credit, debit-credit as amount, blocked,
currency_id
FROM Q1
ORDER BY date, date_maturity, move_id""" % (
self._display_lines_sql_q1(partner_ids, date_start, date_end)))
Expand Down Expand Up @@ -133,7 +134,8 @@ def _show_buckets_sql_q2(self, today, minus_30, minus_60, minus_90,
SELECT partner_id, currency_id, date_maturity, open_due,
open_due_currency,
CASE
WHEN '%s' <= date_maturity AND currency_id is null THEN open_due
WHEN '%s' <= date_maturity AND currency_id is null
THEN open_due
WHEN '%s' <= date_maturity AND currency_id is not null
THEN open_due_currency
ELSE 0.0
Expand Down Expand Up @@ -171,7 +173,8 @@ def _show_buckets_sql_q2(self, today, minus_30, minus_60, minus_90,
ELSE 0.0
END as b_90_120,
CASE
WHEN date_maturity <= '%s' AND currency_id is null THEN open_due
WHEN date_maturity <= '%s' AND currency_id is null
THEN open_due
WHEN date_maturity <= '%s' AND currency_id is not null
THEN open_due_currency
ELSE 0.0
Expand Down Expand Up @@ -309,27 +312,28 @@ def render_html(self, data):
buckets_to_display[partner_id] = {}
for line_tmp in buckets[partner_id]:
line = line_tmp.copy()
currency = line['currency_id'] and self.env['res.currency']\
.browse(line['currency_id']) or company_currency
currency = line['currency_id'] \
and self.env['res.currency'].browse(
line['currency_id']) or company_currency
if currency not in buckets_to_display[partner_id]:
buckets_to_display[partner_id][currency] = []
if len(buckets_to_display[partner_id][currency]) == 0:
buckets_to_display[partner_id][currency].append(line)
else:
buckets_to_display[partner_id][currency][0]['current'] \
+= line['current']
buckets_to_display[partner_id][currency][0]['b_1_30'] \
+= line['b_1_30']
buckets_to_display[partner_id][currency][0]['b_30_60'] \
+= line['b_30_60']
buckets_to_display[partner_id][currency][0]['b_60_90'] \
+= line['b_60_90']
buckets_to_display[partner_id][currency][0][
'current'] += line['current']
buckets_to_display[partner_id][currency][0][
'b_1_30'] += line['b_1_30']
buckets_to_display[partner_id][currency][0][
'b_30_60'] += line['b_30_60']
buckets_to_display[partner_id][currency][0][
'b_60_90'] += line['b_60_90']
buckets_to_display[partner_id][currency][0][
'b_90_120'] += line['b_90_120']
buckets_to_display[partner_id][currency][0][
'b_over_120'] += line['b_over_120']
buckets_to_display[partner_id][currency][0]['balance'] \
+= line['balance']
buckets_to_display[partner_id][currency][0][
'balance'] += line['balance']

docargs = {
'doc_ids': partner_ids,
Expand Down
Expand Up @@ -24,7 +24,8 @@ class CustomerActivityStatementWizard(models.TransientModel):
date.today()-timedelta(days=120)))
date_end = fields.Date(required=True,
default=fields.Date.to_string(date.today()))
show_aging_buckets = fields.Boolean(string='Include Aging Buckets', default=True)
show_aging_buckets = fields.Boolean(string='Include Aging Buckets',
default=True)
number_partner_ids = fields.Integer(
default=lambda self: len(self._context['active_ids'])
)
Expand Down

0 comments on commit cc21971

Please sign in to comment.