[14.0][IMP] account_payment_order: Fix dates in payments

account_payment_order/models/account_payment.py

@@ -50,16 +50,3 @@ def _compute_payment_method_fields(self):
     def _compute_payment_line_date(self):
         for item in self:
             item.payment_line_date = item.payment_line_ids[:1].date
-
-    def _prepare_move_line_default_vals(self, write_off_line_vals=None):
-        """Overwrite date_maturity of the move_lines that are generated when related
-        to a payment order.
-        """
-        vals_list = super()._prepare_move_line_default_vals(
-            write_off_line_vals=write_off_line_vals
-        )
-        if not self.payment_order_id:
-            return vals_list
-        for vals in vals_list:
-            vals["date_maturity"] = self.payment_line_ids[:1].date
-        return vals_list

account_payment_order/models/account_payment_line.py

@@ -187,7 +187,7 @@ def _prepare_account_payment_vals(self):
             "destination_account_id": self.move_line_id.account_id.id,
             "company_id": self.order_id.company_id.id,
             "amount": sum(self.mapped("amount_currency")),
-            "date": fields.Date.today(),
+            "date": self[:1].date,
             "currency_id": self.currency_id.id,
             "ref": self.order_id.name,
             "payment_reference": " - ".join([line.communication for line in self]),

account_payment_order/tests/test_payment_order_inbound.py

@@ -145,14 +145,11 @@ def test_creation(self):
         self.assertEqual(len(self.payment_order_obj.search(self.domain)), 0)
 
     @freeze_time("2024-04-01")
-    def test_creation_transfer_move_date_01(self):
+    def test_creation_transfer_move_date(self):
         self.inbound_order.date_prefered = "fixed"
         self.inbound_order.date_scheduled = "2024-06-01"
         self.inbound_order.draft2open()
-        payment = self.inbound_order.payment_ids
-        self.assertEqual(payment.payment_line_date, date(2024, 6, 1))
-        payment_move = payment.move_id
-        self.assertEqual(payment_move.date, date(2024, 4, 1))  # now
+        payment_move = self.inbound_order.payment_ids.move_id
         self.assertEqual(
             payment_move.line_ids.mapped("date_maturity"),
             [date(2024, 6, 1), date(2024, 6, 1)],
@@ -161,37 +158,4 @@ def test_creation_transfer_move_date_01(self):
         self.inbound_order.open2generated()
         self.inbound_order.generated2uploaded()
         self.assertEqual(self.inbound_order.state, "uploaded")
-        payment = self.inbound_order.payment_ids
-        self.assertEqual(payment.payment_line_date, date(2024, 6, 1))
-        payment_move = payment.move_id
-        self.assertEqual(payment_move.date, date(2024, 4, 1))  # now
-        self.assertEqual(
-            payment_move.line_ids.mapped("date_maturity"),
-            [date(2024, 6, 1), date(2024, 6, 1)],
-        )
-
-    @freeze_time("2024-04-01")
-    def test_creation_transfer_move_date_02(self):
-        # Simulate that the invoice had a different due date
-        self.inbound_order.payment_line_ids.ml_maturity_date = "2024-06-01"
-        self.inbound_order.draft2open()
-        payment = self.inbound_order.payment_ids
-        self.assertEqual(payment.payment_line_date, date(2024, 6, 1))
-        payment_move = payment.move_id
-        self.assertEqual(payment_move.date, date(2024, 4, 1))  # now
-        self.assertEqual(
-            payment_move.line_ids.mapped("date_maturity"),
-            [date(2024, 6, 1), date(2024, 6, 1)],
-        )
-        self.assertEqual(self.inbound_order.payment_count, 1)
-        self.inbound_order.open2generated()
-        self.inbound_order.generated2uploaded()
-        self.assertEqual(self.inbound_order.state, "uploaded")
-        payment = self.inbound_order.payment_ids
-        self.assertEqual(payment.payment_line_date, date(2024, 6, 1))
-        payment_move = payment.move_id
-        self.assertEqual(payment_move.date, date(2024, 4, 1))  # now
-        self.assertEqual(
-            payment_move.line_ids.mapped("date_maturity"),
-            [date(2024, 6, 1), date(2024, 6, 1)],
-        )
+        payment_move = self.inbound_order.payment_ids.move_id

account_payment_order/tests/test_payment_order_outbound.py

@@ -345,7 +345,8 @@ def test_manual_line_and_manual_date(self):
         outbound_order.draft2open()
         self.assertEqual(outbound_order.payment_count, 2)
         self.assertEqual(
-            outbound_order.payment_line_ids[0].payment_ids.date, fields.Date.today()
+            outbound_order.payment_line_ids[0].date,
+            outbound_order.payment_line_ids[0].payment_ids.date,
         )
         self.assertEqual(
             outbound_order.payment_line_ids[1].date,