details: /erp/devel/main/rev/01618445546d
changeset: 11153:01618445546d
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Mar 09 17:02:32 2011 +0100
summary: Remove wrong comment
details: /erp/devel/main/rev/359778f925d1
changeset: 11154:359778f925d1
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Mar 09 18:52:41 2011 +0100
summary: Fixed issue 16178. Three things related to CSV have been fixed:
- Dates will be formatted according to the user-defined format
- Column names will be the correct translated field names
- Columns with list reference will be exported using the translated identifier
for the list item.
details: /erp/devel/main/rev/46ebbcd9c34e
changeset: 11155:46ebbcd9c34e
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Mar 09 18:55:52 2011 +0100
summary: Related to issue 16178. Fix wrong property name
details: /erp/devel/main/rev/5d6088b23934
changeset: 11156:5d6088b23934
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Mar 09 19:00:50 2011 +0100
summary: Fixes issue 16190: Avoid skiping not updatable properties are they
are UI concept
details: /erp/devel/main/rev/03f21336f3da
changeset: 11157:03f21336f3da
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 12:34:16 2011 -0600
summary: Fixes issue 16174 Smoke test: when trying to create a line for a
second price list schema, buttons are disabled
details: /erp/devel/main/rev/9c6fecf14181
changeset: 11158:9c6fecf14181
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Mar 09 19:34:14 2011 +0100
summary: [OBJSON] Moved buildCriteria() method to JsonUtils.
details: /erp/devel/main/rev/8c11b21568d3
changeset: 11159:8c11b21568d3
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Mar 09 19:34:59 2011 +0100
summary: [OBUISEL] Applied advancedCriteria filter to CustomQueryDatasource.
details: /erp/devel/main/rev/715e5f37db43
changeset: 11160:715e5f37db43
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Mar 09 19:36:04 2011 +0100
summary: Fixed issue 16143.[OBUIAPP] Fixed issue on isSalesTransaction()
method.
details: /erp/devel/main/rev/5e97adac7909
changeset: 11161:5e97adac7909
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 13:47:34 2011 -0600
summary: Enabled grid row modal editing
details: /erp/devel/main/rev/92ecb7ac760a
changeset: 11162:92ecb7ac760a
user: Martin Taal <martin.taal <at> openbravo.com>
date: Wed Mar 09 13:56:45 2011 -0600
summary: Removed cancel edit confirmation
details: /erp/devel/main/rev/22464bd0dd6d
changeset: 11163:22464bd0dd6d
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 09 21:04:46 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/94ab6ea9a86b
changeset: 11164:94ab6ea9a86b
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Wed Mar 09 23:29:26 2011 +0100
summary: CI: update AD_MODULE to version 11163
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/OBBindings.java
| 18 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 15 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 5 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 31 ++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 84 ++++--
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/UIDefinition.java
| 2 -
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/DataSourceServlet.java
| 112 ++++++++-
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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 49 +----
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonToDataConverter.java
| 3 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
| 48 ++++
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
| 32 ++-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 6 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 24 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 14 +-
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
49 files changed, 361 insertions(+), 189 deletions(-)
diffs (truncated from 1482 to 300 lines):
diff -r bbf253597190 -r 94ab6ea9a86b
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Mar 09 23:29:26 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.11146]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11163]]></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 bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Mar 09 23:29:26 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.11146]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11163]]></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.11146]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11163]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Wed Mar 09 23:29:26 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.11146]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11163]]></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 bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Mar 09 23:29:26 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.11146]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11163]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Wed Mar 09 23:29:26 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.11146]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11163]]></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 bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Wed Mar 09 23:29:26 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.11146]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11163]]></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.11146]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.11163]]></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.11146]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.11163]]></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.11146]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.11163]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r bbf253597190 -r 94ab6ea9a86b
modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
Wed Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/OBBindings.java
Wed Mar 09 23:29:26 2011 +0100
@@ -103,12 +103,24 @@
}
String value = requestMap.get(OBBindingsConstants.SO_TRX_PARAM);
-
- if (value == null) {
+ if (value != null) {
+ return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
+ }
+ if (httpSession == null) {
+ log.warn("Requesting isSOTrx check without request parameters and
session");
return null;
}
- return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
+ value = (String) httpSession.getAttribute("inpisSOTrxTab");
+ if (value != null) {
+ return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
+ }
+
+ value = (String) httpSession.getAttribute(getWindowId() + "|ISSOTRX");
+ if (value != null) {
+ return "Y".equalsIgnoreCase(value) || "true".equalsIgnoreCase(value);
+ }
+ return null;
}
public String getWindowId() {
diff -r bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js
Wed Mar 09 23:29:26 2011 +0100
@@ -356,6 +356,7 @@
_noCount: true, // never do count for export
exportAs: expProp.exportAs || 'csv',
viewState: expProp.viewState,
+ tab: expProp.tab,
exportToFile: true,
_textMatchStyle: 'substring'
}, this.getCriteria());
diff -r bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Wed Mar 09 23:29:26 2011 +0100
@@ -1411,16 +1411,11 @@
// selected records
grid = view.viewGrid;
}
- callback = function(ok){
- if (ok) {
- if (form) {
- form.undo();
- } else {
- grid.undoEditSelectedRows();
- }
- }
- };
- isc.ask(OB.I18N.getLabel('OBUIAPP_ConfirmUndo', callback), callback);
+ if (form) {
+ form.undo();
+ } else {
+ grid.undoEditSelectedRows();
+ }
},
// ++++++++++++++++++++ Parent-Child Tab Handling ++++++++++++++++++++++++++
diff -r bbf253597190 -r 94ab6ea9a86b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Wed Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Wed Mar 09 23:29:26 2011 +0100
@@ -209,9 +209,10 @@
exportDisplay: 'download',
params: {
exportToFile: true
- }
+ },
+ viewState: this.view.viewGrid.getViewState(),
+ tab: this.view.tabId
};
- requestProperties.viewState = this.view.viewGrid.getViewState();
this.view.viewGrid.exportData(requestProperties);
},
disabled: false,
diff -r bbf253597190 -r 94ab6ea9a86b
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Wed Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Wed Mar 09 23:29:26 2011 +0100
@@ -182,6 +182,26 @@
}
},
+ // add the undo buttons to the clickmask so that no save happens when
+ // clicking undo
+ showClickMask : function(clickAction, mode, unmaskedTargets) {
+ if (!isc.isA.Array(unmaskedTargets)) {
+ if (!unmaskedTargets) {
+ unmaskedTargets = [];
+ } else {
+ unmaskedTargets = [unmaskedTargets];
+ }
+ }
+ // the main undo button
+ unmaskedTargets.push(this.view.toolBar.getLeftMember('undo'));
+
+ // the row cancel button
+ if (this.view.viewGrid.getSelectedRecord() &&
this.view.viewGrid.getSelectedRecord().editColumnLayout) {
+
unmaskedTargets.push(this.view.viewGrid.getSelectedRecord().editColumnLayout.cancelButton);
+ }
+ this.Super('showClickMask', [clickAction, mode, unmaskedTargets]);
+ },
+
setNewState: function(isNew){
this.isNew = isNew;
this.view.statusBar.setNewState(isNew);
@@ -768,9 +788,16 @@
var index1, index2, errorCode, view = form.view;
var status = resp.status;
- // if this is not done the selection gets lost
+ // if no recordIndex then select explicitly
+ if (recordIndex === -1) {
+ var id = form.getValue('id');
+ record = view.viewGrid.data.find('id', id);
+ recordIndex = view.viewGrid.data.indexOf(record);
+ }
+
if (recordIndex || recordIndex === 0) {
- var localRecord = view.viewGrid.getRecord(recordIndex);
+ // if this is not done the selection gets lost
+ var localRecord = view.viewGrid.data.get(recordIndex);
if (localRecord) {
localRecord[view.viewGrid.selection.selectionProperty] = true;
}
diff -r bbf253597190 -r 94ab6ea9a86b
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 Mar 09 18:19:24 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Wed Mar 09 23:29:26 2011 +0100
@@ -137,7 +137,8 @@
// modal editing is not possible as we need to be able to do
// undo, which means clicks outside of the current form.
- modalEditing: false,
+ modalEditing: true,
+ //showGridSummary: true,
timeFormatter: 'to24HourTime',
@@ -167,6 +168,16 @@
}
},
+ cellEditEnd: function(ece) {
+ if (ece === isc.ListGrid.CLICK_OUTSIDE) {
+ // finished editing on a click outside of the
+ // current edit row
+ this.endEditing();
+ } else {
+ this.Super('cellEditEnd', arguments);
+ }
+ },
+
refreshFields: function(){
this.setFields(this.completeFields.duplicate());
},
@@ -451,8 +462,7 @@
}
var context = {
- showPrompt: false,
- textMatchStyle: this.autoFetchTextMatchStyle
+ showPrompt: false
};
this.filterData(this.getCriteria(), callback, context);
},
@@ -715,8 +725,24 @@
operator: 'and',
_constructor: "AdvancedCriteria",
criteria:[]};
+
+ // add a dummy criteria to force a fetch
+ criteria.criteria.push({
+ fieldName: '_dummy',
+ operator: 'equals',
+ value: this.targetRecordId
+ });
+
// remove the filter clause we don't want to use
this.filterClause = null;
+ } else {
+ // remove the _dummy
+ for (i = 0; i < criteria.criteria.length; i++) {
+ if (criteria.criteria[i].fieldName === '_dummy') {
+ criteria.criteria.removeAt(i);
+ break;
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
