details: https://code.openbravo.com/erp/devel/main/rev/7dfa09a88914 changeset: 21464:7dfa09a88914 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Nov 15 15:22:59 2013 +0100 summary: fixed bug 25119: Problem with grid configuration and field grouping
Apply grouping not only for saved views but also in grid configuration details: https://code.openbravo.com/erp/devel/main/rev/905e66af1698 changeset: 21465:905e66af1698 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 20 13:25:03 2013 +0000 summary: commit to update obx version details: https://code.openbravo.com/erp/devel/main/rev/ba0175465809 changeset: 21466:ba0175465809 user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 20 13:28:17 2013 +0000 summary: commit to update obx version details: https://code.openbravo.com/erp/devel/main/rev/f7af9706971a changeset: 21467:f7af9706971a user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 20 13:28:58 2013 +0000 summary: Update AD_MODULE version to 3.0MP29.1 details: https://code.openbravo.com/erp/devel/main/rev/f2a17a54900b changeset: 21468:f2a17a54900b user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 20 13:28:59 2013 +0000 summary: Added tag 3.0MP29.1 for changeset f7af9706971a details: https://code.openbravo.com/erp/devel/main/rev/97accd68d88b changeset: 21469:97accd68d88b user: RM packaging bot <staff.rm <at> openbravo.com> date: Wed Nov 20 13:28:59 2013 +0000 summary: Added signature for changeset f2a17a54900b details: https://code.openbravo.com/erp/devel/main/rev/474f938fae64 changeset: 21470:474f938fae64 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Nov 21 05:22:27 2013 +0000 summary: Merge temporary head for 3.0MP29.1 diffstat: .hgsigs | 1 + .hgtags | 1 + lib/README | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java | 2 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 2 + modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 25 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js | 4 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 23 ++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-window.js | 24 +++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalization.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 7 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 4 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 4 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- 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 | 4 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 18 +- src-db/database/model/functions/M_GET_PARETO_ABC.xml | 14 +- src-db/database/model/functions/M_GET_PRODUCT_PRICE_DATE.xml | 2 + src-db/database/model/tables/C_ORDERLINE.xml | 3 + src-db/database/model/tables/S_TIMEEXPENSELINE.xml | 2 +- src-db/database/model/triggers/C_CONVERSION_RATE_TRG3.xml | 41 ++++++ src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml | 38 ++++- src-db/database/model/triggers/C_INVLINE_CHK_RESTRICTIONS_TRG.xml | 17 ++- src-db/database/model/triggers/S_TIMEEXPENSELINE_TRG.xml | 1 - src-db/database/sourcedata/AD_COLUMN.xml | 6 +- src-db/database/sourcedata/AD_MESSAGE.xml | 28 ++++- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 16 ++ src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Amount.java | 2 +- src/org/openbravo/erpCommon/ad_callouts/SE_ProjectLine_Value.java | 8 +- src/org/openbravo/erpCommon/ad_process/ConvertQuotationIntoOrder.java | 17 +-- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_srptcosts.jrxml | 63 +++++--- src/org/openbravo/erpCommon/ad_reports/ReportStandardCostsJR_subreport0.jrxml | 65 ++++++---- src/org/openbravo/erpCommon/ad_reports/ReportWarehousePartner_data.xsql | 6 +- src/org/openbravo/erpCommon/utility/ComboTableData.java | 12 +- src/org/openbravo/materialmgmt/InventoryCountProcess.java | 2 +- 78 files changed, 467 insertions(+), 227 deletions(-) diffs (truncated from 2397 to 300 lines): diff -r cf86ae37f1ba -r 474f938fae64 .hgsigs --- a/.hgsigs Fri Nov 15 10:32:09 2013 +0000 +++ b/.hgsigs Thu Nov 21 05:22:27 2013 +0000 @@ -130,3 +130,4 @@ f56c14fc0212d08ec0e9663d957dfdbf4ff42543 0 iEYEABECAAYFAlJbyIkACgkQCX/oGf+2qkOXiACgggW09+Z5WL1BrxaSVcZB0ykapr4AoKSn91Y1yvImj5/sEmdM5f37Y2RM ffdd47e41d59e56bf2f85033679accff7feaa941 0 iEYEABECAAYFAlJfscwACgkQCX/oGf+2qkOJFQCg/olIlg4QV8DcH3aJWB9NVlpgvG4An1P8ZPJjX7Rtaav0sb+N1DF9YaSh 3dff4a5ade8aa7966fde9139428e968fb7f04218 0 iEYEABECAAYFAlJlPOMACgkQCX/oGf+2qkPsbgCg4w/JC1tFhyxz6mXa6UBOaEYz6esAnRCq24eVAcoNGrAfIfhXvKUBuQMQ +2630b57465e0c53e77eb0c08140ad461f8a6024f 0 iEYEABECAAYFAlKF+CoACgkQCX/oGf+2qkOn9wCeKuzyuNK/+6xev5U3u8tO6W0eT1YAmwbnnNrtFQRhq0Wd3jFWpbykW/vI diff -r cf86ae37f1ba -r 474f938fae64 .hgtags --- a/.hgtags Fri Nov 15 10:32:09 2013 +0000 +++ b/.hgtags Thu Nov 21 05:22:27 2013 +0000 @@ -141,3 +141,4 @@ db86a9cfecc308c3382feb357d53091f51ad3a4a 3.0MP28 750dc95742e0d15c3ed8b484fa8dbc4aa689c627 3.0MP28.1 0c73b69e61c55d8de0b3a0dfcc2e7511fa8a295f 3.0MP28.2 +cf86ae37f1bab9f9e401a6835258aabbdc91a705 3.0MP29 diff -r cf86ae37f1ba -r 474f938fae64 lib/README --- a/lib/README Fri Nov 15 10:32:09 2013 +0000 +++ b/lib/README Thu Nov 21 05:22:27 2013 +0000 @@ -1,3 +1,3 @@ -When adding or removing libraries to Openbravo ERP please update this page -with your changes: +When adding or removing libraries to Openbravo ERP please update this page +with your changes: http://wiki.openbravo.com/wiki/Openbravo_Libraries diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Nov 21 05:22:27 2013 +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.21419]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.21462]]></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> @@ -25,7 +25,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time. Fixed issue 15305.]]></UPDATEINFO> <!--A918E3331C404B889D69AA9BFAFB23AC--> <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[MP29]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r cf86ae37f1ba -r 474f938fae64 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 Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Nov 21 05:22:27 2013 +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.21419]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.21462]]></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.21419]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.21462]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddOrderOrInvoice.html Thu Nov 21 05:22:27 2013 +0000 @@ -1375,7 +1375,7 @@ </span> </td> <td class="FieldButton_ContentCell"> - <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateFrom', document.frmMain.inpExepctedDateFrom.value, false);return false;"> + <a class="FieldButtonLink" href="#" onfocus="setWindowElementFocus(this); window.status='Calendar'; return true;" onblur="window.status=''; return true;" onkeypress="this.className='FieldButtonLink_active'; return true;" onkeyup="this.className='FieldButtonLink_focus'; return true;" onclick="showCalendar('frmMain.inpExpectedDateFrom', document.frmMain.inpExpectedDateFrom.value, false);return false;"> <table class="FieldButton" onmouseout="this.className='FieldButton';window.status='';return true;" onmouseover="this.className='FieldButton_hover';window.status='Show calendar';return true;" onmousedown="this.className='FieldButton_active';return true;" onmouseup="this.className='FieldButton';return true;"> <tr> <td class="FieldButton_bg"> diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPaymentFromJournal.java Thu Nov 21 05:22:27 2013 +0000 @@ -117,7 +117,7 @@ if (journalLine.isOpenItems() && journalLine.getRelatedPayment() == null) { // Create bundle vars = new VariablesSecureApp(varsAux.getUser(), varsAux.getClient(), varsAux.getOrg(), - varsAux.getRole()); + varsAux.getRole(), varsAux.getLanguage()); ProcessBundle pb = new ProcessBundle("DE1B382FDD2540199D223586F6E216D0", vars) .init(conn); HashMap<String, Object> parameters = new HashMap<String, Object>(); diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Thu Nov 21 05:22:27 2013 +0000 @@ -38,6 +38,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DateUtils; import org.apache.log4j.Logger; +import org.hibernate.LockMode; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; @@ -331,6 +332,7 @@ if (seq == null && tableName != null) { OBCriteria<Sequence> obcSeq = OBDal.getInstance().createCriteria(Sequence.class); obcSeq.add(Restrictions.eq(Sequence.PROPERTY_NAME, tableName)); + obcSeq.setLockMode(LockMode.PESSIMISTIC_WRITE); if (obcSeq != null && obcSeq.list().size() > 0) { seq = obcSeq.list().get(0); } diff -r cf86ae37f1ba -r 474f938fae64 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 Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Nov 21 05:22:27 2013 +0000 @@ -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.21419]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.21462]]></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> @@ -22,7 +22,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--C70732EA90A14EC0916078B85CC33D2D--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--C70732EA90A14EC0916078B85CC33D2D--> <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[MP29]]></VERSION_LABEL> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE> diff -r cf86ae37f1ba -r 474f938fae64 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 Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Nov 21 05:22:27 2013 +0000 @@ -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.21419]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.21462]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cf86ae37f1ba -r 474f938fae64 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 Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Nov 21 05:22:27 2013 +0000 @@ -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.21419]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.21462]]></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> @@ -22,7 +22,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[MP29]]></VERSION_LABEL> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE> diff -r cf86ae37f1ba -r 474f938fae64 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 Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Nov 21 05:22:27 2013 +0000 @@ -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.21419]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.21462]]></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.21419]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.21462]]></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.21419]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.21462]]></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.21419]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.21462]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java Thu Nov 21 05:22:27 2013 +0000 @@ -11,13 +11,15 @@ * 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) 2011-2013 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ */ package org.openbravo.client.application.personalization; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import javax.enterprise.context.RequestScoped; @@ -31,6 +33,8 @@ import org.openbravo.client.kernel.BaseActionHandler; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; +import org.openbravo.dal.service.OBQuery; +import org.openbravo.model.ad.domain.Preference; import org.openbravo.model.ad.ui.Tab; /** @@ -90,6 +94,25 @@ // is null if already removed OBDal.getInstance().remove(uiPersonalization); } + + // Delete also all the preferences that has this uiPersonalization as the 'Default View' + List<Object> params = new ArrayList<Object>(); + StringBuilder hql = new StringBuilder(); + hql.append(" as p where "); + hql.append(" p.searchKey = ? "); + params.add(uiPersonalization); + hql.append(" and p.property = ?"); + params.add("OBUIAPP_DefaultSavedView"); + + OBQuery<Preference> qPref = OBDal.getInstance().createQuery(Preference.class, + hql.toString()); + qPref.setParameters(params); + List<Preference> preferences = qPref.list(); + + for (Preference preference : preferences) { + OBDal.getInstance().remove(preference); + } + return new JSONObject().put("result", "success"); } else if (action.equals(ACTION_STORE)) { diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-characteristics.js Thu Nov 21 05:22:27 2013 +0000 @@ -51,6 +51,9 @@ //Remove all members the widget might have //this.canvas.removeMembers(this.canvas.getMembers()); // + //clear existing values. Refer issue https://issues.openbravo.com/view.php?id=25113 + this.canvas.clearValues(); + if (value.characteristics) { for (field in value.characteristics) { if (value.characteristics.hasOwnProperty(field)) { diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-text.js Thu Nov 21 05:22:27 2013 +0000 @@ -57,6 +57,10 @@ if (!mask) { return null; } + //when ranges are already present, return the same + if (mask.indexOf('[') !== -1) { + return mask; + } split = mask.split(''); for (i = 0; i < split.length; i++) { if (escaped) { diff -r cf86ae37f1ba -r 474f938fae64 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Fri Nov 15 10:32:09 2013 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Nov 21 05:22:27 2013 +0000 @@ -1043,8 +1043,18 @@ // confings as field group are done in local with data, so not applying them // till fetch callback. Marking now grid to reaply state afterwards // see issue #25119 - this.requiredReapplyViewState = true; - localState.group.groupByFields = ''; + if (this.view && this.view.standardWindow) { + this.view.standardWindow.requiredReapplyViewState = true; + this.view.standardWindow.gridsToReapply = this.view.standardWindow.gridsToReapply || []; + // push only what is pending to be reapplied + this.view.standardWindow.gridsToReapply.push({ + view: this, ------------------------------------------------------------------------------ Shape the Mobile Experience: Free Subscription Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now. http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
