details: /erp/devel/pi/rev/c3b786961868
changeset: 12773:c3b786961868
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Jun 09 09:54:52 2011 +0200
summary: fixes performance for payment detail view
details: /erp/devel/pi/rev/d6c82f1924c9
changeset: 12774:d6c82f1924c9
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Thu Jun 09 09:56:16 2011 +0200
summary: Removes deprecated annotation for required methods
diffstat:
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
| 1 -
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
| 1 -
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
| 6 +++---
3 files changed, 3 insertions(+), 5 deletions(-)
diffs (41 lines):
diff -r 4b597a5c6aaa -r d6c82f1924c9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Wed Jun 08 18:31:07 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
Thu Jun 09 09:56:16 2011 +0200
@@ -369,7 +369,6 @@
}
}
- @Deprecated
public FIN_Payment getNewPayment(boolean isReceipt, Organization
organization,
DocumentType docType, String strPaymentDocumentNo, BusinessPartner
businessPartner,
FIN_PaymentMethod paymentMethod, FIN_FinancialAccount finAccount, String
strPaymentAmount,
diff -r 4b597a5c6aaa -r d6c82f1924c9
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
---
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Wed Jun 08 18:31:07 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java
Thu Jun 09 09:56:16 2011 +0200
@@ -177,7 +177,6 @@
/*
* Temporary method to supply defaults for exchange Rate and converted amount
*/
- @Deprecated
public static FIN_Payment savePayment(FIN_Payment _payment, boolean
isReceipt,
DocumentType docType, String strPaymentDocumentNo, BusinessPartner
businessPartner,
FIN_PaymentMethod paymentMethod, FIN_FinancialAccount finAccount, String
strPaymentAmount,
diff -r 4b597a5c6aaa -r d6c82f1924c9
src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml
--- a/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Wed Jun 08
18:31:07 2011 +0200
+++ b/src-db/database/model/views/FIN_PAYMENT_DETAIL_V.xml Thu Jun 09
09:56:16 2011 +0200
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<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, pd.writeoffamt, fa.c_currency_id AS
finacc_currency_id, p.finacc_txn_convert_rate, psd.amount *
p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.expected,
pso.expected) * p.finacc_txn_convert_rate AS expectedconverted
+ <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_schedule_id AS fin_payment_sched_inv_v_id,
pso.fin_payment_schedule_id AS 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.amount,
pso.amount) 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, pd.writeoffamt, fa.c_currency_id AS
finacc_currency_id, p.finacc_txn_convert_rate, psd.amount *
p.finacc_txn_convert_rate AS paidconverted, COALESCE(psi.amount, pso.amount) *
p.finacc_txn_convert_rate AS expectedconverted
FROM fin_payment p
LEFT JOIN fin_financial_account fa ON p.fin_financial_account_id =
fa.fin_financial_account_id, fin_payment_detail pd
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 fin_payment_schedule psi ON psd.fin_payment_schedule_invoice =
psi.fin_payment_schedule_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
+LEFT JOIN fin_payment_schedule pso ON psd.fin_payment_schedule_order =
pso.fin_payment_schedule_id
LEFT JOIN c_order o ON pso.c_order_id = o.c_order_id
LEFT JOIN c_glitem gli ON pd.c_glitem_id = gli.c_glitem_id
WHERE p.fin_payment_id = pd.fin_payment_id]]></view>
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits