nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[merge] v5-design

Browse Source
This commit is contained in:
Rushabh Mehta
2014-12-31 15:03:14 +05:30
parent cbdfb767a9 ee4b8bee33
commit 419ae33c3e
43 changed files with 317 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/status_updater.py
View File

@@ -73,9 +73,7 @@ class StatusUpdater(Document):
frappe.db.set_value(self.doctype, self.name, "status", self.status)
def validate_qty(self):
"""
Validates qty at row level
"""
"""Validates qty at row level"""
self.tolerance = {}
self.global_tolerance = None
@@ -153,7 +151,7 @@ class StatusUpdater(Document):
args['second_source_condition'] = ""
if args.get('second_source_dt') and args.get('second_source_field') \
and args.get('second_join_field'):
if not args.get("second_source_extra_cond"):
if not args.get("second_source_extra_cond"):
args["second_source_extra_cond"] = ""
args['second_source_condition'] = """ + ifnull((select sum(%(second_source_field)s)