From 8535c5ced124f193be319abdb1da0a04648e88be Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Mon, 19 Sep 2022 13:19:32 +0100
Subject: [PATCH] add modalite de paiement and lta file and other attributes

---
 .../resources/domains/ImportationFolder.xml   | 11 +++++++++
 .../resources/domains/ImportationFolder.xml   | 24 +++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml

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
new file mode 100644
index 00000000..7e0dfa3a
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-account/src/main/resources/domains/ImportationFolder.xml
@@ -0,0 +1,11 @@
+<?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="purchase" package="com.axelor.apps.purchase.db"/>
+
+  <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"/>
+  </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 e9b5865c..c4043c5d 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
@@ -15,16 +15,28 @@
 		<string name="containerNumber" title="Number Container."/>
 		<!-- DATE D'EMBARQUEMENT -->
 		<date name="boardingDate" title="Boarding date"/>
-		<!-- reception sur site souhaites -->
+		<!-- reception sur site  -->
 		<date name="arrivalGoodiDate" title="Arrival goods"/>
-		<!-- reception sur site prevy -->
+		<!-- reception sur site souhaite  -->
 		<date name="requestedArrivalGoodiDate" title="Requested Arrival goods"/>
+		<!-- date reception prevu -->
+		<date name="EstimatedArrivalGoodiDate" title="Estimated Arrival goods"/>
 
 		<date name="arrivalDocDate" title="Arrival Documents"/>
+		<string name="noteArrivalDocDate" large="true" multiline="true" title="Arrival document note"/>
+
+
 		<date name="invoiceDirectDebitDate" title="Invoice direct debit"/>
 		<date name="folderReceptionDate" title="Folder reception date"/>
 		<date name="arrivalNoticeDate" title="Arrival notice date"/>
+
+		<many-to-one name="arrivalNoticeFile" ref="com.axelor.meta.db.MetaFile" title="Arrival notice file" />
+
+
 		<date name="d_10_date" title="Date D10"/>
+		<many-to-one name="d10File" ref="com.axelor.meta.db.MetaFile" title="D10 File" />
+
+
 		<many-to-one name="currency" ref="com.axelor.apps.base.db.Currency" title="Currency"/>
 		<integer name="valorisation" title="Valorisation Type" selection="importation.folder.valorisation.type.select" />
 		<integer name="progress" title="Progress %" min="0" max="100" />
@@ -59,9 +71,14 @@
 		<one-to-many name="importationCommentList" ref="ImportationComment" title="Comments" />
 
 		<date name="date_liquidation_invoice" title="Date liquidation facture" />
+		<!-- facture fournisseur -->
+		<many-to-one name="supplierInvoice" ref="com.axelor.meta.db.MetaFile" title="Supplier invoice" />
 
 		<!-- numero document de transport -->
-		<string name="lta_number" title="LTA" />
+		<string name="lta_number" title="LTA" selection="purchase.importation.folder.lta.selection" />
+		<many-to-one name="ltaFile" ref="com.axelor.meta.db.MetaFile" title="LTA file" />
+
+
 		<string name="shipping_tracking_number" title="Shipping tracking number" />
 
 		<!--enlevement  souhaite  -->
@@ -69,7 +86,6 @@
 		<!--enlevement  prevu -->
 		<date name="agreed_collection_date" title="Agreed collection date" />
 
-
 		<!-- COA -->
 		<many-to-one name="coaFile" ref="com.axelor.meta.db.MetaFile" title="coa file" />
 		<string name="noteCOA" large="true" multiline="true" title="Comment on coa"/>