=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm	2010-03-05 13:00:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/addPatientForm.vm	2010-03-08 06:24:52 +0000
@@ -165,14 +165,14 @@
 				<td><label>$attribute.name #if($attribute.mandatory)<em title="$i18n.getString( "required" )" class="required">*</em> #end</label></td>
 				<td>
 					#if( $attribute.valueType == "YES/NO" )
-		                <select id="$attribute.id"  name="attr$attribute.id" style="width:30em" style="width:100%" > 
+		                <select id="attr$attribute.id"  name="attr$attribute.id" style="width:30em" style="width:100%" > 
 		                	 <option value="" >[$i18n.getString( "please_select" )]</option>             
 		                    <option value="true">$i18n.getString( "yes" )</option>
 		                    <option value="false" >$i18n.getString( "no" )</option>
 		                </select>                
 		            #elseif( $attribute.valueType == "DATE" )
 		                    <img src="../images/calendar_icon.gif" width="16" height="16" id="getDateValue$attribute.id" style="cursor: pointer;" title="$i18n.getString("date_selector")" onmouseover="this.style.background='orange';" onmouseout="this.style.background=''" alt="$i18n.getString( "date" )">
-		                	<input type="text" id="$attribute.id"  style="width:30em" name="attr$attribute.id"  class=' #validate( "default"  $attribute.mandatory )' >
+		                	<input type="text" id="attr$attribute.id"  style="width:30em" name="attr$attribute.id"  class=' #validate( "default"  $attribute.mandatory )' >
 		                    <script type="text/javascript">
 		                        Calendar.setup({
 		                            inputField     :    "attr$attribute.id",      // id of the input field
@@ -181,14 +181,14 @@
 		                        });
 		                    </script>                    
 					#elseif( $attribute.valueType == "COMBO" )
-						<select  id="$attribute.id"  name="attr$attribute.id" style="width:30em"  class=' #validate( "default"  $attribute.mandatory )'>
+						<select  id="attr$attribute.id"  name="attr$attribute.id" style="width:30em"  class=' #validate( "default"  $attribute.mandatory )'>
 							 <option value="">[$i18n.getString( "please_select" )]</option>
 							#foreach ($option in $attribute.attributeOptions )
 								<option value="$option.id" >$option.name</option>
 							#end
 						</select>
 					#else 
-						<input type="text"  id="$attribute.id" name="attr$attribute.id" style="width:30em"  class=' #validate( $attribute.valueType  $attribute.mandatory )'   style="width:30em" >
+						<input type="text"  id="attr$attribute.id" name="attr$attribute.id" style="width:30em"  class=' #validate( $attribute.valueType  $attribute.mandatory )'   style="width:30em" >
 					#end
 				</td>		
 			</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js	2010-03-05 06:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/patient.js	2010-03-08 06:24:52 +0000
@@ -286,8 +286,8 @@
 				+'&age=' + getFieldValue( 'age' ) 
 				+'&genre=' + getFieldValue('gender') 
 				+'&underAge=' + jQuery("#underAge").is(":checked")
-				+'&representativeId=' + getFieldValue('representativeId');
-				+'&relationshipTypeId=' + getFieldValue('relationshipTypeId');
+				+'&representativeId=' + getFieldValue('representativeId')
+				+'&relationshipTypeId=' + getFieldValue('relationshipTypeId')
 				+ getIdParams();
 	
 	var request = new Request();
@@ -339,8 +339,8 @@
 				+'&gender=' + getFieldValue( 'gender' ) 
 				+'&birthDate=' + getFieldValue( 'birthDate' ) 
 				+'&underAge=' + jQuery("#underAge").is(":checked")
-				+'&representativeId=' + getFieldValue('representativeId');
-				+'&relationshipTypeId=' + getFieldValue('relationshipTypeId');
+				+'&representativeId=' + getFieldValue('representativeId')
+				+'&relationshipTypeId=' + getFieldValue('relationshipTypeId')
 				+ getIdParams();
 	
 	var request = new Request();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/underage.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/underage.js	2010-03-05 06:24:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/javascript/underage.js	2010-03-08 06:24:52 +0000
@@ -231,7 +231,7 @@
 	}
 	var id = jQuery(this_).attr("id");
 	window.parent.jQuery("#representativeId").val(id);
-	window.parent.jQuery("#relationshipTypeId").val();
+	window.parent.jQuery("#relationshipTypeId").val(relationshipTypeId);
 	jQuery(".identifierRow"+id).each(function(){
 		var inputField = window.parent.jQuery("#"+jQuery(this).attr("id"));
 		if( inputField.metadata({type:"attr",name:"data"}).related  )