From c136395d1e65edf1bd81c5cff5e570c961e539da Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 31 Jan 2024 09:16:38 +0100
Subject: [PATCH] fix: refs #6703 fix conflicts

---
 .../{10832-purpleAralia => 10856-greenAralia}/00-cloneAcl.sql   | 0
 modules/ticket/front/sale/index.js                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename db/versions/{10832-purpleAralia => 10856-greenAralia}/00-cloneAcl.sql (100%)

diff --git a/db/versions/10832-purpleAralia/00-cloneAcl.sql b/db/versions/10856-greenAralia/00-cloneAcl.sql
similarity index 100%
rename from db/versions/10832-purpleAralia/00-cloneAcl.sql
rename to db/versions/10856-greenAralia/00-cloneAcl.sql
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index ce6aad5ed..f295efae9 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -523,7 +523,7 @@ class Controller extends Section {
         if (!sales) return;
 
         const salesIds = sales.map(sale => sale.id);
-        const params = {salesIds: salesIds, withWarehouse: withWarehouse};
+        const params = {salesIds: salesIds, withWarehouse: withWarehouse,};
         const query = 'Sales/clone';
         this.$http.post(query, params).then(res => {
             const [refundTicket] = res.data;