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

Compare commits

base: midsuit:943505d293ee8dfabe0eb2f2b1c8d1e4770e78c3
Branches Tags
midsuit:release-11
..
compare: midsuit:42fb2de77d24954df0c9e1ade7af2a9c40baab5f
Branches Tags
midsuit:release-11

No commits in common. "943505d293ee8dfabe0eb2f2b1c8d1e4770e78c3" and "42fb2de77d24954df0c9e1ade7af2a9c40baab5f" have entirely different histories.
943505d293 ... 42fb2de77d

49 changed files with 127 additions and 714 deletions
Show Stats Expand all files Collapse all files

18
org.adempiere.base.callout/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.base.process/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

16
org.adempiere.base/.classpath
View File

@ -1,27 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/bsh.jar"/> <classpathentry exported="true" kind="lib" path="lib/bsh.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-validator.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/> <classpathentry exported="true" kind="lib" path="lib/cron4j.jar"/>
<classpathentry exported="true" kind="lib" path="lib/avalon-framework-api.jar"/> <classpathentry exported="true" kind="lib" path="lib/avalon-framework-api.jar"/>
<classpathentry exported="true" kind="lib" path="lib/htmlcompressor.jar"/> <classpathentry exported="true" kind="lib" path="lib/htmlcompressor.jar"/>
<classpathentry exported="true" kind="lib" path="lib/yuicompressor.jar"/> <classpathentry exported="true" kind="lib" path="lib/yuicompressor.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

13
org.adempiere.base/src/org/compiere/print/IHTMLExtension.java
View File

