details: https://code.openbravo.com/erp/devel/pi/rev/5048e2947e92 changeset: 19670:5048e2947e92 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Feb 12 12:04:49 2013 +0100 summary: Fixes issue 22776: Tax Exempt field of Tax Rate window is not displayed.
details: https://code.openbravo.com/erp/devel/pi/rev/8e1789c50487 changeset: 19671:8e1789c50487 user: Ioritz Cia <ioritz.cia <at> openbravo.com> date: Tue Feb 12 17:14:43 2013 +0100 summary: Fixes issue 22791: Should not be possible to Reactivate a Reversed Payment. diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 11 +++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java | 10 +++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 20 ++++++++++ modules/org.openbravo.v3/src-db/database/configScript.xml | 6 +-- 4 files changed, 42 insertions(+), 5 deletions(-) diffs (91 lines): diff -r d033d813595f -r 8e1789c50487 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Thu Feb 14 00:49:52 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Feb 12 17:14:43 2013 +0100 @@ -22,6 +22,17 @@ <!--02E1AA15BFCB420C8F618A14ED80F33E--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--02E1AA15BFCB420C8F618A14ED80F33E--></AD_MESSAGE> +<!--065AAE5951154185AC73E7D9A688C43C--><AD_MESSAGE> +<!--065AAE5951154185AC73E7D9A688C43C--> <AD_MESSAGE_ID><![CDATA[065AAE5951154185AC73E7D9A688C43C]]></AD_MESSAGE_ID> +<!--065AAE5951154185AC73E7D9A688C43C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--065AAE5951154185AC73E7D9A688C43C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--065AAE5951154185AC73E7D9A688C43C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--065AAE5951154185AC73E7D9A688C43C--> <VALUE><![CDATA[APRM_ReversePayment]]></VALUE> +<!--065AAE5951154185AC73E7D9A688C43C--> <MSGTEXT><![CDATA[Payment can not be reactivated as it is a reverse payment.]]></MSGTEXT> +<!--065AAE5951154185AC73E7D9A688C43C--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--065AAE5951154185AC73E7D9A688C43C--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--065AAE5951154185AC73E7D9A688C43C--></AD_MESSAGE> + <!--0AF37AC554DE441DB213BA944147E82C--><AD_MESSAGE> <!--0AF37AC554DE441DB213BA944147E82C--> <AD_MESSAGE_ID><![CDATA[0AF37AC554DE441DB213BA944147E82C]]></AD_MESSAGE_ID> <!--0AF37AC554DE441DB213BA944147E82C--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r d033d813595f -r 8e1789c50487 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Thu Feb 14 00:49:52 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java Tue Feb 12 17:14:43 2013 +0100 @@ -603,6 +603,16 @@ OBDal.getInstance().rollbackAndClose(); return; } + // Reverse Payment + if (FIN_Utility.isReversePayment(payment)) { + msg.setType("Error"); + msg.setTitle(Utility.messageBD(conProvider, "Error", language)); + msg.setMessage(Utility.parseTranslation(conProvider, vars, language, + "@APRM_ReversePayment@")); + bundle.setResult(msg); + OBDal.getInstance().rollbackAndClose(); + return; + } // Transaction exists if (hasTransaction(payment)) { msg.setType("Error"); diff -r d033d813595f -r 8e1789c50487 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 Thu Feb 14 00:49:52 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Tue Feb 12 17:14:43 2013 +0100 @@ -1245,4 +1245,24 @@ return pdList; } + + /** + * Returns true if the payment is a reverse payment not a reversed one. + */ + public static boolean isReversePayment(FIN_Payment payment) { + final Session session = OBDal.getInstance().getSession(); + + final StringBuilder hql = new StringBuilder(); + hql.append("select count(p) "); + hql.append(" from FIN_Payment p "); + hql.append(" where p.reversedPayment = '").append(payment.getId()).append("' "); + + final Query qry = session.createQuery(hql.toString()); + + if ((Long) qry.list().get(0) > Long.parseLong("0")) { + return true; + } else { + return false; + } + } } diff -r d033d813595f -r 8e1789c50487 modules/org.openbravo.v3/src-db/database/configScript.xml --- a/modules/org.openbravo.v3/src-db/database/configScript.xml Thu Feb 14 00:49:52 2013 +0100 +++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Tue Feb 12 17:14:43 2013 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <vector> - <versionInfo version="3.0.18388"/> + <versionInfo version="3.0.19466"/> <columnDataChange tablename="AD_PROCESS" columnname="ISACTIVE" pkRow="800026"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> @@ -941,10 +941,6 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="6121"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_FIELD" columnname="ISDISPLAYED" pkRow="6134"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> ------------------------------------------------------------------------------ Free Next-Gen Firewall Hardware Offer Buy your Sophos next-gen firewall before the end March 2013 and get the hardware for free! Learn more. http://p.sf.net/sfu/sophos-d2d-feb _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
