details: /erp/devel/pi/rev/2900108d13e7
changeset: 11324:2900108d13e7
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Mar 18 23:16:00 2011 +0100
summary: Update AD_MODULE version to 3.0RC5
details: /erp/devel/pi/rev/6b5829bdfb83
changeset: 11325:6b5829bdfb83
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Mar 18 23:16:01 2011 +0100
summary: Added tag 3.0RC5 for changeset 2900108d13e7
details: /erp/devel/pi/rev/67e444a3d740
changeset: 11326:67e444a3d740
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Fri Mar 18 23:16:03 2011 +0100
summary: Added signature for changeset 6b5829bdfb83
details: /erp/devel/pi/rev/a5532d1a4778
changeset: 11327:a5532d1a4778
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Mar 21 18:46:00 2011 +0100
summary: CI: update AD_MODULE to version 11317
details: /erp/devel/pi/rev/576352520954
changeset: 11328:576352520954
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Mar 21 20:49:13 2011 +0100
summary: CI: promote changesets from pi to main
details: /erp/devel/pi/rev/8487526135c8
changeset: 11329:8487526135c8
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Mar 21 20:51:39 2011 +0100
summary: CI: merge back from main
diffstat:
.hgsigs
|
1 +
.hgtags
|
1 +
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_MESSAGE.xml
|
26 +-
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/ViewComponent.java
| 15 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 5 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
| 4 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-user-profile-widget.js
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
| 9 +
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
| 1 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 59 +-
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-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/IDUIDefinition.java
| 65 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 5 +-
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.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
| 1 +
modules/org.openbravo.service.json/src/org/openbravo/service/json/JsonUtils.java
|
8 +-
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
| 13 +
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/model/tables/C_ELEMENTVALUE.xml
|
4 +
src-db/database/model/tables/GL_JOURNALLINE.xml
|
2 +-
src-db/database/model/triggers/C_PERIOD_TRG2.xml
|
25 +-
src-db/database/model/triggers/GL_JL_CHK_RESTRICTIONS_TRG.xml
|
3 +-
src-db/database/model/triggers/GL_JOURNALLINE2_TRG.xml
|
9 +-
src-db/database/sourcedata/AD_COLUMN.xml
|
36 +-
src-db/database/sourcedata/AD_ELEMENT.xml
|
13 +
src-db/database/sourcedata/AD_FIELD.xml
|
29 +-
src-db/database/sourcedata/AD_MESSAGE.xml
|
11 +
src-db/database/sourcedata/AD_MODULE.xml
|
4 +-
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
|
11 +
src-wad/src/org/openbravo/wad/javasource.javaxml
|
1 +
src/org/openbravo/erpCommon/ad_forms/FactLine.java
|
2 +-
src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo
|
2 +-
src/org/openbravo/erpCommon/ad_reports/ReportProductionRun.jrxml
|
1754 +++++-----
src/org/openbravo/erpCommon/businessUtility/AccountTree.java
|
10 +-
src/org/openbravo/erpCommon/businessUtility/AccountTree_data.xsql
|
4 +-
src/org/openbravo/erpCommon/obps/ActivationKey.java
|
68 +-
src/org/openbravo/erpCommon/obps/ActiveInstanceProcess.java
|
7 +-
src/org/openbravo/erpReports/RptMA_ProcessPlan.jrxml
|
1490 ++++----
73 files changed, 2122 insertions(+), 1736 deletions(-)
diffs (truncated from 5653 to 300 lines):
diff -r b29071e0e993 -r 8487526135c8 .hgsigs
--- a/.hgsigs Fri Mar 18 22:42:09 2011 +0100
+++ b/.hgsigs Mon Mar 21 20:51:39 2011 +0100
@@ -29,3 +29,4 @@
b430637e3b9d96852ea55b4eaa8278c99a004584 0
iEYEABECAAYFAk1eSPQACgkQCX/oGf+2qkMc8wCfYXVRLMPbYeKhcUDJ1jjbGe/8E0kAnj3k1eojsxsUfLzurS6JsgaXVZ5c
668651fe8a81bcb9a55c3073d6a8f59d91d70b26 0
iEYEABECAAYFAk1eS8gACgkQCX/oGf+2qkOW4ACbB0zLCbzqWAECmpERhBOmSp+hrfAAoPfnoksz58TTrITz6vIdNLlOykKX
37f2d5f6122e0b7d404f15af699bbf517c8620f1 0
iEYEABECAAYFAk1e5jYACgkQCX/oGf+2qkNdOwCg+BZzm0X320yJPlglOs6S3meDeesAoI+GDdOqlwP0J3ZJxtwS2LYiC68K
+6b5829bdfb83a717983a5cc3d93cf23993504dee 0
iEYEABECAAYFAk2D2aIACgkQCX/oGf+2qkNw4ACgnusvXTfY7cwcF8JIyx3gMPDE18sAmQG/UCHIcT/mmqX1UcgpiCgEqUB3
diff -r b29071e0e993 -r 8487526135c8 .hgtags
--- a/.hgtags Fri Mar 18 22:42:09 2011 +0100
+++ b/.hgtags Mon Mar 21 20:51:39 2011 +0100
@@ -39,3 +39,4 @@
bdc0773576839de5e0f134020d57f5040bbf70e4 3.0RC2
379b55d7906ebbfe04b0d864a8b2543f437f7781 3.0RC3
72e872c1dee28e32260afb806938f730c73b6c8e 3.0RC4
+2900108d13e7c88366e2993a7e4ccae9a9a13618 3.0RC5
diff -r b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Mon Mar 21 20:51:39 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.11296]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11317]]></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 b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Mar 21 20:51:39 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.11296]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11317]]></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.11296]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11317]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Mon Mar 21 20:51:39 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.11296]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11317]]></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 b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Mar 21 20:51:39 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.11296]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11317]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r b29071e0e993 -r 8487526135c8
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
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Mon Mar 21 20:51:39 2011 +0100
@@ -833,7 +833,7 @@
<!--FF8081812D6D076E012D6EADF5FD00E1--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081812D6D076E012D6EADF5FD00E1--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8081812D6D076E012D6EADF5FD00E1-->
<VALUE><![CDATA[OBUIAPP_NewIconPrompt]]></VALUE>
-<!--FF8081812D6D076E012D6EADF5FD00E1--> <MSGTEXT><![CDATA[You are editing a
new record.]]></MSGTEXT>
+<!--FF8081812D6D076E012D6EADF5FD00E1--> <MSGTEXT><![CDATA[You are creating a
new record.]]></MSGTEXT>
<!--FF8081812D6D076E012D6EADF5FD00E1--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081812D6D076E012D6EADF5FD00E1-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812D6D076E012D6EADF5FD00E1--></AD_MESSAGE>
@@ -1240,7 +1240,7 @@
<!--FF8081812E912BB3012E91326D8E001B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--FF8081812E912BB3012E91326D8E001B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--FF8081812E912BB3012E91326D8E001B-->
<VALUE><![CDATA[OBUIAPP_toDateOnlyPrefix]]></VALUE>
-<!--FF8081812E912BB3012E91326D8E001B--> <MSGTEXT><![CDATA[before]]></MSGTEXT>
+<!--FF8081812E912BB3012E91326D8E001B--> <MSGTEXT><![CDATA[Before]]></MSGTEXT>
<!--FF8081812E912BB3012E91326D8E001B--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
<!--FF8081812E912BB3012E91326D8E001B-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812E912BB3012E91326D8E001B--></AD_MESSAGE>
@@ -1608,4 +1608,26 @@
<!--FF8081812EB5E3EC012EB5E85D81000D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8081812EB5E3EC012EB5E85D81000D--></AD_MESSAGE>
+<!--FF8081812EC49C0E012EC4AED10C001E--><AD_MESSAGE>
+<!--FF8081812EC49C0E012EC4AED10C001E-->
<AD_MESSAGE_ID><![CDATA[FF8081812EC49C0E012EC4AED10C001E]]></AD_MESSAGE_ID>
+<!--FF8081812EC49C0E012EC4AED10C001E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812EC49C0E012EC4AED10C001E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812EC49C0E012EC4AED10C001E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812EC49C0E012EC4AED10C001E-->
<VALUE><![CDATA[OBUIAPP_ActionNotAllowed]]></VALUE>
+<!--FF8081812EC49C0E012EC4AED10C001E--> <MSGTEXT><![CDATA[With your current
role this action is not allowed.]]></MSGTEXT>
+<!--FF8081812EC49C0E012EC4AED10C001E--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812EC49C0E012EC4AED10C001E-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812EC49C0E012EC4AED10C001E--></AD_MESSAGE>
+
+<!--FF8081812ECF6CFE012ECF7AB485001C--><AD_MESSAGE>
+<!--FF8081812ECF6CFE012ECF7AB485001C-->
<AD_MESSAGE_ID><![CDATA[FF8081812ECF6CFE012ECF7AB485001C]]></AD_MESSAGE_ID>
+<!--FF8081812ECF6CFE012ECF7AB485001C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8081812ECF6CFE012ECF7AB485001C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8081812ECF6CFE012ECF7AB485001C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8081812ECF6CFE012ECF7AB485001C-->
<VALUE><![CDATA[OBUIAPP_EditIconPrompt]]></VALUE>
+<!--FF8081812ECF6CFE012ECF7AB485001C--> <MSGTEXT><![CDATA[You are editing
this record.]]></MSGTEXT>
+<!--FF8081812ECF6CFE012ECF7AB485001C--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8081812ECF6CFE012ECF7AB485001C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8081812ECF6CFE012ECF7AB485001C--></AD_MESSAGE>
+
</data>
diff -r b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Mon Mar 21 20:51:39 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.11296]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11317]]></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 b29071e0e993 -r 8487526135c8
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 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Mar 21 20:51:39 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.11296]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11317]]></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.11296]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.11317]]></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.11296]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.11317]]></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.11296]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.11317]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r b29071e0e993 -r 8487526135c8
modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ViewComponent.java
Mon Mar 21 20:51:39 2011 +0100
@@ -23,6 +23,7 @@
import org.hibernate.criterion.Expression;
import org.openbravo.base.exception.OBException;
import org.openbravo.base.util.OBClassLoader;
+import org.openbravo.base.weld.WeldUtils;
import org.openbravo.client.application.window.StandardWindowComponent;
import org.openbravo.client.kernel.BaseComponent;
import org.openbravo.client.kernel.BaseTemplateComponent;
@@ -46,6 +47,9 @@
@Inject
private StandardWindowComponent standardWindowComponent;
+ @Inject
+ private WeldUtils weldUtils;
+
@Override
public String generate() {
@@ -87,13 +91,15 @@
final BaseTemplateComponent component;
if (viewImpDef.getJavaClassName() != null) {
try {
- component = (BaseTemplateComponent)
OBClassLoader.getInstance().loadClass(
- viewImpDef.getJavaClassName()).newInstance();
+ @SuppressWarnings("unchecked")
+ final Class<BaseTemplateComponent> clz =
(Class<BaseTemplateComponent>) OBClassLoader
+ .getInstance().loadClass(viewImpDef.getJavaClassName());
+ component = weldUtils.getInstance(clz);
} catch (Exception e) {
throw new OBException(e);
}
} else {
- component = new BaseTemplateComponent();
+ component = weldUtils.getInstance(BaseTemplateComponent.class);
if (viewImpDef.getTemplate() == null) {
throw new IllegalStateException("No class and no template defined for
view " + viewName);
}
@@ -109,7 +115,8 @@
private OBUIAPPViewImplementation getView(String viewName) {
OBCriteria<OBUIAPPViewImplementation> obc =
OBDal.getInstance().createCriteria(
OBUIAPPViewImplementation.class);
- obc.add(Expression.eq(OBUIAPPViewImplementation.PROPERTY_NAME, viewName));
+
obc.add(Expression.or(Expression.eq(OBUIAPPViewImplementation.PROPERTY_NAME,
viewName),
+ Expression.eq(OBUIAPPViewImplementation.PROPERTY_ID, viewName)));
if (obc.list().size() > 0) {
return obc.list().get(0);
diff -r b29071e0e993 -r 8487526135c8
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
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Mar 21 20:51:39 2011 +0100
@@ -500,6 +500,11 @@
cachePickListResults: false,
validateOnExit: true,
completeOnTab: true,
+
+ // without this in chrome the content is sorted according to the id/value
+ // not the displayfield
+ sortField: 0,
+
// textMatchStyle is used for the client-side picklist
textMatchStyle: 'substring',
diff -r b29071e0e993 -r 8487526135c8
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
Mon Mar 21 20:51:39 2011 +0100
@@ -79,9 +79,9 @@
}
this.members[0].setFields(newFields);
this.layout.showMember(this.members[0]);
- this.members[1].getField('value').setValue(null);
- this.members[1].getField('value').setElementValue('', null);
}
+ this.members[1].getField('value').setValue(null);
+ this.members[1].getField('value').setElementValue('', null);
},
// handle the case that someone entered a url in the quick launch
diff -r b29071e0e993 -r 8487526135c8
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-user-profile-widget.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-user-profile-widget.js
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-user-profile-widget.js
Mon Mar 21 20:51:39 2011 +0100
@@ -107,8 +107,14 @@
width: '*',
pickListBaseStyle: 'OBFormFieldPickListCell',
pickerIconSrc:
'[SKIN]/../../org.openbravo.client.application/images/form/comboBoxPicker.png',
+
+ // without this in chrome the content is sorted according to the id/value
+ // not the displayfield
+ sortField: 0,
+
height: 21,
pickerIconWidth: 21,
+ pickListCellHeight: 22,
pickListProperties: {
bodyStyleName: 'OBPickListBody'
},
diff -r b29071e0e993 -r 8487526135c8
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-utilities.js
Mon Mar 21 20:51:39 2011 +0100
@@ -527,6 +527,15 @@
return str1 === str2;
};
+//** {{{ OB.Utilities.trim(/*String*/ str)}}} **
+//Trims a string
+OB.Utilities.trim = function(/* String */str){
+ if (!str) {
+ return str;
+ }
+ return str.replace(/^\s*/, '').replace(/\s*$/, '');
+};
+
OB.Utilities.processLogoutQueue = function(){
var q = OB.Utilities.logoutWorkQueue, qElement, result, tab, tabID;
diff -r b29071e0e993 -r 8487526135c8
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
Fri Mar 18 22:42:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Mon Mar 21 20:51:39 2011 +0100
@@ -223,6 +223,12 @@
this.view.updateTabTitle();
this.enableLinkedItemSection(!isNew);
+ if (isNew) {
+ this.view.statusBar.newIcon.prompt =
OB.I18N.getLabel('OBUIAPP_NewIconPrompt');
+ } else {
+ this.view.statusBar.newIcon.prompt =
OB.I18N.getLabel('OBUIAPP_EditIconPrompt');
------------------------------------------------------------------------------
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
