shareneus 1.5.18 → 1.5.20

package/dist/index.d.ts

@@ -130,6 +130,7 @@ export { GetItemPriceForPriceList } from "./inventory/items/item-price-for-price
 export { CalcItemFinalSalePrice } from "./inventory/items/item-price-for-pricelist";
 export { ApplyServicePriceListToProcedure, ApplyServicePriceListToOpcode } from "./services/service-price-for-pricelist";
 export { IsNotNull, IsNull } from "./shared/util";
-export { GetAgeString } from "./shared/util";
+export { GetAgeString, GetNumber } from "./shared/util";
 export { SalesTotalCalculationsWithDecimals } from "./sales-receive/sales-total-calculation";
 export { ServiceHistoryPDFService } from "./services/service-history-pdf.service";
+export { Add, Subtract, Multiply, Divide } from "./shared/math-operations";

package/dist/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebitNotePdfService = exports.DCWithoutPricePdfService = exports.DCLandscapeWithoutPricePdfService = exports.DCLandscapePdfService = exports.CustomerBalancesService = exports.SalesByCustomerPDFService = exports.CustWiseSalesDetailsService = exports.CreditNoteTotalsService = exports.CreditNotePdfService = exports.ConsultationPDFService = exports.ConsultationFullPrintService = exports.ConsultationFeeReceiptPrintService = exports.CNPrintService = exports.ChecklistsPDFService = exports.CheckListPrintService = exports.CategoryWiseItemPDFService = exports.SalesReceiptprintService = exports.AppointmentTotalsService = exports.AnalysisPDFService = exports.VenBalanceXlsxFileService = exports.TallySalesImportXlsxFileService = exports.StockXlsxFileService = exports.IssueSparesXlsxFileService = exports.ScheduledDrugXlsxFileService = exports.ScheduledDrugSummaryXlsxFileService = exports.SalesByServiceSummaryXlsxFileService = exports.SummaryXlsxFileService = exports.ServiceAdvisorWisePartXlsxFileService = exports.ServiceAdvisorWiseLaborXlsxFileService = exports.RepairOrdersXlsxFileService = exports.PaymentsMadeXlsxFileService = exports.PaymentReceiveXlsxFileService = exports.OperatorWiseSummaryXlsxFileService = exports.OperatorWiseDetailsXlsxFileService = exports.ManfWiseSalesXlsxFileService = exports.ItemsWiseSalesXlsxFileService = exports.ItemWiseMOSummaryXlsxFileService = exports.ItemWiseMODetailsXlsxFileService = exports.ItemWiseDoctorSaleXlsxFileService = exports.InvoicesWiseXlsxFileService = exports.InsuranceExpireXlsxFileService = exports.GSTR2ExcelService = exports.GSTR1ExcelService = exports.GSTROXlsxFileService = exports.ExpiringDrugsXlsxFileService = exports.SalesByCustomerXlsxFileService = exports.CustWiseSalesXlsxFileService = exports.CustBalanceXlsxFileService = exports.CategoryWiseItemXlsxFileService = exports.AnalysisXlsxFileService = void 0;
 exports.SharedPDFService = exports.SharedInvoiceprintService = exports.WOPrintService = exports.ScheduledDrugSummaryPDFService = exports.ScheduledDrugPDFService = exports.SalesTotalsService = exports.SaleReceiptPrintService = exports.SalesReceiptpdfService = exports.SalesPrintService = exports.SalesPdfService = exports.SalesByServiceSummaryPDF = exports.ROTotalsService = exports.ROPrintService = exports.RoprintService = exports.RepairOrdersReportsPDFService = exports.ReorderPointPDFService = exports.ReceiptPrintService = exports.PurchaseOrderPDFService = exports.PurchaseOrderTotalsService = exports.PurchaseOrderPrintService = exports.PosReceiptPrintService = exports.POTotalsService = exports.PaymentsReportPDFService = exports.ReceiptPDFService = exports.PackShipPrintService = exports.PackShipPDFService = exports.OperatorWiseSalesSummaryPDF = exports.OperatorWiseSalesDetailsPDF = exports.MaterialOutprintService = exports.MeetingPdfService = exports.ManfWiseSalesService = exports.ItemWiseSalesPDFService = exports.ItemWiseMOSummaryPDF = exports.ItemWiseMODetailsPDF = exports.ItemWiseDoctorSalePDFService = exports.ItemDetaisPdf = exports.IssuePartsprintService = exports.InvoiceTotalsService = exports.InvoiceLandscapePdfService = exports.InvPrintService = exports.InvoiceprintService = exports.InsuranceExpirePDF = exports.ExpiringDrugPDFService = exports.EstPrintService = exports.EquipmentDesignPdf = exports.DeliveryChallanTotalsService = exports.DeliveryChallanPrintService = exports.DeliveryChallanPdfService = exports.DebitNoteTotalsService = exports.DebitNotePrintService = void 0;
-exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetAgeString = exports.IsNull = exports.IsNotNull = exports.ApplyServicePriceListToOpcode = exports.ApplyServicePriceListToProcedure = exports.CalcItemFinalSalePrice = exports.GetItemPriceForPriceList = exports.SalesReceiveTotalsService = exports.SalesReceivePrintService = exports.SalesReceivePdfService = exports.AdjustmentDrugPDFService = exports.HSNSummaryPDFService = exports.HSNSummaryExcelService = exports.ItemBarCodeLabelPdf = exports.NextServiceDatePDFService = exports.NextServiceDateXlsxFileService = exports.ConsultationLetterHeadPDFService = exports.InvoiceLetterheadPdfService = exports.HCInvoiceprintService = exports.InvoicePortraitPrintService = exports.MyDate = exports.TrUtils = exports.VendorDebitNoteTotalsService = exports.VendorDebitNotePrintService = exports.VendorDebitNotePdfService = exports.VendorCreditNoteTotalsService = exports.VendorCreditNotePrintService = exports.VendorCreditNotePDFService = exports.VendorBalancesService = exports.TransferOrderPrintService = exports.TechnicianPrintService = exports.TechnicianpdfService = exports.TaskReportsPDfService = exports.TaskPDfService = exports.PrintSharedService = void 0;
+exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.ServiceHistoryPDFService = exports.SalesTotalCalculationsWithDecimals = exports.GetNumber = exports.GetAgeString = exports.IsNull = exports.IsNotNull = exports.ApplyServicePriceListToOpcode = exports.ApplyServicePriceListToProcedure = exports.CalcItemFinalSalePrice = exports.GetItemPriceForPriceList = exports.SalesReceiveTotalsService = exports.SalesReceivePrintService = exports.SalesReceivePdfService = exports.AdjustmentDrugPDFService = exports.HSNSummaryPDFService = exports.HSNSummaryExcelService = exports.ItemBarCodeLabelPdf = exports.NextServiceDatePDFService = exports.NextServiceDateXlsxFileService = exports.ConsultationLetterHeadPDFService = exports.InvoiceLetterheadPdfService = exports.HCInvoiceprintService = exports.InvoicePortraitPrintService = exports.MyDate = exports.TrUtils = exports.VendorDebitNoteTotalsService = exports.VendorDebitNotePrintService = exports.VendorDebitNotePdfService = exports.VendorCreditNoteTotalsService = exports.VendorCreditNotePrintService = exports.VendorCreditNotePDFService = exports.VendorBalancesService = exports.TransferOrderPrintService = exports.TechnicianPrintService = exports.TechnicianpdfService = exports.TaskReportsPDfService = exports.TaskPDfService = exports.PrintSharedService = void 0;
 var analysis_excel_service_1 = require("./accounting/invoice/reports/excel/analysis-excel.service");
 Object.defineProperty(exports, "AnalysisXlsxFileService", { enumerable: true, get: function () { return analysis_excel_service_1.AnalysisXlsxFileService; } });
 var category_wise_item_excel_service_1 = require("./accounting/invoice/reports/excel/category-wise-item-excel.service");
