From a8619c816fd19c82da4abe1f7c59471ac5e0e33e Mon Sep 17 00:00:00 2001
From: "s.samko" <serhii.samko@salesagility.com>
Date: Mon, 20 May 2024 12:23:57 +0100
Subject: [PATCH] Fix # - VAT Values display incorrectly on Quotes->Service
 Line Items, if Significant Figures = 0

---
 modules/AOS_Products_Quotes/Line_Items.php | 30 ++++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/modules/AOS_Products_Quotes/Line_Items.php b/modules/AOS_Products_Quotes/Line_Items.php
index 1994d017c53..de6f0156a7d 100755
--- a/modules/AOS_Products_Quotes/Line_Items.php
+++ b/modules/AOS_Products_Quotes/Line_Items.php
@@ -176,11 +176,7 @@ function display_lines($focus, $field, $value, $view)
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
 
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
-                if ($locale->getPrecision()) {
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
-                } else {
-                    $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".format_number($line_item->vat)."%</td>";
-                }
+                $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".display_tax_detail_view($locale, $line_item->vat, $sep)."</td>";
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
                 $product .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $product .= "</tr>";
@@ -204,10 +200,8 @@ function display_lines($focus, $field, $value, $view)
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_list_price, $params)."</td>";
 
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".get_discount_string($line_item->discount, $line_item->product_discount, $params, $locale, $sep)."</td>";
-
-
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_unit_price, $params)."</td>";
-                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".rtrim(rtrim(format_number($line_item->vat), '0'), $sep[1])."%</td>";
+                $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".display_tax_detail_view($locale, $line_item->vat, $sep)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->vat_amt, $params)."</td>";
                 $service .= "<td class='tabDetailViewDF' style='text-align: right; padding:2px;'>".currency_format_number($line_item->product_total_price, $params)."</td>";
                 $service .= "</tr>";
@@ -259,3 +253,23 @@ function display_shipping_vat($focus, $field, $value, $view)
     }
     return format_number($value);
 }
+
+/**
+ * Returns formatted value for the tax field;
+ * @param $locale
+ * @param $value
+ * @param $sep
+ * @return string
+ */
+function display_tax_detail_view($locale, $value, $sep): string
+{
+    global $app_strings;
+
+    if ($locale->getPrecision()) {
+        $value = rtrim(rtrim(format_number($value), '0'), $sep[1]) . $app_strings['LBL_PERCENTAGE_SYMBOL'];
+    } else {
+        $value = format_number($value) . $app_strings['LBL_PERCENTAGE_SYMBOL'];
+    }
+
+    return $value;
+}