From be7fb240cbb31b1859f3e3f6c56dffec2aa5d9b6 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 12 Nov 2022 14:48:46 +0100 Subject: [PATCH] IDEMPIERE-870 Fixed Assets using non-existant context variable (#1557) * IDEMPIERE-870 Fixed Assets using non-existant context variable * - Implement context variable #IsCanApproveOwnDoc --- migration/iD10/oracle/202211112147_IDEMPIERE-870.sql | 10 ++++++++++ .../iD10/postgresql/202211112147_IDEMPIERE-870.sql | 7 +++++++ .../src/org/compiere/model/MAssetAddition.java | 5 ++--- org.adempiere.base/src/org/compiere/util/Env.java | 1 + .../src/org/adempiere/webui/AdempiereWebUI.java | 3 ++- 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 migration/iD10/oracle/202211112147_IDEMPIERE-870.sql create mode 100644 migration/iD10/postgresql/202211112147_IDEMPIERE-870.sql diff --git a/migration/iD10/oracle/202211112147_IDEMPIERE-870.sql b/migration/iD10/oracle/202211112147_IDEMPIERE-870.sql new file mode 100644 index 0000000000..b6ae76980e --- /dev/null +++ b/migration/iD10/oracle/202211112147_IDEMPIERE-870.sql @@ -0,0 +1,10 @@ +-- IDEMPIERE-870 +SELECT register_migration_script('202211112147_IDEMPIERE-870.sql') FROM dual; + +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- Nov 11, 2022, 9:48:36 PM CET +UPDATE AD_Column SET DefaultValue='@$C_Currency_ID@',Updated=TO_TIMESTAMP('2022-11-11 21:48:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55548 +; + diff --git a/migration/iD10/postgresql/202211112147_IDEMPIERE-870.sql b/migration/iD10/postgresql/202211112147_IDEMPIERE-870.sql new file mode 100644 index 0000000000..1098fd0746 --- /dev/null +++ b/migration/iD10/postgresql/202211112147_IDEMPIERE-870.sql @@ -0,0 +1,7 @@ +-- IDEMPIERE-870 +SELECT register_migration_script('202211112147_IDEMPIERE-870.sql') FROM dual; + +-- Nov 11, 2022, 9:48:36 PM CET +UPDATE AD_Column SET DefaultValue='@$C_Currency_ID@',Updated=TO_TIMESTAMP('2022-11-11 21:48:36','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Column_ID=55548 +; + diff --git a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java index 6c07e19ca0..36b249d430 100644 --- a/org.adempiere.base/src/org/compiere/model/MAssetAddition.java +++ b/org.adempiere.base/src/org/compiere/model/MAssetAddition.java @@ -436,9 +436,8 @@ public class MAssetAddition extends X_A_Asset_Addition { if(!isProcessed()) { - String str = Env.getContext(getCtx(), "#IsCanApproveOwnDoc"); - boolean isApproved = "Y".equals(str); //ARHIPAC.toBoolean(str, false); - if (log.isLoggable(Level.FINE)) log.fine("#IsCanApproveOwnDoc=" + str + "=" + isApproved); + boolean isApproved = MRole.getDefault().isCanApproveOwnDoc(); + if (log.isLoggable(Level.FINE)) log.fine("IsCanApproveOwnDoc=" + isApproved); setIsApproved(isApproved); } } diff --git a/org.adempiere.base/src/org/compiere/util/Env.java b/org.adempiere.base/src/org/compiere/util/Env.java index d90077cc4d..6d2b44f791 100644 --- a/org.adempiere.base/src/org/compiere/util/Env.java +++ b/org.adempiere.base/src/org/compiere/util/Env.java @@ -113,6 +113,7 @@ public final class Env public static final String DB_TYPE = "#DBType"; public static final String GL_CATEGORY_ID = "#GL_Category_ID"; public static final String HAS_ALIAS = "$HasAlias"; + public static final String IS_CAN_APPROVE_OWN_DOC = "#IsCanApproveOwnDoc"; public static final String IS_CLIENT_ADMIN = "#IsClientAdmin"; /** Context Language identifier */ public static final String LANGUAGE = "#AD_Language"; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index 1375617014..e5c4feaa81 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -325,7 +325,8 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb if (port > 0 && port != 80) { localHttpAddr.append(":").append(port); } - Env.setContext(ctx, Env.LOCAL_HTTP_ADDRESS, localHttpAddr.toString()); + Env.setContext(ctx, Env.LOCAL_HTTP_ADDRESS, localHttpAddr.toString()); + Env.setContext(ctx, Env.IS_CAN_APPROVE_OWN_DOC, MRole.getDefault().isCanApproveOwnDoc()); Clients.response(new AuScript("zAu.cmd0.clearBusy()")); //init favorite