details: https://code.openbravo.com/erp/devel/pi/rev/39b4cef629e4 changeset: 16127:39b4cef629e4 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Apr 16 16:26:50 2012 +0200 summary: Fixes issue 0020274: Now a list of all possible Payment Status is retrieved instead.
details: https://code.openbravo.com/erp/devel/pi/rev/319114556c32 changeset: 16128:319114556c32 user: David Miguelez <david.miguelez <at> openbravo.com> date: Mon Apr 16 16:26:23 2012 +0200 summary: Fixes issue 0020273: Added methods for retrieving a list of Payment status where Payments are confirmed or not. details: https://code.openbravo.com/erp/devel/pi/rev/c5c63261ef70 changeset: 16129:c5c63261ef70 user: Mikel Irurita <mikel.irurita <at> openbravo.com> date: Thu Apr 19 09:44:22 2012 +0200 summary: Related to issue 20273: code review diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 52 +++++++++- 3 files changed, 54 insertions(+), 7 deletions(-) diffs (115 lines): diff -r 857b4617b567 -r c5c63261ef70 modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Wed Apr 18 18:13:37 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml Thu Apr 19 09:44:22 2012 +0200 @@ -19,7 +19,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2011 Openbravo SLU +* All portions are Copyright (C) 2011-2012 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -62,7 +62,7 @@ ORDER BY name) LOOP BEGIN - v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || status || ''', ''' || fin_payment_scheduledetail_id || ''') FROM DUAL'; + v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || coalesce(status, '') || ''', ''' || coalesce(fin_payment_scheduledetail_id, '') || ''') FROM DUAL'; EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed; IF (v_ispaymentconfirmed = 'Y') THEN diff -r 857b4617b567 -r c5c63261ef70 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Wed Apr 18 18:13:37 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java Thu Apr 19 09:44:22 2012 +0200 @@ -1577,14 +1577,15 @@ */ public List<FIN_Payment> getCustomerPaymentsWithCredit(Organization org, BusinessPartner bp, boolean isReceipt) { + + List<String> confirmedStatus = FIN_Utility.getListPaymentConfirmed(); try { OBContext.setAdminMode(true); OBCriteria<FIN_Payment> obcPayment = OBDal.getInstance().createCriteria(FIN_Payment.class); obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_BUSINESSPARTNER, bp)); obcPayment.add(Restrictions.eq(FIN_Payment.PROPERTY_RECEIPT, isReceipt)); obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_GENERATEDCREDIT, BigDecimal.ZERO)); - obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPAP")); - obcPayment.add(Restrictions.ne(FIN_Payment.PROPERTY_STATUS, "RPVOID")); + obcPayment.add(Restrictions.in(FIN_Payment.PROPERTY_STATUS, confirmedStatus)); obcPayment.add(Restrictions.neProperty(FIN_Payment.PROPERTY_GENERATEDCREDIT, FIN_Payment.PROPERTY_USEDCREDIT)); final Organization legalEntity = FIN_Utility.getLegalEntityOrg(org); diff -r 857b4617b567 -r c5c63261ef70 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Wed Apr 18 18:13:37 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Apr 19 09:44:22 2012 +0200 @@ -228,13 +228,14 @@ } /** - * Creates a comma separated string with the Id's of the Set of Strings. - * This method is deprecated as it has been added to Utility (core) + * Creates a comma separated string with the Id's of the Set of Strings. This method is deprecated + * as it has been added to Utility (core) + * * @param set * Set of Strings * @return Comma separated string of Id's */ - @Deprecated + @Deprecated public static String getInStrSet(Set<String> set) { return Utility.getInStrSet(set); } @@ -956,6 +957,51 @@ } /** + * Returns a list of Payment Status. If isConfirmed equals true, then the status returned are + * confirmed payments. Else they are pending of execution + * + */ + private static List<String> getListPaymentConfirmedOrNot(Boolean isConfirmed) { + + List<String> listPaymentConfirmedOrNot = new ArrayList<String>(); + OBContext.setAdminMode(true); + try { + final OBCriteria<org.openbravo.model.ad.domain.List> obCriteria = OBDal.getInstance() + .createCriteria(org.openbravo.model.ad.domain.List.class); + obCriteria.add(Restrictions.eq(org.openbravo.model.ad.domain.List.PROPERTY_REFERENCE + ".id", + "575BCB88A4694C27BC013DE9C73E6FE7")); + List<org.openbravo.model.ad.domain.List> adRefList = obCriteria.list(); + for (org.openbravo.model.ad.domain.List adRef : adRefList) { + if (isConfirmed.equals(isPaymentConfirmed(adRef.getSearchKey(), null))) { + listPaymentConfirmedOrNot.add(adRef.getSearchKey()); + } + } + return listPaymentConfirmedOrNot; + } catch (Exception e) { + log4j.error(e); + return null; + } finally { + OBContext.restorePreviousMode(); + } + } + + /** + * Returns a list confirmed Payment Status + * + */ + public static List<String> getListPaymentConfirmed() { + return getListPaymentConfirmedOrNot(true); + } + + /** + * Returns a list not confirmed Payment Status + * + */ + public static List<String> getListPaymentNotConfirmed() { + return getListPaymentConfirmedOrNot(false); + } + + /** * Returns the legal entity of the given organization * * @param org ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
