details: https://code.openbravo.com/erp/devel/pi/rev/2cae02185081 changeset: 24729:2cae02185081 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Sep 30 20:04:20 2014 +0000 summary: CI: update AD_MODULE to version 24721
details: https://code.openbravo.com/erp/devel/pi/rev/b64757e8b4a0 changeset: 24730:b64757e8b4a0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Sep 30 20:32:52 2014 +0000 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactions.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactionsData.class | 0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java | 63 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData_data.xsql | 113 +--- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.java | 308 +--------- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactions.java | 55 + modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactions_data.xsql | 79 ++ modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/org/openbravo/advpaymentmngt/modulescript/UpdateMatchedDocument_data.xsql | 22 +- modules/org.openbravo.advpaymentmngt/src-util/modulescript/src/src/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactionsData.java | 243 +++++++ modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddPaymentReloadLabelsActionHandler.java | 1 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/AddTransactionActionHandler.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/FindTransactionsToMatchActionHandler.java | 1 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/actionHandler/MatchStatementActionHandler.java | 2 - modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/PurchaseOrderAddPaymentDisplayLogics.java | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/filterexpression/TransactionAddPaymentDefaultValues.java | 21 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_TransactionProcess.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRMUtility_data.xsql | 35 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/APRM_MatchingUtility.java | 124 +--- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 24 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/triggers/AD_ORG_TRG.xml | 15 +- src-db/database/sourcedata/AD_MESSAGE.xml | 12 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 1 + src-util/modulescript/build/classes/org/openbravo/modulescript/Issue26826OrgAllowPeriodControlData.class | 0 src-util/modulescript/build/classes/org/openbravo/modulescript/Issue26826_Org_AllowPeriodControl.class | 0 src-util/modulescript/src/org/openbravo/modulescript/Issue26826_Org_AllowPeriodControl.java | 46 + src-util/modulescript/src/org/openbravo/modulescript/Issue26826_Org_AllowPeriodControl_data.xsql | 45 + src/org/openbravo/erpCommon/ad_actionButton/EditCCPMeasureValues_Values_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_forms/DocMatchInv.java | 22 +- src/org/openbravo/erpCommon/ad_reports/ReportGuaranteeDate_data.xsql | 4 +- src/org/openbravo/financial/ResetAccounting.java | 20 +- 72 files changed, 697 insertions(+), 711 deletions(-) diffs (truncated from 2594 to 300 lines): diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.class has changed diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.class has changed diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactions.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactions.class has changed diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactionsData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/modulescript/DeleteWrongTransactionsData.class has changed diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Sep 25 11:33:00 2014 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Sep 30 20:32:52 2014 +0000 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24712]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.24721]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Sep 25 11:33:00 2014 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Sep 30 20:32:52 2014 +0000 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24712]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.24721]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24712]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.24721]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java Thu Sep 25 11:33:00 2014 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData.java Tue Sep 30 20:32:52 2014 +0000 @@ -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) 2011 Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -37,73 +37,18 @@ TransactionsWithMissingDataData[] listofTransactions = TransactionsWithMissingDataData .selectTransactionsWithMissingData(cp); if (listofTransactions != null && listofTransactions.length > 0) { - String message = "You cannot apply this Advanced Payables and Receivables Management module version because your instance fails in a pre-validation. " - + "It is not allowed to upgrade to this version having transactions with Payment Amount and Deposit Amount of ZERO and/or null Transaction Date and/or null Accounting Date. " + String message = "You cannot update your instance, because a pre-validation fails. " + + "It is not allowed to upgrade to this version having transactions with Transaction Date and/or null Accounting Date. " + "To fix this problem in your instance, have a look to generated alerts (Transactions with Missing Data) and identify the affected transactions. " - + "If you have a transaction like that, fix the problem updating Payment Amount or Deposit Amount to an Amount different to ZERO and/or filling Transaction Date and/or Accounting Date. " + + "If you have a transaction like that, fix the problem filling Transaction Date and/or Accounting Date. " + "It can be very helpful to visit <a href=http://wiki.openbravo.com/wiki/Update_Transaction_Refactor >Learn more</a>"; errors.add(message); } - - for (TransactionsWithMissingDataData transaction : listofTransactions) { - processAlert(cp, transaction); - } - } } catch (Exception e) { return handleError(e); } return errors; } - - private void processAlert(ConnectionProvider cp, TransactionsWithMissingDataData transaction) - throws Exception { - final String TRANSACTION_TAB = "23691259D1BD4496BCC5F32645BCA4B9"; - final String FINANCIAL_ACCOUNT_WINDOW = "94EAA455D2644E04AB25D93BE5157B6D"; - - String ALERT_RULE_NAME = "Transactions with Missing Data"; - String alertDescription = "Transaction has Deposit Amount and Payment Amount of Zero (at least one of them has to be different to Zero), and/or Transaction Date and/or Accounting Date are null. " - + "Update Payment Amount or Deposit Amount to an Amount different to Zero and/or fill Transaction Date and/or Accounting Date. "; - - String alertRuleId = ""; - - String ALERT_RULE_SQL = "SELECT distinct fin_finacc_transaction_id as referencekey_id, " - + " ad_column_identifier('fin_finacc_transaction', fin_finacc_transaction_id, 'en_US') as record_id, 0 as ad_role_id, null as ad_user_id," - + " '" - + alertDescription - + "' as description," - + " 'Y' as isActive, ad_org_id, ad_client_id," - + " now() as created, 0 as createdBy, now() as updated, 0 as updatedBy" - + " FROM fin_finacc_transaction" - + " WHERE (depositamt = 0 AND paymentamt = 0) " - + " OR statementdate IS NULL " - + " OR dateacct IS NULL "; - - // Check if exists the alert rule - if (!TransactionsWithMissingDataData.existsAlertRule(cp, ALERT_RULE_NAME, transaction.adClientId)) { - TransactionsWithMissingDataData.insertAlertRule(cp, transaction.adClientId, transaction.adOrgId, - ALERT_RULE_NAME, TRANSACTION_TAB, ALERT_RULE_SQL); - - alertRuleId = TransactionsWithMissingDataData.getAlertRuleId(cp, ALERT_RULE_NAME, - transaction.adClientId); - TransactionsWithMissingDataData[] roles = TransactionsWithMissingDataData.getRoleId(cp, - FINANCIAL_ACCOUNT_WINDOW, transaction.adClientId); - for (TransactionsWithMissingDataData role : roles) { - TransactionsWithMissingDataData.insertAlertRecipient(cp, transaction.adClientId, - transaction.adOrgId, alertRuleId, role.adRoleId); - } - } else { - alertRuleId = TransactionsWithMissingDataData.getAlertRuleId(cp, ALERT_RULE_NAME, - transaction.adClientId); - } - - // Check if exist the concrete alert for the payment - if (!TransactionsWithMissingDataData.existsAlert(cp, alertRuleId, transaction.finFinaccTransactionId)) { - TransactionsWithMissingDataData.insertAlert(cp, transaction.adClientId, alertDescription, - alertRuleId, transaction.documentno, transaction.finFinaccTransactionId); - } - - } - } diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData_data.xsql --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData_data.xsql Thu Sep 25 11:33:00 2014 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingData_data.xsql Tue Sep 30 20:32:52 2014 +0000 @@ -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) 2011 Openbravo SLU + * All portions are Copyright (C) 2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -32,119 +32,10 @@ <Sql><![CDATA[ SELECT ad_column_identifier('fin_finacc_transaction_id', fin_finacc_transaction_id, 'en_US') as documentno, fin_finacc_transaction_id, ad_client_id, ad_org_id FROM fin_finacc_transaction - WHERE (depositamt = 0 AND paymentamt = 0) - OR statementdate IS NULL + WHERE statementdate IS NULL OR dateacct IS NULL ]]></Sql> </SqlMethod> - <SqlMethod name="getAlertRuleId" type="preparedStatement" return="string"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - SELECT MAX(ad_alertrule_id) AS name - FROM AD_ALERTRULE - WHERE NAME = ? - AND ISACTIVE = 'Y' - AND AD_CLIENT_ID = ? - ]]></Sql> - <Parameter name="name"/> - <Parameter name="client"/> - </SqlMethod> - <SqlMethod name="existsAlert" type="preparedStatement" return="boolean"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - SELECT COUNT(*) AS EXISTING - FROM AD_ALERT - WHERE AD_ALERTRULE_ID = ? - AND REFERENCEKEY_ID = ? - AND ISFIXED = 'N' - ]]> - </Sql> - <Parameter name="alertRule"/> - <Parameter name="payment"/> - </SqlMethod> - <SqlMethod name="existsAlertRule" type="preparedStatement" return="boolean"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - SELECT COUNT(*) AS EXISTING - FROM AD_ALERTRULE - WHERE NAME = ? - AND ISACTIVE = 'Y' - AND AD_CLIENT_ID = ? - ]]> - </Sql> - <Parameter name="alertRule"/> - <Parameter name="client"/> - </SqlMethod> - <SqlMethod name="insertAlertRule" type="preparedStatement" return="rowcount"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - INSERT INTO AD_ALERTRULE ( - AD_ALERTRULE_ID, AD_CLIENT_ID, AD_ORG_ID,ISACTIVE, - CREATED, CREATEDBY, UPDATED, UPDATEDBY, - NAME, AD_TAB_ID, FILTERCLAUSE, TYPE, - SQL - ) VALUES ( - get_uuid(), ?, ?, 'Y', - now(), '100', now(), '100', - ?, ?, '', 'D', - ? - ) - ]]></Sql> - <Parameter name="clientId"/> - <Parameter name="orgId"/> - <Parameter name="name"/> - <Parameter name="tabId"/> - <Parameter name="sql"/> - </SqlMethod> - <SqlMethod name="insertAlert" type="preparedStatement" return="rowcount"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - INSERT INTO AD_Alert ( - AD_Alert_ID, AD_Client_ID, AD_Org_ID, IsActive, - Created, CreatedBy, Updated, UpdatedBy, - Description, AD_AlertRule_ID, Record_Id, Referencekey_ID - ) VALUES ( - get_uuid(), ?, '0', 'Y', - NOW(), '0', NOW(), '0', - ?, ?, ?, ?) - ]]> - </Sql> - <Parameter name="client"/> - <Parameter name="description" /> - <Parameter name="adAlertRuleId" /> - <Parameter name="recordId" /> - <Parameter name="referencekey_id" /> - </SqlMethod> - <SqlMethod name="getRoleId" type="preparedStatement" return="multiple"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - SELECT distinct r.ad_role_id - FROM ad_window_access wa join ad_role r on (wa.ad_role_id=r.ad_role_id) - WHERE wa.ad_window_id = ? - AND wa.ad_client_id = ? - AND wa.isactive = 'Y' - AND r.ismanual = 'Y' - ]]></Sql> - <Parameter name="window"/> - <Parameter name="clientId"/> - </SqlMethod> - <SqlMethod name="insertAlertRecipient" type="preparedStatement" return="rowcount"> - <SqlMethodComment></SqlMethodComment> - <Sql><![CDATA[ - INSERT INTO ad_alertrecipient( - ad_user_id, ad_client_id, ad_org_id, isactive, created, createdby, - updated, updatedby, ad_alertrecipient_id, ad_alertrule_id, ad_role_id, - sendemail) - VALUES (null, ?, ?, 'Y', now(), '100', - now(), '100', get_uuid(), ?, ?, - 'N') - ]]> - </Sql> - <Parameter name="client"/> - <Parameter name="org"/> - <Parameter name="adAlertRuleId" /> - <Parameter name="role" /> - </SqlMethod> <SqlMethod name="existAPRMbasetables" type="preparedStatement" return="boolean"> <SqlMethodComment>Check if the FIN_Finacc_Transaction table exist</SqlMethodComment> <Sql><![CDATA[ diff -r 09de6db5a0a7 -r b64757e8b4a0 modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.java Thu Sep 25 11:33:00 2014 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/TransactionsWithMissingDataData.java Tue Sep 30 20:32:52 2014 +0000 @@ -116,8 +116,7 @@ strSql = strSql + " SELECT ad_column_identifier('fin_finacc_transaction_id', fin_finacc_transaction_id, 'en_US') as documentno, fin_finacc_transaction_id, ad_client_id, ad_org_id " + " FROM fin_finacc_transaction" + - " WHERE (depositamt = 0 AND paymentamt = 0)" + - " OR statementdate IS NULL " + + " WHERE statementdate IS NULL " + " OR dateacct IS NULL"; ResultSet result; @@ -167,311 +166,6 @@ return(objectTransactionsWithMissingDataData); } - public static String getAlertRuleId(ConnectionProvider connectionProvider, String name, String client) throws ServletException { - String strSql = ""; - strSql = strSql + - " SELECT MAX(ad_alertrule_id) AS name" + - " FROM AD_ALERTRULE" + - " WHERE NAME = ?" + - " AND ISACTIVE = 'Y'" + - " AND AD_CLIENT_ID = ?"; - - ResultSet result; - String strReturn = null; - PreparedStatement st = null; - - int iParameter = 0; - try { - st = connectionProvider.getPreparedStatement(strSql); - iParameter++; UtilSql.setValue(st, iParameter, 12, null, name); - iParameter++; UtilSql.setValue(st, iParameter, 12, null, client); - - result = st.executeQuery(); ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
