#19 Tests
* fixes bug where compensations still appeared on the public report despite being marked as deleted * fixes bug where eco account could be deducted into a negative account balance
This commit is contained in:
		
							parent
							
								
									30e5239c49
								
							
						
					
					
						commit
						9ffd1b4482
					
				@ -35,7 +35,9 @@ class CompensationManager(models.Manager):
 | 
			
		||||
 | 
			
		||||
    """
 | 
			
		||||
    def get_queryset(self):
 | 
			
		||||
        return super().get_queryset().select_related(
 | 
			
		||||
        return super().get_queryset().filter(
 | 
			
		||||
            deleted__isnull=True,
 | 
			
		||||
        ).select_related(
 | 
			
		||||
            "modified",
 | 
			
		||||
            "intervention",
 | 
			
		||||
            "intervention__recorded",
 | 
			
		||||
 | 
			
		||||
@ -1,3 +0,0 @@
 | 
			
		||||
from django.test import TestCase
 | 
			
		||||
 | 
			
		||||
# Create your tests here.
 | 
			
		||||
@ -345,9 +345,9 @@ class NewDeductionModalForm(BaseModalForm):
 | 
			
		||||
            return False
 | 
			
		||||
 | 
			
		||||
        # Calculate valid surface
 | 
			
		||||
        sum_surface = acc.get_surface_after_states()
 | 
			
		||||
        deductable_surface = acc.deductable_surface
 | 
			
		||||
        sum_surface_deductions = acc.get_deductions_surface()
 | 
			
		||||
        rest_surface = sum_surface - sum_surface_deductions
 | 
			
		||||
        rest_surface = deductable_surface - sum_surface_deductions
 | 
			
		||||
        form_surface = float(self.cleaned_data["surface"])
 | 
			
		||||
        is_valid_surface = form_surface < rest_surface
 | 
			
		||||
        if not is_valid_surface:
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user