=== modified file 'dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml' --- dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-11 08:27:22 +0000 +++ dhis-2/dhis-services/dhis-service-options/src/main/resources/help_content.xml 2012-01-13 07:32:03 +0000 @@ -2515,9 +2515,9 @@ To access the relationship type maintenance module, choose Maintenance->Beneficiaries and Programs->Relationship Type. To define a new relationship type, click the "Add new" button. Fill all fields in "Add new Relationship Type" form, and click "Add" button. -
- Beneficiary registration - Beneficiary registration section provides a mechanism for managing facilities which allow to registry new beneficiaries or not. +
+ Beneficiary Organisation Unit Registration + Beneficiary organisation unit registration section provides a mechanism for managing facilities which allow to registry new beneficiaries or not. To access the beneficiary registration maintenance module, choose Maintenance->Beneficiaries and Programs->Beneficiary Registration. There are two processes for registering facilities. The first one is where the administrator will say that beneficiaries can register here. The second is where provides services ( Child Health program, Mother Care program, ...) for registered beneficiaries.
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-01-13 04:29:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2012-01-13 07:32:03 +0000 @@ -233,7 +233,7 @@ intro_validation_criteria=Create, modify and view validation criteria. A criteria is used for validation of Beneficiary data. intro_program_attribute=Create, modify and view Program attributes. A program can have any number of attributes. intro_import_data=Import information of patients automatically from an Excel template file into the beneficiary database. -intro_patient_registration=Define the organisation units which should be allowed to register beneficiaries. +intro_patient_organisation_unit_registration=Define the organisation units which should be allowed to register beneficiaries. intro_configuration=Set the Excel XML template file used for automatically importing beneficiary data. add_dependent=Add dependent inheritable=Inheritable @@ -316,7 +316,7 @@ orgunit=Organisation unit validation_criteria_details=Validation criteria details program_attribute_details=Program attribute details -patient_registration=Beneficiary Registration +patient_organisation_unit_registration=Beneficiary Organisation Unit Registration select_program=Select program fill_fields_in_programstage_dataelement_validation=Fill all fields in validation form define_single_dataelement_validation=Define Single Data Element Validation @@ -369,7 +369,6 @@ date_of_incident_description=Description of incident date date_of_enrollment=Date of enrollment date_of_incident=Date of incident -patient_registration_title=Beneficiary registration patient_identifier_type_details=Beneficiary identifier type details male=Male female=Female === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm 2011-09-22 03:11:29 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/index.vm 2012-01-13 07:32:03 +0000 @@ -12,7 +12,7 @@ #introListImgItem( "patientAttributeGroup.action" "patient_attribute_group" "patient" ) #introListImgItem( "patientIdentifierType.action" "patient_identifier_type" "patient" ) #introListImgItem( "relationshipType.action" "relationship_type" "patient" ) - #introListImgItem( "defineOrgunitRegistrationForm.action" "patient_registration" "patient" ) + #introListImgItem( "defineOrgunitRegistrationForm.action" "patient_organisation_unit_registration" "patient" ) #introListImgItem( "program.action" "program" "program" ) #introListImgItem( "programAttribute.action" "program_attribute" "program" ) #introListImgItem( "caseAggregation.action" "beneficiary_aggregation_query_builder" "caseaggregationmapping" ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/menu.vm 2012-01-13 07:32:03 +0000 @@ -4,7 +4,7 @@
  • $i18n.getString( "patient_attribute_group" )
  • $i18n.getString( "patient_identifier_type" )
  • $i18n.getString( "relationship_type" )
  • -
  • $i18n.getString( "patient_registration" )
  • +
  • $i18n.getString( "patient_organisation_unit_registration" )
  • $i18n.getString( "program" )
  • $i18n.getString( "program_attribute" )
  • $i18n.getString( "beneficiary_aggregation_query_builder" )
  • === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2011-09-29 04:17:34 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/orgunitRegistration.vm 2012-01-13 07:32:03 +0000 @@ -1,5 +1,5 @@ -

    $i18n.getString( "patient_registration_title" ) #openHelp( "patient_registration" )

    +

    $i18n.getString( "patient_organisation_unit_registration" ) #openHelp( "patient_organisation_unit_registration" )

    === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 2011-09-14 06:36:13 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/webapp/dhis-web-maintenance-patient/patientAndProgramMenu.vm 2012-01-13 07:32:03 +0000 @@ -4,7 +4,7 @@
  • $i18n.getString( "patient_attribute_group" )
  • $i18n.getString( "patient_identifier_type" )
  • $i18n.getString( "relationship_type" )
  • -
  • $i18n.getString( "patient_registration" )
  • +
  • $i18n.getString( "patient_organisation_unit_registration" )
  • $i18n.getString( "program" )
  • $i18n.getString( "program_attribute" )
  • $i18n.getString( "beneficiary_aggregation_query_builder" )