Skip to content

Commit afa823d

Browse files
Nishka GosaliaNishka Gosalia
authored andcommitted
fix: conditions in work order and production plan
1 parent c990f9d commit afa823d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

erpnext/manufacturing/doctype/production_plan/production_plan.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def get_so_items(self):
368368
(so_item.parent.isin(so_list))
369369
& (so_item.docstatus == 1)
370370
& ((so_item.stock_qty - so_item.stock_reserved_qty) > so_item.work_order_qty)
371-
& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
371+
& (so_item.is_closed == 0)
372372
)
373373
)
374374

@@ -433,7 +433,7 @@ def get_so_items(self):
433433
.where((bom.item == pi.item_code) & (bom.is_active == 1))
434434
)
435435
)
436-
& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
436+
& (so_item.is_closed == 0)
437437
)
438438
)
439439

@@ -1544,7 +1544,7 @@ def get_sales_orders(self):
15441544
& (so.status.notin(["Stopped", "Closed"]))
15451545
& (so.company == self.company)
15461546
& (so_item.qty > so_item.production_plan_qty)
1547-
& ((so_item.is_closed == 0) | (so_item.is_closed.isnull()))
1547+
& (so_item.is_closed == 0)
15481548
)
15491549
)
15501550

erpnext/selling/doctype/sales_order/sales_order.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
18061806
delivered_qty: d.delivered_qty,
18071807
};
18081808
});
1809+
if (!this.data.length) {
1810+
frappe.msgprint(__("No closed items to re-open"));
1811+
return;
1812+
}
18091813
const reopen_item_fields = [
18101814
{
18111815
fieldtype: "Link",
@@ -1845,7 +1849,7 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
18451849

18461850
let selected_items = (values.reopen_items || []).filter((row) => row.__checked);
18471851
if (!selected_items.length) {
1848-
frappe.msgprint(__("Please select one item to re-open"));
1852+
frappe.msgprint(__("Please select atleast one item to re-open"));
18491853
return;
18501854
}
18511855
frappe.call({
@@ -1881,6 +1885,10 @@ erpnext.selling.SalesOrderController = class SalesOrderController extends erpnex
18811885
delivered_qty: d.delivered_qty,
18821886
};
18831887
});
1888+
if (!this.data.length) {
1889+
frappe.msgprint(__("No items available to close"));
1890+
return;
1891+
}
18841892
const close_item_fields = [
18851893
{
18861894
fieldtype: "Link",

0 commit comments

Comments
 (0)