details: /erp/devel/main/rev/4becc65f5a36
changeset: 7121:4becc65f5a36
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 22 10:15:36 2010 +0200
summary: Related to issue 13062.Fix incosistency issue.
details: /erp/devel/main/rev/74a23b6142a3
changeset: 7122:74a23b6142a3
user: David Alsasua <david.alsasua <at> openbravo.com>
date: Mon May 03 10:28:18 2010 +0200
summary: Fixes issue 13175: In payment report
the payments generated in a manual settlement are not shown
diffstat:
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml | 2 +-
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql | 20
++++-----
2 files changed, 10 insertions(+), 12 deletions(-)
diffs (78 lines):
diff -r 19f23c3a4981 -r 74a23b6142a3
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Fri Apr 30
16:45:11 2010 +0200
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Mon May 03
10:28:18 2010 +0200
@@ -2,7 +2,7 @@
<database name="VIEW FIN_PAYMENT_DETAIL_V">
<view name="FIN_PAYMENT_DETAIL_V"><![CDATA[SELECT
psd.fin_payment_scheduledetail_id AS fin_payment_detail_v_id, psd.ad_client_id,
psd.ad_org_id, psd.isactive, psd.created, psd.createdby, psd.updated,
psd.updatedby, psi.fin_payment_sched_inv_v_id, pso.fin_payment_sched_ord_v_id,
i.documentno AS invoiceno, o.documentno AS orderno, p.documentno AS paymentno,
pd.fin_payment_id, COALESCE(psi.duedate, pso.duedate) AS duedate,
COALESCE(i.grandtotal, o.grandtotal) AS invoicedamt, COALESCE(psi.expected,
pso.expected) AS expected, psd.amount AS paidamt, p.c_bpartner_id,
p.fin_paymentmethod_id, p.fin_financial_account_id, p.c_currency_id,
p.paymentdate, gli.name AS glitemname
FROM fin_payment p, fin_payment_detail pd
-INNER JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
+JOIN fin_payment_scheduledetail psd ON pd.fin_payment_detail_id =
psd.fin_payment_detail_id
LEFT JOIN fin_payment_sched_inv_v psi ON psd.fin_payment_schedule_invoice =
psi.fin_payment_sched_inv_v_id
LEFT JOIN c_invoice i ON psi.c_invoice_id = i.c_invoice_id
LEFT JOIN fin_payment_sched_ord_v pso ON psd.fin_payment_schedule_order =
pso.fin_payment_sched_ord_v_id
diff -r 19f23c3a4981 -r 74a23b6142a3
src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
--- a/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
Fri Apr 30 16:45:11 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment_data.xsql
Mon May 03 10:28:18 2010 +0200
@@ -35,9 +35,9 @@
(CASE WHEN I.C_INVOICE_ID IS NULL THEN '0' ELSE I.C_INVOICE_ID END) AS
C_INVOICE_ID, (CASE WHEN DP.C_DEBT_PAYMENT_ID IS NULL THEN '0' ELSE
DP.C_DEBT_PAYMENT_ID END) AS C_DEBT_PAYMENT_ID, B.NAME AS BPARTNER, (CASE WHEN
I.DOCUMENTNO IS NOT NULL THEN I.DOCUMENTNO||' ('||I.DATEINVOICED||')' END) AS
INVOICE, DP.DATEPLANNED,
DP.AMOUNT, DP.WRITEOFFAMT, C.ISO_CODE AS CURRENCY,
(CASE WHEN S1.DOCUMENTNO IS NOT NULL THEN S1.DOCUMENTNO||'
('||S1.DATETRX||')' END) AS DEBTCANCEL,
- C_CURRENCY_CONVERT(DP.AMOUNT, DP.C_CURRENCY_ID, ?,
TO_DATE(I.DATEINVOICED), NULL, C_INVOICELINE.AD_CLIENT_ID,
C_INVOICELINE.AD_ORG_ID) AS CONVAMOUNT,
- C_CURRENCY_SYMBOL(?, 0, 'Y') AS CONVSYM,
- C_CURRENCY_ISOSYM(?) AS CONVISOSYM,
+ C_CURRENCY_CONVERT(DP.AMOUNT, DP.C_CURRENCY_ID, ?,
TO_DATE(I.DATEINVOICED), NULL, I.AD_CLIENT_ID, I.AD_ORG_ID) AS CONVAMOUNT,
+ C_CURRENCY_SYMBOL(?, 0, 'Y') AS CONVSYM,
+ C_CURRENCY_ISOSYM(?) AS CONVISOSYM,
(CASE WHEN S2.DOCUMENTNO IS NOT NULL THEN S2.DOCUMENTNO||'
('||S2.DATETRX||')' END) AS DEBTGENERATE, COALESCE(RLT.NAME, RL.NAME) AS
PAYMENTRULE,
(CASE C_DEBT_PAYMENT_STATUS(DP.C_Settlement_Cancel_ID,
DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID,
DP.C_CASHLINE_ID, DP.C_BANKSTATEMENTLINE_ID) WHEN 'I' THEN
AD_MESSAGE_GET2('DPR_INVALID',?) WHEN 'C' THEN
AD_MESSAGE_GET2('DPR_CONCILIATED',?) WHEN 'W' THEN
AD_MESSAGE_GET2('DPR_CANCELLED',?) WHEN 'A' THEN
AD_MESSAGE_GET2('DPR_SETTLE',?) WHEN
@@ -55,9 +55,8 @@
AND
RLT.AD_LANGUAGE = ?,
AD_REF_LIST RL2 left join AD_REF_LIST_TRL RLT2 on
RL2.AD_REF_LIST_ID = RLT2.AD_REF_LIST_ID
AND
RLT2.AD_LANGUAGE = ?,
- C_CURRENCY C, C_INVOICELINE
- WHERE DP.C_CURRENCY_ID = C.C_CURRENCY_ID
- AND I.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
+ C_CURRENCY C
+ WHERE DP.C_CURRENCY_ID = C.C_CURRENCY_ID
AND DP.PAYMENTRULE = RL.VALUE
AND RL.AD_REFERENCE_ID = '195'
AND DP.STATUS = RL2.VALUE
@@ -68,7 +67,7 @@
AND DP.IsValid='Y'
GROUP BY (BANK.NAME || '/' || BANK.CODEBRANCH || BANK.DIGITCONTROL ||
BA.CODEACCOUNT || '.' || BA.DIGITCONTROL),(CASE BA.showspanish WHEN 'Y' then
BA.CODEACCOUNT ELSE CASE BA.SHOWGENERIC when 'Y' then GENERICACCOUNT ELSE CASE
BA.SHOWIBAN WHEN 'Y' THEN BA.IBAN END END END),
CASE WHEN I.C_INVOICE_ID IS NULL THEN '0' ELSE I.C_INVOICE_ID END, (CASE
WHEN DP.C_DEBT_PAYMENT_ID IS NULL THEN '0' ELSE DP.C_DEBT_PAYMENT_ID END),
B.NAME, (CASE WHEN I.DOCUMENTNO IS NOT NULL THEN I.DOCUMENTNO||'
('||I.DATEINVOICED||')' END), DP.DATEPLANNED,
- DP.AMOUNT,DP.C_CURRENCY_ID, C_INVOICELINE.AD_CLIENT_ID,
C_INVOICELINE.AD_ORG_ID, I.DATEINVOICED,
+ DP.AMOUNT,DP.C_CURRENCY_ID, I.AD_CLIENT_ID, I.AD_ORG_ID, I.DATEINVOICED,
DP.WRITEOFFAMT, C.ISO_CODE, (CASE WHEN S1.DOCUMENTNO IS NOT NULL THEN
S1.DOCUMENTNO||' ('||S1.DATETRX||')' END), (CASE WHEN S2.DOCUMENTNO IS NOT NULL
THEN S2.DOCUMENTNO||' ('||S2.DATETRX||')' END), RLT.NAME, RL.NAME, RLT2.NAME,
RL2.NAME, DP.C_Settlement_Cancel_ID,
DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID,
DP.C_CASHLINE_ID, DP.C_BANKSTATEMENTLINE_ID, DP.DESCRIPTION, (CASE DP.ISRECEIPT
WHEN 'Y' THEN 'SalesInvoice' ELSE 'PurchaseInvoice' END),s2.SETTLEMENTTYPE,
DP.STATUS, URS.NAME
ORDER BY 1,STATUS, DP.DATEPLANNED
@@ -112,7 +111,7 @@
(CASE WHEN I.C_INVOICE_ID IS NULL THEN '0' ELSE I.C_INVOICE_ID END) AS
C_INVOICE_ID, (CASE WHEN DP.C_DEBT_PAYMENT_ID IS NULL THEN '0' ELSE
DP.C_DEBT_PAYMENT_ID END) AS C_DEBT_PAYMENT_ID, B.NAME AS BPARTNER, (CASE WHEN
I.DOCUMENTNO IS NOT NULL THEN I.DOCUMENTNO||' ('||I.DATEINVOICED||')' END) AS
INVOICE, DP.DATEPLANNED,
DP.AMOUNT, DP.WRITEOFFAMT, C.ISO_CODE AS CURRENCY,
(CASE WHEN S1.DOCUMENTNO IS NOT NULL THEN S1.DOCUMENTNO||'
('||S1.DATETRX||')' END) AS DEBTCANCEL, (CASE WHEN S2.DOCUMENTNO IS NOT NULL
THEN S2.DOCUMENTNO||' ('||S2.DATETRX||')' END) AS DEBTGENERATE,
COALESCE(RLT.NAME, RL.NAME) AS PAYMENTRULE,
- C_CURRENCY_CONVERT(DP.AMOUNT, DP.C_CURRENCY_ID, ?,
TO_DATE(I.DATEINVOICED), NULL, C_INVOICELINE.AD_CLIENT_ID,
C_INVOICELINE.AD_ORG_ID) AS CONVAMOUNT,
+ C_CURRENCY_CONVERT(DP.AMOUNT, DP.C_CURRENCY_ID, ?,
TO_DATE(I.DATEINVOICED), NULL, I.AD_CLIENT_ID, I.AD_ORG_ID) AS CONVAMOUNT,
C_CURRENCY_SYMBOL(?, 0, 'Y') AS CONVSYM,
C_CURRENCY_ISOSYM(?) AS CONVISOSYM,
(CASE C_DEBT_PAYMENT_STATUS(DP.C_Settlement_Cancel_ID,
DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID,
@@ -131,9 +130,8 @@
AND
RLT.AD_LANGUAGE = ?,
AD_REF_LIST RL2 left join AD_REF_LIST_TRL RLT2 on
RL2.AD_REF_LIST_ID = RLT2.AD_REF_LIST_ID
AND
RLT2.AD_LANGUAGE = ?,
- C_CURRENCY C, C_INVOICELINE
+ C_CURRENCY C
WHERE DP.C_CURRENCY_ID = C.C_CURRENCY_ID
- AND I.C_INVOICE_ID = C_INVOICELINE.C_INVOICE_ID
AND DP.PAYMENTRULE = RL.VALUE
AND RL.AD_REFERENCE_ID = '195'
AND DP.STATUS = RL2.VALUE
@@ -144,7 +142,7 @@
AND DP.IsValid='Y'
GROUP BY (BANK.NAME || '/' || BANK.CODEBRANCH || BANK.DIGITCONTROL ||
BA.CODEACCOUNT || '.' || BA.DIGITCONTROL), (CASE BA.showspanish WHEN 'Y' then
BA.CODEACCOUNT ELSE CASE BA.SHOWGENERIC when 'Y' then GENERICACCOUNT ELSE CASE
BA.SHOWIBAN WHEN 'Y' THEN BA.IBAN END END END),
CASE WHEN I.C_INVOICE_ID IS NULL THEN '0' ELSE I.C_INVOICE_ID END, (CASE
WHEN DP.C_DEBT_PAYMENT_ID IS NULL THEN '0' ELSE DP.C_DEBT_PAYMENT_ID END),
B.NAME, (CASE WHEN I.DOCUMENTNO IS NOT NULL THEN I.DOCUMENTNO||'
('||I.DATEINVOICED||')' END), DP.DATEPLANNED, DP.AMOUNT,
- DP.C_CURRENCY_ID, C_INVOICELINE.AD_CLIENT_ID, C_INVOICELINE.AD_ORG_ID,
I.DATEINVOICED,
+ DP.C_CURRENCY_ID, I.AD_CLIENT_ID, I.AD_ORG_ID, I.DATEINVOICED,
DP.WRITEOFFAMT, C.ISO_CODE, (CASE WHEN S1.DOCUMENTNO IS NOT NULL THEN
S1.DOCUMENTNO||' ('||S1.DATETRX||')' END), (CASE WHEN S2.DOCUMENTNO IS NOT NULL
THEN S2.DOCUMENTNO||' ('||S2.DATETRX||')' END), RLT.NAME, RL.NAME, RLT2.NAME,
RL2.NAME, DP.C_Settlement_Cancel_ID,
DP.CANCEL_PROCESSED, DP.GENERATE_PROCESSED, DP.ISPAID, DP.ISVALID,
DP.C_CASHLINE_ID, DP.C_BANKSTATEMENTLINE_ID, DP.DESCRIPTION, (CASE DP.ISRECEIPT
WHEN 'Y' THEN 'SalesInvoice' ELSE 'PurchaseInvoice' END),s2.SETTLEMENTTYPE,
DP.STATUS, URS.NAME
ORDER BY 1,STATUS, DP.DATEPLANNED
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
