diff --git a/app/resources/views/ventas/pies/cuotas/add.blade.php b/app/resources/views/ventas/pies/cuotas/add.blade.php
index 47cae41..95ee90c 100644
--- a/app/resources/views/ventas/pies/cuotas/add.blade.php
+++ b/app/resources/views/ventas/pies/cuotas/add.blade.php
@@ -23,7 +23,7 @@
                     </tr>
                 </thead>
                 <tbody id="cuotas">
-                @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas(vigentes: true)); $i ++)
+                @for ($i = count($pie->cuotas(vigentes: true)); $i < $pie->cuotas; $i ++)
                     <tr>
                         <td>{{$i + 1}}</td>
                         <td>
@@ -112,7 +112,7 @@
                 const index = $(event.currentTarget).data('index')
                 const calendar = $(".fecha.calendar[data-index='" + index + "']")
                 const fecha = calendar.calendar('get date')
-                for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
+                for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
                     setDate(i - index, $(".fecha.calendar[data-index='" + i + "']"), fecha)
                 }
             })
@@ -120,7 +120,7 @@
             $('.copy.banco').click(event => {
                 const index = $(event.currentTarget).data('index')
                 const banco = $(".banco.dropdown[data-index='" + index + "']").dropdown('get value')
-                for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
+                for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
                     $(".banco.dropdown[data-index='" + i + "']").dropdown('set selected', banco)
                 }
             })
@@ -133,7 +133,7 @@
             $('.copy.valor').click(event => {
                 const index = $(event.currentTarget).data('index')
                 const valor = $("[name='valor" + index + "']").val()
-                for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
+                for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
                     $("[name='valor" + i + "']").val(valor)
                 }
             })
diff --git a/app/resources/views/ventas/show/forma_pago/pie.blade.php b/app/resources/views/ventas/show/forma_pago/pie.blade.php
index 06f68a2..6471f06 100644
--- a/app/resources/views/ventas/show/forma_pago/pie.blade.php
+++ b/app/resources/views/ventas/show/forma_pago/pie.blade.php
@@ -14,7 +14,7 @@
     <td class="right aligned">Cuotas</td>
     <td>
         <a href="{{$urls->base}}/venta/{{$venta->id}}/pie/cuotas">
-            {{count($pie->cuotas(true))}}/{{$pie->cuotas}}
+            <span data-tooltip="Pagadas">{{count($pie->cuotas(true))}}</span>/{{$pie->cuotas}}
         </a>
         @if (count($pie->cuotas()) < $pie->cuotas)
             <a href="{{$urls->base}}/ventas/pie/{{$pie->id}}/cuotas/add">
diff --git a/app/src/Controller/API/Ventas/Pies.php b/app/src/Controller/API/Ventas/Pies.php
index 12a1b2a..9c90638 100644
--- a/app/src/Controller/API/Ventas/Pies.php
+++ b/app/src/Controller/API/Ventas/Pies.php
@@ -20,7 +20,6 @@ class Pies
             'input' => $body,
             'edited' => false
         ];
-        error_log(var_export($output,true).PHP_EOL,3,'/logs/pies');
         try {
             $pie = $pieService->getById($pie_id);
             $pieService->edit($pie, (array) $body);
diff --git a/app/src/Controller/Ventas/Cuotas.php b/app/src/Controller/Ventas/Cuotas.php
index ea2b29d..0c03d72 100644
--- a/app/src/Controller/Ventas/Cuotas.php
+++ b/app/src/Controller/Ventas/Cuotas.php
@@ -83,13 +83,14 @@ class Cuotas
         });
         return $view->render($response, 'ventas.pies.cuotas.add', compact('pie', 'venta', 'bancos'));
     }
-    public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, int $pie_id): ResponseInterface
+    public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService,
+                          Repository\Venta $ventaRepository, int $pie_id): ResponseInterface
     {
         $body = $request->getParsedBody();
         $pie = $pieService->getById($pie_id);
         $venta = $ventaRepository->fetchByPie($pie_id);
-        $total = $pie->cuotas - count($pie->cuotas());
-        $start = count($pie->cuotas());
+        $start = count($pie->cuotas(vigentes: true));
+        $total = $pie->cuotas;
         for ($i = $start; $i < $total; $i ++) {
             $data = [
                 'pie' => $pie->id,
diff --git a/app/src/Model/Venta/Cuota.php b/app/src/Model/Venta/Cuota.php
index 188f4c0..05dfb41 100644
--- a/app/src/Model/Venta/Cuota.php
+++ b/app/src/Model/Venta/Cuota.php
@@ -27,9 +27,9 @@ class Cuota extends Model
             'valor' => $this->valor,
             'estado' => $this->estado ?? false,
             'banco' => $this->banco,
-            'fecha_pago' => $this->fechaPago->format('Y-m-d H:i:s') ?? '',
+            'fecha_pago' => $this->fechaPago?->format('Y-m-d H:i:s') ?? '',
             'abonado' => $this->abonado ?? false,
-            'fecha_abonado' => $this->fechaAbonado->format('Y-m-d H:i:s') ?? '',
+            'fecha_abonado' => $this->fechaAbonado?->format('Y-m-d H:i:s') ?? '',
             'uf' => $this->uf ?? 1,
             'pago' => $this->pago ?? '',
             'numero' => $this->numero ?? ''
diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php
index 30cfd12..6eb4f5d 100644
--- a/app/src/Model/Venta/Pie.php
+++ b/app/src/Model/Venta/Pie.php
@@ -29,7 +29,7 @@ class Pie extends Model
             });
         }
         return array_filter($this->cuotasArray, function(Cuota $cuota) {
-            return $cuota->pago->currentEstado->tipoEstadoPago->active === 1;
+            return $cuota->pago->currentEstado->tipoEstadoPago->activo or $cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'devuelto';
         });
     }
 
diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php
index eecc7a2..7265668 100644
--- a/app/src/Service/Venta.php
+++ b/app/src/Service/Venta.php
@@ -400,7 +400,6 @@ class Venta
             $pago = $venta->resciliacion();
             $this->pagoService->delete($pago);
             $estado = $venta->currentEstado();
-            error_log(var_export($estado,true));
             $this->estadoVentaRepository->remove($estado);
             $this->ventaRepository->edit($venta, ['resciliacion' => null]);
             return true;