Merge pull request #1014 from compucorp/BTHAMM-14-quotation-fix

BTHAMM-14: Update Quotation ID and round subtotal to 2DP on quotation create
compucorp · May 14, 2024 · 2a959b3 · 2a959b3
2 parents 84daf75 + 6f64f93
commit 2a959b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ang/afsearchQuotations.aff.html b/ang/afsearchQuotations.aff.html
@@ -1,7 +1,7 @@
 <div af-fieldset="">
   <div class="civicase__features">
     <div class="af-container row civicase__case-filter-form-elements">
-      <af-field class="col-md-2" name="id" defn="{label: 'Quotation Id', input_attrs: {}}" />
+      <af-field class="col-md-2" name="id" defn="{label: 'Quote No.', input_attrs: {}}" />
       <af-field name="client_id" class="col-md-2" ng-show="expanded"/>
       <af-field name="owner_id" class="col-md-2" ng-show="expanded"/>
       <af-field name="description" class="col-md-2" ng-show="expanded"/>

diff --git 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);
     }

diff --git 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' => '',
               ],