Merge PR #943 into 16.0

Signed-off-by simahawk

Author: OCA-git-bot

sale_order_import_edifact/tests/common.py

@@ -52,6 +52,7 @@ def get_test_data_no_ean_in_lin(env):
                 ),
                 "client_order_ref": "467819",
                 "date_order": "2023-03-20",
+                "commitment_date": "2023-03-22 00:00:00",
                 "partner": ref("sale_order_import_edifact.partner_edi_shipto_dm"),
                 "shipping_partner": ref(
                     "sale_order_import_edifact.partner_edi_shipto_dm"
@@ -77,6 +78,7 @@ def get_test_data_no_price(env):
                 ),
                 "client_order_ref": "COM-004017",
                 "date_order": "2023-03-20",
+                "commitment_date": "2023-03-21 00:00:00",
                 "partner": ref("sale_order_import_edifact.partner_edi_invoiceto_dm"),
                 "shipping_partner": ref(
                     "sale_order_import_edifact.partner_edi_shipto_dm"

sale_order_import_edifact/tests/test_edifact_order_import.py

@@ -61,6 +61,9 @@ def test_edifact_order_import_no_ean_in_lin(self):
             so = self.env["sale.order"].browse(action["res_id"])
             self.assertEqual(so.partner_id, expected["partner"])
 
+            if expected.get("commitment_date"):
+                self.assertEqual(str(so.commitment_date), expected["commitment_date"])
+
             if expected.get("client_order_ref"):
                 self.assertEqual(so.client_order_ref, expected["client_order_ref"])
 
@@ -95,6 +98,9 @@ def test_edifact_order_import_no_price(self):
             so = self.env["sale.order"].browse(action["res_id"])
             self.assertEqual(so.partner_id, expected["partner"])
 
+            if expected.get("commitment_date"):
+                self.assertEqual(str(so.commitment_date), expected["commitment_date"])
+
             if expected.get("client_order_ref"):
                 self.assertEqual(so.client_order_ref, expected["client_order_ref"])
 

sale_order_import_edifact/wizard/sale_order_import.py

@@ -162,8 +162,8 @@ def _prepare_edifact_dates(self, interchange):
                 dates["delivery_detail"]["validity_date"] = edifact_model.map2odoo_date(
                     seg[0]
                 )
-            elif date_meaning_code == "64":
-                # earliest delivery date
+            elif date_meaning_code == "2":
+                # Delivery date
                 dates["delivery_detail"][
                     "commitment_date"
                 ] = edifact_model.map2odoo_date(seg[0])