From 1456da58f546c811fbc2976db9c34dd74b7a7abd Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 11 Apr 2023 15:38:50 +0200
Subject: [PATCH] refs #5075

---
 modules/client/front/balance/create/index.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/modules/client/front/balance/create/index.js b/modules/client/front/balance/create/index.js
index 7fdf67680..9113d7605 100644
--- a/modules/client/front/balance/create/index.js
+++ b/modules/client/front/balance/create/index.js
@@ -73,15 +73,6 @@ class Controller extends Dialog {
             const accountingType = value.accountingType;
 
             this.receipt.description = [];
-<<<<<<< HEAD
-            if (accountingType.receiptDescription != null && accountingType.receiptDescription != '')
-                this.receipt.description.push(accountingType.receiptDescription);
-            if (this.originalDescription)
-                this.receipt.description.push(this.originalDescription);
-
-            this.receipt.description = this.receipt.description.join(', ').toString();
-
-=======
             this.viewReceipt = accountingType.code == 'cash';
             if (accountingType.code == 'compensation')
                 this.receipt.description = '';
@@ -92,7 +83,6 @@ class Controller extends Dialog {
                     this.receipt.description.push(this.originalDescription);
                 this.receipt.description = this.receipt.description.join(', ');
             }
->>>>>>> dev
             this.maxAmount = accountingType && accountingType.maxAmount;
 
             this.receipt.payed = Date.vnNew();