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

231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
Conversation 0 Commits 490 Files Changed 557 -10
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1456da58f5 - Show all commits

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

@ -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();