=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAuditService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAuditService.java	2012-10-18 07:29:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientAuditService.java	2013-01-05 03:03:21 +0000
@@ -57,7 +57,7 @@
     @Override
     public void deletePatientAudit( PatientAudit patientAudit )
     {
-        patientAuditStore.update( patientAudit );
+        patientAuditStore.delete( patientAudit );
     }
 
     @Override

=== added file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientAuditDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientAuditDeletionHandler.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/PatientAuditDeletionHandler.java	2013-01-05 03:03:21 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2004-2009, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.hisp.dhis.patient;
+
+import java.util.Collection;
+
+import org.hisp.dhis.system.deletion.DeletionHandler;
+
+/**
+ * @author Chau Thu Tran
+ *
+ * @version PatientAuditDeletionHandler.java 8:44:33 AM Jan 5, 2013 $
+ */
+public class PatientAuditDeletionHandler extends DeletionHandler
+{
+    // -------------------------------------------------------------------------
+    // Dependencies
+    // -------------------------------------------------------------------------
+    
+    private PatientAuditService patientAuditService;
+
+    public void setPatientAuditService( PatientAuditService patientAuditService )
+    {
+        this.patientAuditService = patientAuditService;
+    }
+    
+    // -------------------------------------------------------------------------
+    // DeletionHandler implementation
+    // -------------------------------------------------------------------------
+
+    @Override
+    public String getClassName()
+    {
+        return PatientAudit.class.getSimpleName();
+    }
+    
+    @Override
+    public void deletePatient( Patient patient )
+    {
+        Collection<PatientAudit> patientAudits = patientAuditService.getPatientAudits( patient );
+        
+        for ( PatientAudit patientAudit : patientAudits )
+        {
+            patientAuditService.deletePatientAudit( patientAudit );
+        }
+    }
+}

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-01-03 06:54:08 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml	2013-01-05 03:03:21 +0000
@@ -389,6 +389,10 @@
 		class="org.hisp.dhis.program.ProgramStageSectionDeletionHandler">
 		<property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
 	</bean>
+	
+	<bean id="org.hisp.dhis.patient.PatientAuditDeletionHandler" class="org.hisp.dhis.patient.PatientAuditDeletionHandler">
+		<property name="patientAuditService" ref="org.hisp.dhis.patient.PatientAuditService" />
+	</bean>
 
 	<!-- PatientComment -->
 
@@ -501,9 +505,10 @@
 						local="org.hisp.dhis.patientattributevalue.PatientAttributeValueDeletionHandler" />
 					<ref local="org.hisp.dhis.patient.PatientIdentifierDeletionHandler" />
 					<ref local="org.hisp.dhis.relationship.RelationshipDeletionHandler" />
+					<ref local="org.hisp.dhis.patient.PatientAuditDeletionHandler" />
 					<ref
 						local="org.hisp.dhis.patientdatavalue.PatientDataValueDeletionHandler" />
-
+					
 					<ref local="org.hisp.dhis.program.ProgramDeletionHandler" />
 					<ref local="org.hisp.dhis.program.ProgramStageSectionDeletionHandler" />
 					<ref local="org.hisp.dhis.program.ProgramInstanceDeletionHandler" />
@@ -546,6 +551,9 @@
 			<aop:before
 				pointcut="execution( * org.hisp.dhis.relationship.RelationshipTypeService.delete*(..) )"
 				method="intercept" />
+			<aop:before
+				pointcut="execution( * org.hisp.dhis.patient.PatientAuditService.delete*(..) )"
+				method="intercept" />
 
 			<aop:before
 				pointcut="execution( * org.hisp.dhis.program.ProgramService.delete*(..) )"

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2012-11-06 07:01:56 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2013-01-05 03:03:21 +0000
@@ -66,6 +66,7 @@
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientAttribute;
 import org.hisp.dhis.patient.PatientAttributeGroup;
+import org.hisp.dhis.patient.PatientAudit;
 import org.hisp.dhis.patient.PatientIdentifier;
 import org.hisp.dhis.patient.PatientIdentifierType;
 import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
@@ -693,4 +694,14 @@
     public void deleteLockException( LockException lockException )
     {
     }
+    
+    public void deletePatientAudit( PatientAudit patientAudit )
+    {
+    }
+
+    public String allowDeletePatientAudit( PatientAudit patientAudit )
+    {
+        return null;
+    }
+
 }

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-01-03 09:04:36 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/org/hisp/dhis/caseentry/i18n_module.properties	2013-01-05 03:03:21 +0000
@@ -487,4 +487,5 @@
 scheduled = Scheduled
 start = Start
 total_persons_enrolled=Total number of persons enrolled
-value = Value
\ No newline at end of file
+value = Value
+filter_in_section = Filter in section
\ No newline at end of file