details: /erp/devel/pi/rev/5491330f8137
changeset: 11374:5491330f8137
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Mar 26 19:32:02 2011 +0100
summary: CI: update AD_MODULE to version 11362
details: /erp/devel/pi/rev/dfbe95b06ab6
changeset: 11375:dfbe95b06ab6
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Mar 26 19:44:52 2011 +0100
summary: CI: merge back from main
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_MENU.xml
|
12 +
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
|
88 +++
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-db/database/sourcedata/AD_TREENODE.xml
|
11 +
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
| 12 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
| 10 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
| 166 +++++
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
| 9 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js
| 278 ++++++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-management-view.js
| 175 ++++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-alert-manager.js
| 10 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-section-stack.js
| 27 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-manager.js
| 6 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.css
| 35 +
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/3.00/org.openbravo.client.application/ob-form-styles.js
| 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
| 3
+-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 8 +-
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.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 +-
src-db/database/model/tables/AD_ALERT.xml
| 4 +
src-db/database/sourcedata/AD_COLUMN.xml
| 42 +-
src-db/database/sourcedata/AD_ELEMENT.xml
| 16 +
src-db/database/sourcedata/AD_FIELD.xml
| 34 +-
src-db/database/sourcedata/AD_MENU.xml
| 3 +-
src-db/database/sourcedata/AD_MESSAGE.xml
| 44 +
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
src-db/database/sourcedata/AD_REFERENCE.xml
| 13 +
src-db/database/sourcedata/AD_REF_LIST.xml
| 48 +
src-db/database/sourcedata/AD_TAB.xml
| 2 +-
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatus.class
| 0
src-util/modulescript/build/classes/org/openbravo/modulescript/InitializeAlertStatusData.class
| 0
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus.java
|
40 +
src-util/modulescript/src/org/openbravo/modulescript/InitializeAlertStatus_data.xsql
|
58 ++
src/org/openbravo/erpCommon/ad_forms/DocInOut.java
| 4 +-
src/org/openbravo/erpCommon/ad_forms/DocInventory.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocMovement.java
| 2 +-
src/org/openbravo/erpCommon/ad_forms/DocProduction.java
| 2 +-
src/org/openbravo/erpCommon/ad_process/AlertProcess_data.xsql
| 18 +-
71 files changed, 1237 insertions(+), 107 deletions(-)
diffs (truncated from 2349 to 300 lines):
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Sat Mar 26 19:44:52 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.11355]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.11362]]></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 daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Sat Mar 26 19:44:52 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.11355]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.11362]]></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.11355]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.11362]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Sat Mar 26 19:44:52 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.11355]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.11362]]></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 daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Sat Mar 26 19:44:52 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.11355]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.11362]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml
Sat Mar 26 19:44:52 2011 +0100
@@ -26,4 +26,16 @@
<!--B487FABEB36F45C28E22CD309914FD71-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--B487FABEB36F45C28E22CD309914FD71--></AD_MENU>
+<!--FF8080812EB90459012EBA72B4E7004D--><AD_MENU>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_MENU_ID><![CDATA[FF8080812EB90459012EBA72B4E7004D]]></AD_MENU_ID>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EB90459012EBA72B4E7004D--> <NAME><![CDATA[Alert
Management]]></NAME>
+<!--FF8080812EB90459012EBA72B4E7004D--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<ACTION><![CDATA[OBUIAPP_OpenView]]></ACTION>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EB90459012EBA72B4E7004D-->
<EM_OBUIAPP_VIEW_IMPL_ID><![CDATA[FF8080812EB90459012EBA225DDB0029]]></EM_OBUIAPP_VIEW_IMPL_ID>
+<!--FF8080812EB90459012EBA72B4E7004D--></AD_MENU>
+
</data>
diff -r daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
Sat Mar 26 19:44:52 2011 +0100
@@ -761,6 +761,94 @@
<!--FF8080812E8126B7012E8134F22F0013-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
<!--FF8080812E8126B7012E8134F22F0013--></AD_MESSAGE>
+<!--FF8080812EDE8228012EE38964E00054--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38964E00054]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38964E00054--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38964E00054--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38964E00054-->
<VALUE><![CDATA[OBUIAPP_AlertSectionHeader]]></VALUE>
+<!--FF8080812EDE8228012EE38964E00054--> <MSGTEXT><![CDATA[%0 (%1)]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38964E00054--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38964E00054-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38964E00054--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38B157A005C--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38B157A005C]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38B157A005C--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38B157A005C--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<VALUE><![CDATA[OBUIAPP_MoveSelectedToStatus]]></VALUE>
+<!--FF8080812EDE8228012EE38B157A005C--> <MSGTEXT><![CDATA[[Move selected to
%0]]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38B157A005C--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38B157A005C-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38B157A005C--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38C83950064--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38C83950064]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38C83950064--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38C83950064--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38C83950064-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_AlertRule]]></VALUE>
+<!--FF8080812EDE8228012EE38C83950064--> <MSGTEXT><![CDATA[Alert
Rule]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38C83950064--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38C83950064-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38C83950064--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38CD7B70069--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38CD7B70069]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Alert]]></VALUE>
+<!--FF8080812EDE8228012EE38CD7B70069--> <MSGTEXT><![CDATA[Alert]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38CD7B70069--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38CD7B70069-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38CD7B70069--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38D27B2006F--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38D27B2006F]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Time]]></VALUE>
+<!--FF8080812EDE8228012EE38D27B2006F--> <MSGTEXT><![CDATA[Time]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38D27B2006F--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38D27B2006F-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38D27B2006F--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38D601B0074--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38D601B0074]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38D601B0074--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38D601B0074--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Note]]></VALUE>
+<!--FF8080812EDE8228012EE38D601B0074--> <MSGTEXT><![CDATA[Note]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38D601B0074--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38D601B0074-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38D601B0074--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38DA0290079--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38DA0290079]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38DA0290079--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38DA0290079--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<VALUE><![CDATA[OBUIAPP_AlertGrid_Record]]></VALUE>
+<!--FF8080812EDE8228012EE38DA0290079--> <MSGTEXT><![CDATA[Record]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38DA0290079--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38DA0290079-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38DA0290079--></AD_MESSAGE>
+
+<!--FF8080812EDE8228012EE38E0C69007E--><AD_MESSAGE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_MESSAGE_ID><![CDATA[FF8080812EDE8228012EE38E0C69007E]]></AD_MESSAGE_ID>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<VALUE><![CDATA[OBUIAPP_MoveToStatus]]></VALUE>
+<!--FF8080812EDE8228012EE38E0C69007E--> <MSGTEXT><![CDATA[Move to
%0]]></MSGTEXT>
+<!--FF8080812EDE8228012EE38E0C69007E--> <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--FF8080812EDE8228012EE38E0C69007E-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EDE8228012EE38E0C69007E--></AD_MESSAGE>
+
<!--FF8081812D6761CF012D676DF2A70045--><AD_MESSAGE>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_MESSAGE_ID><![CDATA[FF8081812D6761CF012D676DF2A70045]]></AD_MESSAGE_ID>
<!--FF8081812D6761CF012D676DF2A70045-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Sat Mar 26 19:44:52 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.11355]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.11362]]></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 daba093801bb -r dfbe95b06ab6
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
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Sat Mar 26 19:44:52 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.11355]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.11362]]></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.11355]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.11362]]></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.11355]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.11362]]></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.11355]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.11362]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
---
a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
Sat Mar 26 19:44:52 2011 +0100
@@ -22,4 +22,15 @@
<!--8AB1608C49C946D99AFB540DD2EE3543--> <SEQNO><![CDATA[60]]></SEQNO>
<!--8AB1608C49C946D99AFB540DD2EE3543--></AD_TREENODE>
+<!--9E88163FFD3D4B41E040007F01005CF5--><AD_TREENODE>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_TREENODE_ID><![CDATA[9E88163FFD3D4B41E040007F01005CF5]]></AD_TREENODE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<NODE_ID><![CDATA[FF8080812EB90459012EBA72B4E7004D]]></NODE_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <PARENT_ID><![CDATA[161]]></PARENT_ID>
+<!--9E88163FFD3D4B41E040007F01005CF5--> <SEQNO><![CDATA[280]]></SEQNO>
+<!--9E88163FFD3D4B41E040007F01005CF5--></AD_TREENODE>
+
</data>
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_VIEW_IMPL.xml
Sat Mar 26 19:44:52 2011 +0100
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--FF8080812EB90459012EBA225DDB0029--><OBUIAPP_VIEW_IMPL>
+<!--FF8080812EB90459012EBA225DDB0029-->
<OBUIAPP_VIEW_IMPL_ID><![CDATA[FF8080812EB90459012EBA225DDB0029]]></OBUIAPP_VIEW_IMPL_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FF8080812EB90459012EBA225DDB0029--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--FF8080812EB90459012EBA225DDB0029-->
<NAME><![CDATA[OBUIAPP_AlertManagement]]></NAME>
+<!--FF8080812EB90459012EBA225DDB0029--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FF8080812EB90459012EBA225DDB0029--></OBUIAPP_VIEW_IMPL>
+
+</data>
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
Thu Mar 24 23:16:40 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertActionHandler.java
Sat Mar 26 19:44:52 2011 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009 Openbravo SLU
+ * All portions are Copyright (C) 2009-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -97,10 +97,10 @@
final AlertRule alertRule = (AlertRule) o;
final String whereClause = new UsedByLink().getWhereClause(vars, "",
alertRule
.getFilterClause() == null ? "" : alertRule.getFilterClause());
- final String sql = "select * from AD_ALERT where ISACTIVE='Y'" + " AND
ISFIXED ='N'"
- + " AND AD_CLIENT_ID " +
OBDal.getInstance().getReadableClientsInClause()
- + " AND AD_ORG_ID " +
OBDal.getInstance().getReadableOrganizationsInClause()
- + " AND AD_ALERTRULE_ID = ? " + (whereClause == null ? "" :
whereClause);
+ final String sql = "select * from AD_ALERT where STATUS='NEW'" + " AND
AD_CLIENT_ID "
+ + OBDal.getInstance().getReadableClientsInClause() + " AND
AD_ORG_ID "
+ + OBDal.getInstance().getReadableOrganizationsInClause() + " AND
AD_ALERTRULE_ID = ? "
+ + (whereClause == null ? "" : whereClause);
final SQLQuery sqlQuery =
OBDal.getInstance().getSession().createSQLQuery(sql).addEntity(
Alert.ENTITY_NAME);
sqlQuery.setParameter(0, alertRule.getId());
diff -r daba093801bb -r dfbe95b06ab6
modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/AlertManagementActionHandler.java
Sat Mar 26 19:44:52 2011 +0100
@@ -0,0 +1,166 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.1 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
------------------------------------------------------------------------------
Enable your software for Intel(R) Active Management Technology to meet the
growing manageability and security demands of your customers. Businesses
are taking advantage of Intel(R) vPro (TM) technology - will your software
be a part of the solution? Download the Intel(R) Manageability Checker
today! http://p.sf.net/sfu/intel-dev2devmar
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
