Merge branch 'master' into dev-vj

app/Helpers/helpers.php

@@ -147,6 +147,7 @@ if(!function_exists('genericBills')) {
             $genericBills = $genericBills->where('client_id', $patient->id);
         }
 
+    
         if($careMonth){
             $genericBills = $genericBills->where('care_month_id', $careMonth->id);
         }

resources/views/app/generic-bills/inline-for-cm.blade.php

@@ -11,7 +11,7 @@ use App\Models\Client;
 /** @var $entityType */
 /** @var $entityUid */
 
-$genericBills = genericBills($pro, @$patient,null, @$entityType, @$entityUid);
+$genericBills = genericBills($pro, @$patient,@$careMonth, @$entityType, @$entityUid);
 ?>
 
 @if(!count($genericBills))