details: https://code.openbravo.com/erp/devel/pi/rev/71de46d807b2 changeset: 32460:71de46d807b2 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 06 16:46:07 2017 +0200 summary: [refresh-license] refresh every 24hr regardless other conditions
details: https://code.openbravo.com/erp/devel/pi/rev/418a892545a0 changeset: 32461:418a892545a0 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 06 16:48:21 2017 +0200 summary: [refresh-license] updated javadoc details: https://code.openbravo.com/erp/devel/pi/rev/37309afb45d6 changeset: 32462:37309afb45d6 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 06 16:50:48 2017 +0200 summary: [refresh-license] perform time checks on actual instace Note if it was refreshed actual instance could differ from current details: https://code.openbravo.com/erp/devel/pi/rev/a2f6091f6821 changeset: 32463:a2f6091f6821 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jul 07 13:09:07 2017 +0200 summary: [refresh-license] use constant details: https://code.openbravo.com/erp/devel/pi/rev/93b939869a44 changeset: 32464:93b939869a44 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Jul 07 13:14:54 2017 +0200 summary: [refresh-license] don't lock other threads if already refreshing details: https://code.openbravo.com/erp/devel/pi/rev/016e7e67e5db changeset: 32465:016e7e67e5db user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 10 09:47:45 2017 +0200 summary: [refresh-license] butler won't send license if not updated since last refresh details: https://code.openbravo.com/erp/devel/pi/rev/b4099f697b3a changeset: 32466:b4099f697b3a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Jul 10 09:48:08 2017 +0200 summary: [refresh-license] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/b210e7592696 changeset: 32467:b210e7592696 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jul 12 15:23:35 2017 +0200 summary: [refresh-license] pi merge details: https://code.openbravo.com/erp/devel/pi/rev/ce4fe855c655 changeset: 32468:ce4fe855c655 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jul 12 17:02:27 2017 +0200 summary: [refresh-license] removed debugging code details: https://code.openbravo.com/erp/devel/pi/rev/88b32df66c76 changeset: 32469:88b32df66c76 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Wed Jul 12 17:14:05 2017 +0200 summary: [refresh-license] updated comments details: https://code.openbravo.com/erp/devel/pi/rev/18c33f2e464d changeset: 32470:18c33f2e464d user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 08:57:47 2017 +0200 summary: [refresh-license] update timestamp when refreshing online details: https://code.openbravo.com/erp/devel/pi/rev/3ea981d3a917 changeset: 32471:3ea981d3a917 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 09:05:41 2017 +0200 summary: [refresh-license] removes some duplicities details: https://code.openbravo.com/erp/devel/pi/rev/543dc275654e changeset: 32472:543dc275654e user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 09:15:11 2017 +0200 summary: [refresh-license] don't log on catalina.out details: https://code.openbravo.com/erp/devel/pi/rev/369b275494ec changeset: 32473:369b275494ec user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Jul 13 09:42:24 2017 +0200 summary: [refresh-license] use same lock to refresh from DB or remote details: https://code.openbravo.com/erp/devel/pi/rev/3c24ce44c77f changeset: 32474:3c24ce44c77f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 18 10:11:59 2017 +0200 summary: [refresh-license] removed unbalanced admin mode details: https://code.openbravo.com/erp/devel/pi/rev/08da336f2f23 changeset: 32475:08da336f2f23 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 18 10:12:40 2017 +0200 summary: [refresh-license] comment cases were license is loaded from db details: https://code.openbravo.com/erp/devel/pi/rev/ee4945b282bb changeset: 32476:ee4945b282bb user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 18 10:31:34 2017 +0200 summary: fixed 36477: autorefresh professional subscription license diffstat: build.xml | 4 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java | 7 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java | 20 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 9 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java | 9 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java | 8 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 3 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java | 5 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ExecutePayment.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProposalProcess.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_ReconciliationProcess.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionModify.java | 6 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml | 4 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/event/UpdateInvariantCharacteristicsHandler.java | 5 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/StandardWindowComponent.java | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 46 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 18 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml | 2 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 8 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java | 1 - modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/LinkToParentTreeDatasourceService.java | 6 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 3 - src-core/src/org/openbravo/data/Sqlc.java | 54 +- src-core/src/org/openbravo/utils/CryptoUtility.java | 10 - src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml | 1 - src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml | 1 - src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml | 1 - src-db/database/model/functions/M_INOUT_CREATE.xml | 1 - src-db/database/model/functions/M_PRODUCTION_RUN.xml | 1 - src-db/database/model/functions/M_REQUISITION_CREATEPO.xml | 1 - src-db/database/model/tables/M_MOVEMENTLINE.xml | 14 + src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml | 1 - src-db/database/model/triggers/C_INVOICELINE_TRG2.xml | 3 - src-db/database/model/triggers/C_INVOICE_TRG2.xml | 74 +- src-db/database/model/triggers/C_ORDERLINE_TRG.xml | 1 - src-db/database/model/triggers/C_ORDERLINE_TRG2.xml | 1 - src-db/database/model/triggers/C_ORDER_TRG2.xml | 25 +- src-db/database/sourcedata/AD_COLUMN.xml | 98 ++- src-db/database/sourcedata/AD_ELEMENT.xml | 2 +- src-db/database/sourcedata/AD_FIELD.xml | 66 +- src-db/database/sourcedata/AD_MESSAGE.xml | 18 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 341 +++--- src-db/database/sourcedata/AD_VAL_RULE.xml | 11 + src-test/build.xml | 8 +- src-test/src/org/openbravo/test/base/OBBaseTest.java | 5 + src-test/src/org/openbravo/test/base/TestLogAppender.java | 13 +- src-test/src/org/openbravo/test/costing/TestCosting.java | 2 +- src-test/src/org/openbravo/test/javascript/CompressionTest.java | 39 - src-test/src/org/openbravo/test/javascript/JavaScriptAPIChecker.java | 211 ---- src-test/src/org/openbravo/test/javascript/JavaScriptAPITest.java | 95 -- src-test/src/org/openbravo/test/javascript/JavaScriptAntTest.java | 116 -- src-test/src/org/openbravo/test/javascript/JavaScriptParser.java | 135 --- src-test/src/org/openbravo/test/javascript/test-compression.js | 446 ---------- src-test/src/org/openbravo/test/system/ErrorTextParserTest.java | 42 +- src/org/openbravo/common/actionhandler/SRMOPickEditLines.java | 41 +- src/org/openbravo/common/datasource/StockReservationPickAndEditDataSource.java | 2 +- src/org/openbravo/common/hooks/InventoryStatusValidationHook.java | 2 +- src/org/openbravo/common/hooks/OrderLineQtyChangedHook.java | 5 +- src/org/openbravo/costing/LCCostMatchFromInvoiceHandler.java | 4 +- src/org/openbravo/dal/security/EntityAccessChecker.java | 3 +- src/org/openbravo/erpCommon/ad_actionButton/ActionButtonUtility.java | 8 +- src/org/openbravo/erpCommon/ad_callouts/OperativeQuantity_To_BaseQuantity.java | 49 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOutLine_Product.java | 9 +- src/org/openbravo/erpCommon/ad_callouts/SL_InOut_BPartner.java | 21 +- src/org/openbravo/erpCommon/ad_callouts/SL_Inventory_Product.java | 4 +- src/org/openbravo/erpCommon/ad_callouts/SL_Movement_Product.java | 16 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 11 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html | 18 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html | 4 +- src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html | 6 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 40 +- src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html | 11 +- src/org/openbravo/erpCommon/ad_forms/ProductInfo.java | 4 +- src/org/openbravo/erpCommon/ad_forms/SQLExecutor_Query.java | 4 +- src/org/openbravo/erpCommon/ad_forms/ShowSessionVariables.java | 50 +- src/org/openbravo/erpCommon/ad_process/AlertProcess.java | 14 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 6 +- src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java | 13 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLS.jrxml | 43 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleDetailXLSDoubtfulDebt.jrxml | 11 +- src/org/openbravo/erpCommon/ad_reports/AgingScheduleXLS.jrxml | 54 +- src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java | 34 +- src/org/openbravo/erpCommon/businessUtility/AccountTree.java | 64 +- src/org/openbravo/erpCommon/businessUtility/Buscador.java | 2 +- src/org/openbravo/erpCommon/businessUtility/COAUtility.java | 4 +- src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java | 9 +- src/org/openbravo/erpCommon/businessUtility/TabFilter.java | 8 +- src/org/openbravo/erpCommon/businessUtility/Tax.java | 28 +- src/org/openbravo/erpCommon/obps/ActivationKey.java | 128 +- src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java | 25 +- src/org/openbravo/erpCommon/security/Login.html | 2 +- src/org/openbravo/erpCommon/utility/StaticCommunityBranding.java | 18 +- src/org/openbravo/event/InvoiceEventHandler.java | 68 + src/org/openbravo/event/OrderEventHandler.java | 26 +- src/org/openbravo/event/RoleEventHandler.java | 4 +- src/org/openbravo/materialmgmt/UOMUtil.java | 31 + web/html/en_US/StaticCommunityBranding-2.50-Basic.html | 64 - web/html/en_US/StaticCommunityBranding-2.50-Basic_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-Comm.html | 65 - web/html/en_US/StaticCommunityBranding-2.50-Comm_files/banner.png | 0 web/html/en_US/StaticCommunityBranding-2.50-STD.html | 66 - web/html/en_US/StaticCommunityBranding-2.50-STD_files/banner.png | 0 web/js/dojotoolkit/dojo/_base/xhr.js | 4 +- web/js/dojotoolkit/dojo/dojo.js | 2 +- web/js/dojotoolkit/dojo/dojo.js.uncompressed.js | 5 +- web/js/utils.js | 2 +- 109 files changed, 1128 insertions(+), 2014 deletions(-) diffs (truncated from 6224 to 300 lines): diff -r c557445d5d66 -r ee4945b282bb build.xml --- a/build.xml Thu Jul 06 14:07:15 2017 +0200 +++ b/build.xml Tue Jul 18 10:31:34 2017 +0200 @@ -617,10 +617,6 @@ <target name="run.test" depends="init"> <ant dir="${base.src.test}" target="run.test" inheritAll="true" inheritRefs="true" /> </target> - - <target name="run.api.test.javascript"> - <ant dir="${base.src.test}" target="run.api.test.javascript" inheritAll="true" inheritRefs="true" /> - </target> <target name="run.api.test.model" description="Checks current xml db model and dictionary API for not-allowed changes. Requires stableDBdir parameter"> diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddTransaction.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.log4j.Logger; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.hibernate.criterion.Restrictions; @@ -77,6 +78,7 @@ public class AddTransaction extends HttpSecureAppServlet { private static final long serialVersionUID = 1L; private AdvPaymentMngtDao dao; + private static final Logger log = Logger.getLogger(AddTransaction.class); public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { @@ -171,8 +173,7 @@ out.close(); } catch (JSONException e) { - - e.printStackTrace(); + log.error("Error building json output", e); } } diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -361,8 +361,8 @@ return ((FIN_ReconciliationLine_v) obc.uniqueResult()).getTransactionDate(); } - private void printPage(HttpServletResponse response, VariablesSecureApp variables, String strOrgId, - String strWindowId, String strTabId, String strPaymentTypeFilter, + private void printPage(HttpServletResponse response, VariablesSecureApp variables, + String strOrgId, String strWindowId, String strTabId, String strPaymentTypeFilter, String strFinancialAccountId, String reconciliationId, String strShowCleared, String strHideDate) throws IOException, ServletException { log4j @@ -403,8 +403,8 @@ xmlDocument.setParameter("paramPaymentTypeFilter", strPaymentTypeFilter); xmlDocument.setParameter("showCleared", strShowCleared); xmlDocument.setParameter("hideDate", strHideDate); - xmlDocument.setParameter("jsDateFormat", "var sc_JsDateFormat =\"" + variables.getJsDateFormat() - + "\";"); + xmlDocument.setParameter("jsDateFormat", + "var sc_JsDateFormat =\"" + variables.getJsDateFormat() + "\";"); // Check if There is a matching algorithm for the given financial account FIN_FinancialAccount financial = OBDal.getInstance().get(FIN_FinancialAccount.class, strFinancialAccountId); @@ -414,7 +414,8 @@ } catch (Exception ex) { OBDal.getInstance().rollbackAndClose(); OBError message = Utility.translateError(this, variables, variables.getLanguage(), Utility - .parseTranslation(this, variables, variables.getLanguage(), "@APRM_MissingMatchingAlgorithm@")); + .parseTranslation(this, variables, variables.getLanguage(), + "@APRM_MissingMatchingAlgorithm@")); variables.setMessage(strTabId, message); printPageClosePopUp(response, variables, Utility.getTabURL(strTabId, "R", true)); return; @@ -452,12 +453,11 @@ try { OBContext.setAdminMode(true); // long init = System.currentTimeMillis(); - data = getMatchedBankStatementLinesData(variables, strFinancialAccountId, strReconciliationId, - strPaymentTypeFilter, strShowCleared, strHideDate, executeMatching); + data = getMatchedBankStatementLinesData(variables, strFinancialAccountId, + strReconciliationId, strPaymentTypeFilter, strShowCleared, strHideDate, executeMatching); // log4j.error("Getting Grid Data: " + (System.currentTimeMillis() - init)); } catch (Exception e) { - log4j.debug("Output: Exception ocurred while retrieving Bank Statement Lines.", e); - e.printStackTrace(); + log4j.error("Output: Exception ocurred while retrieving Bank Statement Lines.", e); } finally { OBContext.restorePreviousMode(); } diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Tue Jul 18 10:31:34 2017 +0200 @@ -333,8 +333,7 @@ OBDal.getInstance().save(dummyPayment); } catch (final Exception e) { log4j.error("Exception while creating dummy payment for the invoice: " - + strC_Invoice_ID); - e.printStackTrace(); + + strC_Invoice_ID, e); } finally { OBContext.restorePreviousMode(); } @@ -515,8 +514,7 @@ } } catch (final Exception e) { log4j.error("Exception while creating dummy payment for the invoice: " - + strC_Invoice_ID); - e.printStackTrace(); + + strC_Invoice_ID, e); } finally { OBContext.restorePreviousMode(); } @@ -781,8 +779,7 @@ } } catch (final Exception e) { - log4j.error("Exception while canceling the credit in the invoice: " + strC_Invoice_ID); - e.printStackTrace(); + log4j.error("Exception while canceling the credit in the invoice: " + strC_Invoice_ID, e); } finally { OBContext.restorePreviousMode(); } diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/BatchPaymentExecution.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2012 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -342,8 +342,7 @@ strOrderByProperty, strAscDesc, isReceipt); } catch (ServletException e) { - log4j.error("Error in print page data: " + e); - e.printStackTrace(); + log4j.error("Error in print page data: ", e); OBError myError = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()); if (!myError.isConnectionAvailable()) { bdErrorAjax(response, "Error", "Connection Error", "No database connection"); @@ -357,14 +356,14 @@ description = myError.getMessage(); } } catch (Exception e) { - log4j.debug("Error obtaining rows data"); + log4j.error("Error obtaining rows data", e); type = "Error"; title = "Error"; if (e.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + e.getMessage() + "]]>"; else description = e.getMessage(); - e.printStackTrace(); + } } if (!type.startsWith("<![CDATA[")) diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_forms/Transactions.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2011 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -452,8 +452,7 @@ pageSize, offset, strOrderBy); // strNumRows = Integer.toString(finaccTransactions.size()); } catch (ServletException e) { - log4j.error("Error in print page data: " + e); - e.printStackTrace(); + log4j.error("Error in print page data: ", e); OBError myError = Utility.translateError(this, vars, vars.getLanguage(), e.getMessage()); if (!myError.isConnectionAvailable()) { bdErrorAjax(response, "Error", "Connection Error", "No database connection"); @@ -467,14 +466,13 @@ description = myError.getMessage(); } } catch (Exception e) { - log4j.debug("Error obtaining rows data"); + log4j.error("Error obtaining rows data", e); type = "Error"; title = "Error"; if (e.getMessage().startsWith("<![CDATA[")) description = "<![CDATA[" + e.getMessage() + "]]>"; else description = e.getMessage(); - e.printStackTrace(); } } diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_reports/ReportReconciliation.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2015 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -32,6 +32,7 @@ import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperReport; +import org.apache.log4j.Logger; import org.hibernate.criterion.ProjectionList; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; @@ -51,6 +52,7 @@ public class ReportReconciliation extends HttpSecureAppServlet { private static final long serialVersionUID = 1L; + private static final Logger log = Logger.getLogger(ReportReconciliation.class); final static String DETAIL = "DETAIL"; final static String SUMMARY = "SUMMARY"; @@ -340,7 +342,7 @@ BigDecimal totals = getTransactionsTotalAfterReconciliationEndDate(recon); balance = recon.getAccount().getCurrentBalance().subtract(totals); } catch (Exception e) { - e.printStackTrace(); + log.error("Error during getBalanceOfAccount", e); } finally { OBContext.restorePreviousMode(); } diff -r c557445d5d66 -r ee4945b282bb 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 Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Tue Jul 18 10:31:34 2017 +0200 @@ -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-2016 Openbravo SLU + * All portions are Copyright (C) 2010-2017 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* @@ -192,7 +192,6 @@ paymentId); } } catch (final Exception e) { - e.printStackTrace(System.err); throw new OBException(e); } finally { OBContext.restorePreviousMode(); diff -r c557445d5d66 -r ee4945b282bb modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java Thu Jul 06 14:07:15 2017 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_BankStatementProcess.java Tue Jul 18 10:31:34 2017 +0200 @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; +import org.apache.log4j.Logger; import org.hibernate.criterion.Restrictions; import org.openbravo.advpaymentmngt.dao.MatchTransactionDao; import org.openbravo.advpaymentmngt.utility.FIN_Utility; @@ -24,6 +25,8 @@ public class FIN_BankStatementProcess implements org.openbravo.scheduling.Process { + private static final Logger log = Logger.getLogger(FIN_BankStatementProcess.class); + @Override public void execute(ProcessBundle bundle) throws Exception { OBError msg = new OBError(); @@ -128,7 +131,7 @@ ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
