details: https://code.openbravo.com/erp/devel/pi/rev/9cd579c40b28
changeset: 14947:9cd579c40b28
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Dec 21 09:52:54 2011 +0100
summary: fixed bug 19339: Cloned trial instance shows NPE in Instance
Activation window
diffstat:
src/org/openbravo/erpCommon/obps/ActivationKey.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diffs (24 lines):
diff -r f319f22df5fb -r 9cd579c40b28
src/org/openbravo/erpCommon/obps/ActivationKey.java
--- a/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Dec 21
09:21:17 2011 +0100
+++ b/src/org/openbravo/erpCommon/obps/ActivationKey.java Wed Dec 21
09:52:54 2011 +0100
@@ -855,12 +855,14 @@
.append("</td><td>").append(outputFormat.format(startDate)).append("</td></tr>");
}
- sb.append("<tr><td>")
- .append(Utility.messageBD(conn, "OPSEndDate", lang))
- .append("</td><td>")
- .append(
- (getProperty("enddate") == null ? Utility.messageBD(conn,
"OPSNoEndDate", lang)
- : outputFormat.format(endDate))).append("</td></tr>");
+ if (endDate != null) {
+ sb.append("<tr><td>")
+ .append(Utility.messageBD(conn, "OPSEndDate", lang))
+ .append("</td><td>")
+ .append(
+ (getProperty("enddate") == null ? Utility.messageBD(conn,
"OPSNoEndDate", lang)
+ : outputFormat.format(endDate))).append("</td></tr>");
+ }
sb.append("<tr><td>")
.append(Utility.messageBD(conn, "OPSConcurrentUsers", lang))
------------------------------------------------------------------------------
Write once. Port to many.
Get the SDK and tools to simplify cross-platform app development. Create
new or port existing apps to sell to consumers worldwide. Explore the
Intel AppUpSM program developer opportunity. appdeveloper.intel.com/join
http://p.sf.net/sfu/intel-appdev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
