details: https://code.openbravo.com/erp/devel/pi/rev/ff135d3be049 changeset: 15524:ff135d3be049 user: Martin Taal <martin.taal <at> openbravo.com> date: Mon Feb 13 20:41:38 2012 +0100 summary: Fixes issue 19689: It is not possible to change Role twice in a row Change way the page is reloaded after a role change
details: https://code.openbravo.com/erp/devel/pi/rev/6b91404515aa changeset: 15525:6b91404515aa user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Feb 14 16:24:40 2012 +0100 summary: Related to issue 19689: It is not possible to change Role twice in a row details: https://code.openbravo.com/erp/devel/pi/rev/76bd3a47974b changeset: 15526:76bd3a47974b user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 15 20:46:35 2012 +0100 summary: Related to issue 19689: It is not possible to change Role twice in a row Prevent caching through response headers in jsp page details: https://code.openbravo.com/erp/devel/pi/rev/95f7fea58212 changeset: 15527:95f7fea58212 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Feb 17 14:35:30 2012 +0100 summary: Merged heads details: https://code.openbravo.com/erp/devel/pi/rev/a1d79324b1e2 changeset: 15528:a1d79324b1e2 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Feb 17 17:39:07 2012 +0100 summary: Related to issue 18951: Saved View is not rendered well when last state has maximized child Change javascript comment details: https://code.openbravo.com/erp/devel/pi/rev/80505c1ba706 changeset: 15529:80505c1ba706 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Feb 17 17:39:23 2012 +0100 summary: merged heads diffstat: .hgsigs | 1 + .hgtags | 1 + build.xml | 4 +- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java | 1 + modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java | 1 + modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js | 4 +- modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js | 12 +- modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconDelete.png | 0 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js | 34 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js | 1 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 3 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 9 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js | 20 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-manage-views.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 - modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-view.js | 11 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/return-material/ob-return-material.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-navbar-test.js | 66 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-property-store-test.js | 18 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-ui-test.js | 35 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/test/ob-utilities-date-test.js | 316 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-action-button.js | 2 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 9 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/images/process/iconDelete.png | 0 modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-menu-styles.js | 10 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-application-styles.js | 23 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-dialog-styles.js | 19 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 58 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-grid-styles.js | 55 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-messagebar-styles.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-navigation-bar-styles.js | 24 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-personalization-styles.js | 42 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-popup-styles.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-process-styles.js | 5 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-rtl-styles.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-statusbar-styles.js | 9 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tab-styles.js | 6 +- modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-toolbar-styles.js | 6 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java | 23 +- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/test/ob-myopenbravo-test.js | 115 +- modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-myopenbravo-styles.js | 2 +- modules/org.openbravo.client.myob/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.myob/ob-widget-styles.js | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 88 + modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.html | 212 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java | 169 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.xml | 17 +- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportDao.java | 953 +++++++++- modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportPDF.jrxml | 38 +- modules/org.openbravo.service.integration.google/web/org.openbravo.service.integration.google/js/obsegi-account-association-view.js | 13 +- modules/org.openbravo.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient-labels.js | 14 +- modules/org.openbravo.v3/src-db/database/configScript.xml | 10 +- referencedata/sampledata/F_B_International_Group.xml | 2 +- src-db/database/build-create.xml | 1 - src-db/database/lib/dbsourcemanager.jar | 0 src-db/database/model/functions/M_GENERATE_AVERAGE_COSTS.xml | 82 +- src-db/database/model/functions/M_INOUT_POST.xml | 6 +- src-db/database/model/functions/M_PRODUCTION_RUN.xml | 3 + src-db/database/model/tables/M_INOUTLINE.xml | 7 + src-db/database/model/triggers/C_PROJECT_TRG.xml | 16 +- src-db/database/model/triggers/M_PRODUCT_TRG.xml | 10 - src-db/database/model/triggers/M_WAREHOUSE_TRG.xml | 11 - src-db/database/sourcedata/AD_COLUMN.xml | 37 +- src-db/database/sourcedata/AD_ELEMENT.xml | 27 + src-db/database/sourcedata/AD_FIELD.xml | 4 +- src-db/database/sourcedata/AD_FORM.xml | 1 + src-db/database/sourcedata/AD_MENU.xml | 2 +- src-db/database/sourcedata/AD_MESSAGE.xml | 22 + src-db/database/sourcedata/AD_PROCESS.xml | 32 +- src-db/database/sourcedata/AD_PROCESS_PARA.xml | 20 + src-db/database/sourcedata/AD_REFERENCE.xml | 12 + src-db/database/sourcedata/AD_REF_TABLE.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 21 +- src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 - src-db/database/sourcedata/AD_TREENODE.xml | 10 +- src-db/database/sourcedata/AD_WINDOW.xml | 16 +- src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 1 + src-util/modulescript/build/classes/org/openbravo/modulescript/ConvertImages.class | 0 src-util/modulescript/src/org/openbravo/modulescript/ConvertImages.java | 13 +- src/index.jsp | 4 + src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 36 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData.java | 7 +- src/org/openbravo/erpCommon/ad_forms/UpdateReferenceData_data.xsql | 3 +- src/org/openbravo/erpCommon/ad_process/AlertProcess.java | 2 +- src/org/openbravo/erpCommon/ad_process/ApplyModules.java | 5 + src/org/openbravo/erpCommon/ad_reports/OrderEdition_data.xsql | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR_data.xsql | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.html | 16 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderFilterJR.xml | 10 +- src/org/openbravo/erpCommon/ad_reports/ReportSalesOrderJR.java | 51 +- src/org/openbravo/erpCommon/businessUtility/EMail.java | 2 +- src/org/openbravo/erpCommon/businessUtility/InitialSetupUtility.java | 169 +- src/org/openbravo/erpCommon/info/AttributeSetInstance.java | 2 +- src/org/openbravo/erpCommon/modules/ApplyModule.java | 23 +- src/org/openbravo/erpCommon/modules/ApplyModuleTask.java | 22 +- src/org/openbravo/erpCommon/modules/ApplyModule_data.xsql | 22 + src/org/openbravo/erpCommon/modules/ModuleReferenceDataOrgTree_data.xsql | 16 +- src/org/openbravo/erpCommon/obps/licenseRestrictions | 2 +- src/org/openbravo/erpCommon/utility/WindowTree.java | 9 +- src/org/openbravo/erpReports/RptM_Requisition.java | 2 +- src/org/openbravo/erpReports/RptM_Requisition.jrxml | 9 +- 105 files changed, 2420 insertions(+), 900 deletions(-) diffs (truncated from 6405 to 300 lines): diff -r d573ede8052e -r 80505c1ba706 .hgsigs --- a/.hgsigs Mon Feb 13 16:34:12 2012 +0100 +++ b/.hgsigs Fri Feb 17 17:39:23 2012 +0100 @@ -54,6 +54,7 @@ 29635597c9b7110b66a4cde8e0cb0ece277f7407 0 iEYEABECAAYFAk7l05YACgkQCX/oGf+2qkNbCACgoK+bQ83JFW2GQb4j+YBkkBkrMOYAoKDSHPagp61WCcrPkCS7IEtmVI0E bc63869ec25d6771e0b3d3b65ddd630873663fc2 0 iEYEABECAAYFAk7h3vAACgkQCX/oGf+2qkP/HwCgt39R5/w8cF35rRoORikICeXQuDYAn347sM4ST4OvagS5ke9c6whsBYud 5bb9eb1d86194a2fcf8779d28ee7bb131c53f20d 0 iEYEABECAAYFAk8BnJcACgkQCX/oGf+2qkMN7wCg+wl5wJjx0Y60WgZq3PRlBi3T3OoAmQGlwF1vK52FNykjDiACN+7Xdzjh +f7c288af065f5425b20bd8bbef645df237282d4c 0 iEYEABECAAYFAk87pWEACgkQCX/oGf+2qkM1cgCg5Cp8jLM2gcEh+e+4QiJSJanE6J4An1iZUE2/OlrA8jLt9SQCs6/efCNq 4463903e11ac52337be6041dcfb593022f35427f 0 iEYEABECAAYFAk8qiYkACgkQCX/oGf+2qkP6cgCfcsvKoCUqTvEE9+9qeLRBrjKy64YAn1Eg4n1WZcu4dxxnIDgAsjEywG/C d034d0b54ffb6c401b3741be99d4237f82aa9d76 0 iEYEABECAAYFAk8EN/IACgkQCX/oGf+2qkMPzgCg/gXTYW5Vv9s02aG3VAi3lSvNiMwAn29/22CruqkJ9sTWkyA8lCChqk/r aa474df671aa2c3d4a16419479cf8098d5fbca82 0 iEYEABECAAYFAk8N8JAACgkQCX/oGf+2qkMFLACbB+b+pdKa0rd7O+ig6so/ETi1x0YAnRKPM91wMwdONWZ5AOazDoSj6h/c diff -r d573ede8052e -r 80505c1ba706 .hgtags --- a/.hgtags Mon Feb 13 16:34:12 2012 +0100 +++ b/.hgtags Fri Feb 17 17:39:23 2012 +0100 @@ -68,3 +68,4 @@ 5e317c1d2b1e4486fa345a5dd0ba3982e596c8cf 3.0MP7 ed6c72ed7483eeb5a797ae9e1e7dd8775802a4eb 3.0MP7.1 ed6e739763b02d5187fe9bb544dd3d1d9143a716 3.0MP7.2 +746b477b1018404f6781714b9db63e389e5dc828 3.0MP7.3 diff -r d573ede8052e -r 80505c1ba706 build.xml --- a/build.xml Mon Feb 13 16:34:12 2012 +0100 +++ b/build.xml Fri Feb 17 17:39:23 2012 +0100 @@ -777,7 +777,7 @@ <taskdef name="applyModule" classname="org.openbravo.erpCommon.modules.ApplyModuleTask"> <classpath refid="project.class.path" /> </taskdef> - <applyModule userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties"/> + <applyModule userId="0" adminMode="true" forceRefData="${forceRefData}" propertiesFile="${base.config}/Openbravo.properties"/> </target> <target name="compile.apply.module" depends="init"> @@ -794,7 +794,7 @@ --> <target name="apply.module" depends="compile.apply.module"> <java classname="org.openbravo.erpCommon.modules.ApplyModuleTask" fork="true" maxmemory="${build.maxmemory}" failonerror="true"> - <arg line="'${base.src}' '${friendlyWarnings}'" /> + <arg line="'${base.src}' '${friendlyWarnings}' '${forceRefData}'" /> <classpath refid="apply.module.runtime.classpath" /> </java> <delete includeEmptyDirs="true" dir="${build.apply.module}" /> diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/ad_actionbutton/AddPaymentFromInvoice.java Fri Feb 17 17:39:23 2012 +0100 @@ -249,6 +249,7 @@ } } } catch (Exception ex) { + OBDal.getInstance().rollbackAndClose(); message = Utility.translateError(this, vars, vars.getLanguage(), ex.getMessage()); log4j.error(ex); bdErrorGeneralPopUp(request, response, "Error", message.getMessage()); diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_AddPayment.java Fri Feb 17 17:39:23 2012 +0100 @@ -156,6 +156,7 @@ try { for (FIN_PaymentScheduleDetail paymentScheduleDetail : selectedPaymentScheduleDetails) { // Payment Schedule Detail already linked to a payment detail. + OBDal.getInstance().refresh(paymentScheduleDetail); if (paymentScheduleDetail.getPaymentDetails() != null) { throw new OBException(String.format(FIN_Utility.messageBD("APRM_PsdInSeveralPayments"), paymentScheduleDetail.getIdentifier())); diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/FIN_Utilities.js Fri Feb 17 17:39:23 2012 +0100 @@ -238,7 +238,7 @@ /** * Compares two Strings using the operator. - * If both numbers are negative it compares using the absolute value. + * If both numbers are negative it compares using the absolute value. */ function compareWithSign(number1, operator, number2) { @@ -597,7 +597,7 @@ } /** - * + * * @param allowCreditGeneration true if it is allowed to not select any pending payment if actualPayment amount is not * zero. * @return true if validations are fine. diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-utilities.js Fri Feb 17 17:39:23 2012 +0100 @@ -55,11 +55,11 @@ invoiceOutstanding = new BigDecimal(String(item.grid.view.parentWindow.views[0].getParentRecord().outstandingAmount)); if (new BigDecimal(String(value)).compareTo(new BigDecimal("0")) !== 0 && (new BigDecimal(String(value)).compareTo(new BigDecimal("0")) !== invoiceOutstanding.compareTo(new BigDecimal("0")))) { - if (!OB.APRM.validateMPPUserWarnedSign) { - OB.APRM.validateMPPUserWarnedSign = true; - isc.warn(OB.I18N.getLabel('APRM_DifferentSignError')); - } - return false; + if (!OB.APRM.validateMPPUserWarnedSign) { + OB.APRM.validateMPPUserWarnedSign = true; + isc.warn(OB.I18N.getLabel('APRM_DifferentSignError')); + } + return false; } for (indRow = 0; indRow < allRows.length; indRow++) { @@ -132,4 +132,4 @@ return false; } return true; -}; +}; \ No newline at end of file diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/DynamicExpressionParser.java Fri Feb 17 17:39:23 2012 +0100 @@ -233,7 +233,7 @@ UIDefinition uiDef = UIDefinitionController.getInstance().getUIDefinition( field.getColumn().getId()); - return new DisplayLogicElement("currentValues." + fieldName, + return new DisplayLogicElement("OB.Utilities.getValue(currentValues,'" + fieldName + "')", uiDef instanceof YesNoUIDefinition); } } diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconDelete.png Binary file modules/org.openbravo.client.application/web/org.openbravo.client.application/images/iconDelete.png has changed diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/classic/ob-classic-window.js Fri Feb 17 17:39:23 2012 +0100 @@ -331,4 +331,4 @@ // Maintained to support recent items which use the old name // NOTE: can be removed when the user interface is released in production in Q1 2011 // at that time the recent items should have been cleaned up -isc.defineClass('ClassicOBWindow', isc.OBClassicWindow); \ No newline at end of file +isc.defineClass('ClassicOBWindow', isc.OBClassicWindow); diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js Fri Feb 17 17:39:23 2012 +0100 @@ -42,23 +42,22 @@ // with addUnknownValues (to false) as this will // cause the picklist not to show // changeOnKeypress: false, - moveFocusOnPickValue: true, - hidePickListOnBlur: function() { - + hidePickListOnBlur: function () { + // when the form gets redrawn the the focus may not be in // the item but it is still the item which gets the focus // after redrawing if (this.form && this.form._isRedrawing && this.form.getFocusItem() === this) { return; } - + this.Super('hidePickListOnBlur', arguments); }, - + // is overridden to keep track that a value has been explicitly picked - pickValue: function(value) { + pickValue: function (value) { this._pickedValue = true; this.Super('pickValue', arguments); delete this._pickedValue; @@ -69,7 +68,7 @@ } }, - changed: function(form, item, value) { + changed: function (form, item, value) { this.Super('changed', arguments); // if not picking a value then don't do a fic call // otherwise every keypress would result in a fic call @@ -90,16 +89,17 @@ // the solution is to keep a separate entries array with the // records in the correct order, see also the setEntries/setEntry // methods - getClientPickListData: function() { + getClientPickListData: function () { if (this.entries) { return this.entries; } return this.Super('getClientPickListData', arguments); }, - setEntries: function(entries) { - var length = entries.length, i, id, identifier, - valueField = this.getValueFieldName(), valueMap = {}; + setEntries: function (entries) { + var length = entries.length, + i, id, identifier, valueField = this.getValueFieldName(), + valueMap = {}; this.entries = []; for (i = 0; i < length; i++) { id = entries[i][OB.Constants.ID] || ''; @@ -111,9 +111,11 @@ this.setValueMap(valueMap); }, - setEntry: function(id, identifier) { - var i, entries = this.entries || [], entry = {}, valueField = this - .getValueFieldName(), length = entries.length; + setEntry: function (id, identifier) { + var i, entries = this.entries || [], + entry = {}, + valueField = this.getValueFieldName(), + length = entries.length; for (i = 0; i < length; i++) { if (entries[i][valueField] === id) { return; @@ -128,7 +130,7 @@ }, // prevent ids from showing up - mapValueToDisplay: function(value) { + mapValueToDisplay: function (value) { var ret = this.Super('mapValueToDisplay', arguments); if (this.valueMap && this.valueMap[value]) { return this.valueMap[value]; @@ -148,4 +150,4 @@ return ret; } -}); +}); \ No newline at end of file diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-search.js Fri Feb 17 17:39:23 2012 +0100 @@ -60,7 +60,6 @@ isc.OBSearchItem.openSearchItem = null; }; }(this)); // window - isc.OBSearchItem.addProperties({ operator: 'iContains', showPickerIcon: true, diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Fri Feb 17 17:39:23 2012 +0100 @@ -1439,6 +1439,9 @@ form.setNewState(false); view.refreshParentRecord(); + // Refreshes the child views that belong to the same entity + // as the view being saved + view.refreshChildViewsWithEntity(this.view.entity); // We fill attachments in case the record is new, so that components // of the attachments section are created diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Fri Feb 17 17:39:23 2012 +0100 @@ -127,7 +127,8 @@ length = items.length; for (i = 0; i < length; i++) { item = items[i]; - if (item.getCanFocus() && !item.isDisabled()) { + // The first filterable item (editorType!=='StaticTextItem') should be focused + if (item.getCanFocus() && !item.isDisabled() && item.editorType !== 'StaticTextItem') { this.focusInFilterEditor(item); return true; } diff -r d573ede8052e -r 80505c1ba706 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 Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Fri Feb 17 17:39:23 2012 +0100 @@ -490,6 +490,10 @@ } if (this.getDataSource()) { + //If the new state does not have any selected records then all the records of the view are deselected + if (!localState.selected) { + this.deselectAllRecords(); + } // old versions stored selected records in grid view, this can cause // problems if record is not selected yet delete localState.selected; @@ -497,6 +501,11 @@ this.deleteSelectedParentRecordFilter(localState); this.Super('setViewState', ['(' + isc.Comm.serialize(localState, false) + ')']); + + // Focus on the first filterable item + if (this.view.isActiveView()) { + this.focusInFirstFilterEditor(); + } } if (localState.noFilterClause) { diff -r d573ede8052e -r 80505c1ba706 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Mon Feb 13 16:34:12 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js Fri Feb 17 17:39:23 2012 +0100 @@ -637,6 +637,9 @@ } else if (this.isEditingGrid && this.viewGrid.getEditForm() && this.viewGrid.getEditForm().getFocusItem()) { object = this.viewGrid.getEditForm(); functionName = 'focus'; + } else if (this.lastRecordSelected) { + object = this.viewGrid; ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
