Fixed merge conflict

2017-02-27 14:40:53 +05:30
parent c238016aff e0d661f433
commit c642f76a4d
22 changed files with 4591 additions and 4380 deletions
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -47,6 +47,7 @@ $.extend(erpnext, {
 				fields: [
 					{
 						"fieldtype": "Link",
+						"fieldname": "serial_no",
 						"options": "Serial No",
 						"label": __("Serial No"),
 						"get_query": function () {