andrey reports
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	grails-app/domain/org/itech/klinikav2/domain/PatientQueue.groovy
	src/groovy/utils/ReportGenerator.groovy
	target-eclipse/classes/.gitignore
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/grails/plugin/cache/BlockingCache.class
	target-eclipse/classes/grails/plugin/cache/CacheBeanPostProcessor.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$CacheConfigGrailsClass.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler$DefaultCacheConfigGrailsClass.class
	target-eclipse/classes/grails/plugin/cache/CacheConfigArtefactHandler.class
	target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource$DefaultCacheKey.class
	target-eclipse/classes/grails/plugin/cache/GrailsAnnotationCacheOperationSource.class
	target-eclipse/classes/grails/plugin/cache/GrailsCache.class
	target-eclipse/classes/grails/plugin/cache/GrailsCacheManager.class
	target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCache.class
	target-eclipse/classes/grails/plugin/cache/GrailsConcurrentMapCacheManager.class
	target-eclipse/classes/grails/plugin/cache/GrailsValueWrapper.class
	target-eclipse/classes/grails/plugin/cache/Timer.class
	target-eclipse/classes/grails/plugin/cache/compiler/CacheTransformation.class
	target-eclipse/classes/grails/plugin/cache/util/ClassUtils.class
	target-eclipse/classes/grails/plugin/cache/web/ContentCacheParameters.class
	target-eclipse/classes/grails/plugin/cache/web/GenericResponseWrapper.class
	target-eclipse/classes/grails/plugin/cache/web/Header$Type.class
	target-eclipse/classes/grails/plugin/cache/web/Header.class
	target-eclipse/classes/grails/plugin/cache/web/HttpDateFormatter.class
	target-eclipse/classes/grails/plugin/cache/web/PageInfo.class
	target-eclipse/classes/grails/plugin/cache/web/ProxyAwareMixedGrailsControllerHelper.class
	target-eclipse/classes/grails/plugin/cache/web/filter/AbstractFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/CacheExpressionRootObject.class
	target-eclipse/classes/grails/plugin/cache/web/filter/CacheOperationContext.class
	target-eclipse/classes/grails/plugin/cache/web/filter/DefaultWebKeyGenerator.class
	target-eclipse/classes/grails/plugin/cache/web/filter/ExpressionEvaluator.class
	target-eclipse/classes/grails/plugin/cache/web/filter/LazyParamAwareEvaluationContext.class
	target-eclipse/classes/grails/plugin/cache/web/filter/NoOpFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$1.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter$CacheStatus.class
	target-eclipse/classes/grails/plugin/cache/web/filter/PageFragmentCachingFilter.class
	target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryBlockingCache.class
	target-eclipse/classes/grails/plugin/cache/web/filter/simple/MemoryPageFragmentCachingFilter.class
	target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	target-eclipse/classes/grails/plugin/databasemigration/DslBuilder$1.class
	target-eclipse/classes/grails/plugin/databasemigration/GrailsChange$1.class
	target-eclipse/classes/grails/plugin/databasemigration/GrailsPrecondition$1.class
	target-eclipse/classes/grails/plugin/databasemigration/GroovyAwareStringChangeLogSerializer.class
	target-eclipse/classes/grails/plugin/databasemigration/MySQLCompatibleChangeLogSerializer.class
	target-eclipse/classes/grails/plugin/databasemigration/dbdoc/MemoryDocVisitor.class
	target-eclipse/classes/org/grails/plugin/resource/BaseUrlResourceMapper.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceProcessor.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	target-eclipse/classes/org/grails/plugin/resource/mapper/ResourceMappersFactory$_createResourceMappers_closure4.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/AbstractResourcesArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourceMapperClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/DefaultResourcesClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourceMapperClass.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesArtefactHandler.class
	target-eclipse/classes/org/grails/plugin/resources/artefacts/ResourcesClass.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogController.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogControllerTests.class
	target-eclipse/classes/org/itech/klinikav2/domain/CheckUpLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/CheckUpPaymentLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Clinic.class
	target-eclipse/classes/org/itech/klinikav2/domain/Diagnosis.class
	target-eclipse/classes/org/itech/klinikav2/domain/FollowUpCheckUpLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Inventory.class
	target-eclipse/classes/org/itech/klinikav2/domain/Item.class
	target-eclipse/classes/org/itech/klinikav2/domain/ItemController.class
	target-eclipse/classes/org/itech/klinikav2/domain/ItemControllerTests.class
	target-eclipse/classes/org/itech/klinikav2/domain/ItemNotifier.class
	target-eclipse/classes/org/itech/klinikav2/domain/LabRequestFormLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/LaboratoryResult.class
	target-eclipse/classes/org/itech/klinikav2/domain/Log.class
	target-eclipse/classes/org/itech/klinikav2/domain/LogInLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/LogOutLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/MedicalHistory.class
	target-eclipse/classes/org/itech/klinikav2/domain/Patient.class
	target-eclipse/classes/org/itech/klinikav2/domain/PatientController.class
	target-eclipse/classes/org/itech/klinikav2/domain/PatientControllerTests.class
	target-eclipse/classes/org/itech/klinikav2/domain/Payment.class
	target-eclipse/classes/org/itech/klinikav2/domain/Prescription.class
	target-eclipse/classes/org/itech/klinikav2/domain/PrescriptionFormLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/PurchaseLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Referral.class
	target-eclipse/classes/org/itech/klinikav2/domain/VitalSigns.class
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/org/itech/klinikav2/domain/Admin.class
	target/classes/org/itech/klinikav2/domain/Appointment.class
	target/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLog.class
	target/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogController.class
	target/classes/org/itech/klinikav2/domain/CheckUpInvoice.class
	target/classes/org/itech/klinikav2/domain/CheckUpLog.class
	target/classes/org/itech/klinikav2/domain/CheckUpPaymentLog.class
	target/classes/org/itech/klinikav2/domain/Clinic.class
	target/classes/org/itech/klinikav2/domain/ClinicDetail.class
	target/classes/org/itech/klinikav2/domain/DailyCounter.class
	target/classes/org/itech/klinikav2/domain/Diagnosis.class
	target/classes/org/itech/klinikav2/domain/Doctor.class
	target/classes/org/itech/klinikav2/domain/Equipment.class
	target/classes/org/itech/klinikav2/domain/Event.class
	target/classes/org/itech/klinikav2/domain/FollowUpCheckUpLog.class
	target/classes/org/itech/klinikav2/domain/Inventory.class
	target/classes/org/itech/klinikav2/domain/Invoice.class
	target/classes/org/itech/klinikav2/domain/Item.class
	target/classes/org/itech/klinikav2/domain/ItemController.class
	target/classes/org/itech/klinikav2/domain/ItemInvoice.class
	target/classes/org/itech/klinikav2/domain/ItemNotifier.class
	target/classes/org/itech/klinikav2/domain/LabRequestFormLog.class
	target/classes/org/itech/klinikav2/domain/LaboratoryResult.class
	target/classes/org/itech/klinikav2/domain/Log.class
	target/classes/org/itech/klinikav2/domain/LogInLog.class
	target/classes/org/itech/klinikav2/domain/LogOutLog.class
	target/classes/org/itech/klinikav2/domain/MedicalHistory.class
	target/classes/org/itech/klinikav2/domain/Medicine.class
	target/classes/org/itech/klinikav2/domain/NewAppointment.class
	target/classes/org/itech/klinikav2/domain/NormalUser.class
	target/classes/org/itech/klinikav2/domain/Patient.class
	target/classes/org/itech/klinikav2/domain/PatientController.class
	target/classes/org/itech/klinikav2/domain/PatientQueue.class
	target/classes/org/itech/klinikav2/domain/PatientRecord.class
	target/classes/org/itech/klinikav2/domain/Payment.class
	target/classes/org/itech/klinikav2/domain/Prescription.class
	target/classes/org/itech/klinikav2/domain/PrescriptionFormLog.class
	target/classes/org/itech/klinikav2/domain/Profile.class
	target/classes/org/itech/klinikav2/domain/PurchaseLog.class
	target/classes/org/itech/klinikav2/domain/QueueElement.class
	target/classes/org/itech/klinikav2/domain/Receptionist.class
	target/classes/org/itech/klinikav2/domain/Referral.class
	target/classes/org/itech/klinikav2/domain/Revenue.class
	target/classes/org/itech/klinikav2/domain/Schedule.class
	target/classes/org/itech/klinikav2/domain/SecurityQuestion.class
	target/classes/org/itech/klinikav2/domain/User.class
	target/classes/org/itech/klinikav2/domain/VitalSigns.class
	target/classes/org/itech/klinikav2/enums/ActivityType.class
	target/classes/org/itech/klinikav2/enums/AppointmentType.class
	target/classes/org/itech/klinikav2/enums/Gender.class
	target/classes/org/itech/klinikav2/enums/ItemType.class
	target/classes/org/itech/klinikav2/enums/MaritalStatus.class
	target/classes/org/itech/klinikav2/enums/PaymentMethod.class
	target/classes/org/itech/klinikav2/enums/PaymentOption.class
	target/classes/org/itech/klinikav2/enums/SecurityQuestion.class
	target/classes/resources.class
	target/classes/utils/LogCreator.class
	target/classes/utils/PatientCounter.class
	target/classes/utils/ReportGenerator.class
	target/classes/utils/SMSNotifier.class
	target/stacktrace.log
data tables
export
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	grails-app/conf/Config.groovy
	grails-app/controllers/org/itech/klinikav2/domain/PaymentController.groovy
	grails-app/controllers/org/itech/klinikav2/domain/QueueElementController.groovy
	grails-app/domain/org/itech/klinikav2/domain/Item.groovy
	grails-app/views/queueElement/create.gsp
	target-eclipse/classes/messages_de.properties
	target/classes/application.properties