details: /erp/devel/main/rev/ae97ce807f91
changeset: 7408:ae97ce807f91
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon May 24 12:35:09 2010 +0200
summary: fixed bug 13315: prevent NPE
details: /erp/devel/main/rev/b7da0bdd2f91
changeset: 7409:b7da0bdd2f91
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon May 24 13:40:50 2010 +0200
summary: Fixed issue 13422. Deprecation warnings related to setAdminContext()
and related methods in OBContext will not be shown.
details: /erp/devel/main/rev/0f4f4e587302
changeset: 7410:0f4f4e587302
user: Víctor Martínez Romanos <victor.martinez <at> openbravo.com>
date: Tue May 25 12:25:25 2010 +0200
summary: Fixed bug 13428: It is not possible to unprocess a manual settlement
diffstat:
src-db/database/sourcedata/AD_FIELD.xml | 2 +-
src/org/openbravo/dal/core/OBContext.java | 16 +++++--------
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java | 12 ++++++----
3 files changed, 14 insertions(+), 16 deletions(-)
diffs (117 lines):
diff -r a7901e097e1a -r 0f4f4e587302 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Thu May 20 10:40:03 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue May 25 12:25:25 2010 +0200
@@ -118567,7 +118567,7 @@
<!--800562--> <AD_TAB_ID><![CDATA[800029]]></AD_TAB_ID>
<!--800562--> <AD_COLUMN_ID><![CDATA[800340]]></AD_COLUMN_ID>
<!--800562--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--800562--> <DISPLAYLOGIC><![cda...@processed@='Y' & @showa...@='Y' &
@HASDIRECTPOSTING@>0]]></DISPLAYLOGIC>
+<!--800562--> <DISPLAYLOGIC><![cda...@processed@='Y' &
@showa...@='Y']]></DISPLAYLOGIC>
<!--800562--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--800562--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--800562--> <SEQNO><![CDATA[190]]></SEQNO>
diff -r a7901e097e1a -r 0f4f4e587302 src/org/openbravo/dal/core/OBContext.java
--- a/src/org/openbravo/dal/core/OBContext.java Thu May 20 10:40:03 2010 +0200
+++ b/src/org/openbravo/dal/core/OBContext.java Tue May 25 12:25:25 2010 +0200
@@ -90,9 +90,8 @@
private static OBContext adminContext = null;
/**
- * @deprecated use {...@link #setAdminMode()}
+ * deprecated use {...@link #setAdminMode()}
*/
- @Deprecated
public static void setAdminContext() {
if (adminContext == null) {
setOBContext("0", "0", "0", "0");
@@ -112,9 +111,8 @@
}
/**
- * @deprecated use {...@link #setAdminMode()}
+ * deprecated use {...@link #setAdminMode()}
*/
- @Deprecated
public static void enableAsAdminContext() {
setAdminMode();
}
@@ -126,7 +124,7 @@
* To restore the previous privileges call the {...@link
#restorePreviousMode()}.
*
* @see OBContext#restorePreviousMode()
- * @since 2.50MP16
+ * @since 2.50MP18
*/
public static void setAdminMode() {
getAdminModeStack().push(Boolean.TRUE);
@@ -145,9 +143,8 @@
}
/**
- * @deprecated use {...@link #restorePreviousMode()}
+ * deprecated use {...@link #restorePreviousMode()}
*/
- @Deprecated
public static void resetAsAdminContext() {
restorePreviousMode();
}
@@ -157,7 +154,7 @@
* {...@link #setAdminMode()}.
*
* @see OBContext#setAdminMode()
- * @since 2.50MP16
+ * @since 2.50MP18
*/
public static void restorePreviousMode() {
// remove the last admin mode from the stack
@@ -892,9 +889,8 @@
}
/**
- * @deprecated use {...@link #setAdminMode()} and {...@link
#restorePreviousMode()}.
+ * deprecated use {...@link #setAdminMode()} and {...@link
#restorePreviousMode()}.
*/
- @Deprecated
public boolean setInAdministratorMode(boolean inAdministratorMode) {
final boolean prevMode = isInAdministratorMode() && !isAdministrator;
if (inAdministratorMode) {
diff -r a7901e097e1a -r 0f4f4e587302
src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Thu May
20 10:40:03 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java Tue May
25 12:25:25 2010 +0200
@@ -709,7 +709,7 @@
// calculate minimum required version of each extra module (installs &
updates)
minVersions = calcMinVersions(im);
- if (islocal) {
+ if (module == null) {
// set the selected module for obx installation
if (installOrig != null && installOrig.length > 0) {
module = installOrig[0];
@@ -882,21 +882,23 @@
if (!ak.isOPSInstance()) {
for (Module mod : im.getModulesToInstall()) {
if (mod.getIsCommercial()) {
- if (!mod.getModuleID().equals(selectedModule.getModuleID())) {
+ if (selectedModule != null &&
!mod.getModuleID().equals(selectedModule.getModuleID())) {
// Show only in case there are commercial dependencies
showNotActivatedError = true;
}
- } else if (mod.getModuleID().equals(selectedModule.getModuleID())) {
+ } else if (selectedModule != null
+ && !mod.getModuleID().equals(selectedModule.getModuleID())) {
selectedCommercial = true;
}
}
for (Module mod : im.getModulesToUpdate()) {
if (mod.getIsCommercial()) {
- if (!mod.getModuleID().equals(selectedModule.getModuleID())) {
+ if (selectedModule != null &&
!!mod.getModuleID().equals(selectedModule.getModuleID())) {
// Show only in case there are commercial dependencies
showNotActivatedError = true;
}
- } else if (mod.getModuleID().equals(selectedModule.getModuleID())) {
+ } else if (selectedModule != null
+ && !mod.getModuleID().equals(selectedModule.getModuleID())) {
selectedCommercial = true;
}
}
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
