96507 BankReconciliation : blocked the reconciliation of multiple lin…

axelor-bank-payment/src/main/java/com/axelor/apps/bankpayment/exception/BankPaymentExceptionMessage.java

@@ -332,4 +332,7 @@ private BankPaymentExceptionMessage() {}
 
   public static final String BANK_RECONCILIATION_CREATING_MOVE_MISSING_JOURNAL = /*$$(*/
       "Missing journal while creating a move from a bank reconciliation." /*)*/;
+
+  public static final String BANK_RECONCILIATION_MULTIPLE_MOVE_LINE_RECONCILIATION_ERROR = /*$$(*/
+      "The movelines %s are already reconciled with another bank statement line. Multiple bank statement lines can't be reconciled with the same move line." /*)*/;
 }

axelor-bank-payment/src/main/java/com/axelor/apps/bankpayment/service/BankReconciliationToolService.java

@@ -18,8 +18,13 @@
  */
 package com.axelor.apps.bankpayment.service;
 
+import com.axelor.apps.account.db.MoveLine;
 import com.axelor.apps.bankpayment.db.BankReconciliation;
+import com.axelor.apps.bankpayment.db.BankReconciliationLine;
 import com.axelor.apps.base.db.Company;
+import com.axelor.common.ObjectUtils;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 
 public class BankReconciliationToolService {
@@ -33,4 +38,32 @@ public static boolean isForeignCurrency(BankReconciliation bankReconciliation) {
     }
     return false;
   }
+
+  public static List<MoveLine> getMoveLineOnMultipleReconciliationLine(
+      BankReconciliation bankReconciliation) {
+    List<MoveLine> errorMoveLineList = new ArrayList<>();
+
+    if (bankReconciliation == null
+        || ObjectUtils.isEmpty(bankReconciliation.getBankReconciliationLineList())) {
+      return errorMoveLineList;
+    }
+
+    List<MoveLine> moveLineList = new ArrayList<>();
+
+    for (BankReconciliationLine bankReconciliationLine :
+        bankReconciliation.getBankReconciliationLineList()) {
+      MoveLine moveLine = bankReconciliationLine.getMoveLine();
+      if (moveLine == null) {
+        continue;
+      }
+
+      if (moveLineList.contains(moveLine)) {
+        errorMoveLineList.add(moveLine);
+      } else {
+        moveLineList.add(moveLine);
+      }
+    }
+
+    return errorMoveLineList;
+  }
 }

axelor-bank-payment/src/main/java/com/axelor/apps/bankpayment/web/BankReconciliationController.java

@@ -51,6 +51,7 @@
 import com.axelor.apps.base.db.repo.TraceBackRepository;
 import com.axelor.apps.base.service.BankDetailsService;
 import com.axelor.apps.base.service.exception.TraceBackService;
+import com.axelor.common.ObjectUtils;
 import com.axelor.db.EntityHelper;
 import com.axelor.i18n.I18n;
 import com.axelor.inject.Beans;
@@ -556,4 +557,23 @@ public void computeSelections(ActionRequest request, ActionResponse response) {
       TraceBackService.trace(response, e);
     }
   }
+
+  public void checkMultipleMoveLine(ActionRequest request, ActionResponse response) {
+    BankReconciliation bankReconciliation = request.getContext().asType(BankReconciliation.class);
+    List<MoveLine> moveLineList =
+        BankReconciliationToolService.getMoveLineOnMultipleReconciliationLine(bankReconciliation);
+    if (ObjectUtils.isEmpty(moveLineList)) {
+      return;
+    }
+
+    response.setError(
+        String.format(
+            I18n.get(
+                BankPaymentExceptionMessage
+                    .BANK_RECONCILIATION_MULTIPLE_MOVE_LINE_RECONCILIATION_ERROR),
+            moveLineList.stream()
+                .map(MoveLine::getName)
+                .distinct()
+                .collect(Collectors.joining(","))));
+  }
 }

axelor-bank-payment/src/main/resources/i18n/messages.csv

@@ -744,6 +744,7 @@
 "The company %s does not have bank order sequence",,,
 "The field encryption.bankorder.password in config file must be filled.",,,
 "The move %s can't be reversed because it is linked to a bank reconciliation with status validated",,,
+"The movelines %s are already reconciled with another bank statement line. Multiple bank statement lines can't be reconciled with the same move line.",,,
 "The moves %s couldn't be reversed because these are linked to a bank reconciliation with status validated",,,
 "The password is incorrect.",,,
 "The payment status will not update.",,,

axelor-bank-payment/src/main/resources/i18n/messages_en.csv

@@ -744,6 +744,7 @@
 "The company %s does not have bank order sequence",,,
 "The field encryption.bankorder.password in config file must be filled.",,,
 "The move %s can't be reversed because it is linked to a bank reconciliation with status validated",,,
+"The movelines %s are already reconciled with another bank statement line. Multiple bank statement lines can't be reconciled with the same move line.",,,
 "The moves %s couldn't be reversed because these are linked to a bank reconciliation with status validated",,,
 "The password is incorrect.",,,
 "The payment status will not update.",,,

