From 180e43585f3cf5c0a0d36a945f77dcfe0f55fa85 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 26 Jul 2016 17:57:42 +0530 Subject: [PATCH] [minor] formatter for item and employee --- erpnext/public/js/utils.js | 16 ++++++++++++++++ erpnext/stock/doctype/item/item.py | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 4081ca2be5..6c5f59a27d 100644 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -179,6 +179,22 @@ erpnext.utils.map_current_doc = function(opts) { } } +frappe.form.link_formatters['Item'] = function(value, doc) { + if(doc.item_name && doc.item_name !== value) { + return value + ': ' + doc.item_name; + } else { + return value; + } +} + +frappe.form.link_formatters['Employee'] = function(value, doc) { + if(doc.employee_name && doc.employee_name !== value) { + return value + ': ' + doc.employee_name; + } else { + return value; + } +} + // add description on posting time $(document).on('app_ready', function() { if(!frappe.datetime.is_timezone_same()) { diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index cedfb24d7a..b546df4126 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -120,7 +120,10 @@ class Item(WebsiteGenerator): '''set opening stock''' if not self.is_stock_item or self.has_serial_no or self.has_batch_no: return - + + if not self.valuation_rate and self.standard_rate: + self.valuation_rate = self.standard_rate + if not self.valuation_rate: frappe.throw(_("Valuation Rate is mandatory if Opening Stock entered"))