details: https://code.openbravo.com/erp/devel/main/rev/f264717c2585 changeset: 19252:f264717c2585 user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com> date: Wed Jan 16 17:55:15 2013 +0100 summary: Fixed bug 22809 Reverted feature request 22499. Reason: This solution can break current working scenarios, so we need to design a better one
details: https://code.openbravo.com/erp/devel/main/rev/cb48e5193723 changeset: 19253:cb48e5193723 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Thu Jan 17 12:44:05 2013 +0100 summary: Fixes bug 22818 details: https://code.openbravo.com/erp/devel/main/rev/964842f76d10 changeset: 19254:964842f76d10 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 17 13:00:04 2013 +0000 summary: Update AD_MODULE version to 3.0MP19.1 details: https://code.openbravo.com/erp/devel/main/rev/9fe1637c98a6 changeset: 19255:9fe1637c98a6 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 17 13:00:05 2013 +0000 summary: Added tag 3.0MP19.1 for changeset 964842f76d10 details: https://code.openbravo.com/erp/devel/main/rev/bc308c5cc4b5 changeset: 19256:bc308c5cc4b5 user: RM packaging bot <staff.rm <at> openbravo.com> date: Thu Jan 17 13:00:06 2013 +0000 summary: Added signature for changeset 9fe1637c98a6 details: https://code.openbravo.com/erp/devel/main/rev/34b9717a7e19 changeset: 19257:34b9717a7e19 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Jan 21 05:56:13 2013 +0000 summary: Merge temporary head for 3.0MP19.1 diffstat: .hgsigs | 2 + .hgtags | 2 + build.xml | 37 +- config/Openbravo.properties.template | 6 + 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.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/web/org.openbravo.client.application/js/form/ob-view-form.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 6 +- 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.datasource/src/org/openbravo/service/datasource/ReadOnlyDataSourceService.java | 3 + 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.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/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java | 11 + 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 +- referencedata/sampledata/F_B_International_Group.xml | 48 - referencedata/sampledata/QA_Testing.xml | 28 - src-db/database/model/functions/C_INVOICE_POST.xml | 4 +- src-db/database/model/functions/C_ORDER_POST1.xml | 4 +- src-db/database/model/functions/M_INOUT_POST.xml | 4 +- src-db/database/model/functions/M_PROMOTION_CALCULATE.xml | 34 +- src-db/database/model/tables/AD_USER.xml | 10 - src-db/database/sourcedata/AD_CALLOUT.xml | 9 - src-db/database/sourcedata/AD_COLUMN.xml | 78 +-- src-db/database/sourcedata/AD_ELEMENT.xml | 28 - src-db/database/sourcedata/AD_FIELD.xml | 65 +- src-db/database/sourcedata/AD_MESSAGE.xml | 11 - src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 - src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 - src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_PROCESS.xml | 2 +- src-db/database/sourcedata/AD_REFERENCE.xml | 14 + src-db/database/sourcedata/AD_VAL_RULE.xml | 11 - src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml | 10 + src-db/database/sourcedata/OBUISEL_SELECTOR.xml | 18 + src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml | 317 +++++++++- src/org/openbravo/dal/core/DalSessionFactory.java | 13 +- src/org/openbravo/erpCommon/ad_callouts/SE_Invoice_BPartner.java | 46 +- src/org/openbravo/erpCommon/ad_callouts/SE_IsDefaultBillingContact.java | 88 -- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Amt.java | 47 +- src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java | 22 +- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java | 84 ++- src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java | 30 +- src/org/openbravo/erpCommon/ad_forms/DocFINPayment.java | 3 + src/org/openbravo/erpCommon/ad_forms/DocInvoice.java | 2 +- src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoice_data.xsql | 2 +- src/org/openbravo/erpCommon/businessUtility/BpartnerMisc_data.xsql | 20 +- src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 249 +++++++ src/org/openbravo/erpCommon/modules/ExtractModule.java | 62 +- src/org/openbravo/erpCommon/modules/ExtractModuleTask.java | 19 +- src/org/openbravo/erpCommon/modules/ExtractModule_data.xsql | 5 +- src/org/openbravo/erpCommon/modules/ImportModule.java | 16 +- src/org/openbravo/erpCommon/modules/ModuleUtiltiy.java | 25 +- src/org/openbravo/erpCommon/utility/OBMessageUtils.java | 3 + src/org/openbravo/erpCommon/utility/reporting/printing/Poc_data.xsql | 19 - src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 32 +- src/org/openbravo/scheduling/OBScheduler.java | 8 +- 90 files changed, 1069 insertions(+), 716 deletions(-) diffs (truncated from 3987 to 300 lines): diff -r f6d77303909a -r 34b9717a7e19 .hgsigs --- a/.hgsigs Wed Jan 16 02:05:50 2013 +0000 +++ b/.hgsigs Mon Jan 21 05:56:13 2013 +0000 @@ -96,3 +96,5 @@ 9fd46b5349c522407c7fe4eaedeed678487e02a2 0 iEYEABECAAYFAlDK72cACgkQCX/oGf+2qkNv1gCfYsphl/F7dyNNh+u046YI9RwEdD4AoMPAoXJFhg9rV8gF6tZgeSMSAOV3 73102dce4ea86f1b3fab97709f1832f39f89d227 0 iEYEABECAAYFAlDYYXMACgkQCX/oGf+2qkNpJQCg09+Ojgco2TaKN6BlNC4888yhLCgAoJfCfQ/93ePShFci2Fic/lzeg/wL 1b9cd3d88a74c309ec1f97f4cf93ca161e1d6e7f 0 iEYEABECAAYFAlDvi2QACgkQCX/oGf+2qkMOhwCgvmcBpIUpUJH8otzrM3ZOu8uUgFEAoIdvXKVCLQKM5znHtX9Il/HJgzxO +21ee53026babfbaa1acea42273889c2d292eb5b6 0 iEYEABECAAYFAlD2CwAACgkQCX/oGf+2qkMs8QCePue6nyUSbeurM9ltNo/cb3k0vA0An2JJzndMdd/1MAurX6DfEGCTo9Uj +9fe1637c98a6cc490582445af850cc06b3e34a8e 0 iEYEABECAAYFAlD39dUACgkQCX/oGf+2qkMB5gCg/czNu6dng2nZxXKFiyTiuXHl0/IAoPKktgGNoj8crEuTaYuCrpYCtLTA diff -r f6d77303909a -r 34b9717a7e19 .hgtags --- a/.hgtags Wed Jan 16 02:05:50 2013 +0000 +++ b/.hgtags Mon Jan 21 05:56:13 2013 +0000 @@ -107,3 +107,5 @@ 43986bd34e503950718f87d719d70fccfc8607fe 3.0MP18 26a81bd13b9118ce8591e58ed7d04533469708f0 3.0MP18.1 f4f500d33fc0161856f8e4b0ed737053f318313d 3.0MP18.2 +f6d77303909a01da297ca96e5c23f8de1106eb0b 3.0MP19 +964842f76d10b1752cfa63b69c370deb668abe4c 3.0MP19.1 diff -r f6d77303909a -r 34b9717a7e19 build.xml --- a/build.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/build.xml Mon Jan 21 05:56:13 2013 +0000 @@ -89,6 +89,8 @@ <property name="obx.export.RD" value="false" /> <property name="obx.export.DB" value="false" /> <property name="obx.export.CS" value="false" /> + <property name="obx.export.validate" value="true" /> + <property name="obx.export.allDeps" value="false" /> <property name="chekPerms" value="false" /> <property name="force" value="false" /> <property name="strict.template.application" value="false" /> @@ -153,6 +155,13 @@ <equals arg1="true" arg2="${obx.export.CS}" /> </or> </condition> + + <condition property="obx.exp.validate"> + <or> + <equals arg1="yes" arg2="${obx.export.validate}" /> + <equals arg1="true" arg2="${obx.export.validate}" /> + </or> + </condition> <condition property="timestamp"> <or> @@ -927,31 +936,39 @@ <antcall target="export.config.script" /> </target> - <target name="package.module"> - <taskdef name="extractModule" classname="org.openbravo.erpCommon.modules.ExtractModuleTask"> + <target name="obx.export.validateModules" if="obx.exp.validate"> + <taskdef name="validateModules" classname="org.openbravo.service.system.SystemValidationTask"> <classpath refid="project.class.path" /> </taskdef> - <taskdef name="validateModules" classname="org.openbravo.service.system.SystemValidationTask"> - <classpath refid="project.class.path" /> - </taskdef> - <taskdef name="WADValidation" classname="org.openbravo.wad.validation.WADValidatorTask"> <classpath refid="project.class.path" /> </taskdef> - + <echo message="Validating Module..." /> - + <WADValidation propertiesFile="${base.config}/Openbravo.properties" modules="${module}" stoponerror="true"/> <validateModules moduleJavaPackage="${module}" failOnError="true" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" type="module" /> - + </target> + + <target name="package.module"> + <taskdef name="extractModule" classname="org.openbravo.erpCommon.modules.ExtractModuleTask"> + <classpath refid="project.class.path" /> + </taskdef> + + <antcall target="obx.export.validateModules" /> <antcall target="obx.export.database" /> <antcall target="obx.export.config.script" /> - <extractModule moduleName="${module}" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" exportRD="${obx.export.RD}" /> + <extractModule moduleName="${module}" + userId="0" + adminMode="true" + propertiesFile="${base.config}/Openbravo.properties" + exportRD="${obx.export.RD}" + addAllDependencies="${obx.export.allDeps}"/> </target> <target name="diagnostic"> diff -r f6d77303909a -r 34b9717a7e19 config/Openbravo.properties.template --- a/config/Openbravo.properties.template Wed Jan 16 02:05:50 2013 +0000 +++ b/config/Openbravo.properties.template Mon Jan 21 05:56:13 2013 +0000 @@ -204,3 +204,9 @@ # By default those all not generated anymore for tabs for which they are not needed #wad.generateAllClassic250Windows=true +# background.policy property defines whether background processes should be +# executed in this context or not. To prevent process execution this property must +# be set to no-execute +background.policy=default + + diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 21 05:56:13 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.19226]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.19250]]></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[MP19]]></VERSION_LABEL> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 21 05:56:13 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.19226]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.19250]]></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.19226]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.19250]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 21 05:56:13 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.19226]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.19250]]></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[MP19]]></VERSION_LABEL> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 21 05:56:13 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.19226]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.19250]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 21 05:56:13 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.19226]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.19250]]></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[MP19]]></VERSION_LABEL> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 21 05:56:13 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.19226]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.19250]]></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.19226]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.19250]]></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.19226]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.19250]]></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.19226]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.19250]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r f6d77303909a -r 34b9717a7e19 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 Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Mon Jan 21 05:56:13 2013 +0000 @@ -1574,7 +1574,7 @@ form.isSaving = false; view.toolBar.updateButtonState(true); - if (form.isVisible() && storedFocusItem && storedFocusItem.isFocusable(true)) { + if (form.isVisible() && storedFocusItem && storedFocusItem.isFocusable(true) && !this.view.viewForm.isNewRecord()) { // The setTimeout fixes issue https://issues.openbravo.com/view.php?id=21546 // that is only reproducible in certain versions of Chrome setTimeout(function () { diff -r f6d77303909a -r 34b9717a7e19 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 Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Jan 21 05:56:13 2013 +0000 @@ -2619,7 +2619,11 @@ this.view.messageBar.hide(); } this.view.refreshParentRecord(); - this.refreshRow(rowNum); + if (this.getEditRow() === rowNum) { + this.getEditForm().markForRedraw(); + } else { + this.refreshRow(rowNum); + } }, undoEditSelectedRows: function () { diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Mon Jan 21 05:56:13 2013 +0000 @@ -6,7 +6,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D393BE6F22BB44B7B728259B34FC795A--> <NAME><![CDATA[HTML Widget]]></NAME> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.19226]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.19250]]></VERSION> <!--D393BE6F22BB44B7B728259B34FC795A--> <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION> <!--D393BE6F22BB44B7B728259B34FC795A--> <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP> <!--D393BE6F22BB44B7B728259B34FC795A--> <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL> @@ -21,7 +21,7 @@ <!--D393BE6F22BB44B7B728259B34FC795A--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE> <!--D393BE6F22BB44B7B728259B34FC795A--> <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA> -<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION_LABEL><![CDATA[MP19]]></VERSION_LABEL> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL> <!--D393BE6F22BB44B7B728259B34FC795A--> <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED> <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE> diff -r f6d77303909a -r 34b9717a7e19 modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Wed Jan 16 02:05:50 2013 +0000 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Jan 21 05:56:13 2013 +0000 @@ -7,7 +7,7 @@ <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID> <!--DCE798FBC5B648F7A3C81A6941720A57--> <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID> -<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.19226]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.19250]]></STARTVERSION> ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
