starred/books
1
0
Fork 0
mirror of https://github.com/frappe/books.git synced 2026-08-24 10:04:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: validate quantity for batched items in POS

Browse Source
This commit is contained in:
AbleKSaju
2025-02-20 11:55:35 +05:30
parent ee2e8e12d7
commit 61fd1dfb4b
1 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/helpers.ts
+34 -12
View File
@@ -40,7 +40,7 @@ import { safeParseFloat } from 'utils/index';
import { PriceList } from './baseModels/PriceList/PriceList';
import { InvoiceItem } from './baseModels/InvoiceItem/InvoiceItem';
import { SalesInvoiceItem } from './baseModels/SalesInvoiceItem/SalesInvoiceItem';
import { ItemQtyMap, POSItem } from 'src/components/POS/types';
import { ItemQtyMap } from 'src/components/POS/types';
import { ValuationMethod } from './inventory/types';
import {
getRawStockLedgerEntries,
@@ -840,7 +840,7 @@ export async function removeLoyaltyPoint(doc: Doc) {
export async function validateQty(
sinvDoc: SalesInvoice,
item: POSItem | Item | undefined,
item: Item | undefined,
existingItems: InvoiceItem[]
) {
if (!item) {
@@ -848,25 +848,47 @@ export async function validateQty(
}
let itemName = item.name as string;
const itemQtyMap = await getItemQtyMap(sinvDoc);
const itemDoc = (await sinvDoc.fyo.doc.getDoc(
ModelNameEnum.Item,
item.item as string
)) as Item;
const itemQtyMap: ItemQtyMap = await getItemQtyMap(sinvDoc);
if (item instanceof SalesInvoiceItem) {
itemName = item.item as string;
}
if (itemDoc.hasBatch) {
if (!item.batch) {
throw new ValidationError(t`Please select a batch first`);
}
}
if (!itemQtyMap[itemName] || itemQtyMap[itemName].availableQty === 0) {
throw new ValidationError(t`Item ${itemName} has Zero Quantity`);
}
if (
(existingItems && !itemQtyMap[itemName]) ||
itemQtyMap[itemName].availableQty < (existingItems[0]?.quantity as number)
) {
existingItems[0].quantity = itemQtyMap[itemName].availableQty;
throw new ValidationError(
t`Item ${itemName} only has ${itemQtyMap[itemName].availableQty} Quantity`
);
if (item.batch) {
if (
(existingItems && !itemQtyMap[itemName]) ||
itemQtyMap[itemName][item.batch as string] <
(existingItems[0]?.quantity as number)
) {
throw new ValidationError(
t`Item ${itemName} only has ${
itemQtyMap[itemName][item.batch as string]
} Quantity in batch ${item.batch as string}`
);
}
} else {
if (
(existingItems && !itemQtyMap[itemName]) ||
itemQtyMap[itemName].availableQty < (existingItems[0]?.quantity as number)
) {
throw new ValidationError(
t`Item ${itemName} only has ${itemQtyMap[itemName].availableQty} Quantity`
);
}
}
return;