Merge pull request #2 from root/dev

reglage pour construire WAR

build.gradle

@@ -54,7 +54,9 @@ dependencies {
 	}
 }
 
-task wrapper(type: Wrapper) { gradleVersion = "4.4.1" }
+wrapper {
+    gradleVersion = "4.4.1"
+}
 
 task("dataImport", type: JavaExec) {
 	main = "com.axelor.apps.erp.Main"

modules/axelor-open-suite/axelor-base/src/main/resources/domains/Product.xml

@@ -171,7 +171,6 @@
 
 		<track on="UPDATE">
 			<field name="productCategory" />
-			<field name="productSubCategory" />
 			<field name="productFamily" />
 			<field name="saleSupplySelect" />
 			<field name="sellable" />

modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/PurchaseRequestLine.xml

@@ -5,7 +5,7 @@
   
    <module name="purchase" package="com.axelor.apps.purchase.db"/>
    
-   <entity name="PurchaseRequestLine" lang="java" cachable="true">
+   <entity name="PurchaseRequestLine" lang="java" cacheable="true">
 	   <many-to-one name="product" ref="com.axelor.apps.base.db.Product" title="Product"/>
 	   <boolean name="newProduct" title="New product" />
 	   <many-to-one name="unit" ref="com.axelor.apps.base.db.Unit" title="Unit" />