schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-03-05 14:54:44 +05:30
parent 950fff0ba1 ba6003ece7
commit c43c95e0aa
48 changed files with 826 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/utilities/transaction_base.py
View File

@@ -45,7 +45,7 @@ class TransactionBase(StatusUpdater):
events = frappe.db.sql_list("""select name from `tabEvent`
where ref_type=%s and ref_name=%s""", (self.doctype, self.name))
if events:
frappe.db.sql("delete from `tabEvent` where name in (%s)"
frappe.db.sql("delete from `tabEvent` where name in ({0})"
.format(", ".join(['%s']*len(events))), tuple(events))
def _add_calendar_event(self, opts):
@@ -73,6 +73,8 @@ class TransactionBase(StatusUpdater):
validate_uom_is_integer(self, uom_field, qty_fields)
def validate_with_previous_doc(self, ref):
self.exclude_fields = ["conversion_factor", "uom"] if self.get('is_return') else []
for key, val in ref.items():
is_child = val.get("is_child_table")
ref_doc = {}
@@ -103,7 +105,7 @@ class TransactionBase(StatusUpdater):
frappe.throw(_("Invalid reference {0} {1}").format(reference_doctype, reference_name))
for field, condition in fields:
if prevdoc_values[field] is not None:
if prevdoc_values[field] is not None and field not in self.exclude_fields:
self.validate_value(field, condition, prevdoc_values[field], doc)