details: https://code.openbravo.com/erp/devel/main/rev/47c45f7b7ef7 changeset: 17559:47c45f7b7ef7 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Jul 27 00:22:16 2012 +0200 summary: Fixes issue 20955: Is impossible to add a selector field in pick/execute windows Make sure that the valuemap contains the value of the edited record, transfer the valuemap from the edit item to the grid field
details: https://code.openbravo.com/erp/devel/main/rev/c5a9d48336ab changeset: 17560:c5a9d48336ab user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Jul 27 02:17:20 2012 +0200 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/4f51e963ebbe changeset: 17561:4f51e963ebbe user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Jul 27 11:42:07 2012 +0200 summary: Fixes issue 21111: The accounting entry from Income Summary to Retained Earnings not taking into account when closing a year details: https://code.openbravo.com/erp/devel/main/rev/7d6793ea45f1 changeset: 17562:7d6793ea45f1 user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Fri Jul 27 12:23:55 2012 +0200 summary: Fixed issue 20870: Admin others works well when adding a widget with params In Admin others, it is not supported to add widgets with at least one parameter which is mandatory and DefaultValue==null. If we try to save parameters when we are adding widgets in admin others, the widget have to be in the database to update its parameters, but the widget won't be in database until we press Publish button. In order to avoid this problem, widgets with parameters are displayed in content_mode and the widget to add list does not show widgets with at least one parameter which is mandatory and DefaultValue==null. details: https://code.openbravo.com/erp/devel/main/rev/f119181062af changeset: 17563:f119181062af user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jul 27 12:32:57 2012 +0200 summary: Fixes issue 21216: Now the proper grid buttons are shown The toggleProgressIcon function was given for granted that when it was called the Show in form / Edit in grid buttons were visible. However, if the user modifies a field with a callout and presses the down arrow key, this function will be called with the Cancel / Save button visible. Now, it can be called in either of both states. details: https://code.openbravo.com/erp/devel/main/rev/59becbb7d3cc changeset: 17564:59becbb7d3cc user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Jul 27 14:32:30 2012 +0200 summary: Fixes issue 21240, related to issue 20955: Changeset backout The changeset https://code.openbravo.com/erp/devel/pi/rev/47c45f7b7ef7 has been backed out, because it caused a regression. details: https://code.openbravo.com/erp/devel/main/rev/435530c44bdb changeset: 17565:435530c44bdb user: Miguel de Juana <miguel.dejuana <at> openbravo.com> date: Fri Jul 27 15:11:44 2012 +0200 summary: Fixed issue 20825: Now right top buttons are displayed in the issue case. With this fix we resolver this corner case, but it should be analyzed the excessive calls to updateButtonState. details: https://code.openbravo.com/erp/devel/main/rev/a0496efc26eb changeset: 17566:a0496efc26eb user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Jul 27 15:37:08 2012 +0200 summary: Related to issue 20955: Is impossible to add a selector field in pick/execute windows Improve valuemap handling for selector and list item for when handling empty value or when clearing the field by keyboard details: https://code.openbravo.com/erp/devel/main/rev/7f16a6a46998 changeset: 17567:7f16a6a46998 user: Martin Taal <martin.taal <at> openbravo.com> date: Fri Jul 27 16:53:37 2012 +0200 summary: Fixes issue 21230: Pick & Execute Windows:Change reference of read only fields to not do combo value computation by FIC Changed the reference of the storage bin to a selector and of several other columns to search: m_inout_id column, order line column details: https://code.openbravo.com/erp/devel/main/rev/c6491bd9e10b changeset: 17568:c6491bd9e10b user: RM packaging bot <staff.rm <at> openbravo.com> date: Sat Jul 28 01:14:31 2012 +0200 summary: CI: update AD_MODULE to version 17567 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.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/form/formitem/ob-formitem-list.js | 12 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js | 15 ++ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 63 ++++++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 32 ++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/toolbar/ob-toolbar.js | 10 +- 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.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java | 15 ++- modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-widget.js | 6 +- 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.querylist/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml | 1 + 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 | 13 +- 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/sourcedata/AD_COLUMN.xml | 27 ++- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct.java | 22 ++- src/org/openbravo/erpCommon/ad_actionButton/CreateRegFactAcct_data.xsql | 6 +- 53 files changed, 250 insertions(+), 136 deletions(-) diffs (truncated from 1386 to 300 lines): diff -r a73133e6a728 -r c6491bd9e10b modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.17567]]></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 a73133e6a728 -r c6491bd9e10b 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 Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.17567]]></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.17546]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.17567]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a73133e6a728 -r c6491bd9e10b 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 Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.17567]]></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 a73133e6a728 -r c6491bd9e10b 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 Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.17567]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a73133e6a728 -r c6491bd9e10b 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 Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.17567]]></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 a73133e6a728 -r c6491bd9e10b 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 Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sat Jul 28 01:14:31 2012 +0200 @@ -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.17546]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.17567]]></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.17546]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.17567]]></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.17546]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.17567]]></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.17546]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.17567]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r a73133e6a728 -r c6491bd9e10b 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 Thu Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-list.js Sat Jul 28 01:14:31 2012 +0200 @@ -140,10 +140,13 @@ if (this.valueMap && this.valueMap[value]) { return this.valueMap[value]; } + if (ret === value && this.isDisabled()) { return ''; } - if (ret === value) { + + // don't update the valuemap if the value is null or undefined + if (ret === value && value) { if (!this.valueMap) { this.valueMap = {}; this.valueMap[value] = ''; @@ -153,6 +156,13 @@ } } return ret; + }, + + mapDisplayToValue: function(value) { + if (value === '') { + return null; + } + return this.Super('mapDisplayToValue', arguments); } }); \ No newline at end of file diff -r a73133e6a728 -r c6491bd9e10b 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 Thu Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js Sat Jul 28 01:14:31 2012 +0200 @@ -565,6 +565,21 @@ return !field.name.startsWith('_') && field.canFilter; }, + // the valuemap is updated in the form item, make sure that the + // grid field also has it + getEditorValueMap: function (field, values) { + var form, ret = this.Super('getEditorValueMap', arguments); + if (!ret) { + if (this.getEditForm()) { + form = this.getEditForm(); + if (form.getItem(field.name) && form.getItem(field.name).valueMap) { + return form.getItem(field.name).valueMap; + } + } + } + return ret; + }, + // = exportData = // The exportData function exports the data of the grid to a file. The user will // be presented with a save-as dialog. diff -r a73133e6a728 -r c6491bd9e10b 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 Thu Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Sat Jul 28 01:14:31 2012 +0200 @@ -26,7 +26,16 @@ // ListGrid._$ArrowUp and ListGrid._$ArrowDown ARROW_UP_KEY_NAME: 'Arrow_Up', ARROW_DOWN_KEY_NAME: 'Arrow_Down', - ERROR_MESSAGE_PROP: isc.OBViewGrid.ERROR_MESSAGE_PROP + ERROR_MESSAGE_PROP: isc.OBViewGrid.ERROR_MESSAGE_PROP, + ICONS: { + PROGRESS: 0, + OPEN_IN_FORM: 1, + SEPARATOR1: 2, + EDIT_IN_GRID: 3, + CANCEL: 4, + SEPARATOR2: 5, + SAVE: 6 + } }); if (!isc.Browser.isIE) { @@ -2760,29 +2769,35 @@ toggleProgressIcon: function (toggle) { if (toggle) { - this.hideMember(6); - this.hideMember(5); - this.hideMember(4); - this.showMember(0); + this.hideAllMembers(); + this.showMember(isc.OBViewGrid.PROGRESS); } else { - var offset = 0; - if (this.cancelButton) { - offset = 1; - this.hideMember(0); + this.hideMember(isc.OBViewGrid.PROGRESS); + if (this.grid.view.isEditingGrid) { + this.showSaveCancel(); + } else { + this.showEditOpen(); } - this.showMember(2 + offset); - this.showMember(1 + offset); - this.showMember(offset); } }, + hideAllMembers: function () { + this.hideMember(isc.OBViewGrid.ICONS.EDIT_IN_GRID); + this.hideMember(isc.OBViewGrid.ICONS.SEPARATOR1); + this.hideMember(isc.OBViewGrid.ICONS.OPEN_IN_FORM); + this.hideMember(isc.OBViewGrid.ICONS.PROGRESS); + this.hideMember(isc.OBViewGrid.ICONS.CANCEL); + this.hideMember(isc.OBViewGrid.ICONS.SEPARATOR2); + this.hideMember(isc.OBViewGrid.ICONS.SAVE); + }, + showEditOpen: function () { var offset = 0; if (this.cancelButton) { - this.hideMember(6); - this.hideMember(5); - this.hideMember(4); - this.hideMember(0); + this.hideMember(isc.OBViewGrid.ICONS.SAVE); + this.hideMember(isc.OBViewGrid.ICONS.SEPARATOR2); + this.hideMember(isc.OBViewGrid.ICONS.CANCEL); + this.hideMember(isc.OBViewGrid.ICONS.PROGRESS); offset = 1; } this.showMember(offset); @@ -2799,14 +2814,14 @@ showSaveCancel: function () { this.addSaveCancelProgressButtons(); - this.hideMember(3); - this.hideMember(2); - this.hideMember(1); - this.hideMember(0); - - this.showMember(4); - this.showMember(5); - this.showMember(6); + this.hideMember(isc.OBViewGrid.ICONS.EDIT_IN_GRID); + this.hideMember(isc.OBViewGrid.ICONS.SEPARATOR1); + this.hideMember(isc.OBViewGrid.ICONS.OPEN_IN_FORM); + this.hideMember(isc.OBViewGrid.ICONS.PROGRESS); + + this.showMember(isc.OBViewGrid.ICONS.CANCEL); + this.showMember(isc.OBViewGrid.ICONS.SEPARATOR2); + this.showMember(isc.OBViewGrid.ICONS.SAVE); this.grid.currentEditColumnLayout = this; }, diff -r a73133e6a728 -r c6491bd9e10b 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 Thu Jul 26 17:18:03 2012 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Sat Jul 28 01:14:31 2012 +0200 @@ -109,7 +109,37 @@ this.Super('initWidget', arguments); }, - + + // when starting row editing make sure that the current + // value and identifier are part of a valuemap + // so that the combo shows the correct value without + // loading it from the backend + rowEditorEnter: function(record, editValues, rowNum) { + var i = 0, editRecord = this.getEditedRecord(rowNum), gridFld, identifier, formFld, value, form = this.getEditForm(); + + if (editRecord) { + // go through the fields and set the edit values + for (i = 0; i < this.getFields().length;i++) { + gridFld = this.getFields()[i]; + formFld = form.getField(gridFld.name); + value = editRecord[gridFld.name]; + identifier = editRecord[gridFld.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER]; + if (value && identifier) { + if (formFld.setEntry) { + formFld.setEntry(value, identifier); + } else { + if (!formFld.valueMap) { + formFld.valueMap = {}; + } + formFld.valueMap[value] = identifier; + form.setValue(formFld, value); + } + } + } + } + return this.Super('rowEditorEnter', arguments); + }, + ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
