--- lib/A3C/Model/User.pm	2008/03/18 16:15:16	29
+++ lib/A3C/Model/User.pm	2008/03/18 19:03:53	32
@@ -148,6 +148,10 @@
 		],
 		default is '';
 
+	column organization =>
+		refers_to A3C::Model::Organization by 'id',
+		is mandatory;
+
 	column hrEduPersonAffiliation =>
 		label is _('Povezanost s ustanovom'),
 		is mandatory,
@@ -251,38 +255,12 @@
 		label is 'Pripadnost grupi',
 		hint is 'skolskagodina::razred';
 
-	column o =>
-		label is _('Naziv matične ustanove'),
-		is mandatory;
-	
-	column hrEduPersonHomeOrg =>
-		label is _('Oznaka matične ustanove'),
-		hint is 'CARNet',
-		is mandatory;
-
 	column ou =>
 		label is _('Organizacijska jedinica');
 	
 	column roomNumber =>
 		label is _('Broj sobe');
 
-	column postalAddress =>
-		label is _('Poštanska adresa'),
-		render as 'textarea',
-		is mandatory;
-	
-	column l =>
-		label is _('Mjesto'),
-		hist is 'Zagreb',
-		is mandatory;
-
-	column postalCode =>
-		label is _('Poštanski broj'),
-		hint is 'HR-10000';
-
-	column street =>
-		label is _('Ulica i kućni broj');
-	
 	column homePostalAddress =>
 		label is _('Kućna poštanska adresa'),
 		render as 'textarea';