diff --git a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
index 93cf4e6..e91957c 100644
--- a/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
+++ b/src/Pages/BookingScreen/Components/BSBillingTables/BSBillingEditQuantity/BSBillingEditQuantity.jsx
@@ -3180,13 +3180,13 @@ const BSBillingEditQuantity = (props) => {
       ...(
         !offerApply && itemDiscountPrice > 0
           ? {
-            DiscountAmt: safeRound(itemDiscountPrice),
+            DiscountAmt: safeRound(itemDiscountPrice*fixedQty ),
             DiscountType: itemDiscountPercentageSelection === 'Fixed' ? 'F' : 'P',
             DiscountValue:
               itemDiscountPercentageSelection === 'Fixed'
-                ? itemDiscountPrice
+                ? itemDiscountPrice*fixedQty
                 : (
-                  (itemDiscountPrice /
+                  (itemDiscountPrice*fixedQty /
                     (newPrice > 0 ? newPrice : editedProduct?.OrderRate)) * 100
                 )
           }
@@ -3301,7 +3301,7 @@ const BSBillingEditQuantity = (props) => {
     const { OfferType = null, OfferPrice = 0 } = product;
    
      let totalAmount = qty * rate;
-     totalAmount = totalAmount - (itemDiscountPrice || 0);
+     totalAmount = totalAmount - (itemDiscountPrice*qty|| 0);
     const taxAmount = (
       (totalAmount * taxPercentage) /
       (100 + taxPercentage)
diff --git a/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx b/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
index e12d50b..3fe85e2 100644
--- a/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
+++ b/src/Pages/BookingScreen/PrintTemplates/A4/TaxInvoice.jsx
@@ -13,6 +13,7 @@ import {
   GlobalSelectedFooterFontColor,
   GlobalSelectedNetAmountColor,
   GlobalSelectedNetAmountFontColor,
+  GloabalFieldDetails,
 } from '../../../../Features/ThemeChange/ThemeChange';
 import { isMobile } from 'react-device-detect';
 import { extractLastNumberOrderId } from '../../../../Services/Others';
@@ -70,6 +71,10 @@ const TaxInvoice = ({
   const tableBodyColor = printColors?.find(obj => obj.tableBodyColor)?.tableBodyColor;
   const footerColor = printColors?.find(obj => obj.footerColor)?.footerColor;
   const netAmtColor = printColors?.find(obj => obj.netAmtColor)?.netAmtColor;
+  const FieldDetails = useSelector(GloabalFieldDetails);
+  console.log(FieldDetails,"FieldDetails")
+  const Discount = FieldDetails?.['Discount'];
+  console.log(Discount, "Discount")
   // Function to convert number to words
   const numberToWords = (num) => {
     const a = [
@@ -802,7 +807,8 @@ const TaxInvoice = ({
               <div
                 style={{
                   display: 'grid',
-                  gridTemplateColumns: '5% 40% 12% 11% 16% 8% 16%',
+                  gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
+                  // '5% 40% 12% 11% 16% 8% 16%',
                   fontSize: '10px',
                   // borderRight: '1px solid #000',
                   borderBottom: '1px solid #000',
@@ -855,6 +861,15 @@ const TaxInvoice = ({
                 >
                   Rate
                 </div>
+                {Discount && <div
+                  style={{
+                    padding: '8px 4px',
+                    borderRight: '1px solid #000',
+                    textAlign: 'center',
+                  }}
+                >
+                  Disc
+                </div>}
                 {/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>per</div> */}
                 <div style={{ padding: '8px 4px', textAlign: 'center' }}>
                   Amount
@@ -869,7 +884,7 @@ const TaxInvoice = ({
                       key={index}
                       style={{
                         display: 'grid',
-                        gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                        gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                         // borderRight: '1px solid #000',
                         ...(index % 2 === 0 && rowtypeStyle === "even"
                           ? tableBodyStyle
@@ -976,6 +991,21 @@ const TaxInvoice = ({
                           maximumFractionDigits: 2,
                         })}
                       </div>
+                      {Discount && <div
+                        style={{
+                          padding: '4px 4px',
+                          borderRight: '1px solid #000',
+                          textAlign: 'right',
+                        }}
+                      >
+                        {Number(
+
+                          (item.DiscountAmt / item.SalesQty) || 0
+                        ).toLocaleString('en-IN', {
+                          minimumFractionDigits: 2,
+                          maximumFractionDigits: 2,
+                        })}
+                      </div>}
                       {/* <div style={{ padding: '8px 4px', borderRight: '1px solid #000', textAlign: 'center' }}>{item.UomName || 'NOS'}</div> */}
                       <div
                         style={{
@@ -1003,7 +1033,7 @@ const TaxInvoice = ({
                       <div
                         style={{
                           display: 'grid',
-                          gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                          gridTemplateColumns: Discount ? '5% 40% 12% 11% 8%  8% 16% ' : '5% 40% 12% 11% 16% 16% ',
                           // borderRight: '1px solid #000',
                           fontSize: '15px',
                           minHeight: '22px',
@@ -1017,6 +1047,7 @@ const TaxInvoice = ({
                             borderRight: '1px solid #000',
                           }}
                         ></div>
+                        {Discount && <div style={{ borderRight: '1px solid #000' }}></div>}
                         <div style={{ borderRight: '1px solid #000' }}></div>
                         <div style={{ borderRight: '1px solid #000' }}></div>
                         <div style={{ borderRight: '1px solid #000' }}></div>
@@ -1048,7 +1079,7 @@ const TaxInvoice = ({
                               <div
                                 style={{
                                   display: 'grid',
-                                  gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                                  gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                                   // borderRight: '1px solid #000',
                                   fontSize: '11px',
                                   fontWeight: '700',
@@ -1067,6 +1098,9 @@ const TaxInvoice = ({
                                 >
                                   CGST
                                 </div>
+                                {Discount && <div
+                                  style={{ borderRight: '1px solid #000' }}
+                                ></div>}
                                 <div
                                   style={{ borderRight: '1px solid #000' }}
                                 ></div>
@@ -1100,7 +1134,7 @@ const TaxInvoice = ({
                               <div
                                 style={{
                                   display: 'grid',
-                                  gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                                  gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                                   // borderRight: '1px solid #000',
                                   fontSize: '11px',
                                   fontWeight: '700',
@@ -1119,6 +1153,9 @@ const TaxInvoice = ({
                                 >
                                   SGST
                                 </div>
+                                {Discount && <div
+                                  style={{ borderRight: '1px solid #000' }}
+                                ></div>}
                                 <div
                                   style={{ borderRight: '1px solid #000' }}
                                 ></div>
@@ -1155,7 +1192,7 @@ const TaxInvoice = ({
                             <div
                               style={{
                                 display: 'grid',
-                                gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                                gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                                 // borderRight: '1px solid #000',
                                 fontSize: '11px',
                                 fontWeight: '700',
@@ -1174,6 +1211,9 @@ const TaxInvoice = ({
                               >
                                 IGST
                               </div>
+                              {Discount && <div
+                                style={{ borderRight: '1px solid #000' }}
+                              ></div>}
                               <div
                                 style={{ borderRight: '1px solid #000' }}
                               ></div>
@@ -1211,7 +1251,7 @@ const TaxInvoice = ({
                       <div
                         style={{
                           display: 'grid',
-                          gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                          gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                           // borderRight: '1px solid #000',
                           // borderBottom: '1px solid #000',
                           fontSize: '11px',
@@ -1229,6 +1269,10 @@ const TaxInvoice = ({
                         >
                           ROUNDING OFF
                         </div>
+
+                        {Discount && <div
+                          style={{ borderRight: '1px solid #000' }}
+                        ></div>}
                         <div style={{ borderRight: '1px solid #000' }}></div>
                         <div style={{ borderRight: '1px solid #000' }}></div>
                         <div style={{ borderRight: '1px solid #000' }}></div>
@@ -1248,7 +1292,7 @@ const TaxInvoice = ({
                           key={`empty-${idx}`}
                           style={{
                             display: 'grid',
-                            gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                            gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                             // borderRight: '1px solid #000',
 
                             minHeight: '32px', // Adjust height as needed for your design
@@ -1272,6 +1316,15 @@ const TaxInvoice = ({
                           >
                             &nbsp;
                           </div>
+                          {Discount && <div
+                            style={{
+                              padding: '4px 4px',
+                              borderRight: '1px solid #000',
+                              textAlign: 'center',
+                            }}
+                          >
+                            &nbsp;
+                          </div>}
                           <div
                             style={{
                               padding: '4px 4px',
@@ -1311,7 +1364,7 @@ const TaxInvoice = ({
                       <div
                         style={{
                           display: 'grid',
-                          gridTemplateColumns: '5% 40% 12% 11% 16% 16%',
+                          gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                           // borderRight: '1px solid #000',
                           borderBottom: '1px solid #000',
                           borderTop: '1px solid #000',
@@ -1347,6 +1400,7 @@ const TaxInvoice = ({
                             0}{' '}
                           NOS
                         </div>
+                        {Discount && <div style={{ borderRight: '1px solid #000' }}></div>}
                         <div style={{ borderRight: '1px solid #000' }}></div>
                         {/* <div style={{ borderRight: '1px solid #000'}}></div> */}
                         <div
@@ -1376,7 +1430,7 @@ const TaxInvoice = ({
                 <div
                   style={{
                     display: 'grid',
-                    gridTemplateColumns: '5% 40% 12% 10% 12% 8% 13%',
+                    gridTemplateColumns: Discount ? '5% 40% 12% 11% 8% 8% 16%' : '5% 40% 12% 11% 16% 16%',
                     // borderBottom: '1px solid #000',
                     borderLeft: '1px solid #000',
                     borderRight: '1px solid #000',
@@ -1403,6 +1457,15 @@ const TaxInvoice = ({
                   >
                     No items to display
                   </div>
+                  {Discount && <div
+                    style={{
+                      padding: '8px 4px',
+                      borderRight: '1px solid #000',
+                      textAlign: 'center',
+                    }}
+                  >
+                    -
+                  </div>}
                   <div
                     style={{
                       padding: '8px 4px',