From 87545f035f97b2add7d4fa098cc3cc8ad2d93580 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 1 May 2012 17:11:42 +0530
Subject: [PATCH] double column fix

---
 js/core.min.js                     | 3 ++-
 js/wn/meta.js                      | 9 ++++++++-
 py/core/doctype/doctype/doctype.py | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/js/core.min.js b/js/core.min.js
index c767d410e6..d7051bfb6f 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -73,7 +73,8 @@ wn.provide('wn.model');wn.model={no_value_type:['Section Break','Column Break','
  *	lib/js/wn/meta.js
  */
 wn.provide('wn.meta.docfield_map');wn.provide('wn.meta.docfield_list');wn.provide('wn.meta.doctypes');$.extend(wn.meta,{add_field:function(df){wn.provide('wn.meta.docfield_map.'+df.parent);wn.meta.docfield_map[df.parent][df.fieldname||df.label]=df;if(!wn.meta.docfield_list[df.parent])
-wn.meta.docfield_list[df.parent]=[]
+wn.meta.docfield_list[df.parent]=[];for(var i in wn.meta.docfield_list[df.parent]){var d=wn.meta.docfield_list[df.parent][i];if(df.fieldname==d.fieldname)
+return;}
 wn.meta.docfield_list[df.parent].push(df);}});
 /*
  *	lib/js/wn/misc/tools.js
diff --git a/js/wn/meta.js b/js/wn/meta.js
index fcd4534bb0..d3f0d33b8f 100644
--- a/js/wn/meta.js
+++ b/js/wn/meta.js
@@ -31,7 +31,14 @@ $.extend(wn.meta, {
 		wn.meta.docfield_map[df.parent][df.fieldname || df.label] = df;
 		
 		if(!wn.meta.docfield_list[df.parent])
-			wn.meta.docfield_list[df.parent] = []
+			wn.meta.docfield_list[df.parent] = [];
+			
+		// check for repeat
+		for(var i in wn.meta.docfield_list[df.parent]) {
+			var d = wn.meta.docfield_list[df.parent][i];
+			if(df.fieldname==d.fieldname) 
+				return; // no repeat
+		}
 		wn.meta.docfield_list[df.parent].push(df);
 	}
 });
\ No newline at end of file
diff --git a/py/core/doctype/doctype/doctype.py b/py/core/doctype/doctype/doctype.py
index 3e9422c63d..ff3e766f3c 100644
--- a/py/core/doctype/doctype/doctype.py
+++ b/py/core/doctype/doctype/doctype.py
@@ -87,7 +87,10 @@ class DocType:
 					for c in illegal:
 						if c in d.fieldname:
 							webnotes.msgprint('"%s" not allowed in fieldname' % c)
-					
+				
+				else:
+					webnotes.msgprint("Fieldname is mandatory in row %s" % str(d.idx+1), raise_exception=1)
+				
 				# check illegal mandatory
 				if d.fieldtype in ('HTML', 'Button', 'Section Break', 'Column Break') and d.reqd:
 					webnotes.msgprint('%(lable)s [%(fieldtype)s] cannot be mandatory', raise_exception=1)