From 732ebbc22fbcc544aedc3d277e30c5240a349b28 Mon Sep 17 00:00:00 2001
From: bachir souldi <bachir.souldi@sophal.net>
Date: Thu, 15 Sep 2022 13:07:12 +0100
Subject: [PATCH] add document upload + new fields in importation folder

---
 .../resources/domains/ImportationDocument.xml | 17 ++++++++
 .../resources/domains/ImportationFolder.xml   | 40 +++++++++++++++----
 2 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationDocument.xml

diff --git a/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationDocument.xml b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationDocument.xml
new file mode 100644
index 0000000..3558f7f
--- /dev/null
+++ b/modules/axelor-open-suite/axelor-purchase/src/main/resources/domains/ImportationDocument.xml
@@ -0,0 +1,17 @@
+<?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"/>
+
+	<sequence name="importation.seq" initial="1" increment="1" padding="5" prefix="DOSIMP"/>
+
+	<entity name="ImportationDocument" sequential="true" lang="java">
+		
+        <many-to-one name="docFile" ref="com.axelor.meta.db.MetaFile" title="Doc file" />
+		<integer name="docType" selection="purchase.importation.folder.doc.type.select" />
+		<string name="notes" large="true" multiline="true" title="Description To Display"/>
+
+	</entity>
+
+</domain-models>
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 f67c087..374475e 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
@@ -13,8 +13,13 @@
 		<many-to-one name="forwardingPartner" ref="com.axelor.apps.base.db.Partner" title="Forwarding Partner"/>
 		<many-to-one name="supplierPartner" ref="com.axelor.apps.base.db.Partner" title="Supplier"/>
 		<string name="containerNumber" title="Number Container."/>
-		<date name="boardingDate" title="DATE D'EMBARQUEMENT"/>
+		<!-- DATE D'EMBARQUEMENT -->
+		<date name="boardingDate" title="Boarding date"/>
+		<!-- reception sur site souhaites -->
 		<date name="arrivalGoodiDate" title="Arrival goods"/>
+		<!-- reception sur site prevy -->
+		<date name="requestedArrivalGoodiDate" title="Requested Arrival goods"/>
+
 		<date name="arrivalDocDate" title="Arrival Documents"/>
 		<date name="invoiceDirectDebitDate" title="Invoice direct debit"/>
 		<date name="folderReceptionDate" title="Folder reception date"/>
@@ -38,16 +43,35 @@
 
 		<date name="transmissionPoToSupplier" title="Date transmission BC au fournisseur" />
 		<string name="priority" selection="purchase.importation.folder.priority.select" default="1" />
-		<string name="label" title="libelle" />
-		<date name="estimdatedBoardingDate" title="DATE D'EMBARQUEMENT PREVU" />
-		<date name="liquidation_date" title="DATE DE LIQUIDATION" />
-		<date name="reception_sophal_date" title="ARRIVEE SOPHAL" />
-		<date name="reception_magasin_date" title="RECEPTION MAGASIN SOPHAL" />
+		<string name="label" title="Label" />
+		<!-- Date d'embarqument prevu -->
+		<date name="estimdatedBoardingDate" title="Estimated boarding date" /> 
+		<date name="liquidation_date" title="Liquidation date" />
+		<date name="reception_sophal_date" title="Sophal Arrival" />
+		<date name="reception_magasin_date" title="Store reception date" />
 		<date name="transmission_dg_date" title="Date transmission a la DG" />
 
-		<date name="delivery_date" title="DATE DE LIVRAISON PREVU" />
+		<date name="delivery_date" title="Estimated delivery date" />
 
-		<boolean name="reception_magasin_status" title="Reception Magasin Statut" />
+		<boolean name="reception_magasin_status" title="Store received statut" />
+
+		<one-to-many name="importationDocumentList" ref="ImportationDocument" title="Information document" />
+
+		<date name="date_liquidation_invoice" title="Date liquidation facture" />
+
+		<!-- numero document de transport -->
+		<string name="lta_number" title="LTA" />
+		<string name="shipping_tracking_number" title="Shipping tracking number" />
+
+		<!--enlevement  souhaite  -->
+		<date name="requested_collection_date" title="Requested collection date" />
+		<!--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"/>
 
 		<extra-code>
 			<![CDATA[