diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index e35a28c593..c94d776ec9 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,8 +27,8 @@
-
-
+
+
diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
index b6a27d5fe0..2e902b8f4c 100644
--- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF
@@ -154,7 +154,8 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
org.apache.commons.io;bundle-version="0.0.0",
com.itextpdf;bundle-version="0.0.0",
org.atmosphere.runtime;bundle-version="0.0.0",
- javax.activation;bundle-version="1.1.0"
+ javax.activation;bundle-version="1.1.0",
+ zkwebfragment
Bundle-Activator: org.adempiere.webui.WebUIActivator
Eclipse-ExtensibleAPI: true
Web-ContextPath: webui
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index fd6c31364b..466f3f6ad9 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -10,7 +10,7 @@
org.idempiere.maven.to.p2
pom
- https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip
+ https://sourceforge.net/projects/zk1/files/ZK/zk-8.6.0/zk-bin-osgi-8.6.0.zip
1.1.3.v20160715
8.5.33
@@ -914,6 +914,16 @@ it also resolve issue confilic between eclipse runtime and tycho build
zcommon.source
+
+ org.zkoss.zk:zkwebfragment:jar:sources:${zk.version}
+
+ false
+
+ zkwebfragment;version="${zk.version}";roots:="."
+ zkwebfragment
+ zkwebfragment.source
+
+
org.javassist:javassist:jar:sources:${zk.javassist.src.version}
@@ -1010,6 +1020,15 @@ it also resolve issue confilic between eclipse runtime and tycho build
zcommon
+
+ org.zkoss.zk:zkwebfragment:${zk.version}
+
+ false
+
+ zkwebfragment
+ zkwebfragment
+
+
@@ -1345,6 +1364,10 @@ it also resolve issue confilic between eclipse runtime and tycho build
${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zweb.osgi.jar
${project.build.directory}/repository/plugins/zweb_${zk.version}.jar
+
+ ${project.build.directory}/zk-bin-osgi-${zk.version}/dist/lib/zkwebfragment.osgi.jar
+ ${project.build.directory}/repository/plugins/zkwebfragment_${zk.version}.jar
+
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index b7e6cd38bd..e60160ef4d 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -764,6 +764,14 @@
+
+
+
+
+
+
+
+
@@ -792,82 +800,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -924,6 +862,8 @@
+
+
@@ -940,6 +880,10 @@
+
+
+
+
@@ -950,10 +894,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1012,8 +978,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1027,6 +1015,7 @@
+
@@ -1045,35 +1034,38 @@
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.idempiere.parent/pom.xml b/org.idempiere.parent/pom.xml
index d59b3a8290..897dc38df0 100644
--- a/org.idempiere.parent/pom.xml
+++ b/org.idempiere.parent/pom.xml
@@ -15,7 +15,7 @@
UTF-8
9.4.12.v20180830
6.7.0
- 8.5.0
+ 8.6.0
3.23.1-GA
3.1.1
1.4.1
diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml
index 4eb4cc381a..ed142ded2e 100644
--- a/org.idempiere.zk-feature/feature.xml
+++ b/org.idempiere.zk-feature/feature.xml
@@ -101,4 +101,11 @@
version="0.0.0"
unpack="false"/>
+
+
diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath
index 85036c7cc4..92d760e60b 100644
--- a/org.idempiere.zk.extra/.classpath
+++ b/org.idempiere.zk.extra/.classpath
@@ -13,5 +13,6 @@
+
diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
index abb07d53ed..0f0aa50b81 100644
--- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF
+++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-ClassPath: .,
lib/closure-compiler.jar,
lib/gmapsz.jar,
lib/timelinez.jar,
- lib/timeplotz.jar
+ lib/timeplotz.jar,
+ lib/iceblue_c.jar
Export-Package: com.google.common.annotations,
com.google.common.base,
com.google.common.cache,
@@ -96,15 +97,18 @@ Export-Package: com.google.common.annotations,
org.zkoss.gmaps,
org.zkoss.gmaps.event,
org.zkoss.theme.breeze,
+ org.zkoss.theme.iceblue_c,
org.zkoss.zul.impl,
web.breeze.js.zkex.grid.css,
web.breeze.js.zkex.inp.css,
web.breeze.js.zkex.layout.css,
web.breeze.js.zkex.menu.css,
+ web.breeze.js.zkmax.barscanner.css,
web.breeze.js.zkmax.big.css,
web.breeze.js.zkmax.inp.css,
web.breeze.js.zkmax.inp.ext,
web.breeze.js.zkmax.layout.css,
+ web.breeze.js.zkmax.med.css,
web.breeze.js.zkmax.nav.css,
web.breeze.js.zkmax.wgt.css,
web.breeze.js.zul.box.css,
@@ -121,37 +125,48 @@ Export-Package: com.google.common.annotations,
web.breeze.zkex.img.colorbox,
web.breeze.zkmax.css,
web.breeze.zkmax.img.big,
- web.breeze.zkmax.img.inp,
- web.breeze.zkmax.img.tablet,
web.breeze.zkmax.img.tablet.big,
web.breeze.zkmax.img.tablet.colorbox,
- web.breeze.zkmax.img.tablet.grid,
- web.breeze.zkmax.img.tablet.inp,
web.breeze.zkmax.img.tablet.layout,
- web.breeze.zkmax.img.tablet.menu,
- web.breeze.zkmax.img.tablet.paging,
- web.breeze.zkmax.img.tablet.popup,
- web.breeze.zkmax.img.tablet.tab,
- web.breeze.zkmax.img.tablet.tree,
- web.breeze.zkmax.img.tablet.wnd,
web.breeze.zul.css,
web.breeze.zul.img,
- web.breeze.zul.img.button,
web.breeze.zul.img.common,
- web.breeze.zul.img.errbox,
web.breeze.zul.img.grid,
- web.breeze.zul.img.input,
- web.breeze.zul.img.layout,
- web.breeze.zul.img.menu,
web.breeze.zul.img.misc,
web.breeze.zul.img.msgbox,
- web.breeze.zul.img.paging,
- web.breeze.zul.img.popup,
web.breeze.zul.img.slider,
- web.breeze.zul.img.splt,
- web.breeze.zul.img.tab,
- web.breeze.zul.img.tree,
- web.breeze.zul.img.wnd,
+ web.iceblue_c.js.zkex.grid.css,
+ web.iceblue_c.js.zkex.inp.css,
+ web.iceblue_c.js.zkex.layout.css,
+ web.iceblue_c.js.zkex.menu.css,
+ web.iceblue_c.js.zkmax.barscanner.css,
+ web.iceblue_c.js.zkmax.big.css,
+ web.iceblue_c.js.zkmax.inp.css,
+ web.iceblue_c.js.zkmax.inp.ext,
+ web.iceblue_c.js.zkmax.layout.css,
+ web.iceblue_c.js.zkmax.med.css,
+ web.iceblue_c.js.zkmax.nav.css,
+ web.iceblue_c.js.zkmax.wgt.css,
+ web.iceblue_c.js.zul.box.css,
+ web.iceblue_c.js.zul.db.css,
+ web.iceblue_c.js.zul.grid.css,
+ web.iceblue_c.js.zul.inp.css,
+ web.iceblue_c.js.zul.layout.css,
+ web.iceblue_c.js.zul.menu.css,
+ web.iceblue_c.js.zul.mesh.css,
+ web.iceblue_c.js.zul.sel.css,
+ web.iceblue_c.js.zul.tab.css,
+ web.iceblue_c.js.zul.wgt.css,
+ web.iceblue_c.js.zul.wnd.css,
+ web.iceblue_c.zkex.img.colorbox,
+ web.iceblue_c.zkmax.css,
+ web.iceblue_c.zkmax.img.tablet.layout,
+ web.iceblue_c.zul.css,
+ web.iceblue_c.zul.img.common,
+ web.iceblue_c.zul.img.grid,
+ web.iceblue_c.zul.img.misc,
+ web.iceblue_c.zul.img.msgbox,
+ web.iceblue_c.zul.img.slider,
web.js.calendar,
web.js.calendar.css,
web.js.calendar.img,
diff --git a/org.idempiere.zk.extra/build.properties b/org.idempiere.zk.extra/build.properties
index 34a18c798b..fdcd8cceab 100644
--- a/org.idempiere.zk.extra/build.properties
+++ b/org.idempiere.zk.extra/build.properties
@@ -7,4 +7,5 @@ bin.includes = META-INF/,\
lib/closure-compiler.jar,\
lib/gmapsz.jar,\
lib/timelinez.jar,\
- lib/timeplotz.jar
+ lib/timeplotz.jar,\
+ lib/iceblue_c.jar
diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml
index 5ed5129c3f..b41320c124 100644
--- a/org.idempiere.zk.extra/pom.xml
+++ b/org.idempiere.zk.extra/pom.xml
@@ -27,7 +27,7 @@
org.zkoss.zkforge
gmapsz
- 3.0.4
+ 3.0.5
org.zkoss.zkforge
@@ -47,12 +47,17 @@
org.zkoss.theme
breeze
- 8.5.0
+ ${zk.version}
+
+
+ org.zkoss.theme
+ iceblue_c
+ ${zk.version}
com.google.javascript
closure-compiler
- v20181008
+ v20181028
lib