details: https://code.openbravo.com/erp/devel/pi/rev/ef9a070edd19 changeset: 17638:ef9a070edd19 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 09 12:50:31 2012 +0200 summary: CI: update AD_MODULE to version 17596
details: https://code.openbravo.com/erp/devel/pi/rev/9e0d9a370e8c changeset: 17639:9e0d9a370e8c user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Aug 09 13:05:34 2012 +0200 summary: CI: merge back from main diffstat: modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class | 0 modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.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-db/database/sourcedata/AD_VAL_RULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java | 20 +- modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql | 9 + modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java | 38 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html | 6 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 18 + 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_MESSAGE.xml | 11 + 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.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java | 6 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 36 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 56 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 1 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 13 +- 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.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 53 +- 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/functions/C_ORDER_POST1.xml | 21 +- src-db/database/model/functions/MRP_RUN_EXPLODE.xml | 22 +- src-db/database/model/functions/M_INOUT_POST.xml | 11 + src-db/database/model/functions/M_INVENTORY_LISTCREATE.xml | 5 +- src-db/database/model/functions/M_PRODUCTION_RUN.xml | 6 +- src-db/database/model/tables/MA_PROCESSPLAN_TOT_AUX.xml | 39 + src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 323 +++++++++- src-db/database/sourcedata/AD_ELEMENT.xml | 84 ++ src-db/database/sourcedata/AD_FIELD.xml | 81 ++- src-db/database/sourcedata/AD_MESSAGE.xml | 11 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 24 + src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src-db/database/sourcedata/AD_MODULE.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 25 +- src-db/database/sourcedata/AD_TABLE.xml | 21 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 4 +- src/org/openbravo/authentication/basic/DefaultAuthenticationManager.java | 15 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_ShipmentPO.xml | 2 +- src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java | 273 ++++++++ src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java | 2 + src/org/openbravo/erpCommon/ad_callouts/SL_TaxCategory_Org.java | 70 ++ src/org/openbravo/erpCommon/ad_forms/MaterialReceiptPending_data.xsql | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedgerExcel.jrxml | 18 +- src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger_data.xsql | 6 +- src/org/openbravo/erpCommon/info/BusinessPartnerMultiple.java | 22 +- src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 4 +- 85 files changed, 1398 insertions(+), 160 deletions(-) diffs (truncated from 3011 to 300 lines): diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.class has changed diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class Binary file modules/org.openbravo.advpaymentmngt/build/classes/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.class has changed diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 09 13:05:34 2012 +0200 @@ -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.17571]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17596]]></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 37b66a5e3f63 -r 9e0d9a370e8c 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 Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Aug 09 13:05:34 2012 +0200 @@ -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.17571]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17596]]></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.17571]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17596]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml Thu Aug 09 13:05:34 2012 +0200 @@ -29,7 +29,7 @@ <!--575E470ABADB4C278132C957A78C47E3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--575E470ABADB4C278132C957A78C47E3--> <NAME><![CDATA[Process Payment valid actions]]></NAME> <!--575E470ABADB4C278132C957A78C47E3--> <TYPE><![CDATA[S]]></TYPE> -<!--575E470ABADB4C278132C957A78C47E3--> <CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('RE')) OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('V') AND @Status@='RPAE') OR (@EM_APRM_Process_Payment@ is null))]]></CODE> +<!--575E470ABADB4C278132C957A78C47E3--> <CODE><![CDATA[((@EM_APRM_Process_Payment@ = 'P' AND AD_Ref_List.value='P') OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('RE','R')) OR (@EM_APRM_Process_Payment@ = 'R' AND AD_Ref_List.value IN ('V') AND @Status@='RPAE') OR (@EM_APRM_Process_Payment@ is null))]]></CODE> <!--575E470ABADB4C278132C957A78C47E3--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--575E470ABADB4C278132C957A78C47E3--></AD_VAL_RULE> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck.java Thu Aug 09 13:05:34 2012 +0200 @@ -31,15 +31,19 @@ ConnectionProvider cp = getConnectionProvider(); ArrayList<String> errors = new ArrayList<String>(); try { - // Prevent error when upgrading from a pure 2.50 (MP0) - if (WrongPaymentScheduleDetailsCheckData.existAPRMbasetables(cp)) { - if (WrongPaymentScheduleDetailsCheckData.existWrongPaymentSchedules(cp)) { - String alertRuleId = UnpostRefundPaymentsData.getUUID(cp); - if (!WrongPaymentScheduleDetailsCheckData.existsAlertRule(cp)) { - WrongPaymentScheduleDetailsCheckData.insertAlertRule(cp, alertRuleId); + //Verify if it is necessary execute the buildvalidation + if (WrongPaymentScheduleDetailsCheckData.before30MP3(cp)) + { + // Prevent error when upgrading from a pure 2.50 (MP0) + if (WrongPaymentScheduleDetailsCheckData.existAPRMbasetables(cp)) { + if (WrongPaymentScheduleDetailsCheckData.existWrongPaymentSchedules(cp)) { + String alertRuleId = UnpostRefundPaymentsData.getUUID(cp); + if (!WrongPaymentScheduleDetailsCheckData.existsAlertRule(cp)) { + WrongPaymentScheduleDetailsCheckData.insertAlertRule(cp, alertRuleId); + } + alertRuleId = WrongPaymentScheduleDetailsCheckData.getAlertRuleId(cp); + processAlert(alertRuleId, cp); } - alertRuleId = WrongPaymentScheduleDetailsCheckData.getAlertRuleId(cp); - processAlert(alertRuleId, cp); } } } catch (Exception e) { diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheck_data.xsql Thu Aug 09 13:05:34 2012 +0200 @@ -204,4 +204,13 @@ ]]> </Sql> </SqlMethod> + <SqlMethod name="before30MP3" type="preparedStatement" return="boolean"> + <SqlMethodComment>Check if the core version is before 3.0MP3(3.0.13698)</SqlMethodComment> + <Sql><![CDATA[ + SELECT count(*) STARTVERSION + FROM ad_module + WHERE ad_module_id = '0' AND TO_NUMBER(REPLACE(version,'.','')) <= 3013698 + ]]> + </Sql> + </SqlMethod> </SqlClass> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java --- a/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src-util/buildvalidation/src/src/org/openbravo/advpaymentmngt/buildvalidation/WrongPaymentScheduleDetailsCheckData.java Thu Aug 09 13:05:34 2012 +0200 @@ -701,4 +701,42 @@ } return(boolReturn); } + +/** +Check if the core version is before 3.0MP3(3.0.13698) + */ + public static boolean before30MP3(ConnectionProvider connectionProvider) throws ServletException { + String strSql = ""; + strSql = strSql + + " SELECT count(*) STARTVERSION " + + " FROM ad_module " + + " WHERE ad_module_id = '0' AND TO_NUMBER(REPLACE(version,'.','')) <= 3013698"; + + ResultSet result; + boolean boolReturn = false; + PreparedStatement st = null; + + try { + st = connectionProvider.getPreparedStatement(strSql); + + result = st.executeQuery(); + if(result.next()) { + boolReturn = !UtilSql.getValue(result, "startversion").equals("0"); + } + result.close(); + } catch(SQLException e){ + log4j.error("SQL error in query: " + strSql + "Exception:"+ e); + throw new ServletException("@CODE=" + Integer.toString(e.getErrorCode()) + "@" + e.getMessage()); + } catch(Exception ex){ + log4j.error("Exception in query: " + strSql + "Exception:"+ ex); + throw new ServletException("@CODE=@" + ex.getMessage()); + } finally { + try { + connectionProvider.releasePreparedStatement(st); + } catch(Exception ignore){ + ignore.printStackTrace(); + } + } + return(boolReturn); + } } diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/MatchTransaction.html Thu Aug 09 13:05:34 2012 +0200 @@ -224,6 +224,8 @@ } else { document.getElementById('sectionGrid').innerHTML = ''; } + document.frmMain.inpShowCleared.disabled = false; + document.frmMain.inphideDate.disabled = false; } catch (e) { } } @@ -568,9 +570,9 @@ <td colspan="5" style="text-align: center; font-weight: bold;">Transactions in Openbravo</td> </tr> <tr style="border-top: thin solid gray;"> - <td colspan="5" style="border-right: thin solid gray;"><span class="LabelText">Show</span> <span><select name="inpPaymentTypeFilter" class="ComboKey Combo_TwoCells_width required" id="inpPaymentTypeFilter" onchange="loadGrid(); return true;"><option value="" class="discard">Deposits and payments</option></select></span> <nobr><span class="LabelText">Cleared</span> <span><input type="checkbox" name="inpShowCleared" id="inpShowCleared" value="Y" onclick="loadGrid(); return true;" /></span></nobr></td> + <td colspan="5" style="border-right: thin solid gray;"><span class="LabelText">Show</span> <span><select name="inpPaymentTypeFilter" class="ComboKey Combo_TwoCells_width required" id="inpPaymentTypeFilter" onchange="loadGrid(); return true;"><option value="" class="discard">Deposits and payments</option></select></span> <nobr><span class="LabelText">Cleared</span> <span><input type="checkbox" name="inpShowCleared" id="inpShowCleared" disabled=true value="Y" onclick="loadGrid(); return true;" /></span></nobr></td> <td style="text-align: center;"></td> - <td colspan="5" style="border-left: thin solid gray;"></span> <span>Hide transactions after statement date</span> <span><input type="checkbox" name="inphideDate" id="fieldhideDate" value="Y" onClick="loadGrid(); return true;"/></span> <span>Ending Date</span> <span type="LabelText" id="paramDateTo"></span></td> + <td colspan="5" style="border-left: thin solid gray;"></span> <span>Hide transactions after statement date</span> <span><input type="checkbox" name="inphideDate" id="fieldhideDate" disabled=true value="Y" onClick="loadGrid(); return true;"/></span> <span>Ending Date</span> <span type="LabelText" id="paramDateTo"></span></td> </tr> <tr class="DataGrid_Body_Row"> <th class="DataGrid_Header_LineNoCell DataGrid_Body_Cell_CheckBox" width="25"> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Thu Aug 09 13:05:34 2012 +0200 @@ -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) 2012 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************* + */ package org.openbravo.advpaymentmngt.event; import java.util.List; diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 09 13:05:34 2012 +0200 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17571]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17596]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Aug 09 13:05:34 2012 +0200 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17571]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17596]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml Thu Aug 09 13:05:34 2012 +0200 @@ -244,6 +244,17 @@ <!--36611160D1404304930C24E2EA3C0434--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--36611160D1404304930C24E2EA3C0434--></AD_MESSAGE> +<!--366664A3D4334A33ACC382F777863945--><AD_MESSAGE> +<!--366664A3D4334A33ACC382F777863945--> <AD_MESSAGE_ID><![CDATA[366664A3D4334A33ACC382F777863945]]></AD_MESSAGE_ID> +<!--366664A3D4334A33ACC382F777863945--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--366664A3D4334A33ACC382F777863945--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--366664A3D4334A33ACC382F777863945--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--366664A3D4334A33ACC382F777863945--> <VALUE><![CDATA[OBUIAPP_FormConfirmDownloadMultiple]]></VALUE> +<!--366664A3D4334A33ACC382F777863945--> <MSGTEXT><![CDATA[Do you want to download all attachments of the selected record as attachments.zip?]]></MSGTEXT> +<!--366664A3D4334A33ACC382F777863945--> <MSGTYPE><![CDATA[I]]></MSGTYPE> +<!--366664A3D4334A33ACC382F777863945--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> +<!--366664A3D4334A33ACC382F777863945--></AD_MESSAGE> + <!--39C9A1A417A24B738B6861D5B98D6A51--><AD_MESSAGE> <!--39C9A1A417A24B738B6861D5B98D6A51--> <AD_MESSAGE_ID><![CDATA[39C9A1A417A24B738B6861D5B98D6A51]]></AD_MESSAGE_ID> <!--39C9A1A417A24B738B6861D5B98D6A51--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Aug 09 13:05:34 2012 +0200 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17571]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17596]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Aug 09 13:05:34 2012 +0200 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17571]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17596]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17571]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17596]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17571]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17596]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.17571]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.17596]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 37b66a5e3f63 -r 9e0d9a370e8c modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Wed Aug 01 17:52:40 2012 -0500 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java Thu Aug 09 13:05:34 2012 +0200 @@ -225,7 +225,8 @@ } // change in fieldgroup - if (field.getFieldGroup() != null && field.getFieldGroup() != currentADFieldGroup) { + if (field.isDisplayed() && field.getFieldGroup() != null + && field.getFieldGroup() != currentADFieldGroup) { // start of a fieldgroup use it final OBViewFieldGroup viewFieldGroup = new OBViewFieldGroup(); ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
