details: /erp/devel/main/rev/8e3d08f05c01
changeset: 11535:8e3d08f05c01
user: Pablo Sarobe <pablo.sarobe <at> openbravo.com>
date: Wed Apr 06 19:59:01 2011 +0200
summary: Fixes issues 16675, 16672
details: /erp/devel/main/rev/e056ce5721bb
changeset: 11536:e056ce5721bb
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 07 09:37:25 2011 +0200
summary: Fixes issue 16603: Autosave disabled doesn't work on grid
details: /erp/devel/main/rev/3d1ee3ff4716
changeset: 11537:3d1ee3ff4716
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Apr 07 09:46:54 2011 +0200
summary: Related to issue 16546. Improved message.
details: /erp/devel/main/rev/30abdcb31368
changeset: 11538:30abdcb31368
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 07 10:53:51 2011 +0200
summary: Fixes issue 16581: On alert management, when a record is edited it
automatically appear the record in all the grids
details: /erp/devel/main/rev/fc564c1ef2e1
changeset: 11539:fc564c1ef2e1
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 07 11:07:00 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/376b12312af4
changeset: 11540:376b12312af4
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Apr 07 11:34:53 2011 +0200
summary: Related to issue 16603: Autosave disabled doesn't work on grid
details: /erp/devel/main/rev/d8cc7fbe4988
changeset: 11541:d8cc7fbe4988
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Apr 07 11:39:27 2011 +0200
summary: Fixes issue 16678: Avoid polluting the log with useless warning
details: /erp/devel/main/rev/c6571cdea5b0
changeset: 11542:c6571cdea5b0
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Thu Apr 07 12:41:22 2011 +0200
summary: Fixed issue 16674.Added Getting started widget instance at System
level so it's shown to all users.
details: /erp/devel/main/rev/e2556cfac1b6
changeset: 11543:e2556cfac1b6
user: Juan Pablo Aroztegi <juanpablo.aroztegi <at> openbravo.com>
date: Thu Apr 07 12:54:22 2011 +0200
summary: Fixes 16684: swap the order in the root.user and no.java.home checks.
Some Linux systems don't have JAVA_HOME set for the root user.
When a user runs ant commands in these cases they get an
error about the JAVA_HOME not being set, but the real cause
is that they're running the command as root. Hence the order
swapping.
details: /erp/devel/main/rev/db4e342ac247
changeset: 11544:db4e342ac247
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Apr 07 13:03:03 2011 +0200
summary: Fixes issue 16686: No need to recalculate the about and parameters
data
details: /erp/devel/main/rev/6ab82961bf8c
changeset: 11545:6ab82961bf8c
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Thu Apr 07 13:42:28 2011 +0200
summary: Fixes issue 16686: Added widgetInstanceId to default properties
- widgetInstanceId is now a default widget property
- About info and parameters are pulled from the widget definition
details: /erp/devel/main/rev/a3dd21ac300b
changeset: 11546:a3dd21ac300b
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 07 14:23:30 2011 +0200
summary: fixed bug 16691: Notes are not shown sometimes
details: /erp/devel/main/rev/38570888ce33
changeset: 11547:38570888ce33
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 07 14:53:38 2011 +0200
summary: Notes: styling
details: /erp/devel/main/rev/092b43dd4ecb
changeset: 11548:092b43dd4ecb
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 07 15:07:40 2011 +0200
summary: Notes: styling
details: /erp/devel/main/rev/915b198578bd
changeset: 11549:915b198578bd
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Thu Apr 07 15:23:44 2011 +0200
summary: Make file non-public as not needed and to avoid it being part of
public api
details: /erp/devel/main/rev/b981769d0cef
changeset: 11550:b981769d0cef
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Apr 07 16:39:28 2011 +0200
summary: fixed bug 16701: All section are closed when it should be open
details: /erp/devel/main/rev/8d002e0b6285
changeset: 11551:8d002e0b6285
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Thu Apr 07 17:55:21 2011 +0200
summary: CI: merge back from main
details: /erp/devel/main/rev/e5716dbd8be4
changeset: 11552:e5716dbd8be4
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Thu Apr 07 18:54:29 2011 +0200
summary: Make column non mandatory until issue 16713 is fixed.
Note: AD column is set as mandatory, so the user will not notice it
details: /erp/devel/main/rev/fcb4a740ab97
changeset: 11553:fcb4a740ab97
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Apr 08 00:05:46 2011 +0200
summary: CI: update AD_MODULE to version 11552
diffstat:
.hgsigs
| 1 +
.hgtags
| 1 +
build.xml
| 2 +-
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/model/tables/OBUIAPP_NOTE.xml
| 2
+-
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.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/templates/ob-view-field.js.ftl
| 4 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 9 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 2 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
| 13 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 38 +-
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 14 +-
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/CSSMinimizer.java
| 4
+-
modules/org.openbravo.client.myob/referencedata/standard/MyOBData.xml
| 15 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_DATASET_TABLE.xml
|
4 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
| 4
+-
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
|
1 +
modules/org.openbravo.client.myob/web/org.openbravo.client.myob/js/ob-myopenbravo.js
|
9 +-
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/templates/datasource.ftl
| 3 +
modules/org.openbravo.service.datasource/web/org.openbravo.service.datasource/js/ob-datasource-utilities.js
| 5 +
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.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 +-
referencedata/sampledata/F_B_International_Group.xml
| 197 ++++-----
src-db/database/sourcedata/AD_MODULE.xml
| 4 +-
58 files changed, 276 insertions(+), 208 deletions(-)
diffs (truncated from 1665 to 300 lines):
diff -r 0649b6a37a1e -r fcb4a740ab97 .hgsigs
--- a/.hgsigs Wed Apr 06 17:58:50 2011 +0200
+++ b/.hgsigs Fri Apr 08 00:05:46 2011 +0200
@@ -30,3 +30,4 @@
668651fe8a81bcb9a55c3073d6a8f59d91d70b26 0
iEYEABECAAYFAk1eS8gACgkQCX/oGf+2qkOW4ACbB0zLCbzqWAECmpERhBOmSp+hrfAAoPfnoksz58TTrITz6vIdNLlOykKX
37f2d5f6122e0b7d404f15af699bbf517c8620f1 0
iEYEABECAAYFAk1e5jYACgkQCX/oGf+2qkNdOwCg+BZzm0X320yJPlglOs6S3meDeesAoI+GDdOqlwP0J3ZJxtwS2LYiC68K
6b5829bdfb83a717983a5cc3d93cf23993504dee 0
iEYEABECAAYFAk2D2aIACgkQCX/oGf+2qkNw4ACgnusvXTfY7cwcF8JIyx3gMPDE18sAmQG/UCHIcT/mmqX1UcgpiCgEqUB3
+290cb79e7e1b40a7584920fa1ab2319bb6f36dd2 0
iEYEABECAAYFAk2TX/0ACgkQCX/oGf+2qkPETwCdF5Lxy/MMap+EFbYn3VPcBWjg6qUAoLYKMP5vkaxVXxQWqMrAEKJ+Tr3a
diff -r 0649b6a37a1e -r fcb4a740ab97 .hgtags
--- a/.hgtags Wed Apr 06 17:58:50 2011 +0200
+++ b/.hgtags Fri Apr 08 00:05:46 2011 +0200
@@ -40,3 +40,4 @@
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
2900108d13e7c88366e2993a7e4ccae9a9a13618 3.0RC5
+5f47e83fbcb3746a754737199769a7edd6a9eee2 3.0RC5.1
diff -r 0649b6a37a1e -r fcb4a740ab97 build.xml
--- a/build.xml Wed Apr 06 17:58:50 2011 +0200
+++ b/build.xml Fri Apr 08 00:05:46 2011 +0200
@@ -329,8 +329,8 @@
<taskdef resource="axis-tasks.properties" classpathref="project.class.path"
/>
<target name="init" depends="code.rev">
+ <fail if="root.user" message="Don't run ant tasks with the root user" />
<fail if="no.java.home" message="The environment variable JAVA_HOME is not
set." />
- <fail if="root.user" message="Don't run ant tasks with the root user" />
</target>
<target name="code.rev" depends="set.code.rev">
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -6,7 +6,7 @@
<!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and
Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11404]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11552]]></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 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -7,7 +7,7 @@
<!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11404]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11552]]></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.11404]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11552]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -6,7 +6,7 @@
<!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11404]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11552]]></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 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -7,7 +7,7 @@
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11404]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11552]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NOTE.xml
---
a/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NOTE.xml
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NOTE.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -21,7 +21,7 @@
<default/>
<onCreateDefault/>
</column>
- <column name="NOTE" primaryKey="false" required="true" type="CLOB"
size="4000" autoIncrement="false">
+ <column name="NOTE" primaryKey="false" required="false" type="CLOB"
size="4000" autoIncrement="false">
<default/>
<onCreateDefault/>
</column>
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -888,7 +888,7 @@
<!--FF8080812F10C577012F1138306C0027--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8080812F10C577012F1138306C0027--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8080812F10C577012F1138306C0027-->
<VALUE><![CDATA[OBUIAPP_ExecuteInCallout]]></VALUE>
-<!--FF8080812F10C577012F1138306C0027--> <MSGTEXT><![CDATA[This window is
using some functionality which needs to be updated to work in Openbravo 3.
Therefore, it's likely that this window will not work correctly in Openbravo 3
mode. A preference has been added so that this window is opened in classic mode
until this problem is fixed. Contact with your System Administrator, or with
the developer of the module to fix this. You now need to log out of the
application, and login again, so that this window is shown in classic
mode.]]></MSGTEXT>
+<!--FF8080812F10C577012F1138306C0027--> <MSGTEXT><![CDATA[This window is
using some functionality which needs to be updated to work in Openbravo 3. A
preference has been added so that this window is opened in classic mode until
this problem is fixed. Contact with your System Administrator, or with the
developer of the module to fix this. You now need to log out of the
application, and login again, so that this window is shown in classic
mode.]]></MSGTEXT>
<!--FF8080812F10C577012F1138306C0027--> <MSGTYPE><![CDATA[E]]></MSGTYPE>
<!--FF8080812F10C577012F1138306C0027-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8080812F10C577012F1138306C0027--></AD_MESSAGE>
diff -r 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -6,7 +6,7 @@
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface
Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11404]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11552]]></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 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Fri Apr 08 00:05:46 2011 +0200
@@ -7,7 +7,7 @@
<!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--15D7CE8D95D043189162DBABA54A1F61-->
<AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11404]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11552]]></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.11404]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.11552]]></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.11404]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.11552]]></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.11404]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.11552]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Fri Apr 08 00:05:46 2011 +0200
@@ -62,7 +62,11 @@
</#if>
</#if>
<#if fieldDefinition.type = "OBSectionItem" || fieldDefinition.type =
"OBNoteSectionItem" || fieldDefinition.type = "OBLinkedItemSectionItem" >
+ <#if fieldDefinition.type = "OBNoteSectionItem">
sectionExpanded: false,
+ <#else>
+ sectionExpanded: true,
+ </#if>
defaultValue: '${fieldDefinition.label?js_string}',
itemIds: [
<#list fieldDefinition.children as childField>
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Fri Apr 08 00:05:46 2011 +0200
@@ -511,7 +511,7 @@
moveFocusOnPickValue: true,
// is overridden to keep track that a value has been explicitly picked
- pickValue : function (value) {
+ pickValue: function (value) {
this._pickedValue = true;
this.Super('pickValue', arguments);
delete this._pickedValue;
@@ -898,6 +898,13 @@
change: function(form, item, value, oldValue){ /* transformInput */
var isADate = value !== null &&
Object.prototype.toString.call(value) === '[object Date]';
+ // prevent a change if nothing changed
+ if (value === oldValue) {
+ return false;
+ }
+ if (isADate && value && oldValue && oldValue.getTime && value.getTime()
=== oldValue.getTime()) {
+ return false;
+ }
if (isADate) {
return;
}
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Fri Apr 08 00:05:46 2011 +0200
@@ -225,6 +225,7 @@
}
var callback = function(ok){
+ delete me.inAutoSaveConfirmation;
if (ok) {
if (me.getDirtyEditForm()) {
me.getDirtyEditForm().resetForm();
@@ -242,6 +243,7 @@
}
}
};
+ this.inAutoSaveConfirmation = true;
isc.ask(OB.I18N.getLabel('OBUIAPP_AutoSaveNotPossibleExecuteAction'),
callback);
},
diff -r 0649b6a37a1e -r fcb4a740ab97
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
Wed Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form-notes.js
Fri Apr 08 00:05:46 2011 +0200
@@ -64,6 +64,11 @@
this.getNotePart().refresh();
},
+expandSection: function() {
+ this.Super('expandSection',arguments);
+ this.form.noteSection.refresh();
+},
+
hide: function(){
this.Super('hide',arguments);
if (this.canvasItem) {
@@ -219,7 +224,8 @@
fetchData :
function(criteria, callback,
requestProperties) {
- if
(this.layout.isDrawn()) {
+ if
(this.layout.getForm() && this.layout.getForm().noteSection &&
+
this.layout.getForm().noteSection.visible &&
this.layout.getForm().noteSection.isExpanded()) {
return
this.Super('fetchData', [ this.convertCriteria(criteria),
callback, requestProperties ]);
}
@@ -276,7 +282,7 @@
value = value
+ ' <span class="OBNoteListGridAuthor">' +
OB.Utilities.getTimePassed(record.created) +
' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' +
-
record['createdBy._identifier'];
+
record['createdBy._identifier']+'</span>';
// show delete
link if the note was created by
// the current
user
@@ -285,9 +291,8 @@
' <span class="OBNoteListGridDelete" >[ <a class="OBNoteListGridDelete"
href="#" onclick="' +
this.layout.ID + '.deleteNote(\'' +
record.id +
-
'\')">' + OB.I18N.getLabel('OBUIAPP_delete') + '</a> ]</span>';
+
'\')">' + OB.I18N.getLabel('OBUIAPP_delete') + ' </a>]</span>';
}
- value = value +
'</span>';
return value;
},
diff -r 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Fri Apr 08 00:05:46 2011 +0200
@@ -771,7 +771,10 @@
// disable with a delay to allow the focus to be moved to a new field
// before disabling
- this.delayCall('setDisabled', [true], 10);
+ // only do this if there is no popup currently
+ if (!this.view.standardWindow.inAutoSaveConfirmation) {
+ this.delayCall('setDisabled', [true], 10);
+ }
var editRow = this.view.viewGrid.getEditRow();
@@ -1025,7 +1028,6 @@
}
return;
}
- this.resetFocusItem();
},
getFirstErrorItem: function() {
diff -r 0649b6a37a1e -r fcb4a740ab97
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 Apr 06 17:58:50 2011 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
Fri Apr 08 00:05:46 2011 +0200
@@ -1268,6 +1268,10 @@
}
}
}
+ if (colNum || colNum === 0) {
+ this.forceFocusColumn = this.getField(colNum).name;
+ }
+
------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
