details: /erp/devel/main/rev/07813f3009e7
changeset: 7850:07813f3009e7
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Jul 08 23:41:54 2010 +0200
summary: fixes issue 13909: Registration popup is now shown always, even
after using 'Decline'
details: /erp/devel/main/rev/4f3b42370064
changeset: 7851:4f3b42370064
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 10 14:11:51 2010 +0000
summary: CI: promote changesets from pi to main
details: /erp/devel/main/rev/ba2af91d3aab
changeset: 7852:ba2af91d3aab
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Sat Jul 10 14:11:52 2010 +0000
summary: CI: update AD_MODULE - Core version and label
diffstat:
src-db/database/sourcedata/AD_MODULE.xml | 4 ++--
src/org/openbravo/erpCommon/utility/VerticalMenu.java | 14 ++++++++++----
2 files changed, 12 insertions(+), 6 deletions(-)
diffs (48 lines):
diff -r 34044b40c787 -r ba2af91d3aab src-db/database/sourcedata/AD_MODULE.xml
--- a/src-db/database/sourcedata/AD_MODULE.xml Thu Jul 08 19:17:06 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODULE.xml Sat Jul 10 14:11:52 2010 +0000
@@ -6,7 +6,7 @@
<!--0--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
<!--0--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
<!--0--> <NAME><![CDATA[core]]></NAME>
-<!--0--> <VERSION><![CDATA[2.50.17732]]></VERSION>
+<!--0--> <VERSION><![CDATA[2.50.17851]]></VERSION>
<!--0--> <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
<!--0--> <HELP><![CDATA[Core module is the base one, all developments in core
are included as part of the standard Openbravo ERP.]]></HELP>
<!--0--> <URL><![CDATA[www.openbravo.com]]></URL>
@@ -21,7 +21,7 @@
<!--0--> <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
<!--0--> <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
<!--0--> <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0--> <VERSION_LABEL><![CDATA[dev]]></VERSION_LABEL>
+<!--0--> <VERSION_LABEL><![CDATA[CI]]></VERSION_LABEL>
<!--0--> <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
<!--0--></AD_MODULE>
diff -r 34044b40c787 -r ba2af91d3aab
src/org/openbravo/erpCommon/utility/VerticalMenu.java
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.java Thu Jul 08
19:17:06 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.java Sat Jul 10
14:11:52 2010 +0000
@@ -546,13 +546,19 @@
final HeartBeatOrRegistration showHeartBeatOrRegistration =
HeartbeatProcess
.showHeartBeatOrRegistration(vars, myPool);
- if (showHeartBeatOrRegistration ==
HeartbeatProcess.HeartBeatOrRegistration.HeartBeat) {
+ switch (showHeartBeatOrRegistration) {
+ case HeartBeat:
xmlDocument.setParameter("popup", "openHeartbeat();");
- } else if (showHeartBeatOrRegistration ==
HeartbeatProcess.HeartBeatOrRegistration.Registration) {
+ return;
+ case Registration:
xmlDocument.setParameter("popup", "openRegistration();");
- } else {
- // neither of the popups need to be popped-up
+ return;
+ case None:
xmlDocument.setParameter("popup", "");
+ return;
+ default:
+ throw new IllegalStateException("HeartbeatOrRegistration " +
showHeartBeatOrRegistration
+ + " not supported");
}
}
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
