Compare commits

..

2 Commits

Author SHA1 Message Date
Saqib
9cf4b391cc fix: cannot delete a project if linked with sales order (#27536)
(cherry picked from commit 0b040c7437)

# Conflicts:
#	erpnext/projects/doctype/project/test_project.py
2025-02-21 00:13:20 +00:00
mergify[bot]
f5160dc83d fix: use Stock Qty while getting POS Reserved Qty (backport #38962) (#38983)
fix: use `Stock Qty` while getting `POS Reserved Qty`

(cherry picked from commit 7223106417)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-28 12:00:04 +05:30
3 changed files with 6 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ import frappe
from erpnext.hooks import regional_overrides
__version__ = "13.55.2"
__version__ = "13.54.4"
def get_default_company(user=None):

View File

@@ -704,7 +704,7 @@ def get_pos_reserved_qty(item_code, warehouse):
reserved_qty = (
frappe.qb.from_(p_inv)
.from_(p_item)
.select(Sum(p_item.qty).as_("qty"))
.select(Sum(p_item.stock_qty).as_("stock_qty"))
.where(
(p_inv.name == p_item.parent)
& (IfNull(p_inv.consolidated_invoice, "") == "")
@@ -715,7 +715,7 @@ def get_pos_reserved_qty(item_code, warehouse):
)
).run(as_dict=True)
return reserved_qty[0].qty or 0 if reserved_qty else 0
return flt(reserved_qty[0].stock_qty) if reserved_qty else 0
@frappe.whitelist()

View File

@@ -155,7 +155,10 @@ class TestProject(unittest.TestCase):
so.reload()
self.assertFalse(so.project)
<<<<<<< HEAD
=======
>>>>>>> 0b040c7437 (fix: cannot delete a project if linked with sales order (#27536))
def get_project(name, template):
project = frappe.get_doc(