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

add Invoice approach & parent comment

Browse Source
This commit is contained in:
bachir souldi
2022-10-02 15:16:36 +01:00
parent 5c3d39c341
commit e47a7103c7
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/axelor-open-suite/axelor-account/build.gradle
View File

@@ -14,7 +14,7 @@ axelor {
dependencies { dependencies {
compile project(":modules:axelor-base") compile project(":modules:axelor-base")
compile project(":modules:axelor-purchase")
compile 'xalan:xalan:2.7.2' compile 'xalan:xalan:2.7.2'
compile group: 'jdom', name: 'jdom', version: '1.1' compile group: 'jdom', name: 'jdom', version: '1.1'

1
modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml
View File

@@ -7,5 +7,6 @@
<entity name="ImportationFolder" lang="java"> <entity name="ImportationFolder" lang="java">
<many-to-one name="paymentMode" ref="com.axelor.apps.account.db.PaymentMode" title="Payment mode"/> <many-to-one name="paymentMode" ref="com.axelor.apps.account.db.PaymentMode" title="Payment mode"/>
<many-to-one name="paymentCondition" ref="com.axelor.apps.account.db.PaymentCondition" title="Payment condition"/> <many-to-one name="paymentCondition" ref="com.axelor.apps.account.db.PaymentCondition" title="Payment condition"/>
<one-to-many name="invoices" ref="com.axelor.apps.account.db.Invoice" title="Importation Folder" mappedBy="importationFolder" />
</entity> </entity>
</domain-models> </domain-models>

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

@@ -68,7 +68,7 @@
<boolean name="reception_magasin_status" title="Store received statut" /> <boolean name="reception_magasin_status" title="Store received statut" />
<one-to-many name="importationDocumentList" ref="ImportationDocument" title="Information document" /> <one-to-many name="importationDocumentList" ref="ImportationDocument" title="Information document" />
<one-to-many name="importationCommentList" ref="ImportationComment" title="Comments" /> <one-to-many name="importationCommentList" ref="com.axelor.apps.purchase.db.ImportationComment" mappedBy="importationFolder" title="Comments" />
<date name="date_liquidation_invoice" title="Date liquidation facture" /> <date name="date_liquidation_invoice" title="Date liquidation facture" />
<!-- facture fournisseur --> <!-- facture fournisseur -->

12
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/Invoice.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<domain-models xmlns="http://axelor.com/xml/ns/domain-models"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://axelor.com/xml/ns/domain-models http://axelor.com/xml/ns/domain-models/domain-models_5.2.xsd">
<module name="account" package="com.axelor.apps.account.db"/>
<entity name="Invoice" lang="java">
<many-to-one name="importationFolder" ref="com.axelor.apps.purchase.db.ImportationFolder" title="Importation folder"/>
</entity>
</domain-models>

5
modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImortationComment.xml → modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/importationComment.xml
View File

@@ -4,9 +4,10 @@
<module name="purchase" package="com.axelor.apps.purchase.db"/> <module name="purchase" package="com.axelor.apps.purchase.db"/>
<entity name="ImportationComment" sequential="true" lang="java"> <entity name="ImportationComment">
<string name="comments" large="true" multiline="true" title="Note"/> <string name="comments" large="true" multiline="true" title="Note"/>
<string name="step" title="Step" selection="purchase.importation.folder.status.select" /> <integer name="step" title="Step" selection="purchase.importation.folder.status.select" />
<many-to-one name="importationFolder" ref="com.axelor.apps.purchase.db.ImportationFolder" title="importation folder"/>
</entity> </entity>
</domain-models> </domain-models>