details: https://code.openbravo.com/erp/devel/pi/rev/5c3aeebd4d49 changeset: 26173:5c3aeebd4d49 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Mar 12 16:00:40 2015 +0100 summary: Fixed bug 29197 Payment Out is registered as "BP Deposit" transaction
In FIN_TransactionProcess.java set the correct value depending on the type of transaction details: https://code.openbravo.com/erp/devel/pi/rev/e2cc40f75e69 changeset: 26174:e2cc40f75e69 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Mar 12 16:06:00 2015 +0100 summary: related to issue 29197 update Copyright diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.class | 0 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.java | 18 ++++++++++ modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab_data.xsql | 6 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 3 +- 6 files changed, 25 insertions(+), 6 deletions(-) diffs (100 lines): diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.class has changed diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.class has changed diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.java --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.java Mon Mar 09 18:58:14 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab.java Thu Mar 12 16:06:00 2015 +0100 @@ -1,3 +1,21 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2014-2015 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* + */ package org.openbravo.advpaymentmngt.modulescript; import org.openbravo.database.ConnectionProvider; diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab_data.xsql --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab_data.xsql Mon Mar 09 18:58:14 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTab_data.xsql Thu Mar 12 16:06:00 2015 +0100 @@ -12,7 +12,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) 2014 Openbravo SLU + * All portions are Copyright (C) 2014-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -58,7 +58,7 @@ SELECT count(*) as exist FROM DUAL WHERE EXISTS (SELECT 1 FROM ad_preference - WHERE attribute = 'UpdatedTransactionType') + WHERE attribute = 'UpdatedTransactionTypeV2') ]]> </Sql> </SqlMethod> @@ -70,7 +70,7 @@ ad_preference_id, ad_client_id, ad_org_id, isactive, createdby, created, updatedby, updated,attribute ) VALUES ( - get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'UpdatedTransactionType') + get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'UpdatedTransactionTypeV2') ]]> </Sql> </SqlMethod> diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.java Mon Mar 09 18:58:14 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/UpdateTransactionTypeTransactionTabData.java Thu Mar 12 16:06:00 2015 +0100 @@ -173,7 +173,7 @@ " SELECT count(*) as exist" + " FROM DUAL" + " WHERE EXISTS (SELECT 1 FROM ad_preference" + - " WHERE attribute = 'UpdatedTransactionType')"; + " WHERE attribute = 'UpdatedTransactionTypeV2')"; ResultSet result; boolean boolReturn = false; @@ -210,7 +210,7 @@ " ad_preference_id, ad_client_id, ad_org_id, isactive," + " createdby, created, updatedby, updated,attribute" + " ) VALUES (" + - " get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'UpdatedTransactionType')"; + " get_uuid(), '0', '0', 'Y', '0', NOW(), '0', NOW(),'UpdatedTransactionTypeV2')"; int updateCount = 0; PreparedStatement st = null; diff -r ba035397bf8a -r e2cc40f75e69 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Mon Mar 09 18:58:14 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java Thu Mar 12 16:06:00 2015 +0100 @@ -11,7 +11,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) 2010-2014 Openbravo SLU + * All portions are Copyright (C) 2010-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -119,6 +119,7 @@ } payment.setStatus(payment.isReceipt() ? "RDNC" : "PWNC"); transaction.setStatus(payment.isReceipt() ? "RDNC" : "PWNC"); + transaction.setTransactionType(payment.isReceipt() ? "BPD" : "BPW"); OBDal.getInstance().save(payment); if (transaction.getDescription() == null || "".equals(transaction.getDescription())) { transaction.setDescription(payment.getDescription()); ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
