Skip to content

fix: respect Item Price validity dates when fetching POS prices #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tushar-git26 wants to merge 1 commit into
base: develop
Choose a base branch
from
+19 −0
Open

fix: respect Item Price validity dates when fetching POS prices #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pos_next/api/items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,15 @@ def search_by_barcode(barcode, pos_profile):
uom_prices = {}
if pos_profile_doc.selling_price_list:
ItemPrice = DocType("Item Price")
today = nowdate()
prices = (
frappe.qb.from_(ItemPrice)
.select(ItemPrice.uom, ItemPrice.price_list_rate)
.where(ItemPrice.item_code == item_code)
.where(ItemPrice.price_list == pos_profile_doc.selling_price_list)
.where(ItemPrice.valid_from.isnull() | (ItemPrice.valid_from <= today))
.where(ItemPrice.valid_upto.isnull() | (ItemPrice.valid_upto >= today))
.orderby(ItemPrice.valid_from)
.run(as_dict=True)
)
for p in prices:
Expand Down Expand Up @@ -565,13 +569,17 @@ def get_item_variants(template_item, pos_profile):
uom_prices_map = {}
if variant_codes:
ItemPrice = DocType("Item Price")
today = nowdate()
prices = (
frappe.qb.from_(ItemPrice)
.select(ItemPrice.item_code, ItemPrice.uom, ItemPrice.price_list_rate)
.where(ItemPrice.item_code.isin(variant_codes))
.where(ItemPrice.price_list == pos_profile_doc.selling_price_list)
.where(ItemPrice.valid_from.isnull() | (ItemPrice.valid_from <= today))
.where(ItemPrice.valid_upto.isnull() | (ItemPrice.valid_upto >= today))
.orderby(ItemPrice.item_code)
.orderby(ItemPrice.uom)
.orderby(ItemPrice.valid_from)
.run(as_dict=True)
)
for price in prices:
Expand Down Expand Up @@ -1291,13 +1299,17 @@ def get_items(
# UOM-specific prices - batch query ALL prices for all items using Query Builder
if item_codes:
ItemPrice = DocType("Item Price")
today = nowdate()
prices = (
frappe.qb.from_(ItemPrice)
.select(ItemPrice.item_code, ItemPrice.uom, ItemPrice.price_list_rate)
.where(ItemPrice.item_code.isin(item_codes))
.where(ItemPrice.price_list == pos_profile_doc.selling_price_list)
.where(ItemPrice.valid_from.isnull() | (ItemPrice.valid_from <= today))
.where(ItemPrice.valid_upto.isnull() | (ItemPrice.valid_upto >= today))
.orderby(ItemPrice.item_code)
.orderby(ItemPrice.uom)
.orderby(ItemPrice.valid_from)
.run(as_dict=True)
)
for price in prices:
Expand Down Expand Up @@ -1387,13 +1399,16 @@ def get_items(
if not price_row and item.get("has_variants"):
ItemPrice = DocType("Item Price")
Item = DocType("Item")
today = nowdate()
variant_prices = (
frappe.qb.from_(ItemPrice)
.inner_join(Item)
.on(Item.name == ItemPrice.item_code)
.select(fn.Min(ItemPrice.price_list_rate).as_("min_price"))
.where(Item.variant_of == item["item_code"])
.where(ItemPrice.price_list == pos_profile_doc.selling_price_list)
.where(ItemPrice.valid_from.isnull() | (ItemPrice.valid_from <= today))
.where(ItemPrice.valid_upto.isnull() | (ItemPrice.valid_upto >= today))
.where(Item.disabled == 0)
.run(as_dict=True)
)
Expand Down Expand Up @@ -1611,12 +1626,16 @@ def get_items_bulk(
price_list = pos_profile_doc.selling_price_list
if price_list and item_codes:
ItemPrice = DocType("Item Price")
today = nowdate()
prices = (
frappe.qb.from_(ItemPrice)
.select(ItemPrice.item_code, ItemPrice.uom, ItemPrice.price_list_rate)
.where(ItemPrice.price_list == price_list)
.where(ItemPrice.item_code.isin(item_codes))
.where(ItemPrice.selling == 1)
.where(ItemPrice.valid_from.isnull() | (ItemPrice.valid_from <= today))
.where(ItemPrice.valid_upto.isnull() | (ItemPrice.valid_upto >= today))
.orderby(ItemPrice.valid_from)
.run(as_dict=True)
)
for p in prices:
Expand Down