From b8417ef1d6e116d2a82100a9abf734670dcb8b6d Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 23 Jul 2012 15:03:51 +0530
Subject: [PATCH] fixes in new report: same fieldname in multiple table

---
 js/core.min.js      | 2 +-
 js/wn/ui/filters.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/core.min.js b/js/core.min.js
index e50349b3de..f07a844ced 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -230,7 +230,7 @@ return[me.fieldselect.$select.find('option:selected').attr('table'),me.field.df.
 this.add_field_option(this.filter_fields[i])}else{this.build_options();}},build_options:function(){var me=this;me.table_fields=[];var std_filters=[{fieldname:'name',fieldtype:'Data',label:'ID',parent:me.doctype},{fieldname:'modified',fieldtype:'Date',label:'Last Modified',parent:me.doctype},{fieldname:'owner',fieldtype:'Data',label:'Created By',parent:me.doctype},{fieldname:'creation',fieldtype:'Date',label:'Created On',parent:me.doctype},{fieldname:'_user_tags',fieldtype:'Data',label:'Tags',parent:me.doctype},{fieldname:'docstatus',fieldtype:'Int',label:'Doc Status',parent:me.doctype},];var doctype_obj=locals['DocType'][me.doctype];if(doctype_obj&&cint(doctype_obj.istable)){std_filters=std_filters.concat([{fieldname:'parent',fieldtype:'Data',label:'Parent',parent:me.doctype}]);}
 if(this.with_blank){this.$select.append($('<option>',{value:''}).text(''));}
 $.each(std_filters.concat(wn.meta.docfield_list[me.doctype]),function(i,df){me.add_field_option(df);});$.each(me.table_fields,function(i,table_df){if(table_df.options){$.each(wn.meta.docfield_list[table_df.options],function(i,df){me.add_field_option(df);});}});},add_field_option:function(df){var me=this;if(me.doctype&&df.parent==me.doctype){var label=df.label;var table=me.doctype;if(df.fieldtype=='Table')me.table_fields.push(df);}else{var label=df.label+' ('+df.parent+')';var table=df.parent;}
-if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!me.fields_by_name[df.fieldname]){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
+if(df.fieldname=='description')console.log(me.fields_by_name[df.fieldname]);if(wn.model.no_value_type.indexOf(df.fieldtype)==-1&&!(me.fields_by_name[df.fieldname]&&me.fields_by_name[df.fieldname]['parent']==df.parent)){this.$select.append($('<option>',{value:df.fieldname,table:table}).text(label));me.fields_by_name[df.fieldname]=df;}}})
 /*
  *	lib/js/wn/views/container.js
  */
diff --git a/js/wn/ui/filters.js b/js/wn/ui/filters.js
index 9f047e1506..ae1d2d2124 100644
--- a/js/wn/ui/filters.js
+++ b/js/wn/ui/filters.js
@@ -339,7 +339,7 @@ wn.ui.FieldSelect = Class.extend({
 			var table = df.parent;
 		}
 		if(wn.model.no_value_type.indexOf(df.fieldtype)==-1 && 
-			!me.fields_by_name[df.fieldname]) {
+			!(me.fields_by_name[df.fieldname] && me.fields_by_name[df.fieldname]['parent'] == df.parent)) {
 			this.$select.append($('<option>', {
 				value: df.fieldname,
 				table: table