OCA
/
account-financial-reporting
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[FIX] Consider reconciled_date and fix aging report

pull/389/head
mreficent 7 years ago
parent
af11a55d80
commit
ebd41598f2
4 changed files with 62 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      customer_activity_statement/__init__.py
  2. 75
      customer_activity_statement/report/customer_activity_statement.py
  3. 9
      customer_activity_statement/views/statement.xml
  4. 4
      customer_activity_statement/wizard/customer_activity_statement_wizard.py

1
customer_activity_statement/__init__.py
View File

@ -2,4 +2,3 @@
from . import report from . import report
from . import wizard from . import wizard
from . import tests

75
customer_activity_statement/report/customer_activity_statement.py
View File

@ -33,7 +33,7 @@ class CustomerActivityStatement(models.AbstractModel):
JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_account_type at ON (at.id = l.user_type_id)
JOIN account_move m ON (l.move_id = m.id) JOIN account_move m ON (l.move_id = m.id)
WHERE l.partner_id IN (%s) AND at.type = 'receivable' WHERE l.partner_id IN (%s) AND at.type = 'receivable'
AND l.date <= '%s' AND not l.blocked
AND l.date < '%s' AND not l.blocked
GROUP BY l.partner_id, l.currency_id, l.amount_currency, GROUP BY l.partner_id, l.currency_id, l.amount_currency,
l.company_id l.company_id
""" % (partners, date_start) """ % (partners, date_start)
@ -82,7 +82,7 @@ class CustomerActivityStatement(models.AbstractModel):
JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_account_type at ON (at.id = l.user_type_id)
JOIN account_move m ON (l.move_id = m.id) JOIN account_move m ON (l.move_id = m.id)
WHERE l.partner_id IN (%s) AND at.type = 'receivable' WHERE l.partner_id IN (%s) AND at.type = 'receivable'
AND '%s' < l.date AND l.date <= '%s'
AND '%s' <= l.date AND l.date <= '%s'
GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name, GROUP BY l.partner_id, m.name, l.date, l.date_maturity, l.name,
l.ref, l.blocked, l.currency_id, l.ref, l.blocked, l.currency_id,
l.amount_currency, l.company_id l.amount_currency, l.company_id
@ -118,6 +118,31 @@ class CustomerActivityStatement(models.AbstractModel):
res[row.pop('partner_id')].append(row) res[row.pop('partner_id')].append(row)
return res return res
def _show_buckets_sql_q0(self, date_end):
return """
SELECT l1.id,
CASE WHEN l1.reconciled = TRUE and l1.balance > 0.0
THEN max(pd.max_date)
WHEN l1.reconciled = TRUE and l1.balance < 0.0
THEN max(pc.max_date)
ELSE null
END as reconciled_date
FROM account_move_line l1
LEFT JOIN (SELECT pr.*
FROM account_partial_reconcile pr
INNER JOIN account_move_line l2
ON pr.credit_move_id = l2.id
WHERE l2.date <= '%s'
) as pd ON pd.debit_move_id = l1.id
LEFT JOIN (SELECT pr.*
FROM account_partial_reconcile pr
INNER JOIN account_move_line l2
ON pr.debit_move_id = l2.id
WHERE l2.date <= '%s'
) as pc ON pc.credit_move_id = l1.id
GROUP BY l1.id
""" % (date_end, date_end)
def _show_buckets_sql_q1(self, partners, date_end): def _show_buckets_sql_q1(self, partners, date_end):
return """ return """
SELECT l.partner_id, l.currency_id, l.company_id, l.move_id, SELECT l.partner_id, l.currency_id, l.company_id, l.move_id,
@ -136,6 +161,7 @@ class CustomerActivityStatement(models.AbstractModel):
FROM account_move_line l FROM account_move_line l
JOIN account_account_type at ON (at.id = l.user_type_id) JOIN account_account_type at ON (at.id = l.user_type_id)
JOIN account_move m ON (l.move_id = m.id) JOIN account_move m ON (l.move_id = m.id)
LEFT JOIN Q0 ON Q0.id = l.id
LEFT JOIN (SELECT pr.* LEFT JOIN (SELECT pr.*
FROM account_partial_reconcile pr FROM account_partial_reconcile pr
INNER JOIN account_move_line l2 INNER JOIN account_move_line l2
@ -149,13 +175,15 @@ class CustomerActivityStatement(models.AbstractModel):
WHERE l2.date <= '%s' WHERE l2.date <= '%s'
) as pc ON pc.credit_move_id = l.id ) as pc ON pc.credit_move_id = l.id
WHERE l.partner_id IN (%s) AND at.type = 'receivable' WHERE l.partner_id IN (%s) AND at.type = 'receivable'
AND not l.reconciled AND not l.blocked
AND (Q0.reconciled_date is null or
Q0.reconciled_date > '%s')
AND l.date <= '%s' AND not l.blocked
GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity, GROUP BY l.partner_id, l.currency_id, l.date, l.date_maturity,
l.amount_currency, l.balance, l.move_id, l.amount_currency, l.balance, l.move_id,
l.company_id l.company_id
""" % (date_end, date_end, partners)
""" % (date_end, date_end, partners, date_end, date_end)
def _show_buckets_sql_q2(self, today, minus_30, minus_60, minus_90,
def _show_buckets_sql_q2(self, date_end, minus_30, minus_60, minus_90,
minus_120): minus_120):
return """ return """
SELECT partner_id, currency_id, date_maturity, open_due, SELECT partner_id, currency_id, date_maturity, open_due,
@ -209,10 +237,10 @@ class CustomerActivityStatement(models.AbstractModel):
FROM Q1 FROM Q1
GROUP BY partner_id, currency_id, date_maturity, open_due, GROUP BY partner_id, currency_id, date_maturity, open_due,
open_due_currency, move_id, company_id open_due_currency, move_id, company_id
""" % (today, today, minus_30, today, minus_30, today, minus_60,
minus_30, minus_60, minus_30, minus_90, minus_60, minus_90,
minus_60, minus_120, minus_90, minus_120, minus_90, minus_120,
minus_120)
""" % (date_end, date_end, minus_30, date_end, minus_30, date_end,
minus_60, minus_30, minus_60, minus_30, minus_90, minus_60,
minus_90, minus_60, minus_120, minus_90, minus_120, minus_90,
minus_120, minus_120)
def _show_buckets_sql_q3(self, company_id): def _show_buckets_sql_q3(self, company_id):
return """ return """
@ -236,12 +264,13 @@ class CustomerActivityStatement(models.AbstractModel):
GROUP BY partner_id, currency_id GROUP BY partner_id, currency_id
""" """
_bucket_dates = {
'today': fields.date.today(),
'minus_30': fields.date.today() - timedelta(days=30),
'minus_60': fields.date.today() - timedelta(days=60),
'minus_90': fields.date.today() - timedelta(days=90),
'minus_120': fields.date.today() - timedelta(days=120),
def _get_bucket_dates(self, date_end):
return {
'date_end': date_end,
'minus_30': date_end - timedelta(days=30),
'minus_60': date_end - timedelta(days=60),
'minus_90': date_end - timedelta(days=90),
'minus_120': date_end - timedelta(days=120),
} }
def _get_account_show_buckets(self, company_id, partner_ids, date_end): def _get_account_show_buckets(self, company_id, partner_ids, date_end):
@ -249,9 +278,10 @@ class CustomerActivityStatement(models.AbstractModel):
partners = ', '.join([str(i) for i in partner_ids]) partners = ', '.join([str(i) for i in partner_ids])
date_end = datetime.strptime( date_end = datetime.strptime(
date_end, DEFAULT_SERVER_DATE_FORMAT).date() date_end, DEFAULT_SERVER_DATE_FORMAT).date()
full_dates = self._get_bucket_dates(date_end)
# pylint: disable=E8103 # pylint: disable=E8103
self.env.cr.execute("""WITH Q1 AS (%s), Q2 AS (%s),
Q3 AS (%s), Q4 AS (%s)
self.env.cr.execute("""
WITH Q0 AS (%s), Q1 AS (%s), Q2 AS (%s), Q3 AS (%s), Q4 AS (%s)
SELECT partner_id, currency_id, current, b_1_30, b_30_60, b_60_90, SELECT partner_id, currency_id, current, b_1_30, b_30_60, b_60_90,
b_90_120, b_over_120, b_90_120, b_over_120,
current+b_1_30+b_30_60+b_60_90+b_90_120+b_over_120 current+b_1_30+b_30_60+b_60_90+b_90_120+b_over_120
@ -259,13 +289,14 @@ class CustomerActivityStatement(models.AbstractModel):
FROM Q4 FROM Q4
GROUP BY partner_id, currency_id, current, b_1_30, b_30_60, b_60_90, GROUP BY partner_id, currency_id, current, b_1_30, b_30_60, b_60_90,
b_90_120, b_over_120""" % ( b_90_120, b_over_120""" % (
self._show_buckets_sql_q0(date_end),
self._show_buckets_sql_q1(partners, date_end), self._show_buckets_sql_q1(partners, date_end),
self._show_buckets_sql_q2( self._show_buckets_sql_q2(
self._bucket_dates['today'],
self._bucket_dates['minus_30'],
self._bucket_dates['minus_60'],
self._bucket_dates['minus_90'],
self._bucket_dates['minus_120']),
full_dates['date_end'],
full_dates['minus_30'],
full_dates['minus_60'],
full_dates['minus_90'],
full_dates['minus_120']),
self._show_buckets_sql_q3(company_id), self._show_buckets_sql_q3(company_id),
self._show_buckets_sql_q4())) self._show_buckets_sql_q4()))
for row in self.env.cr.dictfetchall(): for row in self.env.cr.dictfetchall():

