Merge branch 'develop' into feature/develop_QuickSheet

adempiere · Jul 28, 2018 · 52e648d · 52e648d
2 parents 9bda36e + 3d4f7f2
commit 52e648d
Show file tree

Hide file tree

Showing 48 changed files with 60,469 additions and 1,759 deletions.
diff --git a/.classpath b/.classpath
@@ -352,5 +352,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SBT: org.scalatest:scalatest_2.11:2.2.4:jar"/>
 	<classpathentry kind="lib" path="tools/lib/mariadb-java-client.jar"/>
 	<classpathentry kind="lib" path="tools/lib/slf4j-api-1.6.0.jar"/>
+	<classpathentry kind="lib" path="tools/lib/icepdf-core-6.2.2.jar"/>
+	<classpathentry kind="lib" path="tools/lib/icepdf-viewer-6.2.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
@@ -50,4 +50,6 @@ migration/postgresql.properties
 /packages/
 /posterita/
 /zkpackages/
-/.metadata/
+/.metadata/
+/.recommenders/
+/RemoteSystemsTempFiles/
diff --git a/RemoteSystemsTempFiles/.project b/RemoteSystemsTempFiles/.project
diff --git a/adempiere.iml b/adempiere.iml
@@ -207,6 +207,7 @@
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.pos/src/main/java/ui/swing" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.pos/src/main/java/ui/zk" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/org.adempiere.request/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/org.adempiere.project/src/main/java" isTestSource="false" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />