From 6d82731dc5b114380c85b08d00e9d4084bb8de9a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 8 Feb 2019 12:56:39 +0100 Subject: [PATCH] Fix debian installer control prerequisites for 6.2 --- .../src/org/adempiere/model/CalloutBPartnerQuickEntry.java | 4 ++-- org.adempiere.base/src/org/compiere/model/MQuery.java | 4 +++- .../utils.unix/unix/DebianInstaller/DEBIAN/control | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java index 7e990cb629..98956df64b 100644 --- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java +++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutBPartnerQuickEntry.java @@ -34,8 +34,8 @@ public class CalloutBPartnerQuickEntry implements IColumnCallout { if (!Util.isEmpty(docSOTrx)) { boolean isSOTrx = "Y".equals(docSOTrx); - mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); - mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); + //mTab.setValue(MBPartner.COLUMNNAME_IsCustomer, isSOTrx); + //mTab.setValue(MBPartner.COLUMNNAME_IsVendor, !isSOTrx); } } return null; diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java index 9b7a03dbd6..8b9a6963a1 100644 --- a/org.adempiere.base/src/org/compiere/model/MQuery.java +++ b/org.adempiere.base/src/org/compiere/model/MQuery.java @@ -1023,8 +1023,10 @@ class Restriction implements Serializable // this.Operator = operator; // Boolean - if (code instanceof Boolean) + if (code instanceof Boolean) { Code = ((Boolean)code).booleanValue() ? "Y" : "N"; + Code = Msg.getMsg(Env.getAD_Language(Env.getCtx()), Code.toString()); + } else if (code instanceof KeyNamePair) Code = Integer.valueOf(((KeyNamePair)code).getKey()); else if (code instanceof ValueNamePair) diff --git a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control index 5e3334bdde..9f3e5f8e40 100644 --- a/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control +++ b/org.adempiere.server-feature/utils.unix/unix/DebianInstaller/DEBIAN/control @@ -3,7 +3,7 @@ Version: 6.2 Section: web Priority: extra Architecture: all -Pre-Depends: openjdk-10-jdk|openjdk-11-jdk|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser +Pre-Depends: openjdk-11-jre|openjdk-11-jdk|openjdk-12-jre|openjdk-12-jdk, postgresql-11|postgresql-10|postgresql-9.6, postgresql-contrib, adduser Suggests: firefox Installed-Size: 968668 Maintainer: Carlos Ruiz