9
customer_activity_statement/views/statement.xml
View File

@ -11,11 +11,11 @@
<span t-raw="o.contact_address.replace('\n\n', '\n').replace('\n', '&lt;br&gt;')"/> <span t-raw="o.contact_address.replace('\n\n', '\n').replace('\n', '&lt;br&gt;')"/>
<span t-field="o.vat"/> <span t-field="o.vat"/>
</div> </div>
<h4 style="padding-left:20em">
<h4 style="padding-left:15em;padding-top:2em">
Activity Statement Activity Statement
</h4> </h4>
<p> <p>
Date: <span t-esc="Date[o.id]" /><br/>
Date: <span t-esc="Date[o.id]" /><br/><!--Today-->
<t t-if="o.ref">Partner ref: <span t-field="o.ref"/></t> <t t-if="o.ref">Partner ref: <span t-field="o.ref"/></t>
</p> </p>
@ -24,7 +24,7 @@
<t t-foreach="Lines[o.id]" t-as="currency"> <t t-foreach="Lines[o.id]" t-as="currency">
<br t-if="not currency_first" /> <br t-if="not currency_first" />
<p> <p>
Activity Statement in <span t-esc="Currencies[o.id][currency].name"/>:
Activity Statement between <span t-esc="Date_start[o.id]" /> and <span t-esc="Date_end[o.id]" /> in <span t-esc="Currencies[o.id][currency].name"/>:
</p> </p>
<table class="table table-condensed" style="border: 1px solid black; border-collapse: collapse;"> <table class="table table-condensed" style="border: 1px solid black; border-collapse: collapse;">
<thead> <thead>
@ -116,6 +116,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<p>
Aging Report at <span t-esc="Date_end[o.id]" /> in <span t-esc="Currencies[o.id][currency].name"/>:
</p>
<table class="table table-condensed" t-if="Show_Buckets" style="border: 1px solid black; border-collapse: collapse;"> <table class="table table-condensed" t-if="Show_Buckets" style="border: 1px solid black; border-collapse: collapse;">
<thead> <thead>
<tr> <tr>

4
customer_activity_statement/wizard/customer_activity_statement_wizard.py
View File

@ -2,7 +2,7 @@
# (http://www.eficent.com) # (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from datetime import date, timedelta
from datetime import date
from odoo import api, fields, models from odoo import api, fields, models
@ -20,7 +20,7 @@ class CustomerActivityStatementWizard(models.TransientModel):
date_start = fields.Date(required=True, date_start = fields.Date(required=True,
default=fields.Date.to_string( default=fields.Date.to_string(
date.today()-timedelta(days=120)))
date(date.today().year, 1, 1)))
date_end = fields.Date(required=True, date_end = fields.Date(required=True,
default=fields.Date.to_string(date.today())) default=fields.Date.to_string(date.today()))
show_aging_buckets = fields.Boolean(string='Include Aging Buckets', show_aging_buckets = fields.Boolean(string='Include Aging Buckets',

Write Preview
Loading…
Cancel
Save