axelor-bank-payment/src/main/resources/i18n/messages_fr.csv

@@ -744,6 +744,7 @@
 "The company %s does not have bank order sequence","La société %s n'a pas de séquence d'ordre bancaire configurée",,
 "The field encryption.bankorder.password in config file must be filled.","Le champ encryption.bankorder.password dans la configuration doit être rempli.",,
 "The move %s can't be reversed because it is linked to a bank reconciliation with status validated","L'écriture %s ne peut être extournée car elle est liée à un rapprochement bancaire au statut validé",,
+"The movelines %s are already reconciled with another bank statement line. Multiple bank statement lines can't be reconciled with the same move line.","Les lignes d'écriture %s pointent déjà vers une autre ligne de rapprochement bancaire. Il n'est pas possible de faire pointer plusieurs lignes de rapprochement bancaire vers une même ligne d'écriture.",,
 "The moves %s couldn't be reversed because these are linked to a bank reconciliation with status validated","Les écritures %s ne peuvent être extournées car elle sont liées à un rapprochement bancaire au statut validé",,
 "The password is incorrect.","Le mot de passe est incorrect.",,
 "The payment status will not update.","Le statut du paiement ne sera pas mis à jour.",,

axelor-bank-payment/src/main/resources/views/BankReconciliation.xml

@@ -21,7 +21,8 @@
 
   <form name="bank-reconciliation-form" title="Bank reconciliation"
     model="com.axelor.apps.bankpayment.db.BankReconciliation" width="large"
-    onNew="action-bank-reconciliation-onnew-group" onLoad="action-bank-reconciliation-onload-group">
+    onNew="action-bank-reconciliation-onnew-group" onLoad="action-bank-reconciliation-onload-group"
+    onSave="action-bank-reconciliation-method-check-multiple-move-line">
     <panel name="mainPanel" colSpan="12">
       <spacer colSpan="10"/>
       <button name="correctBtn" title="Correct" hidden="true"
@@ -100,13 +101,13 @@
         orderBy="effectDate" height="12"/>
       <button name="autoReconcileBtn" title="Auto reconcile"
         showIf="bankStatement &amp;&amp; bankReconciliationLineList.length > 0" colSpan="3"
-        onClick="action-bank-reconciliation-method-automatic-reconciliation"/>
+        onClick="action-bank-reconciliation-method-automatic-reconciliation,action-bank-reconciliation-method-check-multiple-move-line"/>
       <button name="multipleReconcileBtn" title="Multiple reconciles" colSpan="3"
         onClick="save,action-bank-reconciliation-validate-lines-selected,action-bank-reconciliation-view-multiple-reconcile-wizard"/>
       <button name="unreconcileBtn" title="Unreconcile selected" colSpan="3"
         onClick="save,action-bank-reconciliation-method-unreconcile"/>
       <button name="reconcileBtn" title="Reconcile selected" colSpan="3"
-        onClick="save,action-bank-reconciliation-method-reconcile-selected"/>
+        onClick="action-group-bank-reconciliation-reconcile"/>
       <spacer colSpan="1"/>
       <label name="selectionBankReconciliationLinesLabel"
         title="Selection total for bank reconciliation lines" css="label-bold" colSpan="3"/>
@@ -227,6 +228,7 @@
     <action name="save"/>
     <action name="action-bank-reconciliation-method-compute"/>
     <action name="action-bank-reconciliation-check-incomplete-bankreconciliation-line"/>
+    <action name="action-bank-reconciliation-method-check-multiple-move-line"/>
     <action name="action-bank-reconciliation-method-validate"/>
     <action name="action-bank-reconciliation-method-compute-balances"/>
     <action name="action-bank-reconciliation-method-set-bank-statement-is-fully-reconciled"/>
@@ -237,6 +239,12 @@
     <action name="action-bank-reconciliation-method-compute"/>
   </action-group>
 
+  <action-group name="action-group-bank-reconciliation-reconcile">
+    <action name="save"/>
+    <action name="action-bank-reconciliation-method-reconcile-selected"/>
+    <action name="action-bank-reconciliation-method-check-multiple-move-line"/>
+  </action-group>
+
   <action-record model="com.axelor.apps.bankpayment.db.BankReconciliation"
     name="action-bank-reconciliation-active-company">
     <field name="company" expr="eval:__user__.activeCompany"
@@ -463,6 +471,11 @@
     <call class="com.axelor.apps.bankpayment.web.BankReconciliationController" method="correct"/>
   </action-method>
 
+  <action-method name="action-bank-reconciliation-method-check-multiple-move-line">
+    <call class="com.axelor.apps.bankpayment.web.BankReconciliationController"
+      method="checkMultipleMoveLine"/>
+  </action-method>
+
   <search-filters name="bank-reconciliation-filters"
     model="com.axelor.apps.bankpayment.db.BankReconciliation" title="Bank reconciliation filters">
     <field name="company" hidden="true"

changelogs/unreleased/96507.yml

@@ -0,0 +1,3 @@
+---
+title: "Bank Reconciliation: blocked the reconciliation of multiple lines on a single move line."
+module: axelor-bank-payment