@@ -271,7 +271,13 @@ Object.defineProperty(exports, "IsNotNull", { enumerable: true, get: function ()
 Object.defineProperty(exports, "IsNull", { enumerable: true, get: function () { return util_1.IsNull; } });
 var util_2 = require("./shared/util");
 Object.defineProperty(exports, "GetAgeString", { enumerable: true, get: function () { return util_2.GetAgeString; } });
+Object.defineProperty(exports, "GetNumber", { enumerable: true, get: function () { return util_2.GetNumber; } });
 var sales_total_calculation_1 = require("./sales-receive/sales-total-calculation");
 Object.defineProperty(exports, "SalesTotalCalculationsWithDecimals", { enumerable: true, get: function () { return sales_total_calculation_1.SalesTotalCalculationsWithDecimals; } });
 var service_history_pdf_service_1 = require("./services/service-history-pdf.service");
 Object.defineProperty(exports, "ServiceHistoryPDFService", { enumerable: true, get: function () { return service_history_pdf_service_1.ServiceHistoryPDFService; } });
+var math_operations_1 = require("./shared/math-operations");
+Object.defineProperty(exports, "Add", { enumerable: true, get: function () { return math_operations_1.Add; } });
+Object.defineProperty(exports, "Subtract", { enumerable: true, get: function () { return math_operations_1.Subtract; } });
+Object.defineProperty(exports, "Multiply", { enumerable: true, get: function () { return math_operations_1.Multiply; } });
+Object.defineProperty(exports, "Divide", { enumerable: true, get: function () { return math_operations_1.Divide; } });

package/dist/sales-receive/sales-total-calculation.js

@@ -37,6 +37,7 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     let returnTotal = 0;
     let nonReturnTotal = 0;
     let returnTotalDiscount = 0;
+    let nonReturnTotalDiscount = 0;
     // Tax breakdown totals - only calculate if taxable
     let totalSGST = 0;
     let totalCGST = 0;
@@ -55,6 +56,7 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         // Calculate return total for items with Ret = true (explicitly check for true)
         if (item.Ret === true) {
             const itemNetAmount = (0, math_operations_1.Subtract)(itemUnAmt, (0, math_operations_1.Add)(itemDisc, itemRecDisc));
+            returnTotalDiscount = (0, math_operations_1.Add)(returnTotalDiscount, itemDisc, itemRecDisc);
             // Add to return subtotal (net amount after discounts)
             returnSubtotal = (0, math_operations_1.Add)(returnSubtotal, itemUnAmt);
             if (isTaxable) {
@@ -114,12 +116,15 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     subtotal = (0, math_operations_1.Add)(subtotalOnItems, subtotalOnLabor);
     nonReturnSubTotal = subtotal;
     nonReturnTax = totalTax;
+    nonReturnTotalDiscount = totalDiscount;
     // Step 2: Add tax if taxable
     nonReturnTotal = isTaxable ? (0, math_operations_1.Add)((0, math_operations_1.Subtract)(subtotal, totalDiscount), totalTax) : (0, math_operations_1.Subtract)(subtotal, totalDiscount);
     // Subtract return subtotal from subtotal
     subtotal = (0, math_operations_1.Subtract)(subtotal, returnSubtotal);
     // Subtract return tax from total tax
     totalTax = (0, math_operations_1.Subtract)(totalTax, returnTax);
+    // Subtract return Discount from total discount
+    totalDiscount = (0, math_operations_1.Subtract)(totalDiscount, returnTotalDiscount);
     // Calculate combined tax breakdown totals only if taxable
     if (isTaxable) {
         totalSGST = (0, math_operations_1.Add)(totalSGSTOnItems, totalSGSTOnLabor);
@@ -157,7 +162,8 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         returnTotal,
         nonReturnSubTotal,
         nonReturnTax,
-        nonReturnTotal
+        nonReturnTotal,
+        nonReturnTotalDiscount
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {
@@ -205,7 +211,8 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
         returnTotal: roundToDecimals(result.returnTotal),
         nonReturnSubTotal: roundToDecimals(result.nonReturnSubTotal),
         nonReturnTax: roundToDecimals(result.nonReturnTax),
-        nonReturnTotal: roundToDecimals(result.nonReturnTotal)
+        nonReturnTotal: roundToDecimals(result.nonReturnTotal),
+        nonReturnTotalDiscount: roundToDecimals(result.nonReturnTotalDiscount)
     };
     // Only include tax fields and taxSummary if taxable
     if (isTaxable) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.5.18",
+  "version": "1.5.20",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",