details: https://code.openbravo.com/erp/devel/main/rev/b625c136e3de changeset: 26189:b625c136e3de user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 16 16:42:25 2015 +0100 summary: Related with issue 28727: Checks if the okButton exists to prevent error in log
details: https://code.openbravo.com/erp/devel/main/rev/a882ebfc5ae6 changeset: 26190:a882ebfc5ae6 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 16 16:57:41 2015 +0100 summary: Fixes issue 28727: valueMap is properly initialized in pick and execute windows The problem was that when a line in a pick and execute grid was edited, the valueMap of its OBFKComboItems was not properly initialized. The initialization is done in the OBPickAndExecuteGrid.processColumnValue function. Before the Openbravo combos was refactored, the columnValue parameter used to contain the full valueMap of the combo in its entries attribute. This atribute was passed to the OBPickAndExecuteGrid.setValueMap, and the valueMap of the combos was initialized. The problem was that since the combos was refactored the columnValue parameter no longer contained the entries attribute, because the FIC now only returns the selected value. To fix this, in this case the valueMap is built manually based on the column value and identifier. This valueMap is passed to the OBPickAndExecuteGrid.setValueMap function to initialize the field valueMap. details: https://code.openbravo.com/erp/devel/main/rev/efa53163ee0c changeset: 26191:efa53163ee0c user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 16 18:01:47 2015 +0100 summary: Fixes issue 28727: Use proper attribute names in the valueMap of the combo The ListGrid.setValueMap function expected a valueMap that is an array, where each position contains an object with two properties: id and _identifier (OB.Constants.ID and OB.Constants.IDENTIFIER constants). The identifier property was not being properly named, so the valueMap did not contain the proper values. details: https://code.openbravo.com/erp/devel/main/rev/9cb33bf7fc79 changeset: 26192:9cb33bf7fc79 user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com> date: Tue Mar 10 13:58:57 2015 +0100 summary: Fixes issue 29211 Cannot complete a goods receipt with a line without attribute set value if it has a related prereservation. Added coalesce when inserting to get default value details: https://code.openbravo.com/erp/devel/main/rev/1c38281215d7 changeset: 26193:1c38281215d7 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Mar 16 18:39:38 2015 +0100 summary: Related to issue 29211: Update copyright details: https://code.openbravo.com/erp/devel/main/rev/8e0a9e1ef5c3 changeset: 26194:8e0a9e1ef5c3 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 16 18:35:40 2015 +0100 summary: Fixes issue 28727: Set properly the value of fk combo items in P&E windows The problem was that when the value was being set to fk combo items before its valueMap was defined. To fix this, the value of the combo is reset just after defining its combo. details: https://code.openbravo.com/erp/devel/main/rev/0a80ccfcebd0 changeset: 26195:0a80ccfcebd0 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 16 22:52:31 2015 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/fb806ae22a47 changeset: 26196:fb806ae22a47 user: Sandra Huguet <sandra.huguet <at> openbravo.com> date: Tue Mar 17 17:53:05 2015 +0100 summary: Fixed bug 29145: Used credit is not correct under certain circumstances details: https://code.openbravo.com/erp/devel/main/rev/2e3cf56c8f15 changeset: 26197:2e3cf56c8f15 user: RM packaging bot <staff.rm <at> openbravo.com> date: Tue Mar 17 22:47:56 2015 +0000 summary: CI: update AD_MODULE to version 26196 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml | 12 +++++ 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/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js | 18 +++++++ modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- 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/process/ob-parameter-window-view.js | 4 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 21 ++++++-- 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.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 ++-- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 ++-- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- 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 | 20 ++++---- src-db/database/model/functions/M_INOUT_POST.xml | 4 +- src-db/database/sourcedata/AD_MODULE.xml | 4 +- 48 files changed, 135 insertions(+), 94 deletions(-) diffs (truncated from 1024 to 300 lines): diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml Tue Mar 17 22:47:56 2015 +0000 @@ -1489,6 +1489,18 @@ <!--F4500597D99243129F93A0769047CFCB--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> <!--F4500597D99243129F93A0769047CFCB--></AD_MESSAGE> +<!--F482DF98F6FF45728419D116A7726765--><AD_MESSAGE> +<!--F482DF98F6FF45728419D116A7726765--> <AD_MESSAGE_ID><![CDATA[F482DF98F6FF45728419D116A7726765]]></AD_MESSAGE_ID> +<!--F482DF98F6FF45728419D116A7726765--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--F482DF98F6FF45728419D116A7726765--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--F482DF98F6FF45728419D116A7726765--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--F482DF98F6FF45728419D116A7726765--> <VALUE><![CDATA[APRM_MORECREDITAMOUNT]]></VALUE> +<!--F482DF98F6FF45728419D116A7726765--> <MSGTEXT><![CDATA[Credit amount should not be greater than total amount]]></MSGTEXT> +<!--F482DF98F6FF45728419D116A7726765--> <MSGTYPE><![CDATA[E]]></MSGTYPE> +<!--F482DF98F6FF45728419D116A7726765--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> +<!--F482DF98F6FF45728419D116A7726765--> <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +<!--F482DF98F6FF45728419D116A7726765--></AD_MESSAGE> + <!--F579E42461DC472AA4F21B14DD3D680B--><AD_MESSAGE> <!--F579E42461DC472AA4F21B14DD3D680B--> <AD_MESSAGE_ID><![CDATA[F579E42461DC472AA4F21B14DD3D680B]]></AD_MESSAGE_ID> <!--F579E42461DC472AA4F21B14DD3D680B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +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.26182]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.26196]]></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 e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +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.26182]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.26196]]></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.26182]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.26196]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js --- a/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/web/org.openbravo.advpaymentmngt/js/ob-aprm-addPayment.js Tue Mar 17 22:47:56 2015 +0000 @@ -813,8 +813,21 @@ }; OB.APRM.AddPayment.doSelectionChangedCredit = function (record, state, view) { + var issotrx = view.theForm.getItem('issotrx'), + grid = view.theForm.getItem('credit_to_use').canvas.viewGrid, + amountField = grid.getFieldByColumnName('paymentAmount'), + outstanding = new BigDecimal(String(record.outstandingAmount)); + + if (state) { + grid.setEditValue(grid.getRecordIndex(record), amountField, Number(outstanding)); + } else { + grid.setEditValue(grid.getRecordIndex(record), amountField, '0'); + } OB.APRM.AddPayment.updateCreditTotal(view.theForm); OB.APRM.AddPayment.updateActualExpected(view.theForm); + if (issotrx) { + OB.APRM.AddPayment.distributeAmount(view, view.theForm, true); + } }; OB.APRM.AddPayment.conversionRateOnChange = function (item, view, form, grid) { @@ -1103,6 +1116,11 @@ return false; } + if ((total.compareTo(creditTotalItem) < 0) && (overpaymentAction === 'CR')) { + view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('APRM_MORECREDITAMOUNT')); + return false; + } + if (document !== null && document !== '' && actualPayment.compareTo(BigDecimal.prototype.ZERO) === 0 && view.parentWindow && view.parentWindow.windowId) { view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, null, OB.I18N.getLabel('APRM_ZEROAMOUNTPAYMENTTRANSACTION')); return false; diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +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.26182]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.26196]]></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 e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +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.26182]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.26196]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +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.26182]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.26196]]></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 e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +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.26182]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.26196]]></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.26182]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.26196]]></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.26182]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.26196]]></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.26182]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.26196]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-parameter-window-view.js Tue Mar 17 22:47:56 2015 +0000 @@ -725,7 +725,9 @@ this.xlsButton.setEnabled(allRequiredSet); } } else { - this.okButton.setEnabled(allRequiredSet); + if (this.okButton) { + this.okButton.setEnabled(allRequiredSet); + } } }, diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Tue Mar 17 22:47:56 2015 +0000 @@ -692,17 +692,26 @@ }, processColumnValue: function (rowNum, columnName, columnValue) { - var field; + var field, valueMap = []; if (!columnValue) { return; } - + field = this.getFieldByColumnName(columnName); + if (!field) { + return; + } if (columnValue.entries) { - field = this.getFieldByColumnName(columnName); - if (!field) { - return; + this.setValueMap(field.name, columnValue.entries); + } else if (field.fkField && columnValue.value && columnValue.identifier) { + // build the valueMap manually, set it and set the value of the + // fk combo item in the edit form if possible + valueMap[0] = {}; + valueMap[0][OB.Constants.ID] = columnValue.value; + valueMap[0][OB.Constants.IDENTIFIER] = columnValue.identifier; + this.setValueMap(field.name, valueMap); + if (this.isEditing()) { + this.setEditValue(this.getEditRow(), field.name, columnValue.value); } - this.setValueMap(field.name, columnValue.entries); } }, diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +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.26182]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.26196]]></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> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 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 Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +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.26182]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.26196]]></STARTVERSION> <!--DCE798FBC5B648F7A3C81A6941720A57--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME> <!--DCE798FBC5B648F7A3C81A6941720A57--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +0000 @@ -6,7 +6,7 @@ <!--4B828F4D03264080AA1D2057B13F613C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--4B828F4D03264080AA1D2057B13F613C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--4B828F4D03264080AA1D2057B13F613C--> <NAME><![CDATA[User Interface Client Kernel]]></NAME> -<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.26182]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.26196]]></VERSION> <!--4B828F4D03264080AA1D2057B13F613C--> <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION> <!--4B828F4D03264080AA1D2057B13F613C--> <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP> <!--4B828F4D03264080AA1D2057B13F613C--> <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +0000 @@ -7,7 +7,7 @@ <!--26B041893E844A53AFA58BC326C4F0D7--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--26B041893E844A53AFA58BC326C4F0D7--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.26182]]></STARTVERSION> +<!--26B041893E844A53AFA58BC326C4F0D7--> <STARTVERSION><![CDATA[3.0.26196]]></STARTVERSION> <!--26B041893E844A53AFA58BC326C4F0D7--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--26B041893E844A53AFA58BC326C4F0D7--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID> -<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.26182]]></STARTVERSION> +<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <STARTVERSION><![CDATA[1.1.26196]]></STARTVERSION> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME> <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID> -<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.26182]]></STARTVERSION> +<!--D7BA4BB0844942C58DC46B9E23CF8E67--> <STARTVERSION><![CDATA[2.0.26196]]></STARTVERSION> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME> <!--D7BA4BB0844942C58DC46B9E23CF8E67--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml Tue Mar 17 22:47:56 2015 +0000 @@ -6,7 +6,7 @@ <!--2758CD25B2704AF6BBAD10365FC82C06--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--2758CD25B2704AF6BBAD10365FC82C06--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--2758CD25B2704AF6BBAD10365FC82C06--> <NAME><![CDATA[Workspace & Widgets]]></NAME> -<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.26182]]></VERSION> +<!--2758CD25B2704AF6BBAD10365FC82C06--> <VERSION><![CDATA[2.1.26196]]></VERSION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION> <!--2758CD25B2704AF6BBAD10365FC82C06--> <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP> <!--2758CD25B2704AF6BBAD10365FC82C06--> <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL> diff -r e4c7b3d0a0ff -r 2e3cf56c8f15 modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 16 16:35:31 2015 +0100 +++ b/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Tue Mar 17 22:47:56 2015 +0000 @@ -7,7 +7,7 @@ <!--15F51F03882F444CAB6593B4566DC929--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
