From 4aeffabfa8826d963e25e6a405d0208907385518 Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Mon, 22 Nov 2021 11:25:09 +0530 Subject: [PATCH] fix(ux): show outstanding amount if non zero fix: don't allow submit for cancelled Payments fix(ui): JE credit/debit colors --- src/pages/InvoiceForm.vue | 16 ++++++++++++++++ src/pages/JournalEntryForm.vue | 4 ++-- src/pages/QuickEditForm.vue | 3 ++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue index ad145434..adc80a06 100644 --- a/src/pages/InvoiceForm.vue +++ b/src/pages/InvoiceForm.vue @@ -165,6 +165,22 @@
{{ _('Grand Total') }}
{{ formattedValue('grandTotal') }}
+
+
{{ _('Outstanding Amount') }}
+
{{ formattedValue('outstandingAmount') }}
+
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue index c027659d..653bc591 100644 --- a/src/pages/JournalEntryForm.vue +++ b/src/pages/JournalEntryForm.vue @@ -107,10 +107,10 @@ :read-only="doc.submitted" /> -
+
{{ totalDebit }}
-
+
{{ totalCredit }}
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue index 471064e7..758eb228 100644 --- a/src/pages/QuickEditForm.vue +++ b/src/pages/QuickEditForm.vue @@ -30,7 +30,8 @@ meta.isSubmittable && doc && !doc.submitted && - !doc._notInserted + !doc._notInserted && + !(doc.cancelled || false) " class="ml-2 text-white text-xs" >