midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-7.1 into master

This commit is contained in:
Carlos Ruiz 2020-01-16 15:26:55 +01:00
parent 44fd0fe898 0e8e4b6f13
commit f810d5a692
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAutoCompleterCity.java
View File

@ -42,7 +42,7 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
/**
*
*/
private static final long serialVersionUID = 318310285903469314L;
private static final long serialVersionUID = -5130826429569842714L;
private static final int PopupDelayMillis = 500;
@ -153,7 +153,7 @@ public class WAutoCompleterCity extends AutoComplete implements EventListener<Ev
"SELECT cy.C_City_ID, cy.Name, cy.C_Region_ID, r.Name"
+" FROM C_City cy"
+" LEFT OUTER JOIN C_Region r ON (r.C_Region_ID=cy.C_Region_ID)"
+" WHERE cy.AD_Client_ID IN (0,?)");
+" WHERE cy.AD_Client_ID IN (0,?) AND cy.IsActive = 'Y'");
params.add(getAD_Client_ID());
if (getC_Region_ID() > 0)
{

6
org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
View File

@ -40,7 +40,7 @@
<repositories>
<repository>
<id>orbit-photon-R20180531190352</id><!--only this repository have bakik 1.9-->
<url>http://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository</url>
<url>https://download.eclipse.org/tools/orbit/downloads/drops2/R20180531190352/repository</url>
<layout>p2</layout>
</repository>
<repository>
@ -50,11 +50,11 @@
</repository>
<repository>
<id>zkoss</id>
<url>http://mavensync.zkoss.org/maven2</url>
<url>https://mavensync.zkoss.org/maven2</url>
</repository>
<repository>
<id>restlet-maven</id>
<url>http://maven.restlet.com</url>
<url>https://maven.restlet.com</url>
</repository>
</repositories>

16
org.idempiere.parent/pom.xml
View File

@ -26,9 +26,9 @@
<maven-clean-plugin.version>2.5</maven-clean-plugin.version><!-- get from master, update when mave have update-->
<!-- default value of properties, use when run without profile -->
<idempiere.target>org.idempiere.p2.targetplatform</idempiere.target>
<idempiere-equinox-url>http://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
<idempiere-equinox-url>https://download.eclipse.org/eclipse/updates/4.10</idempiere-equinox-url>
<idempiere-equinox-repository-id>eclipse-photon-201810</idempiere-equinox-repository-id>
<idempiere-orbit-url>http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository</idempiere-orbit-url>
<idempiere-orbit-url>https://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository</idempiere-orbit-url>
<idempiere-orbit-repository-id>orbit-photon-R20181128170323</idempiere-orbit-repository-id>
<url.file.srv>https://raw.githubusercontent.com/idempiere/binary.file/master</url.file.srv>
<extra.ui.install>org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group</extra.ui.install>
@ -464,7 +464,7 @@
<repositories>
<repository>
<id>Central</id>
<url>http://central.maven.org/maven2</url>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
@ -474,7 +474,7 @@
<repository>
<id>OpenNMS</id>
<url>http://repo.opennms.org/maven2</url>
<url>https://repo.opennms.org/maven2</url>
</repository>
<repository>
@ -489,12 +489,12 @@
<repository>
<id>NetBeans</id>
<url>http://bits.netbeans.org/maven2</url>
<url>https://bits.netbeans.org/maven2</url>
</repository>
<repository>
<id>Clojars</id>
<url>http://clojars.org/repo</url>
<url>https://clojars.org/repo</url>
</repository>
<repository>
@ -504,12 +504,12 @@
<repository>
<id>zkoss</id>
<url>http://mavensync.zkoss.org/maven2</url>
<url>https://mavensync.zkoss.org/maven2</url>
</repository>
<repository>
<id>jenkins</id>
<url>http://repo.jenkins-ci.org/releases</url>
<url>https://repo.jenkins-ci.org/releases</url>
</repository>
</repositories>
<build>