nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-29 22:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into update-items-permission-fix

Browse Source
This commit is contained in:
Marica
2020-06-15 11:44:59 +05:30
committed by GitHub
parent 359e934cd2 11253a91f1
commit 7dd92f15fa
33 changed files with 1507 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/stock_controller.py
View File

@@ -19,7 +19,8 @@ class QualityInspectionNotSubmittedError(frappe.ValidationError): pass
class StockController(AccountsController):
def validate(self):
super(StockController, self).validate()
self.validate_inspection()
if not self.get('is_return'):
self.validate_inspection()
self.validate_serialized_batch()
self.validate_customer_provided_item()