details: https://code.openbravo.com/erp/devel/main/rev/1527de35db72 changeset: 22653:1527de35db72 user: Javier Etxarri <javier.echarri <at> openbravo.com> date: Fri Mar 07 14:09:53 2014 +0100 summary: Fixes issue 25097: Payment in Void status should not appear in report, as "post" button is disabled for them
details: https://code.openbravo.com/erp/devel/main/rev/e2c94843708c changeset: 22654:e2c94843708c user: David Baz Fayos <david.baz <at> openbravo.com> date: Fri Mar 07 16:39:14 2014 +0100 summary: Fixed issue 25934: OBTreeGrid now can be included within a skin details: https://code.openbravo.com/erp/devel/main/rev/aa84f9dc3836 changeset: 22655:aa84f9dc3836 user: RM packaging bot <staff.rm <at> openbravo.com> date: Fri Mar 07 16:42:12 2014 +0000 summary: CI: merge back from main details: https://code.openbravo.com/erp/devel/main/rev/e00a853ba5c9 changeset: 22656:e00a853ba5c9 user: Salvador Zapata <salvador.zapata <at> gmail.com> date: Sat Mar 08 15:28:03 2014 -0300 summary: Fixed issue 25739: Price adjustment for multiples details: https://code.openbravo.com/erp/devel/main/rev/8c76a7a6bf32 changeset: 22657:8c76a7a6bf32 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Sun Mar 09 12:58:18 2014 +0530 summary: Fixes issue 0025431: The linked items on a partner -customer- is showing incorrect links The value of the json data is compared to null along with the object comparison to null. details: https://code.openbravo.com/erp/devel/main/rev/396b7943dbbe changeset: 22658:396b7943dbbe user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Mar 10 14:45:53 2014 +0530 summary: Fixes Issue 0025855: Problem on Building runtime model when the tablename starts with pg Remove where clause that was excluding tables starting with pg and sql. details: https://code.openbravo.com/erp/devel/main/rev/a48a8ccbc362 changeset: 22659:a48a8ccbc362 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 10 10:51:16 2014 +0100 summary: Fixes issue 25937: Right clicking on a tree record does not trigger any action details: https://code.openbravo.com/erp/devel/main/rev/d8b34bab1751 changeset: 22660:d8b34bab1751 user: Rafa de Miguel <rafael.demiguel <at> openbravo.com> date: Mon Mar 10 09:33:09 2014 +0100 summary: fixed bug 25871: Exceptions are not correctly managed in OrderLoader class in the method createShipmentLines details: https://code.openbravo.com/erp/devel/main/rev/15a48f5b6cfe changeset: 22661:15a48f5b6cfe user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Mar 10 17:14:30 2014 +0530 summary: Fixes Issue 0025557: Is not possible to enter more than one datasource table in ORACLE Duplication error is not raised when the same record is being updated. details: https://code.openbravo.com/erp/devel/main/rev/e41a9ad232c6 changeset: 22662:e41a9ad232c6 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Mon Mar 10 12:49:47 2014 +0100 summary: Fixes issue 25610: text area fields do not parse properly the filter criteria The problem was that the text area columns where not being considered text column when they were filtered. This was because they used the 'textArea' type, which was not included in the smartclientbuiltinTypes. This has been fixed by including it, and defining that the textAreaType inherits from the text type. details: https://code.openbravo.com/erp/devel/main/rev/8fe053d8c26f changeset: 22663:8fe053d8c26f user: Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> openbravo.com> date: Mon Mar 10 18:13:58 2014 +0530 summary: Fixes Issue 25785: Wrong grandtotal in invoices when you void it details: https://code.openbravo.com/erp/devel/main/rev/000a54089250 changeset: 22664:000a54089250 user: Salvador Zapata <salvador.zapata <at> gmail.com> date: Mon Mar 10 11:25:37 2014 -0300 summary: Fixed db oracle inconsistency details: https://code.openbravo.com/erp/devel/main/rev/b362f74ef31a changeset: 22665:b362f74ef31a user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Mar 10 21:40:49 2014 +0000 summary: CI: update AD_MODULE to version 22664 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-tree-filter.js | 13 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js | 41 +++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js | 5 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js | 11 + modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js | 4 + 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.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java | 3 +- modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/TreeDatasourceService.java | 4 - 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.userinterface.smartclient/web/org.openbravo.userinterface.smartclient/js/ob-smartclient.js | 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/model/functions/M_PROMOTION_ADJUSTMENT.xml | 10 +- src-db/database/model/tables/M_OFFER.xml | 8 + src-db/database/sourcedata/AD_COLUMN.xml | 71 +++++++ src-db/database/sourcedata/AD_ELEMENT.xml | 28 +++ src-db/database/sourcedata/AD_FIELD.xml | 57 ++++++ src-db/database/sourcedata/AD_MODULE.xml | 4 +- src-util/modulescript/build/classes/org/openbravo/modulescript/UpdateGrandTotalData.class | 0 src-util/modulescript/src/org/openbravo/modulescript/UpdateGrandTotal_data.xsql | 4 - src/org/openbravo/base/session/SessionFactoryController.java | 3 +- src/org/openbravo/erpCommon/ad_reports/ReportNotPosted_data.xsql | 2 + src/org/openbravo/erpCommon/businessUtility/PriceAdjustment.java | 37 ++- src/org/openbravo/event/ADTableEventHandler.java | 2 + src/org/openbravo/service/db/CallProcess.java | 92 +++++++++- 61 files changed, 438 insertions(+), 127 deletions(-) diffs (truncated from 1659 to 300 lines): diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 10 21:40:49 2014 +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.22645]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.22664]]></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 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 10 21:40:49 2014 +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.22645]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.22664]]></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.22645]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.22664]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 10 21:40:49 2014 +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.22645]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.22664]]></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 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 10 21:40:49 2014 +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.22645]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.22664]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 10 21:40:49 2014 +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.22645]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.22664]]></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 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Mar 10 21:40:49 2014 +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.22645]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.22664]]></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.22645]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.22664]]></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.22645]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.22664]]></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.22645]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.22664]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree-filter.js Mon Mar 10 21:40:49 2014 +0000 @@ -133,9 +133,20 @@ }; ds.transformResponse = function (dsResponse, dsRequest, jsonData) { + var i, node; if (jsonData.response.error) { dsResponse.error = jsonData.response.error; } + if (jsonData.response && jsonData.response.data) { + for (i = 0; i < jsonData.response.data.length; i++) { + node = jsonData.response.data[i]; + if (node.showDropIcon) { + node.icon = OB.Styles.OBTreeGrid.iconFolder; + } else { + node.icon = OB.Styles.OBTreeGrid.iconNode; + } + } + } return this.Super('transformResponse', arguments); }; @@ -278,7 +289,6 @@ } }, - pickerIconSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/search_picker.png', filterDialogCallback: function (criteria) { this.grid.parentElement.setFilterEditorCriteria(criteria); this.lastValueFromPopup = this.getValue(); @@ -287,6 +297,7 @@ init: function () { var field; + this.pickerIconSrc = OB.Styles.OBFormField.DefaultSearch.pickerIconSrc; this.Super('init', arguments); field = this.grid.getField(this.name); this.criteriaField = field.displayField; diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-tree.js Mon Mar 10 21:40:49 2014 +0000 @@ -30,11 +30,19 @@ isc.OBTreeItem.addProperties({ showPickerIcon: true, - pickerIconSrc: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/comboBoxPicker.png', pickerIconHSpace: 0, iconHSpace: 0, tree: null, init: function () { + this.pickerIconSrc = OB.Styles.OBFormField.DefaultComboBox.pickerIconSrc; + this.icons = [{ + src: OB.Styles.OBFormField.DefaultSearch.pickerIconSrc, + width: OB.Styles.OBFormField.DefaultSearch.pickerIconWidth, + height: OB.Styles.OBFormField.DefaultSearch.pickerIconHeight, + click: function (form, item, icon) { + item.openTreeWindow(); + } + }]; this.Super('init', arguments); this.tree = isc.OBTreeItemTree.create({ treeItem: this @@ -101,15 +109,6 @@ return response; }, - icons: [{ - src: OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/form/search_picker.png', - width: 21, - height: 21, - click: function (form, item, icon) { - item.openTreeWindow(); - } - }], - openTreeWindow: function () { var selectedValue = this.getValue(), criteria, innerCriteria; @@ -291,9 +290,20 @@ }; ds.transformResponse = function (dsResponse, dsRequest, jsonData) { + var i, node; if (jsonData.response.error) { dsResponse.error = jsonData.response.error; } + if (jsonData.response && jsonData.response.data) { + for (i = 0; i < jsonData.response.data.length; i++) { + node = jsonData.response.data[i]; + if (node.showDropIcon) { + node.icon = OB.Styles.OBTreeGrid.iconFolder; + } else { + node.icon = OB.Styles.OBTreeGrid.iconNode; + } + } + } return this.Super('transformResponse', arguments); }; @@ -515,9 +525,20 @@ }; ds.transformResponse = function (dsResponse, dsRequest, jsonData) { + var i, node; if (jsonData.response.error) { dsResponse.error = jsonData.response.error; } + if (jsonData.response && jsonData.response.data) { + for (i = 0; i < jsonData.response.data.length; i++) { + node = jsonData.response.data[i]; + if (node.showDropIcon) { + node.icon = OB.Styles.OBTreeGrid.iconFolder; + } else { + node.icon = OB.Styles.OBTreeGrid.iconNode; + } + } + } return this.Super('transformResponse', arguments); }; diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-grid.js Mon Mar 10 21:40:49 2014 +0000 @@ -131,5 +131,10 @@ handleFilterEditorSubmit: function (criteria, context, callback) { this.setOpenState('[]'); this.Super('handleFilterEditorSubmit', arguments); + }, + + // No actions should be triggered when clicking a record with the right button + cellContextClick: function (record, rowNum, colNum) { + return false; } }); \ No newline at end of file diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-tree-view-grid.js Mon Mar 10 21:40:49 2014 +0000 @@ -102,6 +102,7 @@ }; ds.transformResponse = function (dsResponse, dsRequest, jsonData) { + var i, node; if (jsonData.response.message) { me.view.messageBar.setMessage(jsonData.response.message.messageType, null, jsonData.response.message.message); } else if (dsRequest.operationType === 'update') { @@ -110,6 +111,16 @@ if (jsonData.response.error) { dsResponse.error = jsonData.response.error; } + if (jsonData.response && jsonData.response.data) { + for (i = 0; i < jsonData.response.data.length; i++) { + node = jsonData.response.data[i]; + if (node.showDropIcon) { + node.icon = OB.Styles.OBTreeGrid.iconFolder; + } else { + node.icon = OB.Styles.OBTreeGrid.iconNode; + } + } + } return this.Super('transformResponse', arguments); }; diff -r 39e474a762db -r b362f74ef31a modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js --- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-tree-grid-styles.js Mon Mar 10 21:40:49 2014 +0000 @@ -17,6 +17,10 @@ ************************************************************************ */ +OB.Styles.OBTreeGrid = OB.Styles.OBTreeGrid || {}; +OB.Styles.OBTreeGrid.iconFolder = OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/tree-grid/iconFolder.png'; +OB.Styles.OBTreeGrid.iconNode = OB.Styles.skinsPath + 'Default/org.openbravo.client.application/images/tree-grid/iconNode.png'; + isc.OBTreeGrid.addProperties({ bodyStyleName: 'OBGridBody', baseStyle: 'OBTreeGridCell', diff -r 39e474a762db -r b362f74ef31a 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 Fri Mar 07 07:49:14 2014 +0100 +++ b/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml Mon Mar 10 21:40:49 2014 +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.22645]]></VERSION> +<!--D393BE6F22BB44B7B728259B34FC795A--> <VERSION><![CDATA[1.0.22664]]></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 39e474a762db -r b362f74ef31a modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml ------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. Written by three acclaimed leaders in the field, this first edition is now available. Download your free book today! http://p.sf.net/sfu/13534_NeoTech _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
