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 -5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1770b8c038 - Show all commits

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

@ -4,11 +4,6 @@ import Dialog from 'core/components/dialog';
class Controller extends Dialog { class Controller extends Dialog {
constructor($element, $, $transclude, vnReport, vnEmail) { constructor($element, $, $transclude, vnReport, vnEmail) {
super($element, $, $transclude); super($element, $, $transclude);
<<<<<<< HEAD
this.viewReceipt = true;
this.sendEmail = true;
=======
>>>>>>> dev
this.vnReport = vnReport; this.vnReport = vnReport;
this.vnEmail = vnEmail; this.vnEmail = vnEmail;
this.receipt = {}; this.receipt = {};