| commit | 1ea98cbbe1f1d93adac518c5c4c354615fd2f8b0 | [log] [tgz] |
|---|---|---|
| author | Saif Ur Rehman <saifi0102@gmail.com> | Fri Dec 28 00:29:43 2018 +0500 |
| committer | Saif Ur Rehman <saifi0102@gmail.com> | Fri Dec 28 00:29:43 2018 +0500 |
| tree | b57fc9fc91f0c4a8abd61e5a3deb060eb35e9aa5 | |
| parent | 07acc2bf5a68456a7ccd17402d62bd7fb761038b [diff] |
fix: missing line due to conflict resolution
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index a1aa6b1..a936001 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py
@@ -126,6 +126,7 @@ self.validate_fixed_asset() self.validate_retain_sample() self.validate_uom_conversion_factor() + self.validate_item_defaults() if not self.get("__islocal"): self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")