=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2012-01-20 05:42:41 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunit/AddOrganisationUnitAction.java 2012-02-22 12:01:02 +0000 @@ -131,6 +131,13 @@ this.openingDate = openingDate; } + private boolean active; + + public void setActive( boolean active ) + { + this.active = active; + } + private String comment; public void setComment( String comment ) @@ -254,7 +261,7 @@ // Create organisation unit // --------------------------------------------------------------------- - OrganisationUnit organisationUnit = new OrganisationUnit( name, shortName, code, date, null, true, comment ); + OrganisationUnit organisationUnit = new OrganisationUnit( name, shortName, code, date, null, active, comment ); organisationUnit.setUrl( url ); organisationUnit.setParent( parent ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-02-21 13:01:40 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/resources/org/hisp/dhis/oum/i18n_module.properties 2012-02-22 12:01:02 +0000 @@ -1,5 +1,5 @@ create_new_org_unit=Create new organisation unit -registers_date=Registers data +registers_data=Registers data crease_new_org_unit_group=Create new organisation unit group hierarchy_operations=Hierarchy operations select_an_org_unit_to_move=Select an organisation unit to move === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2011-10-29 14:16:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/addOrganisationUnitForm.vm 2012-02-22 12:01:02 +0000 @@ -45,7 +45,16 @@ - + + + + + + + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2011-10-29 14:16:54 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/updateOrganisationUnitForm.vm 2012-02-22 12:01:02 +0000 @@ -63,7 +63,7 @@ #end - +