add Invoice approach & parent comment
This commit is contained in:
@@ -14,7 +14,7 @@ axelor {
|
||||
|
||||
dependencies {
|
||||
compile project(":modules:axelor-base")
|
||||
|
||||
compile project(":modules:axelor-purchase")
|
||||
compile 'xalan:xalan:2.7.2'
|
||||
|
||||
compile group: 'jdom', name: 'jdom', version: '1.1'
|
||||
|
||||
@@ -7,5 +7,6 @@
|
||||
<entity name="ImportationFolder" lang="java">
|
||||
<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"/>
|
||||
<one-to-many name="invoices" ref="com.axelor.apps.account.db.Invoice" title="Importation Folder" mappedBy="importationFolder" />
|
||||
</entity>
|
||||
</domain-models>
|
||||
@@ -68,7 +68,7 @@
|
||||
<boolean name="reception_magasin_status" title="Store received statut" />
|
||||
|
||||
<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" />
|
||||
<!-- facture fournisseur -->
|
||||
|
||||
@@ -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>
|
||||
@@ -4,9 +4,10 @@
|
||||
|
||||
<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="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>
|
||||
|
||||
</domain-models>
|
||||
Reference in New Issue
Block a user