From 521a5dd12a75c334ac07ac7c1c6bcd412a5a819b Mon Sep 17 00:00:00 2001 From: olayiwola-compucorp Date: Wed, 1 May 2024 09:22:16 +0100 Subject: [PATCH 1/2] BTHAMM-14: Round quotation subtotal amount to 2DP --- .../quotations/directives/quotations-create.directive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ang/civicase-features/quotations/directives/quotations-create.directive.js b/ang/civicase-features/quotations/directives/quotations-create.directive.js index b6721466e..bf8fad4e7 100644 --- a/ang/civicase-features/quotations/directives/quotations-create.directive.js +++ b/ang/civicase-features/quotations/directives/quotations-create.directive.js @@ -313,7 +313,7 @@ return; } - item.subtotal_amount = item.unit_price * item.quantity * ((100 - item.discounted_percentage) / 100) || 0; + item.subtotal_amount = roundTo(item.unit_price * item.quantity * ((100 - item.discounted_percentage) / 100) || 0, 2); $scope.$emit('totalChange'); validateProductPrice(index); } From 6f64f93449f14300e0df551cd46d9acd7a97913f Mon Sep 17 00:00:00 2001 From: olayiwola-compucorp Date: Wed, 1 May 2024 10:19:43 +0100 Subject: [PATCH 2/2] BTHAMM-14: Update Quote Id to Quote No on Quotation list --- ang/afsearchQuotations.aff.html | 2 +- managed/SavedSearch_Civicase_Quotations.mgd.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ang/afsearchQuotations.aff.html b/ang/afsearchQuotations.aff.html index b6d80d2a5..cff2c00b4 100644 --- a/ang/afsearchQuotations.aff.html +++ b/ang/afsearchQuotations.aff.html @@ -1,7 +1,7 @@
- + diff --git a/managed/SavedSearch_Civicase_Quotations.mgd.php b/managed/SavedSearch_Civicase_Quotations.mgd.php index 1000f31fc..2146f4683 100644 --- a/managed/SavedSearch_Civicase_Quotations.mgd.php +++ b/managed/SavedSearch_Civicase_Quotations.mgd.php @@ -80,7 +80,7 @@ 'type' => 'field', 'key' => 'id', 'dataType' => 'Integer', - 'label' => 'ID', + 'label' => 'Quote No.', 'sortable' => TRUE, 'alignment' => '', ], @@ -262,7 +262,7 @@ 'type' => 'field', 'key' => 'id', 'dataType' => 'Integer', - 'label' => 'ID', + 'label' => 'Quote No.', 'sortable' => TRUE, 'alignment' => '', ],