From e47a7103c7289ea13f30d37498da534a3a37d95d Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Sun, 2 Oct 2022 15:16:36 +0100
Subject: [PATCH] add Invoice approach & parent comment

---
 .../axelor-open-suite/axelor-account/build.gradle    |  2 +-
 .../src/main/resources/domains/ImportationFolder.xml |  1 +
 .../src/main/resources/domains/ImportationFolder.xml |  2 +-
 .../src/main/resources/domains/Invoice.xml           | 12 ++++++++++++
 ...{ImortationComment.xml => importationComment.xml} |  5 +++--
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/Invoice.xml
 rename modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/{ImortationComment.xml => importationComment.xml} (63%)

diff --git a/modules/axelor-open-suite/axelor-account/build.gradle b/modules/axelor-open-suite/axelor-account/build.gradle
index 3b542c51..e1379c23 100644
--- a/modules/axelor-open-suite/axelor-account/build.gradle
+++ b/modules/axelor-open-suite/axelor-account/build.gradle
@@ -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'
diff --git a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml
index 7e0dfa3a..aa620038 100644
--- a/modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml
+++ b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml
@@ -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>   
\ No newline at end of file
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
index 79b0d887..f18af81e 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationFolder.xml
@@ -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 -->
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/Invoice.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/Invoice.xml
new file mode 100644
index 00000000..158366ec
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/Invoice.xml
@@ -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>
diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImortationComment.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/importationComment.xml
similarity index 63%
rename from modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImortationComment.xml
rename to modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/importationComment.xml
index 870dd4f7..21443c06 100644
--- a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImortationComment.xml
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/importationComment.xml
@@ -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>