nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 10:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not rely on client side to update quantities during partial d… (backport #54804) (#54821)

Browse Source 
* fix: do not rely on client side to update quantities during partial d… (#54804)

fix: do not rely on client side to update quantities during partial dropship
(cherry picked from commit 03acbc3dc9)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
This commit is contained in:
mergify[bot]
2026-05-11 07:40:14 +00:00
committed by GitHub
parent 1fcd2837e8
commit f24b556336
2 changed files with 64 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -813,61 +813,26 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends (
}, },
], ],
primary_action: (values) => { primary_action: (values) => {
const data = values.items.filter((item) => item.__checked);
if (!data.length) {
frappe.throw(__("Please select at least one item to update delivered quantity."));
}
data.forEach((item) => {
if (!item.qty_change) {
frappe.throw(
__(
"Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity.",
[item.item_code.bold()]
)
);
}
if (item.qty_change < 0 && Math.abs(item.qty_change) > item.delivered_qty) {
frappe.throw(
__("Delivered Qty cannot be reduced by more than {0} for item {1}", [
item.delivered_qty,
item.item_code.bold(),
])
);
}
if (item.qty_change > 0 && item.delivered_qty + item.qty_change > item.qty) {
frappe.throw(
__("Delivered Qty cannot be increased by more than {0} for item {1}", [
item.qty - item.delivered_qty,
item.item_code.bold(),
])
);
}
});
data.forEach((item) => {
frappe.model.set_value(
"Purchase Order Item",
item.name,
"received_qty",
item.delivered_qty + item.qty_change
);
});
const frm = this.frm; const frm = this.frm;
frm.dirty(); frappe.call({
frm.save("Update", () => { doc: frm.doc,
frappe.call({ method: "update_dropship_received_qty",
doc: frm.doc, args: {
method: "update_receiving_percentage", data: values.items
callback: function (r) { .filter((item) => item.__checked)
if (!r.exc) { .map((item) => ({
dialog.hide(); name: item.name,
frappe.toast(__("Quantities updated successfully.")); current_qty: item.delivered_qty,
frm.reload_doc(); qty_change: item.qty_change,
} })),
}, },
}); callback: function (r) {
if (!r.exc) {
frm.reload_doc();
frappe.toast(__("Quantities updated successfully."));
dialog.hide();
}
},
}); });
}, },
}); });

46
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -575,6 +575,51 @@ class PurchaseOrder(BuyingController):
def has_drop_ship_item(self): def has_drop_ship_item(self):
return any(d.delivered_by_supplier for d in self.items) return any(d.delivered_by_supplier for d in self.items)
@frappe.whitelist()
def update_dropship_received_qty(self, data: list[dict]):
if not data:
frappe.throw(_("Please select at least one item to update delivered quantity."))
for d in data:
item = next((item for item in self.items if item.name == d.get("name")), None)
if not item:
frappe.throw(
_("Item with name {0} not found in the Purchase Order").format(frappe.bold(d.get("name")))
)
if not item.has_permlevel_access_to("received_qty", permission_type="write"):
frappe.throw(
_("You don't have permission to update Received Qty DocField for item {0}").format(
frappe.bold(item.item_code)
)
)
if not d.get("qty_change"):
frappe.throw(
_(
"Item {0} has no changes in delivered quantity. Please unselect the row if you do not wish to update its quantity."
).format(frappe.bold(item.item_code))
)
if d.get("qty_change") < 0 and abs(d.get("qty_change")) > item.received_qty:
frappe.throw(
_("Delivered Qty cannot be reduced by more than {0} for item {1}").format(
item.received_qty, frappe.bold(item.item_code)
)
)
if d.get("qty_change") > 0 and item.received_qty + d.get("qty_change") > item.qty:
frappe.throw(
_("Delivered Qty cannot be increased by more than {0} for item {1}").format(
item.qty - item.received_qty, frappe.bold(item.item_code)
)
)
item.received_qty += d.get("qty_change")
self.update_receiving_percentage()
self.save()
def is_against_so(self): def is_against_so(self):
return any(d.sales_order for d in self.items if d.sales_order) return any(d.sales_order for d in self.items if d.sales_order)
@@ -588,7 +633,6 @@ class PurchaseOrder(BuyingController):
stock_bin = get_bin(d.rm_item_code, d.reserve_warehouse) stock_bin = get_bin(d.rm_item_code, d.reserve_warehouse)
stock_bin.update_reserved_qty_for_sub_contracting(subcontract_doctype="Purchase Order") stock_bin.update_reserved_qty_for_sub_contracting(subcontract_doctype="Purchase Order")
@frappe.whitelist()
def update_receiving_percentage(self): def update_receiving_percentage(self):
total_qty, received_qty = 0.0, 0.0 total_qty, received_qty = 0.0, 0.0
for item in self.items: for item in self.items: