Merge PR #805 into 13.0

Signed-off-by pedrobaeza

account_payment_order/models/account_payment_order.py

@@ -416,6 +416,7 @@ class AccountPaymentOrder(models.Model):
         return True
 
     def _prepare_move(self, bank_lines=None):
+        move_date = False
         if self.payment_type == "outbound":
             ref = _("Payment order %s") % self.name
         else:
@@ -424,6 +425,8 @@ class AccountPaymentOrder(models.Model):
             ref += " - " + bank_lines.name
         if self.payment_mode_id.offsetting_account == "bank_account":
             journal_id = self.journal_id.id
+            if bank_lines:
+                move_date = bank_lines[0].date
         elif self.payment_mode_id.offsetting_account == "transfer_account":
             journal_id = self.payment_mode_id.transfer_journal_id.id
         vals = {
@@ -432,6 +435,8 @@ class AccountPaymentOrder(models.Model):
             "payment_order_id": self.id,
             "line_ids": [],
         }
+        if move_date:
+            vals.update({"date": move_date})
         total_company_currency = total_payment_currency = 0
         for bline in bank_lines:
             total_company_currency += bline.amount_company_currency

account_payment_order/tests/test_payment_order_outbound.py

@@ -146,6 +146,7 @@ class TestPaymentOrderOutbound(TransactionCase):
         order.draft2open()
         order.open2generated()
         order.generated2uploaded()
+        self.assertEqual(order.move_ids[0].date, order.bank_line_ids[0].date)
         order.action_done()
         self.assertEqual(order.state, "done")