verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

refs #5075
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Pablo Natek 2023-04-11 15:38:50 +02:00
parent c928274e24
commit 1456da58f5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/client/front/balance/create/index.js
View File

@ -73,15 +73,6 @@ class Controller extends Dialog {
const accountingType = value.accountingType; const accountingType = value.accountingType;
this.receipt.description = []; 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'; this.viewReceipt = accountingType.code == 'cash';
if (accountingType.code == 'compensation') if (accountingType.code == 'compensation')
this.receipt.description = ''; this.receipt.description = '';
@ -92,7 +83,6 @@ class Controller extends Dialog {
this.receipt.description.push(this.originalDescription); this.receipt.description.push(this.originalDescription);
this.receipt.description = this.receipt.description.join(', '); this.receipt.description = this.receipt.description.join(', ');
} }
>>>>>>> dev
this.maxAmount = accountingType && accountingType.maxAmount; this.maxAmount = accountingType && accountingType.maxAmount;
this.receipt.payed = Date.vnNew(); this.receipt.payed = Date.vnNew();