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

[10.0] AFR Aged partner balance : columns and datas consistency. (#383)

pull/868/head
Adrien Peiffer (ACSONE) 2018-02-22 14:10:19 +01:00 committed by Jasmin Solanki
parent c3bac35217
commit 1326bb37d2
14 changed files with 16044 additions and 1642 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
account_financial_report/__manifest__.py
View File

@ -5,7 +5,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
{
'name': 'Account Financial Reports',
'version': '11.0.1.1.0',
'version': '11.0.1.2.0',
'category': 'Reporting',
'summary': 'OCA Financial Reports',
'author': 'Camptocamp SA,'

2186
account_financial_report/i18n/account_financial_report.pot
View File

File diff suppressed because it is too large Load Diff

2340
account_financial_report/i18n/ca.po 100644
View File

File diff suppressed because it is too large Load Diff

1202
account_financial_report/i18n/de.po
View File

File diff suppressed because it is too large Load Diff

1351
account_financial_report/i18n/es.po
View File

File diff suppressed because it is too large Load Diff

1167
account_financial_report/i18n/fr.po
View File

File diff suppressed because it is too large Load Diff

1173
account_financial_report/i18n/hr_HR.po
View File

File diff suppressed because it is too large Load Diff

2340
account_financial_report/i18n/it.po 100644
View File

File diff suppressed because it is too large Load Diff

1164
account_financial_report/i18n/nl.po
View File

File diff suppressed because it is too large Load Diff

1168
account_financial_report/i18n/nl_NL.po
View File

File diff suppressed because it is too large Load Diff

1167
account_financial_report/i18n/pt.po
View File

File diff suppressed because it is too large Load Diff

2346
account_financial_report/i18n/ro.po 100644
View File

File diff suppressed because it is too large Load Diff

54
account_financial_report/report/aged_partner_balance.py
View File

@ -318,12 +318,11 @@ WITH
date_range AS
(
SELECT
%s AS date_current,
DATE %s AS date_current,
DATE %s - INTEGER '30' AS date_less_30_days,
DATE %s - INTEGER '60' AS date_less_60_days,
DATE %s - INTEGER '90' AS date_less_90_days,
DATE %s - INTEGER '120' AS date_less_120_days,
DATE %s - INTEGER '150' AS date_older
DATE %s - INTEGER '120' AS date_less_120_days
)
INSERT INTO
report_aged_partner_balance_line
@ -348,45 +347,45 @@ SELECT
SUM(rlo.amount_residual) AS amount_residual,
SUM(
CASE
WHEN rlo.date_due > date_range.date_less_30_days
WHEN rlo.date_due >= date_range.date_current
THEN rlo.amount_residual
END
) AS current,
SUM(
CASE
WHEN
rlo.date_due > date_range.date_less_60_days
AND rlo.date_due <= date_range.date_less_30_days
rlo.date_due >= date_range.date_less_30_days
AND rlo.date_due < date_range.date_current
THEN rlo.amount_residual
END
) AS age_30_days,
SUM(
CASE
WHEN
rlo.date_due > date_range.date_less_90_days
AND rlo.date_due <= date_range.date_less_60_days
rlo.date_due >= date_range.date_less_60_days
AND rlo.date_due < date_range.date_less_30_days
THEN rlo.amount_residual
END
) AS age_60_days,
SUM(
CASE
WHEN
rlo.date_due > date_range.date_less_120_days
AND rlo.date_due <= date_range.date_less_90_days
rlo.date_due >= date_range.date_less_90_days
AND rlo.date_due < date_range.date_less_60_days
THEN rlo.amount_residual
END
) AS age_90_days,
SUM(
CASE
WHEN
rlo.date_due > date_range.date_older
AND rlo.date_due <= date_range.date_less_120_days
rlo.date_due >= date_range.date_less_120_days
AND rlo.date_due < date_range.date_less_90_days
THEN rlo.amount_residual
END
) AS age_120_days,
SUM(
CASE
WHEN rlo.date_due <= date_range.date_older
WHEN rlo.date_due < date_range.date_less_120_days
THEN rlo.amount_residual
END
) AS older
@ -420,7 +419,7 @@ AND ra.report_id = %s
GROUP BY
rp.id
"""
query_inject_line_params = (self.date_at,) * 6
query_inject_line_params = (self.date_at,) * 5
query_inject_line_params += (
self.env.uid,
self.open_items_id.id,
@ -439,12 +438,11 @@ WITH
date_range AS
(
SELECT
%s AS date_current,
DATE %s AS date_current,
DATE %s - INTEGER '30' AS date_less_30_days,
DATE %s - INTEGER '60' AS date_less_60_days,
DATE %s - INTEGER '90' AS date_less_90_days,
DATE %s - INTEGER '120' AS date_less_120_days,
DATE %s - INTEGER '150' AS date_older
DATE %s - INTEGER '120' AS date_less_120_days
)
INSERT INTO
report_aged_partner_balance_move_line
@ -480,35 +478,35 @@ SELECT
rlo.label,
rlo.amount_residual AS amount_residual,
CASE
WHEN rlo.date_due > date_range.date_less_30_days
WHEN rlo.date_due >= date_range.date_current
THEN rlo.amount_residual
END AS current,
CASE
WHEN
rlo.date_due > date_range.date_less_60_days
AND rlo.date_due <= date_range.date_less_30_days
rlo.date_due >= date_range.date_less_30_days
AND rlo.date_due < date_range.date_current
THEN rlo.amount_residual
END AS age_30_days,
CASE
WHEN
rlo.date_due > date_range.date_less_90_days
AND rlo.date_due <= date_range.date_less_60_days
rlo.date_due >= date_range.date_less_60_days
AND rlo.date_due < date_range.date_less_30_days
THEN rlo.amount_residual
END AS age_60_days,
CASE
WHEN
rlo.date_due > date_range.date_less_120_days
AND rlo.date_due <= date_range.date_less_90_days
rlo.date_due >= date_range.date_less_90_days
AND rlo.date_due < date_range.date_less_60_days
THEN rlo.amount_residual
END AS age_90_days,
CASE
WHEN
rlo.date_due > date_range.date_older
AND rlo.date_due <= date_range.date_less_120_days
rlo.date_due >= date_range.date_less_120_days
AND rlo.date_due < date_range.date_less_90_days
THEN rlo.amount_residual
END AS age_120_days,
CASE
WHEN rlo.date_due <= date_range.date_older
WHEN rlo.date_due < date_range.date_less_120_days
THEN rlo.amount_residual
END AS older
FROM
@ -539,7 +537,7 @@ WHERE
rao.report_id = %s
AND ra.report_id = %s
"""
query_inject_move_line_params = (self.date_at,) * 6
query_inject_move_line_params = (self.date_at,) * 5
query_inject_move_line_params += (
self.env.uid,
self.open_items_id.id,

12
account_financial_report/report/templates/aged_partner_balance.xml
View File

@ -106,17 +106,17 @@
<!--## amount_residual-->
<div class="act_as_cell" style="width: 110px;">Residual</div>
<!--## current-->
<div class="act_as_cell" style="width: 110px;">Current</div>
<div class="act_as_cell" style="width: 110px;">Not due</div>
<!--## age_30_days-->
<div class="act_as_cell" style="width: 110px;">Age ≤ 30 d.</div>
<div class="act_as_cell" style="width: 110px;">1 - 30 d.</div>
<!--## age_60_days-->
<div class="act_as_cell" style="width: 110px;">Age ≤ 60 d.</div>
<div class="act_as_cell" style="width: 110px;">31 - 60 d.</div>
<!--## age_90_days-->
<div class="act_as_cell" style="width: 110px;">Age ≤ 90 d.</div>
<div class="act_as_cell" style="width: 110px;">61 - 90 d.</div>
<!--## age_120_days-->
<div class="act_as_cell" style="width: 110px;">Age ≤ 120 d.</div>
<div class="act_as_cell" style="width: 110px;">91 - 120 d.</div>
<!--## older-->
<div class="act_as_cell" style="width: 110px;">Older</div>
<div class="act_as_cell" style="width: 110px;"> > 120 d.</div>
</div>
</div>
</template>