details: https://code.openbravo.com/erp/devel/main/rev/60961105cec1 changeset: 26092:60961105cec1 user: Jorge Garcia <jorge.garcia <at> openbravo.com> date: Wed Feb 25 11:13:09 2015 +0100 summary: Fixed issue 28917: There is no Processed field in transaction tab
In the Financial Account window, in the Transactions tab, there is no field in order to know if a created transaction is processed or not. The solution is to display the field Processed in the Windows, Tabs and Fields. Now, the Processed Field is shown in the Transaction tab. details: https://code.openbravo.com/erp/devel/main/rev/e0db9fdfe275 changeset: 26093:e0db9fdfe275 user: Jorge Garcia <jorge.garcia <at> openbravo.com> date: Thu Feb 26 12:52:37 2015 +0100 summary: Fixed issue 28819: Include "Accounting" tab in Internal Consumption It is necessary to include "Accounting" tab in Internal Consumption window. The accounting tab has been added to the Internal Consumption window and has been configurated properly. Now, the Internal Consumption windows shows the Accounting tab. details: https://code.openbravo.com/erp/devel/main/rev/452fedf8a214 changeset: 26094:452fedf8a214 user: Reinaldo Guerra <reinaldo.guerra <at> peoplewalking.com> date: Thu Feb 26 13:37:44 2015 -0500 summary: Fixed bug 27010: Invoice Dimensional Report should not consider voided status. A new primary filter, was added to the Sales Invoice Dimensional Report, to allow exclude or not, documents voided in report's output. This filter can be managed through a new preference that was created too, in order to let user decide if filter will be shown. By default the filter will be hidden and documents voided will be considered. details: https://code.openbravo.com/erp/devel/main/rev/50e5345f5a57 changeset: 26095:50e5345f5a57 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Fri Feb 27 14:30:15 2015 +0100 summary: Fixes bug 28870: Callouts are run when moving from grid to form with a shortcut When a dynamic column is modified, a call is done to the FIC to run the callouts. The list of dynamic columns is stored in the form (in the view form and also in the grid edit form), and is loaded from the FIC response. For instance, when a record is created (either or grid or form view), a call is done to the FIC in NEW mode, and the dynamicCols list is initialized. The cause of this issue is that it was possible to open a record in form view in an inconsistent state, having the form's dynamicCols list not set. In this state the callouts are not run. To get to this in consistent state, the following steps should take place: - The user creates a record in the grid (a call to the FIC in NEW mode is done, and the dynamicCols list of the grid edit form is initialized) - Without saving, the user presses Ctrl+F2 to edit the record in form view. No FIC call is done (there is no need for it), so even though the record is shown in the form view, its dynamicCols list is not s et. The callouts will not run until a call to the FIC is done (for instance by refreshing the record). To fix this, the list of dynamicCols of the grid edit form is copied to the form view. This is done in the ksAction_EditInForm function, which is the function executed when the user presses Ctrl+F2 to move from the grid view to the form view. The list of dynamic columns returned from the FIC to the grid view is the same as the one returned from the FIC to the form view, so it is not a problem is a dynamic columns is shown in the form view but n ot in the grid view. details: https://code.openbravo.com/erp/devel/main/rev/dcc32a653a50 changeset: 26096:dcc32a653a50 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Feb 27 15:10:33 2015 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/becbc7144120 changeset: 26097:becbc7144120 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Thu Feb 26 11:26:38 2015 +0100 summary: fixed bug 28712: record selection lost in p&e grid if data has multiple pages In P&E grid with data displayed in several pages, if part of the selection was not in the 1st page two errors occured: -If after selecting a record in 2nd page another one in the 1st page was selected, selection of record in 2nd page was lost -If record in 2nd page was selected by using a filter, the filter was removed, and the p&e was submitted, the selection was not sent to backend The problem is in SC grid.getSelectedRecords which returns records only in current page. To solve this a cache of selected/unselected records is completelly maintained for p&e grids without using getSelectedRecords, this is used also to send the selected recors on p&e submission. details: https://code.openbravo.com/erp/devel/main/rev/70dd176270f0 changeset: 26098:70dd176270f0 user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Feb 16 18:10:06 2015 +0100 summary: Fixes issue 28507: Error shown when posting a reconciliation When posting a reconciliation with a payment with a payment method not included in the financial account, a warning message will be shown instead of an error message, saying "Documemt disabled for accounting" details: https://code.openbravo.com/erp/devel/main/rev/643bf6486d11 changeset: 26099:643bf6486d11 user: Unai Martirena <unai.martirena <at> openbravo.com> date: Fri Feb 27 14:51:17 2015 +0100 summary: Fixes bug 29093: LazyInitializationException avoided calculating BOM prod. cost prodLine has been reloaded in case cost calculation of previous BOM Product has cleared the session. details: https://code.openbravo.com/erp/devel/main/rev/fc4236ca4ff7 changeset: 26100:fc4236ca4ff7 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 02 10:56:15 2015 +0100 summary: Fixes issue 28754: Context info is properly sent for selectors in P&E grids The problem was that when a selector drop down was open in a P&E window, the context info sent to the datasource did not include any info of the record being edited. This made impossible to include in the selector a validation based on other fields of the P&E window. To fix this, the OBSelectorItem.prepareDSRequest function has been updated. Now that function detects if the selector belongs to a P&E grid, and if so it adds to the datasource request params the context info of the record being edited. details: https://code.openbravo.com/erp/devel/main/rev/a1c3c8123501 changeset: 26101:a1c3c8123501 user: Atul Gaware <atul.gaware <at> openbravo.com> date: Wed Feb 18 21:38:42 2015 +0530 summary: 28772: Commission payment details are duplicated if the invoice is paid in two different months In case of BasisType = Fully Paid Documents and BasisAmt = NetAmount, Commission detail amount is calculated as per percentage of invoice schedule amount with respect to total invoice amount based on payment terms lines if exists any. details: https://code.openbravo.com/erp/devel/main/rev/03b252d94692 changeset: 26102:03b252d94692 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Mon Mar 02 12:22:20 2015 +0100 summary: fixed issue 27315: Slow query for interrupted bg processes on tomcat start On Tomcat start, background processes that were in execution are updated to change their status from 'Processing' to 'System Restart'. This query does a sequential scan on ad_process_run which can be slow if there are many records. This fix: * Adds a filter on STATUS column which is indexed. The amount of processes in PRC status is expected to be small (specially comapring with the total rows in this table), so indexed scan should be used instead of sequential scan. * Adds log to inform about the number of executions marked as 'System Restart' details: https://code.openbravo.com/erp/devel/main/rev/9d659cacae03 changeset: 26103:9d659cacae03 user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 02 19:14:01 2015 +0000 summary: CI: update AD_MODULE to version 26102 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-pickeditgrid.js | 7 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 60 +- 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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js | 5 + 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/C_COMMISSION_PROCESS.xml | 41 +- src-db/database/sourcedata/AD_FIELD.xml | 1276 +++++++++- src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-db/database/sourcedata/AD_REF_LIST.xml | 11 + src-db/database/sourcedata/AD_TAB.xml | 32 + src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 + src/org/openbravo/base/OBSchedulerInitializerListener.java | 8 +- src/org/openbravo/costing/CostingAlgorithm.java | 5 +- src/org/openbravo/erpCommon/ad_forms/DocFINReconciliation.java | 6 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR.java | 76 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.html | 19 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJRFilter.xml | 4 +- src/org/openbravo/erpCommon/ad_reports/ReportInvoiceCustomerDimensionalAnalysesJR_data.xsql | 15 +- 59 files changed, 1593 insertions(+), 158 deletions(-) diffs (truncated from 3247 to 300 lines): diff -r b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 02 19:14:01 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.26084]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 02 19:14:01 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.26084]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.26102]]></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.26084]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.26102]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 02 19:14:01 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.26084]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 02 19:14:01 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.26084]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.26102]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 02 19:14:01 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.26084]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 02 19:14:01 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.26084]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.26102]]></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.26084]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.26102]]></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.26084]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.26102]]></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.26084]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.26102]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r b6c2ecaf7e1a -r 9d659cacae03 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js Mon Mar 02 19:14:01 2015 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2014 Openbravo SLU + * All portions are Copyright (C) 2014-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -95,7 +95,10 @@ var allProperties = {}, grid = this.canvas.viewGrid, allRows, len, i, selection, tmp; - selection = grid.getSelectedRecords() || []; + + // if available, use grid.pneSelectedRecords because getSelectedRecords can + // return inaccurate values in case of records selected in different pages + selection = grid.pneSelectedRecords || grid.getSelectedRecords() || []; len = selection.length; allRows = grid.data.allRows || grid.data.localData || grid.data; allProperties._selection = []; diff -r b6c2ecaf7e1a -r 9d659cacae03 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 Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Mon Mar 02 19:14:01 2015 +0000 @@ -1450,6 +1450,11 @@ autoSaveEditsBackup = me.autoSaveEdits, recordToEdit, originalValuesOfEditedRow; if (me.getSelectedRecords().length === 1) { + if (me.getEditForm() && me.view && me.view.viewForm) { + // copy the list of dynamicCols to the viewForm, as otherwise they will not be set until for form + // makes a call to the FIC (see issue https://issues.openbravo.com/view.php?id=28870) + me.view.viewForm.dynamicCols = me.getEditForm().dynamicCols; + } if (me.view.isEditingGrid) { // do not save the provisional changes me.autoSaveEdits = false; diff -r b6c2ecaf7e1a -r 9d659cacae03 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 Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Mon Mar 02 19:14:01 2015 +0000 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2011-2014 Openbravo SLU + * All portions are Copyright (C) 2011-2015 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -76,6 +76,7 @@ this.selectedIds = []; this.deselectedIds = []; + this.pneSelectedRecords = []; this.lastValidatedValues = []; // the getValuesAsCriteria function of the edit form of the filter editor should always be called with @@ -308,23 +309,48 @@ this.discardEdits(recordIdx); } - this.selectionUpdated(record, this.getSelectedRecords()); + this.pneSelectionUpdated(record, state); this.Super('selectionChanged', arguments); this.view.theForm.markForRedraw(); }, - selectionUpdated: function (record, recordList) { - var i, j, len = recordList.length, - prevSelectedLen = this.selectedIds.length, - recordId, found; + // overriding selectRecord function because super.selectRecord to maintain selectedIds + // as super.selectedRecord does not trigger selectionChanged + selectRecord: function (recordNo, state) { + // when invoking directly selectRecord, state can be undefined but it should be selected, + // unselectRecord finally invokes this function with state === false + var selected = state !== false, + actualRecord; - // Look for deselected records (records in selectedIds not present in recordList) - for (i = 0; i < prevSelectedLen; i++) { - recordId = this.selectedIds[i]; + actualRecord = isc.isA.Number(recordNo) ? this.getRecord(recordNo) : recordNo; + + this.pneSelectionUpdated(actualRecord, selected); + + this.Super('selectRecord', arguments); + }, + + // A new record has been selected/unselected: keep track of it. + // this.getSelectedRecords cannot be trusted because in case of several pages, + // selection only in latest received page is returned + pneSelectionUpdated: function (record, selected) { + var recordId = record.id, + found, i; + + if (selected) { + if (!this.pneSelectedRecords.find('id', recordId)) { + // this method can be invoked more than once per selection, ensure we only + // add the record once + this.selectedIds.push(recordId); + this.pneSelectedRecords.push(record); + } + this.deselectedIds.remove(recordId); + } else { + // this method can be invoked more than once per selection, ensure we only + // add the record once: can't use find on a simple array, let's iterate over it found = false; - for (j = 0; j < len; j++) { - if (recordId === recordList[j].id) { + for (i = 0; i < this.deselectedIds.length; i++) { + if (recordId === this.deselectedIds[i]) { found = true; break; } @@ -332,19 +358,12 @@ if (!found) { this.deselectedIds.push(recordId); } + this.selectedIds.remove(recordId); + this.pneSelectedRecords.remove(this.pneSelectedRecords.find('id', recordId)); } - this.selectedIds = []; - - for (i = 0; i < len; i++) { - this.selectedIds.push(recordList[i].id); - // Remove the record from deselectedIds - this.deselectedIds.remove(recordList[i].id); - } // refresh it all as multiple lines can be selected this.markForRedraw('Selection changed'); - - this.Super('selectionUpdated', arguments); }, cellEditEnd: function (editCompletionEvent, newValue, ficCallDone, autoSaveDone) { @@ -522,6 +541,7 @@ for (i = 0; i < len; i++) { if (rows[i] && rows[i][this.selectionProperty]) { this.selectedIds.push(rows[i][OB.Constants.ID]); + this.pneSelectedRecords.push(rows[i]); } } } diff -r b6c2ecaf7e1a -r 9d659cacae03 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 Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 02 19:14:01 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.26084]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 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 Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 02 19:14:01 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.26084]]></STARTVERSION> +<!--DCE798FBC5B648F7A3C81A6941720A57--> <STARTVERSION><![CDATA[2.1.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 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 Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 02 19:14:01 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.26084]]></VERSION> +<!--4B828F4D03264080AA1D2057B13F613C--> <VERSION><![CDATA[2.1.26102]]></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 b6c2ecaf7e1a -r 9d659cacae03 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 Thu Feb 26 19:48:36 2015 +0100 +++ b/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 02 19:14:01 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.26084]]></STARTVERSION> ------------------------------------------------------------------------------ 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 [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
