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

Merge pull request #24546 from pateljannat/validation-for-disabled-warehouse-v12

Browse Source 
Validation for disabled warehouse v12
This commit is contained in:
Marica
2021-02-11 13:09:29 +05:30
committed by GitHub
parent 7fea8a95e6 82c162dfe7
commit 23364b374e
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/stock_controller.py
View File

@@ -319,12 +319,13 @@ class StockController(AccountsController):
return incoming_rate return incoming_rate
def validate_warehouse(self): def validate_warehouse(self):
from erpnext.stock.utils import validate_warehouse_company from erpnext.stock.utils import validate_warehouse_company, validate_disabled_warehouse
warehouses = list(set([d.warehouse for d in warehouses = list(set([d.warehouse for d in
self.get("items") if getattr(d, "warehouse", None)])) self.get("items") if getattr(d, "warehouse", None)]))
for w in warehouses: for w in warehouses:
validate_disabled_warehouse(w)
validate_warehouse_company(w, self.company) validate_warehouse_company(w, self.company)
def update_billing_percentage(self, update_modified=True): def update_billing_percentage(self, update_modified=True):

3
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
View File

@@ -25,10 +25,11 @@ class StockLedgerEntry(Document):
def validate(self): def validate(self):
self.flags.ignore_submit_comment = True self.flags.ignore_submit_comment = True
from erpnext.stock.utils import validate_warehouse_company from erpnext.stock.utils import validate_warehouse_company, validate_disabled_warehouse
self.validate_mandatory() self.validate_mandatory()
self.validate_item() self.validate_item()
self.validate_batch() self.validate_batch()
validate_disabled_warehouse(self.warehouse)
validate_warehouse_company(self.warehouse, self.company) validate_warehouse_company(self.warehouse, self.company)
self.scrub_posting_time() self.scrub_posting_time()
self.validate_and_set_fiscal_year() self.validate_and_set_fiscal_year()

6
erpnext/stock/utils.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe, erpnext import frappe, erpnext
from frappe import _ from frappe import _
import json import json
from frappe.utils import flt, cstr, nowdate, nowtime from frappe.utils import flt, cstr, nowdate, nowtime, get_link_to_form
from six import string_types from six import string_types
@@ -279,6 +279,10 @@ def is_group_warehouse(warehouse):
if frappe.db.get_value("Warehouse", warehouse, "is_group"): if frappe.db.get_value("Warehouse", warehouse, "is_group"):
frappe.throw(_("Group node warehouse is not allowed to select for transactions")) frappe.throw(_("Group node warehouse is not allowed to select for transactions"))
def validate_disabled_warehouse(warehouse):
if frappe.db.get_value("Warehouse", warehouse, "disabled"):
frappe.throw(_("Disabled Warehouse {0} cannot be used for this transaction.").format(get_link_to_form('Warehouse', warehouse)))
def update_included_uom_in_report(columns, result, include_uom, conversion_factors): def update_included_uom_in_report(columns, result, include_uom, conversion_factors):
if not include_uom or not conversion_factors: if not include_uom or not conversion_factors:
return return