0046848: Cancel & Replace messes up when original document has a dash (-)

Description

The Cancel & Replace messes up when the original document that is going to be cancelled contains a dash (-). Example:
Original Order: SO-221-011
New Order created after running cancel and replace: SO-221-12, when it should be SO-221-011-1

If you repeat the same exercise using a document number SO/221/011 (without any dash), then the process works fine.

Steps To Reproduce

Login in Backoffice.
Create a Sales Order and set the document no. to SO-221-011
Enter any line and book it.
Now press Cancel & Replace (see http://wiki.openbravo.com/wiki/How_to_manage_Cancel_and_Replace_process [^] for details).
Verify the new ticket is SO-221-12, when it should be SO-221-011-1.

Tags

DemoImprovementProgram

Attached Files

46848-proposedsolution.diff [^] (1,868 bytes) 2022-08-26 11:48 [Show Content] [Hide Content]

diff --git a/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java b/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
index c850e43da0..85914f8e97 100644
--- a/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
+++ b/src/org/openbravo/erpCommon/businessUtility/CancelAndReplaceUtils.java
@@ -223,10 +223,10 @@ public class CancelAndReplaceUtils {
    *          Document number of the cancelled order.
    * @return The new document number for the order which cancels the old order.
    */
-  public static String getNextCancelDocNo(final String documentNo) {
+  public static String getNextCancelDocNo(final String documentNo, Order oldOrder) {
     final StringBuilder newDocNo = new StringBuilder();
     final String[] splittedDocNo = documentNo.split(HYPHEN);
-    if (splittedDocNo.length > 1) {
+    if (splittedDocNo.length > 1 && oldOrder != null) {
       int nextNumber;
       try {
         nextNumber = Integer.parseInt(splittedDocNo[splittedDocNo.length - 1]) + 1;
diff --git a/src/org/openbravo/erpCommon/businessUtility/CreateReplacementOrderExecutor.java b/src/org/openbravo/erpCommon/businessUtility/CreateReplacementOrderExecutor.java
index cd1bbfbba8..d1bb1e02e7 100644
--- a/src/org/openbravo/erpCommon/businessUtility/CreateReplacementOrderExecutor.java
+++ b/src/org/openbravo/erpCommon/businessUtility/CreateReplacementOrderExecutor.java
@@ -98,7 +98,7 @@ class CreateReplacementOrderExecutor extends CancelAndReplaceUtils {
     newOrder.setSummedLineAmount(BigDecimal.ZERO);
     newOrder.setOrderDate(new Date());
     newOrder.setReplacedorder(oldOrder);
-    newOrder.setDocumentNo(getNextCancelDocNo(documentNo));
+    newOrder.setDocumentNo(getNextCancelDocNo(documentNo, oldOrder.getReplacedorder()));
     OBDal.getInstance().save(newOrder);
 
     // Create new Order lines

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
There are no notes attached to this issue.

Issue History
Date Modified	Username	Field	Change
2021-05-26 16:31	vmromanos	New Issue
2021-05-26 16:31	vmromanos	Assigned To	=> Triage Finance
2021-05-26 16:31	vmromanos	Modules	=> Core
2021-05-26 16:31	vmromanos	Triggers an Emergency Pack	=> No
2021-05-27 12:02	xplacesc	Tag Attached: DemoImprovementProgram
2022-08-26 11:48	vmromanos	File Added: 46848-proposedsolution.diff