@ -24,20 +24,17 @@ import org.apache.ecs.xhtml.body;
public interface IHTMLExtension { public interface IHTMLExtension {
/** /**
* Get CSS class prefix for HTML report element * @return css class prefix for report element
* @return CSS class prefix for HTML report element
*/ */
public String getClassPrefix(); public String getClassPrefix();
/** /**
* Get URL to report CSS * @return url to report css
* @return URL to report CSS
*/ */
public String getStyleURL(); public String getStyleURL();
/** /**
* Get URL to report javascript * @return url to report js
* @return URL to report javascript
*/ */
public String getScriptURL(); public String getScriptURL();
@ -64,13 +61,11 @@ public interface IHTMLExtension {
public void setWebAttribute (body reportBody); public void setWebAttribute (body reportBody);
/** /**
* Get absolute local file path to CSS file (typically for embedding the file content to HTML report) * @return absolute path to css style file
* @return absolute local file path to CSS file
*/ */
public String getFullPathStyle (); public String getFullPathStyle ();
/** /**
* Get one or more links (&lt;link ... &gt;) to web font
* @return one or more links for web font * @return one or more links for web font
*/ */
String getWebFontLinks(); String getWebFontLinks();

2
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -558,7 +558,7 @@ public class Login
ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>(); ArrayList<KeyNamePair> list = new ArrayList<KeyNamePair>();
KeyNamePair[] retValue = null; KeyNamePair[] retValue = null;
// //
String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name, 'N' as IsSummary,r.RoleType,r.IsClientAdministrator " String sql = " SELECT DISTINCT r.UserLevel, r.ConnectionProfile,o.AD_Org_ID,o.Name,o.IsSummary,r.RoleType,r.IsClientAdministrator "
+" FROM AD_Org o" +" FROM AD_Org o"
+" INNER JOIN AD_Role r on (r.AD_Role_ID=?)" +" INNER JOIN AD_Role r on (r.AD_Role_ID=?)"
+" INNER JOIN AD_Client c on (c.AD_Client_ID=?)" +" INNER JOIN AD_Client c on (c.AD_Client_ID=?)"

18
org.adempiere.eclipse.equinox.http.servlet/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.install/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.payment.processor/.classpath
View File

@ -1,24 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/> <classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
<classpathentry exported="true" kind="lib" path="lib/payflow.jar"/> <classpathentry exported="true" kind="lib" path="lib/payflow.jar"/>
<classpathentry exported="true" kind="lib" path="lib/Verisign.jar"/> <classpathentry exported="true" kind="lib" path="lib/Verisign.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.pipo.handlers/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

2
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/OrgRoleElementHandler.java
View File

@ -84,7 +84,7 @@ public class OrgRoleElementHandler extends AbstractElementHandler {
PoExporter filler = new PoExporter(ctx, document, po); PoExporter filler = new PoExporter(ctx, document, po);
List<String> excludes = defaultExcludeList(X_AD_Role_OrgAccess.Table_Name); List<String> excludes = defaultExcludeList(X_AD_Role_OrgAccess.Table_Name);
filler.export(excludes, true); filler.export(excludes);
} }
@Override @Override

18
org.adempiere.pipo/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.plugin.utils/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.replication.server/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.replication/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

9
org.adempiere.report.jasper.library/.classpath
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
@ -14,10 +14,5 @@
<classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/> <classpathentry exported="true" kind="lib" path="lib/jasperreports-functions.jar"/>
<classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/> <classpathentry exported="true" kind="lib" path="lib/olap4j.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/> <classpathentry exported="true" kind="lib" path="lib/xmpcore.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.report.jasper/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

30
org.adempiere.server/.classpath
View File

@ -1,33 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src/main/server"> <classpathentry kind="src" path="src/main/server/"/>
<attributes> <classpathentry kind="src" path="src/main/servlet/"/>
<attribute name="optional" value="true"/> <classpathentry kind="src" path="src/main/home/"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/servlet">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/home">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.adempiere.ui.zk/.classpath
View File

@ -1,24 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="WEB-INF/src"> <classpathentry kind="src" path="WEB-INF/src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/> <classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
<classpathentry exported="true" kind="lib" path="lib/daisydiff.jar"/> <classpathentry exported="true" kind="lib" path="lib/daisydiff.jar"/>
<classpathentry exported="true" kind="lib" path="lib/owasp-java-html-sanitizer.jar"/> <classpathentry exported="true" kind="lib" path="lib/owasp-java-html-sanitizer.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewer.java
View File

@ -35,6 +35,7 @@ import org.adempiere.webui.component.Button;
import org.adempiere.webui.component.Checkbox; import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.Column; import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns; import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.Datebox;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListModelTable; import org.adempiere.webui.component.ListModelTable;
@ -51,13 +52,11 @@ import org.adempiere.webui.component.VerticalBox;
import org.adempiere.webui.component.WListItemRenderer; import org.adempiere.webui.component.WListItemRenderer;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.desktop.IDesktop; import org.adempiere.webui.desktop.IDesktop;
import org.adempiere.webui.editor.WDateEditor;
import org.adempiere.webui.event.DialogEvents; import org.adempiere.webui.event.DialogEvents;
import org.adempiere.webui.panel.InfoPanel; import org.adempiere.webui.panel.InfoPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.adempiere.webui.window.Dialog; import org.adempiere.webui.window.Dialog;
import org.compiere.model.MAcctSchema; import org.compiere.model.MAcctSchema;
import org.compiere.model.MAcctSchemaElement; import org.compiere.model.MAcctSchemaElement;
@ -165,8 +164,8 @@ public class WAcctViewer extends Window implements EventListener<Event>
private Label lSort = new Label(); private Label lSort = new Label();
private Label lGroup = new Label(); private Label lGroup = new Label();
private WDateEditor selDateFrom = new WDateEditor(); private Datebox selDateFrom = new Datebox();
private WDateEditor selDateTo = new WDateEditor(); private Datebox selDateTo = new Datebox();
private Checkbox selDocument = new Checkbox(); private Checkbox selDocument = new Checkbox();
private Checkbox displayQty = new Checkbox(); private Checkbox displayQty = new Checkbox();
@ -328,11 +327,9 @@ public class WAcctViewer extends Window implements EventListener<Event>
row = rows.newRow(); row = rows.newRow();
row.appendChild(lDate); row.appendChild(lDate);
hlayout = new Hlayout(); hlayout = new Hlayout();
hlayout.appendChild(selDateFrom.getComponent()); hlayout.appendChild(selDateFrom);
hlayout.appendChild(new Label(" - ")); hlayout.appendChild(new Label(" - "));
hlayout.appendChild(selDateTo.getComponent()); hlayout.appendChild(selDateTo);
DateRangeButton drb = (new DateRangeButton(selDateFrom, selDateTo));
hlayout.appendChild(drb);
row.appendChild(hlayout); row.appendChild(hlayout);
// Organization // Organization
@ -1196,8 +1193,8 @@ public class WAcctViewer extends Window implements EventListener<Event>
selTable.setEnabled(doc); selTable.setEnabled(doc);
selRecord.setEnabled(doc); selRecord.setEnabled(doc);
// //
selDateFrom.setReadWrite(!doc); selDateFrom.setEnabled(!doc);
selDateTo.setReadWrite(!doc); selDateTo.setEnabled(!doc);
selOrg.setEnabled(!doc); selOrg.setEnabled(!doc);
selAcct.setEnabled(!doc); selAcct.setEnabled(!doc);
sel1.setEnabled(!doc); sel1.setEnabled(!doc);

99
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/DocumentSearchController.java
View File

@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Label; import org.adempiere.webui.component.Label;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.compiere.model.I_AD_SearchDefinition; import org.compiere.model.I_AD_SearchDefinition;
@ -39,7 +38,6 @@ import org.compiere.model.Query;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Util; import org.compiere.util.Util;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
@ -54,9 +52,7 @@ import org.zkoss.zul.Vlayout;
* *
*/ */
public class DocumentSearchController implements EventListener<Event>{ public class DocumentSearchController implements EventListener<Event>{
/** Style for transaction code guide or execution error */
private static final String MESSAGE_LABEL_STYLE = "color: rgba(0,0,0,0.34)";
/** {@link A} component attribute to hold reference to corresponding {@link #SEARCH_RESULT} **/ /** {@link A} component attribute to hold reference to corresponding {@link #SEARCH_RESULT} **/
private static final String SEARCH_RESULT = "search.result"; private static final String SEARCH_RESULT = "search.result";
/** onSearchDocuments event **/ /** onSearchDocuments event **/
@ -68,8 +64,6 @@ public class DocumentSearchController implements EventListener<Event>{
private ArrayList<SearchResult> list; private ArrayList<SearchResult> list;
/** Current selected index of {@link #list} **/ /** Current selected index of {@link #list} **/
private int selected = -1; private int selected = -1;
/** True when showing transaction code available */
private boolean showingGuide = false;
/** /**
* default constructor * default constructor
@ -98,12 +92,7 @@ public class DocumentSearchController implements EventListener<Event>{
* @param value * @param value
*/ */
public void search(String value) { public void search(String value) {
if (Util.isEmpty(value) || (value.startsWith("/") && value.indexOf(" ") < 0)) { layout.getChildren().clear();
if (!showingGuide)
layout.getChildren().clear();
} else {
layout.getChildren().clear();
}
Events.echoEvent(ON_SEARCH_DOCUMENTS_EVENT, layout, value); Events.echoEvent(ON_SEARCH_DOCUMENTS_EVENT, layout, value);
} }
@ -114,31 +103,12 @@ public class DocumentSearchController implements EventListener<Event>{
*/ */
private void onSearchDocuments(String searchString) { private void onSearchDocuments(String searchString) {
list = new ArrayList<SearchResult>(); list = new ArrayList<SearchResult>();
if (Util.isEmpty(searchString) || (searchString.startsWith("/") && searchString.indexOf(" ") < 0)) { if (Util.isEmpty(searchString)) {
// No search string, show available transaction code
if (!showingGuide) {
Query query = new Query(Env.getCtx(), I_AD_SearchDefinition.Table_Name, "TransactionCode IS NOT NULL", null);
List<MSearchDefinition> definitions = query.setOnlyActiveRecords(true).setOrderBy("TransactionCode").list();
for(MSearchDefinition definition : definitions) {
Label label = new Label("/"+definition.getTransactionCode() + " " + definition.getName());
label.setStyle(MESSAGE_LABEL_STYLE);
layout.appendChild(label);
}
showingGuide = true;
}
return; return;
} }
showingGuide = false;
// Search and show results
List<SearchResult> list = doSearch(searchString); List<SearchResult> list = doSearch(searchString);
if (list.size() > 0) {
if (list.size() == 1 && list.get(0).getRecordId() == -1) {
// DB error or query timeout
Label label = new Label(list.get(0).getLabel());
label.setStyle(MESSAGE_LABEL_STYLE);
layout.appendChild(label);
} else if (list.size() > 0) {
Collections.sort(list, new Comparator<SearchResult>() { Collections.sort(list, new Comparator<SearchResult>() {
@Override @Override
public int compare(SearchResult o1, SearchResult o2) { public int compare(SearchResult o1, SearchResult o2) {
@ -148,47 +118,20 @@ public class DocumentSearchController implements EventListener<Event>{
return r; return r;
} }
}); });
String matchString = searchString.toLowerCase();
if (searchString != null && searchString.startsWith("/") && searchString.indexOf(" ") > 1) {
// "/TransactionCode Search Text"
matchString = searchString.substring(searchString.indexOf(" ")+1).toLowerCase();
}
String windowName = null; String windowName = null;
for(SearchResult result : list) { for(SearchResult result : list) {
if (windowName == null || !windowName.equals(result.getWindowName())) { if (windowName == null || !windowName.equals(result.getWindowName())) {
windowName = result.getWindowName(); windowName = result.getWindowName();
Label label = new Label(windowName); Label label = new Label(windowName);
LayoutUtils.addSclass("window-name", label); label.setStyle("padding: 3px; font-weight: bold; display: inline-block;");
layout.appendChild(label); layout.appendChild(label);
} }
A a = new A(); A a = new A();
a.setAttribute(SEARCH_RESULT, result); a.setAttribute(SEARCH_RESULT, result);
a.setLabel(result.getLabel());
layout.appendChild(a); layout.appendChild(a);
LayoutUtils.addSclass("search-result", a); a.setStyle("padding-left: 3px; display: inline-block;");
a.addEventListener(Events.ON_CLICK, this); a.addEventListener(Events.ON_CLICK, this);
String label = result.getLabel();
if (!Util.isEmpty(matchString, true)) {
int match = label.toLowerCase().indexOf(matchString);
while (match >= 0) {
if (match > 0) {
a.appendChild(new Label(label.substring(0, match)));
Label l = new Label(label.substring(match, match+matchString.length()));
LayoutUtils.addSclass("highlight", l);
a.appendChild(l);
label = label.substring(match+matchString.length());
} else {
Label l = new Label(label.substring(0, matchString.length()));
LayoutUtils.addSclass("highlight", l);
a.appendChild(l);
label = label.substring(matchString.length());
}
match = label.toLowerCase().indexOf(matchString);
}
}
if (label.length() > 0)
a.appendChild(new Label(label));
} }
layout.invalidate(); layout.invalidate();
} }
@ -203,23 +146,7 @@ public class DocumentSearchController implements EventListener<Event>{
final MRole role = MRole.get(Env.getCtx(), Env.getAD_Role_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()), true); final MRole role = MRole.get(Env.getCtx(), Env.getAD_Role_ID(Env.getCtx()), Env.getAD_User_ID(Env.getCtx()), true);
selected = -1; selected = -1;
Query query = new Query(Env.getCtx(), I_AD_SearchDefinition.Table_Name, "TransactionCode IS NULL", null);
// Search with or without transaction code
StringBuilder whereClause = new StringBuilder();
String transactionCode = null;
if (searchString != null && searchString.startsWith("/") && searchString.indexOf(" ") > 1) {
// "/TransactionCode Search Text"
transactionCode = searchString.substring(1, searchString.indexOf(" "));
searchString = searchString.substring(searchString.indexOf(" ")+1);
whereClause.append("Upper(TransactionCode) = ?");
} else {
// Search with definition that doesn't use transaction code
whereClause.append("TransactionCode IS NULL");
}
Query query = new Query(Env.getCtx(), I_AD_SearchDefinition.Table_Name, whereClause.toString(), null);
if (transactionCode != null)
query.setParameters(transactionCode.toUpperCase());
List<MSearchDefinition> definitions = query.setOnlyActiveRecords(true).list(); List<MSearchDefinition> definitions = query.setOnlyActiveRecords(true).list();
for(MSearchDefinition msd : definitions) { for(MSearchDefinition msd : definitions) {
MTable table = new MTable(Env.getCtx(), msd.getAD_Table_ID(), null); MTable table = new MTable(Env.getCtx(), msd.getAD_Table_ID(), null);
@ -343,15 +270,7 @@ public class DocumentSearchController implements EventListener<Event>{
list.add(result); list.add(result);
} }
} catch (SQLException e) { } catch (SQLException e) {
SearchResult result = new SearchResult(); e.printStackTrace();
result.setRecordId(-1);
if (DB.getDatabase().isQueryTimeout(e)) {
result.setLabel(Msg.getMsg(Env.getCtx(), "Timeout"));
} else {
result.setLabel(Msg.getMsg(Env.getCtx(), "DBExecuteError"));
e.printStackTrace();
}
list.add(result);
} finally { } finally {
DB.close(rs, pstmt); DB.close(rs, pstmt);
} }

37
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/GlobalSearch.java
View File

@ -100,13 +100,9 @@ public class GlobalSearch extends Div implements EventListener<Event> {
bandbox.addEventListener(Events.ON_CHANGE, this); bandbox.addEventListener(Events.ON_CHANGE, this);
bandbox.setCtrlKeys("#up#down"); bandbox.setCtrlKeys("#up#down");
bandbox.addEventListener(Events.ON_CTRL_KEY, this); bandbox.addEventListener(Events.ON_CTRL_KEY, this);
bandbox.addEventListener(Events.ON_FOCUS, e -> {
if (!bandbox.isOpen())
bandbox.setOpen(true);
});
Bandpopup popup = new Bandpopup(); Bandpopup popup = new Bandpopup();
ZKUpdateUtil.setWindowHeightX(popup, ClientInfo.get().desktopHeight-100); ZKUpdateUtil.setWindowHeightX(popup, ClientInfo.get().desktopHeight-50);
bandbox.appendChild(popup); bandbox.appendChild(popup);
tabbox = new Tabbox(); tabbox = new Tabbox();
@ -143,18 +139,15 @@ public class GlobalSearch extends Div implements EventListener<Event> {
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
if (Events.ON_CHANGING.equals(event.getName())) { if (Events.ON_CHANGING.equals(event.getName())) {
// Post ON_SEARCH_EVENT for ON_CHANGING from bandbox //post ON_SEARCH_EVENT for ON_CHANGING from bandbox
InputEvent inputEvent = (InputEvent) event; InputEvent inputEvent = (InputEvent) event;
String value = inputEvent.getValue(); String value = inputEvent.getValue();
// Auto switch to Search with "/"
if (value != null && value.startsWith("/") && tabbox.getSelectedIndex()==0)
tabbox.setSelectedIndex(1);
bandbox.setAttribute(LAST_ONCHANGING_ATTR, value); bandbox.setAttribute(LAST_ONCHANGING_ATTR, value);
Events.postEvent(ON_SEARCH_EVENT, this, value); Events.postEvent(ON_SEARCH_EVENT, this, value);
} else if (Events.ON_CHANGE.equals(event.getName())) { } else if (Events.ON_CHANGE.equals(event.getName())) {
bandbox.removeAttribute(LAST_ONCHANGING_ATTR); bandbox.removeAttribute(LAST_ONCHANGING_ATTR);
} else if (Events.ON_CTRL_KEY.equals(event.getName())) { } else if (Events.ON_CTRL_KEY.equals(event.getName())) {
// Handle keyboard navigation for bandbox items //handle keyboard navigation for bandbox items
KeyEvent ke = (KeyEvent) event; KeyEvent ke = (KeyEvent) event;
if (ke.getKeyCode() == KeyEvent.UP) { if (ke.getKeyCode() == KeyEvent.UP) {
if (bandbox.getFirstChild().isVisible()) { if (bandbox.getFirstChild().isVisible()) {
@ -187,12 +180,10 @@ public class GlobalSearch extends Div implements EventListener<Event> {
} }
} else if (event.getName().equals(ON_SEARCH_EVENT)) { } else if (event.getName().equals(ON_SEARCH_EVENT)) {
String value = (String) event.getData(); String value = (String) event.getData();
if (tabbox.getSelectedIndex()==0) { if (tabbox.getSelectedIndex()==0)
menuController.setHighlightText(value);
menuController.search(value); menuController.search(value);
} else { else
docController.search(value); docController.search(value);
}
bandbox.focus(); bandbox.focus();
} else if (event.getName().equals(ON_CREATE_ECHO_EVENT)) { } else if (event.getName().equals(ON_CREATE_ECHO_EVENT)) {
//setup client side listener for enter key //setup client side listener for enter key
@ -256,20 +247,4 @@ public class GlobalSearch extends Div implements EventListener<Event> {
public void onClientInfo() { public void onClientInfo() {
ZKUpdateUtil.setWindowHeightX(bandbox.getDropdown(), ClientInfo.get().desktopHeight-50); ZKUpdateUtil.setWindowHeightX(bandbox.getDropdown(), ClientInfo.get().desktopHeight-50);
} }
/**
* Set place holder text for global search input box
* @param placeHolder
*/
public void setPlaceHolderText(String placeHolder) {
bandbox.setPlaceholder(placeHolder);
}
/**
* Set tooltip text for global search input box
* @param tooltipText
*/
public void setTooltipText(String tooltipText) {
bandbox.setTooltiptext(tooltipText);
}
} }

39
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/MenuSearchController.java
View File

@ -17,8 +17,6 @@ import java.util.ArrayList;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.component.Label;
import org.adempiere.webui.component.ListHead; import org.adempiere.webui.component.ListHead;
import org.adempiere.webui.component.ListItem; import org.adempiere.webui.component.ListItem;
import org.adempiere.webui.component.Listbox; import org.adempiere.webui.component.Listbox;
@ -97,8 +95,6 @@ public class MenuSearchController implements EventListener<Event>{
private ListModelList<MenuItem> fullModel; private ListModelList<MenuItem> fullModel;
/** true when controller is handling event from Star/Favourite button **/ /** true when controller is handling event from Star/Favourite button **/
private boolean inStarEvent; private boolean inStarEvent;
private String highlightText = null;
/** Event post from {@link #selectTreeitem(Object, Boolean)} **/ /** Event post from {@link #selectTreeitem(Object, Boolean)} **/
private static final String ON_POST_SELECT_TREEITEM_EVENT = "onPostSelectTreeitem"; private static final String ON_POST_SELECT_TREEITEM_EVENT = "onPostSelectTreeitem";
@ -608,14 +604,6 @@ public class MenuSearchController implements EventListener<Event>{
return false; return false;
} }
/**
* Set text to highlight
* @param s
*/
public void setHighlightText(String s) {
highlightText = s;
}
/** /**
* {@link ListitemRenderer} for {@link #listbox} * {@link ListitemRenderer} for {@link #listbox}
*/ */
@ -646,33 +634,6 @@ public class MenuSearchController implements EventListener<Event>{
cell.setImage(null); cell.setImage(null);
cell.setIconSclass(data.getImage()); cell.setIconSclass(data.getImage());
} }
// Highlight search text
if (!Util.isEmpty(highlightText, true) && data.getLabel().toLowerCase().contains(highlightText.toLowerCase())) {
// Space to maintain proper gap between icon and label
cell.setLabel(" ");
String label = data.getLabel();
String matchString = highlightText.toLowerCase();
int match = label.toLowerCase().indexOf(matchString);
while (match >= 0) {
if (match > 0) {
cell.appendChild(new Label(label.substring(0, match)));
Label l = new Label(label.substring(match, match+matchString.length()));
LayoutUtils.addSclass("highlight", l);
cell.appendChild(l);
label = label.substring(match+matchString.length());
} else {
Label l = new Label(label.substring(0, matchString.length()));
LayoutUtils.addSclass("highlight", l);
cell.appendChild(l);
label = label.substring(matchString.length());
}
match = label.toLowerCase().indexOf(matchString);
}
if (label.length() > 0)
cell.appendChild(new Label(label));
}
item.appendChild(cell); item.appendChild(cell);
cell.setTooltip(data.getDescription()); cell.setTooltip(data.getDescription());
item.setValue(data); item.setValue(data);

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WArchiveViewer.java
View File

@ -41,6 +41,7 @@ import org.adempiere.webui.component.Checkbox;
import org.adempiere.webui.component.Column; import org.adempiere.webui.component.Column;
import org.adempiere.webui.component.Columns; import org.adempiere.webui.component.Columns;
import org.adempiere.webui.component.ConfirmPanel; import org.adempiere.webui.component.ConfirmPanel;
import org.adempiere.webui.component.Datebox;
import org.adempiere.webui.component.DatetimeBox; import org.adempiere.webui.component.DatetimeBox;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.GridFactory; import org.adempiere.webui.component.GridFactory;
@ -56,7 +57,6 @@ import org.adempiere.webui.component.Tabpanels;
import org.adempiere.webui.component.Tabs; import org.adempiere.webui.component.Tabs;
import org.adempiere.webui.component.Textbox; import org.adempiere.webui.component.Textbox;
import org.adempiere.webui.component.ToolBarButton; import org.adempiere.webui.component.ToolBarButton;
import org.adempiere.webui.editor.WDateEditor;
import org.adempiere.webui.editor.WSearchEditor; import org.adempiere.webui.editor.WSearchEditor;
import org.adempiere.webui.panel.ADForm; import org.adempiere.webui.panel.ADForm;
import org.adempiere.webui.panel.CustomForm; import org.adempiere.webui.panel.CustomForm;
@ -64,7 +64,6 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.adempiere.webui.window.Dialog; import org.adempiere.webui.window.Dialog;
import org.adempiere.webui.window.WEMailDialog; import org.adempiere.webui.window.WEMailDialog;
import org.compiere.apps.form.Archive; import org.compiere.apps.form.Archive;
@ -179,9 +178,9 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
private Listbox createdByQField = new Listbox(); private Listbox createdByQField = new Listbox();
private Label createdQLabel = new Label(Msg.translate(Env.getCtx(), "Created")); private Label createdQLabel = new Label(Msg.translate(Env.getCtx(), "Created"));
/** Created date from field of query tab */ /** Created date from field of query tab */
private WDateEditor createdQFrom = new WDateEditor(); private Datebox createdQFrom = new Datebox();
/** Created date to field of query tab */ /** Created date to field of query tab */
private WDateEditor createdQTo = new WDateEditor(); private Datebox createdQTo = new Datebox();
//Viewer Tab //Viewer Tab
/** Prior button of viewer tab */ /** Prior button of viewer tab */
@ -458,10 +457,8 @@ public class WArchiveViewer extends Archive implements IFormController, EventLis
rows.appendChild(row); rows.appendChild(row);
row.appendChild(createdQLabel); row.appendChild(createdQLabel);
Hbox hbox = new Hbox(); Hbox hbox = new Hbox();
hbox.appendChild(createdQFrom.getComponent()); hbox.appendChild(createdQFrom);
hbox.appendChild(createdQTo.getComponent()); hbox.appendChild(createdQTo);
DateRangeButton drb = (new DateRangeButton(createdQFrom, createdQTo));
hbox.appendChild(drb);
row.appendChild(hbox); row.appendChild(hbox);
row.appendChild(new Space()); row.appendChild(new Space());

11
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WFactReconcile.java
View File

@ -67,7 +67,6 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager; import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.compiere.apps.form.FactReconcile; import org.compiere.apps.form.FactReconcile;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MColumn; import org.compiere.model.MColumn;
@ -87,7 +86,6 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.South; import org.zkoss.zul.South;
@ -263,14 +261,11 @@ implements IFormController, EventListener<Event>, WTableModelListener, ValueChan
row.appendCellChild(fieldProduct.getComponent(), 2); row.appendCellChild(fieldProduct.getComponent(), 2);
row = rows.newRow(); row = rows.newRow();
row.appendCellChild(labelDateAcct.rightAlign()); row.appendCellChild(labelDateAcct.rightAlign());
ZKUpdateUtil.setHflex(fieldDateAcct.getComponent(), "true");
row.appendCellChild(fieldDateAcct.getComponent(), 2); row.appendCellChild(fieldDateAcct.getComponent(), 2);
row.appendCellChild(labelDateAcct2.rightAlign()); row.appendCellChild(labelDateAcct2.rightAlign());
Hbox boxTo = new Hbox(); ZKUpdateUtil.setHflex(fieldDateAcct2.getComponent(), "true");
boxTo.appendChild(fieldDateAcct2.getComponent()); row.appendCellChild(fieldDateAcct2.getComponent(), 2);
DateRangeButton drb = (new DateRangeButton(fieldDateAcct, fieldDateAcct2));
boxTo.appendChild(drb);
row.appendCellChild(boxTo, 2);
row = rows.newRow(); row = rows.newRow();
row.appendChild(bRefresh); row.appendChild(bRefresh);
if (ClientInfo.maxWidth(ClientInfo.EXTRA_SMALL_WIDTH-1)) if (ClientInfo.maxWidth(ClientInfo.EXTRA_SMALL_WIDTH-1))

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WMatch.java
View File

@ -52,7 +52,6 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.panel.StatusBarPanel; import org.adempiere.webui.panel.StatusBarPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.compiere.apps.form.Match; import org.compiere.apps.form.Match;
import org.compiere.minigrid.ColumnInfo; import org.compiere.minigrid.ColumnInfo;
import org.compiere.minigrid.IDColumn; import org.compiere.minigrid.IDColumn;
@ -66,10 +65,9 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.event.Events;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.Separator;
import org.zkoss.zul.South; import org.zkoss.zul.South;
import org.zkoss.zul.Separator;
import org.zkoss.zul.Space; import org.zkoss.zul.Space;
import org.zkoss.zul.Vlayout; import org.zkoss.zul.Vlayout;
@ -344,11 +342,7 @@ public class WMatch extends Match
row.appendChild(dateFromLabel.rightAlign()); row.appendChild(dateFromLabel.rightAlign());
row.appendChild(dateFrom.getComponent()); row.appendChild(dateFrom.getComponent());
row.appendChild(dateToLabel.rightAlign()); row.appendChild(dateToLabel.rightAlign());
Hbox boxTo = new Hbox(); row.appendChild(dateTo.getComponent());
boxTo.appendChild(dateTo.getComponent());
DateRangeButton drb = (new DateRangeButton(dateFrom, dateTo));
boxTo.appendChild(drb);
row.appendChild(boxTo);
bSearch.setStyle("float: right"); bSearch.setStyle("float: right");
int r = row.getChildren().size() % noOfColumn; int r = row.getChildren().size() % noOfColumn;
row.appendCellChild(bSearch, noOfColumn-r); row.appendCellChild(bSearch, noOfColumn-r);

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTrxMaterial.java
View File

@ -43,7 +43,6 @@ import org.adempiere.webui.panel.IFormController;
import org.adempiere.webui.panel.StatusBarPanel; import org.adempiere.webui.panel.StatusBarPanel;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.util.ZKUpdateUtil; import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.DateRangeButton;
import org.compiere.apps.form.TrxMaterial; import org.compiere.apps.form.TrxMaterial;
import org.compiere.model.MLocatorLookup; import org.compiere.model.MLocatorLookup;
import org.compiere.model.MLookup; import org.compiere.model.MLookup;
@ -55,7 +54,6 @@ import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Borderlayout; import org.zkoss.zul.Borderlayout;
import org.zkoss.zul.Center; import org.zkoss.zul.Center;
import org.zkoss.zul.Hbox;
import org.zkoss.zul.North; import org.zkoss.zul.North;
import org.zkoss.zul.South; import org.zkoss.zul.South;
@ -227,11 +225,7 @@ public class WTrxMaterial extends TrxMaterial
row = rows.newRow(); row = rows.newRow();
} }
row.appendCellChild(dateTLabel.rightAlign()); row.appendCellChild(dateTLabel.rightAlign());
Hbox boxTo = new Hbox(); row.appendCellChild(dateTField.getComponent());
boxTo.appendChild(dateTField.getComponent());
DateRangeButton drb = (new DateRangeButton(dateFField, dateTField));
boxTo.appendChild(drb);
row.appendCellChild(boxTo);
} }
/** /**

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java
View File

@ -740,7 +740,7 @@ public class DashboardController implements EventListener<Event> {
HtmlBasedComponent parentComponent, List<Component> components, Component zulComponent, ServerPushTemplate spt) throws Exception { HtmlBasedComponent parentComponent, List<Component> components, Component zulComponent, ServerPushTemplate spt) throws Exception {
// HTML content // HTML content
String htmlContent = dashboardContent.get_ID() > 0 ? dashboardContent.get_Translation(MDashboardContent.COLUMNNAME_HTML) : null; String htmlContent = dashboardContent.get_ID() > 0 ? dashboardContent.get_Translation(MDashboardContent.COLUMNNAME_HTML) : null;
if(!Util.isEmpty(htmlContent)) if(htmlContent != null)
{ {
StringBuilder result = new StringBuilder("<html><head>"); StringBuilder result = new StringBuilder("<html><head>");

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java
View File

@ -189,13 +189,13 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
@Override @Override
public void onEvent(Event event) throws Exception { public void onEvent(Event event) throws Exception {
getComponent().getTextbox().focus(); getComponent().getTextbox().focus();
m_value = ld.getValue();
// //
if (!ld.isChanged()) if (!ld.isChanged())
return; return;
// Data Binding // Data Binding
m_value = ld.getValue();
int C_Location_ID = 0; int C_Location_ID = 0;
if (m_value != null) if (m_value != null)
C_Location_ID = m_value.getC_Location_ID(); C_Location_ID = m_value.getC_Location_ID();
@ -206,7 +206,7 @@ public class WLocationEditor extends WEditor implements EventListener<Event>, Pr
ValueChangeEvent vc = new ValueChangeEvent(WLocationEditor.this,getColumnName(),null,ii); ValueChangeEvent vc = new ValueChangeEvent(WLocationEditor.this,getColumnName(),null,ii);
fireValueChange(vc); fireValueChange(vc);
} }
getComponent().setText(m_value != null ? m_value.toString() : null); setValue(ii);
} }
}); });
ld.addEventListener(Events.ON_OPEN, new EventListener<OpenEvent>() { ld.addEventListener(Events.ON_OPEN, new EventListener<OpenEvent>() {

6
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WStringEditor.java
View File

@ -221,10 +221,8 @@ public class WStringEditor extends WEditor implements ContextMenuListener
// Validate VFormat with regular expression // Validate VFormat with regular expression
if (!Util.isEmpty(vFormat) && vFormat.startsWith("~")) { if (!Util.isEmpty(vFormat) && vFormat.startsWith("~")) {
String regex = gridField.getVFormat().substring(1); // remove the initial ~ String regex = gridField.getVFormat().substring(1); // remove the initial ~
if (!newValue.matches(regex)) { if (!newValue.matches(regex))
String msgregex = Msg.getMsg(Env.getCtx(), regex); throw new WrongValueException(component, Msg.getMsg(Env.getCtx(), "InvalidFormatRegExp", new Object[] {regex}));
throw new WrongValueException(component, Msg.getMsg(Env.getCtx(), "InvalidFormatRegExp", new Object[] {msgregex}));
}
} }
ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue); ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue);

17
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/HeaderPanel.java
View File

@ -95,7 +95,7 @@ public class HeaderPanel extends Panel implements EventListener<Event>
btnMenu = (LabelImageElement) getFellow("menuButton"); btnMenu = (LabelImageElement) getFellow("menuButton");
btnMenu.setIconSclass("z-icon-sitemap"); btnMenu.setIconSclass("z-icon-sitemap");
btnMenu.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(),"Menu")) + " Alt+M"); btnMenu.setTooltiptext(Util.cleanAmp(Msg.getMsg(Env.getCtx(),"Menu")));
btnMenu.addEventListener(Events.ON_CLICK, this); btnMenu.addEventListener(Events.ON_CLICK, this);
if (ClientInfo.isMobile()) { if (ClientInfo.isMobile()) {
LayoutUtils.addSclass("mobile", this); LayoutUtils.addSclass("mobile", this);
@ -131,8 +131,6 @@ public class HeaderPanel extends Panel implements EventListener<Event>
stub.getParent().insertBefore(globalSearch, stub); stub.getParent().insertBefore(globalSearch, stub);
stub.detach(); stub.detach();
globalSearch.setId("menuLookup"); globalSearch.setId("menuLookup");
globalSearch.setPlaceHolderText("Alt+G");
globalSearch.setTooltipText("Alt+G");
} }
@Override @Override
@ -156,19 +154,16 @@ public class HeaderPanel extends Panel implements EventListener<Event>
} else if (Events.ON_CREATE.equals(event.getName())) { } else if (Events.ON_CREATE.equals(event.getName())) {
onCreate(); onCreate();
}else if (event instanceof KeyEvent) }else if (event instanceof KeyEvent)
{ {
//alt+m for the menu
KeyEvent ke = (KeyEvent) event; KeyEvent ke = (KeyEvent) event;
if (ke.getKeyCode() == 77) // alt+m for the menu if (ke.getKeyCode() == 77)
{ {
popMenu.open(btnMenu, "after_start"); popMenu.open(btnMenu, "after_start");
popMenu.setFocus(true); popMenu.setFocus(true);
} }else if (ke.getKeyCode() == 27) {
else if (ke.getKeyCode() == 27) // esc to close menu
{
popMenu.close(); popMenu.close();
} }else if (ke.getKeyCode() == 71) {
else if (ke.getKeyCode() == 71) // alt+g for the search
{
globalSearch.setFocus(true); globalSearch.setFocus(true);
} }
} else if(event.getName().equals(ZoomEvent.EVENT_NAME)) { } else if(event.getName().equals(ZoomEvent.EVENT_NAME)) {

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/report/HTMLExtension.java
View File

@ -65,14 +65,14 @@ public class HTMLExtension implements IHTMLExtension {
String theme = MSysConfig.getValue(MSysConfig.HTML_REPORT_THEME, "/", Env.getAD_Client_ID(Env.getCtx())); String theme = MSysConfig.getValue(MSysConfig.HTML_REPORT_THEME, "/", Env.getAD_Client_ID(Env.getCtx()));
if (!theme.startsWith("/") && !theme.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE)) if (! theme.startsWith("/") && !theme.startsWith("~./"))
theme = "/" + theme; theme = "/" + theme;
if (! theme.endsWith("/")) if (! theme.endsWith("/"))
theme = theme + "/"; theme = theme + "/";
this.classPrefix = classPrefix; this.classPrefix = classPrefix;
this.componentId = componentId; this.componentId = componentId;
if (theme.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE)) { if (theme.startsWith("~./")) {
if (Executions.getCurrent() != null) { if (Executions.getCurrent() != null) {
this.styleURL = Executions.encodeURL(theme + "css/report.css"); this.styleURL = Executions.encodeURL(theme + "css/report.css");
} }
@ -197,16 +197,12 @@ public class HTMLExtension implements IHTMLExtension {
@Override @Override
public String getFullPathStyle() { public String getFullPathStyle() {
String theme = MSysConfig.getValue(MSysConfig.HTML_REPORT_THEME, "/", Env.getAD_Client_ID(Env.getCtx())); String theme = MSysConfig.getValue(MSysConfig.HTML_REPORT_THEME, "/", Env.getAD_Client_ID(Env.getCtx()));
if (!theme.startsWith("/") && !theme.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE)) if (! theme.startsWith("/"))
theme = "/" + theme; theme = "/" + theme;
if (!theme.endsWith("/")) if (! theme.endsWith("/"))
theme = theme + "/"; theme = theme + "/";
String resFile = theme + "css/report.css"; String resFile = theme + "css/report.css";
// translate ~./ url to classpath url
if (theme.startsWith(ThemeManager.ZK_URL_PREFIX_FOR_CLASSPATH_RESOURCE))
resFile = ThemeManager.toClassPathResourcePath(resFile);
URL urlFile = this.getClass().getResource(resFile); URL urlFile = this.getClass().getResource(resFile);
if (urlFile == null) { if (urlFile == null) {
resFile = "/css/report.css"; // default resFile = "/css/report.css"; // default

13
org.adempiere.ui.zk/WEB-INF/src/web/theme/default/css/fragment/application-menu.css.dsp
View File

@ -152,19 +152,6 @@
} }
} }
.global-search-tabpanel .window-name.z-label {
padding: 3px;
font-weight: bold;
display: inline-block;
}
.global-search-tabpanel .search-result.z-a {
padding-left: 3px;
display: inline-block;
}
.global-search-tabpanel .highlight {
background-color: #FFFF00;
}
.menu-href [class^="z-icon-"] { .menu-href [class^="z-icon-"] {
font-size: larger; font-size: larger;
color: #333; color: #333;

18
org.adempiere.ui/.classpath
View File

@ -1,24 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/org-netbeans-api-visual.jar"/> <classpathentry exported="true" kind="lib" path="lib/org-netbeans-api-visual.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org-openide-util.jar"/> <classpathentry exported="true" kind="lib" path="lib/org-openide-util.jar"/>
<classpathentry exported="true" kind="lib" path="lib/org-openide-util-lookup.jar"/> <classpathentry exported="true" kind="lib" path="lib/org-openide-util-lookup.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.apache.ecs/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.compiere.db.oracle.provider/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

1
org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/partition/TablePartitionService.java
View File

@ -553,7 +553,6 @@ public class TablePartitionService implements ITablePartitionService {
String s = rs.getString(partitionKeyColumn.getColumnName()); String s = rs.getString(partitionKeyColumn.getColumnName());
name.append(s); name.append(s);
if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo
|| DisplayType.isList(partitionKeyColumn.getAD_Reference_ID())
|| "EntityType".equals(partitionKeyColumn.getColumnName()) || "EntityType".equals(partitionKeyColumn.getColumnName())
|| "AD_Language".equals(partitionKeyColumn.getColumnName())) || "AD_Language".equals(partitionKeyColumn.getColumnName()))
expression.append(DB.TO_STRING(s)); expression.append(DB.TO_STRING(s));

16
org.compiere.db.postgresql.provider/.classpath
View File

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

14
org.compiere.db.postgresql.provider/src/org/adempiere/db/postgresql/partition/TablePartitionService.java
View File

@ -235,17 +235,8 @@ public class TablePartitionService implements ITablePartitionService {
//unique index must include partition key column //unique index must include partition key column
String indexdef = uniqueMap.get(indexName); String indexdef = uniqueMap.get(indexName);
for(String partitionKey : partitionKeyColumnNames) { for(String partitionKey : partitionKeyColumnNames) {
if (!indexdef.contains(partitionKey.toLowerCase()+",") && !indexdef.contains(partitionKey.toLowerCase()+")")) { if (!indexdef.contains(partitionKey.toLowerCase()+",") && !indexdef.contains(partitionKey.toLowerCase()+")"))
int whereIndex = indexdef.toLowerCase().indexOf(" where "); indexdef = indexdef.substring(0, indexdef.length()-1)+", "+partitionKey.toLowerCase()+")";
if (whereIndex > 0) {
String whereClause = indexdef.substring(whereIndex);
indexdef = indexdef.substring(0, whereIndex);
indexdef = indexdef.substring(0, indexdef.length()-1)+", "+partitionKey.toLowerCase()+")";
indexdef = indexdef + whereClause;
} else {
indexdef = indexdef.substring(0, indexdef.length()-1)+", "+partitionKey.toLowerCase()+")";
}
}
} }
StringBuilder alter = new StringBuilder("DROP INDEX ").append(indexName); StringBuilder alter = new StringBuilder("DROP INDEX ").append(indexName);
DB.executeUpdateEx(alter.toString(), trxName); DB.executeUpdateEx(alter.toString(), trxName);
@ -899,7 +890,6 @@ public class TablePartitionService implements ITablePartitionService {
updateStmt.append(partitionKeyColumn.getColumnName()).append("="); updateStmt.append(partitionKeyColumn.getColumnName()).append("=");
if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo if (DisplayType.isText(partitionKeyColumn.getAD_Reference_ID()) || partitionKeyColumn.getAD_Reference_ID() == DisplayType.YesNo
|| DisplayType.isList(partitionKeyColumn.getAD_Reference_ID())
|| "EntityType".equals(partitionKeyColumn.getColumnName()) || "EntityType".equals(partitionKeyColumn.getColumnName())
|| "AD_Language".equals(partitionKeyColumn.getColumnName())) || "AD_Language".equals(partitionKeyColumn.getColumnName()))
updateStmt.append("'").append(listValue).append("' "); updateStmt.append("'").append(listValue).append("' ");

18
org.idempiere.felix.webconsole/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.idempiere.hazelcast.service/.classpath
View File

@ -1,22 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/hazelcast.jar"/> <classpathentry exported="true" kind="lib" path="lib/hazelcast.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

11
org.idempiere.javadoc/.classpath
View File

@ -1,15 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

16
org.idempiere.jetty.osgi.boot.fragment/.classpath
View File

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

15
org.idempiere.keikai/.classpath
View File

@ -1,26 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/keikai-oss.jar"/> <classpathentry exported="true" kind="lib" path="lib/keikai-oss.jar"/>
<classpathentry exported="true" kind="lib" path="lib/keikai-model-oss.jar"/> <classpathentry exported="true" kind="lib" path="lib/keikai-model-oss.jar"/>
<classpathentry exported="true" kind="lib" path="lib/zpoi.jar"/> <classpathentry exported="true" kind="lib" path="lib/zpoi.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ooxml-schemas.jar"/> <classpathentry exported="true" kind="lib" path="lib/ooxml-schemas.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlbeans.jar"/> <classpathentry exported="true" kind="lib" path="lib/xmlbeans.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

16
org.idempiere.printformat.editor/.classpath
View File

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

14
org.idempiere.test/.classpath
View File

@ -1,20 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/">
<attributes> <attributes>
<attribute name="optional" value="true"/> <attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

16
org.idempiere.webservices.resources/.classpath
View File

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="module" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.idempiere.zk.billboard.chart/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.idempiere.zk.billboard/.classpath
View File

@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>

18
org.idempiere.zk.extra/.classpath
View File

@ -1,17 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" output="target/classes" path="src"> <classpathentry kind="src" path="src/"/>
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/breeze.jar"/> <classpathentry exported="true" kind="lib" path="lib/breeze.jar"/>
<classpathentry exported="true" kind="lib" path="lib/calendar.jar" sourcepath="lib/calendar-sources.jar"/> <classpathentry exported="true" kind="lib" path="lib/calendar.jar" sourcepath="lib/calendar-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/closure-compiler.jar"/> <classpathentry exported="true" kind="lib" path="lib/closure-compiler.jar"/>
@ -19,10 +10,5 @@
<classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/> <classpathentry exported="true" kind="lib" path="lib/timelinez.jar"/>
<classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/> <classpathentry exported="true" kind="lib" path="lib/timeplotz.jar"/>
<classpathentry exported="true" kind="lib" path="lib/iceblue_c.jar"/> <classpathentry exported="true" kind="lib" path="lib/iceblue_c.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>