details: https://code.openbravo.com/erp/devel/main/rev/9700d819690d changeset: 19763:9700d819690d user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Feb 21 09:42:51 2013 +0100 summary: Fixes issue 23084: Error when processing an invoice and select "Use Credit" option, if credit payment description is long
details: https://code.openbravo.com/erp/devel/main/rev/a26f66513343 changeset: 19764:a26f66513343 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Mar 01 10:39:09 2013 +0100 summary: Fixes issue 23079: Currency Conversion Rate Not Found error when adding a payment from an invoice details: https://code.openbravo.com/erp/devel/main/rev/be6198a5f205 changeset: 19765:be6198a5f205 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Feb 21 10:40:09 2013 +0100 summary: fixed issue 23134: StyleSheet components should bypass authentication details: https://code.openbravo.com/erp/devel/main/rev/0d32601d0243 changeset: 19766:0d32601d0243 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Feb 21 10:43:08 2013 +0100 summary: fixed issue 23135: Bypass authentication resources create sessions details: https://code.openbravo.com/erp/devel/main/rev/afe543a30c97 changeset: 19767:afe543a30c97 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Feb 21 13:29:49 2013 +0100 summary: Fixes issue 22821: Triggers executed after entering full identifier in selector This changeset is the same as [1] with one exception, we don't want to set the fullIdentifierEntered property to true when the user selects an option using th e selector window, because in that case setValueFromRecord has already been executed, so there is no need to do it again in the blur function. This has been f ixed by not setting the fullIdentifierEntered property if the change event was originated from the setValueFromRecord function. [1] https://code.openbravo.com/erp/devel/pi/rev/98421b2454605ceb4c47e1267a1787c74d82e169 details: https://code.openbravo.com/erp/devel/main/rev/d63d93f6e256 changeset: 19768:d63d93f6e256 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 21 13:50:02 2013 +0100 summary: Related to issue 23029: Added properties to 'OB.User' object details: https://code.openbravo.com/erp/devel/main/rev/387d054faef6 changeset: 19769:387d054faef6 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Mar 01 13:57:28 2013 +0100 summary: Fixes issue 22508: "Sales Order" field in Goods Shipment header should be emptied when deleting referenced order line details: https://code.openbravo.com/erp/devel/main/rev/12d6cc4e0e5d changeset: 19770:12d6cc4e0e5d user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 21 14:44:49 2013 +0100 summary: [calendar] Changed the way the checked filter is handled details: https://code.openbravo.com/erp/devel/main/rev/e8aaf57d9953 changeset: 19771:e8aaf57d9953 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 21 14:46:16 2013 +0100 summary: [calendar] Modified OBMultiCalendarLegendElement to show color only if set details: https://code.openbravo.com/erp/devel/main/rev/607c7929ee14 changeset: 19772:607c7929ee14 user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 21 14:54:23 2013 +0100 summary: [calendar] Added capabilities to define a custom filter in OBMultiCalendar details: https://code.openbravo.com/erp/devel/main/rev/f586c319295c changeset: 19773:f586c319295c user: David Baz Fayos <david.baz <at> openbravo.com> date: Thu Feb 21 14:58:20 2013 +0100 summary: Related to issue 19728: Do more JS code formatting details: https://code.openbravo.com/erp/devel/main/rev/142b3bae0423 changeset: 19774:142b3bae0423 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Thu Feb 21 16:44:32 2013 +0100 summary: Fixes issue 22767: Info is not lost when updating personalization settings Fix has been refactored and improved: - When a personalization is going to be stored, the parameters carry a new parameter called applyLevelInformation. If the value of this parameter is false, th en the level information (client, organization, role and user) will not be fetched from the request, but from the existing personalization. The only point in which this parameter is false is when a Form personalization is updated. The changes made in the PersonalizationHandler class have been reverted, they are not needed anymore. details: https://code.openbravo.com/erp/devel/main/rev/38be060bff04 changeset: 19775:38be060bff04 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Mar 01 17:01:40 2013 +0100 summary: Fixes issue 22913: Second UOM not shown when creating a receipt from an order that has been partially received details: https://code.openbravo.com/erp/devel/main/rev/35e740951a43 changeset: 19776:35e740951a43 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Wed Feb 20 13:50:10 2013 +0100 summary: Fixes issue 0023016: Withholding Account should not appear in grid view details: https://code.openbravo.com/erp/devel/main/rev/edb2ab602527 changeset: 19777:edb2ab602527 user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Tue Feb 19 09:29:58 2013 +0530 summary: Fixes Issue 22564: The checkbox "Include Accounting" needs to be renamed details: https://code.openbravo.com/erp/devel/main/rev/af1f70ccd590 changeset: 19778:af1f70ccd590 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Thu Feb 21 09:48:26 2013 +0100 summary: Related to issue 22564 details: https://code.openbravo.com/erp/devel/main/rev/7bd5f6e3424a changeset: 19779:7bd5f6e3424a user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Feb 21 17:47:33 2013 +0100 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/d9e211f5e8bf changeset: 19780:d9e211f5e8bf user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Thu Feb 21 18:25:34 2013 +0100 summary: issue 22508 and fixes in-full-oracle 4546 details: https://code.openbravo.com/erp/devel/main/rev/722e8e7b485d changeset: 19781:722e8e7b485d user: Carlos Aristu <carlos.aristu <at> openbravo.com> date: Thu Feb 21 18:32:19 2013 +0100 summary: fixes issue 23133: Print formats are broken when there are too many lines details: https://code.openbravo.com/erp/devel/main/rev/b99c43bfb674 changeset: 19782:b99c43bfb674 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Feb 22 07:40:05 2013 +0100 summary: CI: update AD_MODULE to version 19781 diffstat: 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/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java | 4 +- 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.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java | 31 ++- modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java | 53 ++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js | 22 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-multicalendar.js | 100 ++++++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js | 6 +- 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/KernelServlet.java | 51 ++++- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StyleSheetResourceComponent.java | 7 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/templates/application-dynamic-js.ftl | 12 + 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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 26 ++- 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/M_INOUTLINE_TRG.xml | 6 + src-db/database/model/triggers/M_INOUT_TRG_PROV.xml | 19 +- src-db/database/sourcedata/AD_FIELD.xml | 2 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 22 +- src/org/openbravo/base/secureApp/HttpSecureAppServlet.java | 9 +- src/org/openbravo/dal/core/OBContext.java | 5 +- src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Shipment_data.xsql | 7 +- src/org/openbravo/erpCommon/ad_forms/InitialOrgSetup.html | 2 +- src/org/openbravo/erpReports/RptC_Invoice.jrxml | 4 +- 62 files changed, 389 insertions(+), 173 deletions(-) diffs (truncated from 1692 to 300 lines): diff -r 9f692840db92 -r b99c43bfb674 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19781]]></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 9f692840db92 -r b99c43bfb674 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 Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19781]]></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.19746]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19781]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9f692840db92 -r b99c43bfb674 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 Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/ProcessInvoice.java Fri Feb 22 07:40:05 2013 +0100 @@ -300,7 +300,9 @@ description.append(String.format( Utility.messageBD(this, "APRM_CreditUsedinInvoice", vars.getLanguage()), invoice.getDocumentNo())); - creditPayment.setDescription(description.toString()); + String truncateDescription = (description.length() > 255) ? description + .substring(0, 251).concat("...").toString() : description.toString(); + creditPayment.setDescription(truncateDescription); totalUsedCreditAmt = totalUsedCreditAmt.add(usedCreditAmt); creditPaymentsIdentifiers.append(creditPayment.getDocumentNo()); creditPaymentsIdentifiers.append(", "); diff -r 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java Fri Feb 22 07:40:05 2013 +0100 @@ -850,7 +850,9 @@ obcConvRate.add(Restrictions.eq(ConversionRate.PROPERTY_CURRENCY, fromCurrency)); obcConvRate.add(Restrictions.eq(ConversionRate.PROPERTY_TOCURRENCY, toCurrency)); obcConvRate.add(Restrictions.le(ConversionRate.PROPERTY_VALIDFROMDATE, conversionDate)); - obcConvRate.add(Restrictions.ge(ConversionRate.PROPERTY_VALIDTODATE, conversionDate)); + long oneDay = 24 * 60 * 60 * 1000; + obcConvRate.add(Restrictions.ge(ConversionRate.PROPERTY_VALIDTODATE, + new Date(conversionDate.getTime() - oneDay))); conversionRateList = obcConvRate.list(); if ((conversionRateList != null) && (conversionRateList.size() != 0)) { conversionRate = conversionRateList.get(0); diff -r 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19781]]></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 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19781]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19781]]></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 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Fri Feb 22 07:40:05 2013 +0100 @@ -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.19746]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19781]]></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.19746]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19781]]></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.19746]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19781]]></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.19746]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19781]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 9f692840db92 -r b99c43bfb674 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 Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationActionHandler.java Fri Feb 22 07:40:05 2013 +0100 @@ -55,6 +55,7 @@ private static final String USERID = "userId"; private static final String TABID = "tabId"; private static final String WINDOWID = "windowId"; + private static final String APPLYLEVELINFORMATION = "applyLevelInformation"; @Inject private PersonalizationHandler personalizationHandler; @@ -80,21 +81,37 @@ final String action = (String) parameters.get(ACTION); final String tabId = (String) parameters.get(TABID); final String windowId = (String) parameters.get(WINDOWID); + final String applyLevelInformation = (String) parameters.get(APPLYLEVELINFORMATION); + final String personalizationID = (String) parameters.get(PERSONALIZATIONID); if (action.equals(ACTION_DELETE)) { - final String persId = (String) parameters.get(PERSONALIZATIONID); final UIPersonalization uiPersonalization = OBDal.getInstance().get( - UIPersonalization.class, persId); + UIPersonalization.class, personalizationID); if (uiPersonalization != null) { // is null if already removed OBDal.getInstance().remove(uiPersonalization); } return new JSONObject().put("result", "success"); } else if (action.equals(ACTION_STORE)) { - final UIPersonalization uiPersonalization = personalizationHandler - .storePersonalization((String) parameters.get(PERSONALIZATIONID), - (String) parameters.get(CLIENTID), (String) parameters.get(ORGID), - (String) parameters.get(ROLEID), (String) parameters.get(USERID), tabId, windowId, - (String) parameters.get(TARGET), data); + + String clientID = (String) parameters.get(CLIENTID); + String orgID = (String) parameters.get(ORGID); + String roleID = (String) parameters.get(ROLEID); + String userID = (String) parameters.get(USERID); + + if ("false".equals(applyLevelInformation) && personalizationID != null) { + // If we don't have to apply the level information and the personalization is being + // updated, use the original level information + final UIPersonalization uiPersonalization = OBDal.getInstance().get( + UIPersonalization.class, personalizationID); + clientID = uiPersonalization.getVisibleAtClient().getId(); + orgID = uiPersonalization.getVisibleAtOrganization().getId(); + roleID = uiPersonalization.getVisibleAtRole().getId(); + userID = uiPersonalization.getUser().getId(); + } + + final UIPersonalization uiPersonalization = personalizationHandler.storePersonalization( + personalizationID, clientID, orgID, roleID, userID, tabId, windowId, + (String) parameters.get(TARGET), data); final JSONObject result = new JSONObject(); result.put("personalizationId", uiPersonalization.getId()); return result; diff -r 9f692840db92 -r b99c43bfb674 modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java Fri Feb 22 07:40:05 2013 +0100 @@ -396,40 +396,33 @@ uiPersonalization.setWindow(OBDal.getInstance().get(Window.class, windowId)); uiPersonalization.setType("Window"); } + } - // Only enter the clientId, orgId, roleId and userId if the record is new. - // If the personalization is being updated, only the form personalization data should be - // changed - // See issue https://issues.openbravo.com/view.php?id=22767 - // See comment - // https://code.openbravo.com/erp/devel/pi/file/9bbd07a91478/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js#l597 - if (clientId != null) { - uiPersonalization.setVisibleAtClient(OBDal.getInstance().get(Client.class, clientId)); - // also store it in that client - uiPersonalization.setClient(uiPersonalization.getVisibleAtClient()); - } else { - uiPersonalization.setVisibleAtClient(null); - } + if (clientId != null) { + uiPersonalization.setVisibleAtClient(OBDal.getInstance().get(Client.class, clientId)); + // also store it in that client + uiPersonalization.setClient(uiPersonalization.getVisibleAtClient()); + } else { + uiPersonalization.setVisibleAtClient(null); + } - if (orgId != null) { - uiPersonalization.setVisibleAtOrganization(OBDal.getInstance().get(Organization.class, - orgId)); - } else { - uiPersonalization.setVisibleAtOrganization(null); - } + if (orgId != null) { + uiPersonalization.setVisibleAtOrganization(OBDal.getInstance().get(Organization.class, + orgId)); + } else { + uiPersonalization.setVisibleAtOrganization(null); + } - if (roleId != null) { - uiPersonalization.setVisibleAtRole(OBDal.getInstance().get(Role.class, roleId)); - } else { - uiPersonalization.setVisibleAtRole(null); - } + if (roleId != null) { + uiPersonalization.setVisibleAtRole(OBDal.getInstance().get(Role.class, roleId)); + } else { + uiPersonalization.setVisibleAtRole(null); + } - if (userId != null) { - uiPersonalization.setUser(OBDal.getInstance().get(User.class, userId)); - } else { - uiPersonalization.setUser(null); - } - + if (userId != null) { + uiPersonalization.setUser(OBDal.getInstance().get(User.class, userId)); + } else { + uiPersonalization.setUser(null); } final JSONObject jsonValue = new JSONObject(value); diff -r 9f692840db92 -r b99c43bfb674 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js Thu Feb 21 02:28:45 2013 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/calendar/ob-calendar.js Fri Feb 22 07:40:05 2013 +0100 @@ -118,7 +118,7 @@ }, transformResponse: function (dsResponse, dsRequest, data) { var showDSAlert, records = data && data.response && data.response.data, - i; + i, j; showDSAlert = function (text) { isc.warn(text, function () { @@ -152,6 +152,13 @@ if (typeof calendar.customTransformResponse === 'function') { records[i] = calendar.customTransformResponse(records[i], calendar); } + if (multiCalendar && multiCalendar.calendarData.hasCustomFilters) { + for (j = 0; j < multiCalendar.calendarData.customFilters.length; j++) { + if (typeof multiCalendar.calendarData.customFilters[j].handler.transformResponse === 'function') { + records[i] = multiCalendar.calendarData.customFilters[j].handler.transformResponse(records[i], calendar, multiCalendar.calendarData.customFilters[j]); + } + } + } } } } @@ -236,8 +243,8 @@ eventMoved: function (newDate, event) { newDate.setSeconds(0); if (this.showEventDialogOnEventMove) { + //Event duration var dateDiff = event[this.endDateField] - event[this.startDateField], - //Event duration newEndDate = newDate.getTime() + dateDiff; //Add the event duration to the new startDate newEndDate = new Date(newEndDate); this.eventDialog.event = event; @@ -261,8 +268,7 @@ try { //To avoid js error due to conflicts with Smartclient default EventDialog this.eventDialog.show(); - } catch (e) { ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_feb _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
