details: /erp/devel/main/rev/11ca56569ffd
changeset: 10464:11ca56569ffd
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 09 13:41:01 2011 +0100
summary: [quickaction] Change 'form' view types icon with proper one - part2
details: /erp/devel/main/rev/1bc65959fd80
changeset: 10465:1bc65959fd80
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 09 12:28:11 2011 +0100
summary: fixed bug 15864: 'Show Audit Trail' in Community Edition, link is
incorrect
details: /erp/devel/main/rev/94a11e5a4603
changeset: 10466:94a11e5a4603
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 09 13:44:43 2011 +0100
summary: [process] Don't use non-standard location.origin for closing poup
details: /erp/devel/main/rev/0e5e7efe3769
changeset: 10467:0e5e7efe3769
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Feb 09 13:53:35 2011 +0100
summary: Change test be independent on special behavior of
ModelProvider.getTables()
Needed in preperation of planned behavior change of the mentioned method
details: /erp/devel/main/rev/d98f5745a830
changeset: 10468:d98f5745a830
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Feb 09 15:12:04 2011 +0100
summary: Fixed 15900. Change getTables() to only return tables usable with
DAL.
This changes the list of tables returned by ModelProvider.getTables() to only
return the list of tables usable with dal and not all the tables which are
defined in ad_table. Difference between those are tables not supported by dal
i.e. which do not have any column defined which is marked as primary key.
details: /erp/devel/main/rev/9cc8c8a6dfd1
changeset: 10469:9cc8c8a6dfd1
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Wed Feb 09 15:17:13 2011 +0100
summary: Improve performance of first login after tomcat startup.
UIDefinitionController fills a in-memory cache on its first use (normally
on first login after tomcat start). Improve this by reusing the list of columns
already present in the DAL in memory model (from ModelProvider) instead of
it again from the db. Saves around 3-4s on first login.
Note: This removes around 367 entries from this cache. However those are never
needed as they are linked to tables which cannot be used via DAL so the reduced
entry set in the cache is now consistent with DAL-usable columns.
details: /erp/devel/main/rev/e9931b4858fb
changeset: 10470:e9931b4858fb
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Feb 09 15:31:55 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/e6ffe83b821a
changeset: 10471:e6ffe83b821a
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 09 15:50:36 2011 +0100
summary: [form][style] Fixed webkit browser default's disabled style
details: /erp/devel/main/rev/4e4473fffff4
changeset: 10472:4e4473fffff4
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Feb 09 16:22:33 2011 +0100
summary: Support for out-fields in selector item
details: /erp/devel/main/rev/0bea82161179
changeset: 10473:0bea82161179
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 09 16:26:09 2011 +0100
summary: Fixed issue 15679: Now dialog buttons are centered
details: /erp/devel/main/rev/85e53b4d0fb0
changeset: 10474:85e53b4d0fb0
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Feb 09 12:40:06 2011 +0100
summary: Fix SetDocumentNoHandler. Take into account that docTypeTarget and
docType can be null.
details: /erp/devel/main/rev/c228888b1225
changeset: 10475:c228888b1225
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Feb 09 16:01:38 2011 +0100
summary: Refresh in form and grid view when is needed.
details: /erp/devel/main/rev/6fff697189e9
changeset: 10476:6fff697189e9
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Feb 09 16:30:07 2011 +0100
summary: Windows with a column of reference ImageBLOB will be shown in
classic mode until the reference is implemented in 3.0 windows.
details: /erp/devel/main/rev/ddde82ccfd59
changeset: 10477:ddde82ccfd59
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Wed Feb 09 16:49:19 2011 +0100
summary: Fixes issue 15898: Payment methods modify in F&B
details: /erp/devel/main/rev/52ad9b93930a
changeset: 10478:52ad9b93930a
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Wed Feb 09 17:21:22 2011 +0100
summary: Fixes issue 15905: Remove the metric system from the name of US
product
details: /erp/devel/main/rev/88b76805cac7
changeset: 10479:88b76805cac7
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Wed Feb 09 17:31:48 2011 +0100
summary: Fixes issue 15905: Activate POS Order document in F&B demo data
details: /erp/devel/main/rev/3cc3d1a740b2
changeset: 10480:3cc3d1a740b2
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Feb 09 17:32:12 2011 +0100
summary: fixed issue 15874: Permissions to processes are not respected
details: /erp/devel/main/rev/8191d45f2d75
changeset: 10481:8191d45f2d75
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 09 17:32:31 2011 +0100
summary: [OBUIAPP] Fix issue on ob-grid renaming the property to remove the
'_identifier'.
details: /erp/devel/main/rev/9158261ee690
changeset: 10482:9158261ee690
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 09 17:36:03 2011 +0100
summary: [OBUISEL] Fixed issue filtering the picklist on selectors using
custom query.
details: /erp/devel/main/rev/9a61e6cef524
changeset: 10483:9a61e6cef524
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 09 17:38:56 2011 +0100
summary: [OBUISEL] Properly define foreign key fields on the grid.
details: /erp/devel/main/rev/1e14058a7dec
changeset: 10484:1e14058a7dec
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 09 17:39:38 2011 +0100
summary: [OBUISEL] Implement default expressions on grid fields.
details: /erp/devel/main/rev/a5da93a71cd6
changeset: 10485:a5da93a71cd6
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Wed Feb 09 17:48:09 2011 +0100
summary: Fixed 'Installation History' Search button html
details: /erp/devel/main/rev/389529e55ba6
changeset: 10486:389529e55ba6
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Feb 09 19:39:32 2011 +0100
summary: CI: update AD_MODULE to version 10485
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/src/org/openbravo/client/application/ApplicationUtils.java
| 10 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
| 7 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 4
+-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 13 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
| 8 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 18 +-
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.kernel/src/org/openbravo/client/kernel/reference/UIDefinitionController.java
| 50 +-
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/web/org.openbravo.client.myob/js/ob-myopenbravo.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.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.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/src/org/openbravo/userinterface/selector/CustomQuerySelectorDatasource.java
| 25 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
| 16 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDefaultFilterActionHandler.java
| 42 +-
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/templates/selector.ftl
| 5 +-
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 28 +-
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
|
22 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 12 +-
referencedata/sampledata/F_B_International_Group.xml
| 330 +++++-----
src-db/database/sourcedata/AD_MESSAGE.xml
| 2 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
src-db/database/sourcedata/AD_REF_LIST.xml
| 12 +
src-test/org/openbravo/test/model/RuntimeModelTest.java
| 58 +-
src-wad/src/org/openbravo/wad/javasource.javaxml
| 23 +-
src/org/openbravo/base/model/ModelProvider.java
| 22 +-
src/org/openbravo/erpCommon/ad_forms/ModuleManagementHistory.html
| 30 +-
src/org/openbravo/erpCommon/obps/ErrorActivatedInstancesOnly.html
| 2 +-
56 files changed, 521 insertions(+), 340 deletions(-)
diffs (truncated from 2367 to 300 lines):
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10485]]></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 ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10485]]></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.10454]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10485]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
--- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 13:38:28 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10485]]></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 ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10485]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10485]]></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 ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Feb 09 19:39:32 2011 +0100
@@ -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.10454]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10485]]></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.10454]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10485]]></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.10454]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10485]]></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.10454]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10485]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationUtils.java
Wed Feb 09 19:39:32 2011 +0100
@@ -49,6 +49,16 @@
static boolean showWindowInClassicMode(Window window) {
for (Tab tab : window.getADTabList()) {
+
+ // FIXME Remove this once ImageBLOB is implemented
+ // Currently, windows with ImageBLOB reference columns will be shown in
classic mode
+ String tableName = tab.getTable().getDBTableName();
+ org.openbravo.base.model.Table table =
ModelProvider.getInstance().getTable(tableName);
+ for (org.openbravo.base.model.Column col : table.getColumns()) {
+ if
(col.getReference().getId().equals("4AA6C3BE9D3B4D84A3B80489505A23E5")) {
+ return true;
+ }
+ }
if (tab.getSQLWhereClause() != null && tab.getHqlwhereclause() == null) {
// There is a tab with a SQL whereclause, but without a defined HQL
whereclause
return true;
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/SetDocumentNoHandler.java
Wed Feb 09 19:39:32 2011 +0100
@@ -68,9 +68,10 @@
String documentNo = (String) event.getCurrentState(documentNoProperty);
if (documentNo == null || documentNo.startsWith("<")) {
- final DocumentType docTypeTarget = (DocumentType) event
- .getCurrentState(docTypeTargetProperty);
- final DocumentType docType = (DocumentType)
event.getCurrentState(documentTypeProperty);
+ final DocumentType docTypeTarget = (docTypeTargetProperty == null ?
null
+ : (DocumentType) event.getCurrentState(docTypeTargetProperty));
+ final DocumentType docType = (documentTypeProperty == null ? null :
(DocumentType) event
+ .getCurrentState(documentTypeProperty));
// use empty strings instead of null
final String docTypeTargetId = docTypeTarget != null ?
docTypeTarget.getId() : "";
final String docTypeId = docType != null ? docType.getId() : "";
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-action-button.js
Wed Feb 09 19:39:32 2011 +0100
@@ -93,12 +93,10 @@
OB.ActionButton.executingProcess = null;
if (newWindow) {
- if (newWindow.indexOf(location.origin) !== -1){
- newWindow = newWindow.substr(location.origin.length);
- }
+ var contextURL = location.href.substr(0,
location.href.indexOf(OB.Application.contextUrl) +
OB.Application.contextUrl.length);
- if (newWindow.startsWith(OB.Application.contextUrl)){
- newWindow = newWindow.substr(OB.Application.contextUrl.length);
+ if (newWindow.indexOf(contextURL) !== -1){
+ newWindow = newWindow.substr(contextURL.length);
}
if (!newWindow.startsWith('/')){
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Wed Feb 09 19:39:32 2011 +0100
@@ -148,7 +148,7 @@
for (prop in criteria) {
if (criteria.hasOwnProperty(prop) && prop.endsWith('.' +
OB.Constants.IDENTIFIER)) {
value = criteria[prop];
- index = prop.indexOf('.');
+ index = prop.lastIndexOf('.');
prop = prop.substring(0, index);
criteria[prop] = value;
}
@@ -246,7 +246,7 @@
var value = criteria[prop];
// see the description in setValuesAsCriteria above
if (prop.endsWith('.' + OB.Constants.IDENTIFIER)) {
- var index = prop.indexOf('.');
+ var index = prop.lastIndexOf('.');
prop = prop.substring(0, index);
}
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Feb 09 19:39:32 2011 +0100
@@ -1115,22 +1115,21 @@
if (!this.isShowingForm) {
this.messageBar.hide();
- this.viewGrid.filterData(this.viewGrid.getCriteria(), refreshCallback);
+ this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
+ this.viewGrid.invalidateCache();
} else {
var view = this;
if (this.viewForm.hasChanged) {
var callback = function(ok){
if (ok) {
- var criteria = [];
- criteria[OB.Constants.ID] =
view.viewGrid.getSelectedRecord()[OB.Constants.ID];
- view.viewForm.fetchData(criteria, refreshCallback);
+ this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
+ this.viewGrid.invalidateCache();
}
};
isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmRefresh'), callback);
} else {
- var criteria = [];
- criteria[OB.Constants.ID] = view.viewForm.getValue(OB.Constants.ID);
- view.viewForm.fetchData(criteria, refreshCallback);
+ this.viewGrid.targetRecordId =
this.viewGrid.getSelectedRecord()[OB.Constants.ID];
+ this.viewGrid.invalidateCache();
}
}
},
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Feb 09 19:39:32 2011 +0100
@@ -463,6 +463,10 @@
if (this.view.standardWindow.directTabInfo) {
this.view.openDirectChildTab();
}
+
+ if (this.view.isShowingForm) {
+ this.view.viewForm.editRecord(gridRecord);
+ }
} else {
// wait a bit longer til the body is drawn
this.delayCall('delayedHandleTargetRecord', [startRow, endRow], 200,
this);
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-application-styles.js
Wed Feb 09 19:39:32 2011 +0100
@@ -133,10 +133,10 @@
* Changed styling of the standard dialogs
=======================================================================*/
-isc.addProperties(isc.Dialog.Warn.toolbarDefaults,
- {buttonConstructor: isc.OBFormButton
- }
-);
+isc.addProperties(isc.Dialog.Warn.toolbarDefaults, {
+ buttonConstructor: isc.OBFormButton,
+ styleName: 'OBDialogButtonToolBar'
+});
isc.ListGrid.addProperties({
alternateRecordStyles: true
diff -r ed51b9f4041f -r 389529e55ba6
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
---
a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Wed Feb 09 13:38:28 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
Wed Feb 09 19:39:32 2011 +0100
@@ -19,11 +19,12 @@
/*=======================================================================
* Contains styles for:
- * View Form Styles
+ * View Form Styles
* Form Fields/Items
* Date Picker
- * Form Buttons
- * SectionItem Button Styles
+ * Form Buttons
+ * SectionItem Button
+ * Dialog
=======================================================================*/
/*=======================================================================
@@ -125,6 +126,7 @@
.OBFormFieldStaticDisabled {
color: #7d7d7d;
+ -webkit-text-fill-color: #7d7d7d;
}
.OBFormFieldInputDisabled,
@@ -133,6 +135,7 @@
border: 1px solid #d7d7d7;
background-color: #ffffff;
color: #7d7d7d;
+ -webkit-text-fill-color: #7d7d7d;
}
.OBFormFieldDateInput,
@@ -564,7 +567,7 @@
}
/*=======================================================================
- * SectionItem Button Styles
+ * SectionItem Button
=======================================================================*/
.OBSectionItemButton_Title_opened,
@@ -589,3 +592,10 @@
color: #58A618;
}
+/*=======================================================================
+ * Dialog
+=======================================================================*/
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits