SOPHAL/ERP
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from root/dev

Browse Source 
reglage pour construire WAR
This commit is contained in:
walid
2022-05-04 16:03:29 +02:00
parent 349fdac4de d1570dfce5
commit fd76ad3721
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

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

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

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

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

@@ -5,7 +5,7 @@
<module name="purchase" package="com.axelor.apps.purchase.db"/> <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"/> <many-to-one name="product" ref="com.axelor.apps.base.db.Product" title="Product"/>
<boolean name="newProduct" title="New product" /> <boolean name="newProduct" title="New product" />
<many-to-one name="unit" ref="com.axelor.apps.base.db.Unit" title="Unit" /> <many-to-one name="unit" ref="com.axelor.apps.base.db.Unit" title="Unit" />