diff --git a/ci4/app/Entities/Tarifas/TarifaextraEntity.php b/ci4/app/Entities/Tarifas/TarifaextraEntity.php
index 2ff79cd9..ac6b35eb 100755
--- a/ci4/app/Entities/Tarifas/TarifaextraEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifaextraEntity.php
@@ -9,8 +9,6 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity
         "id" => null,
         "nombre" => null,
         "precio" => null,
-        "precio_min" => 0,
-        "importe_fijo" => 0,
         "margen" => 0,
         "mostrar_en_presupuesto" => 1,
         "user_created_id" => 1,
@@ -22,8 +20,6 @@ class TarifaextraEntity extends \CodeIgniter\Entity\Entity
     ];
     protected $casts = [
         "precio" => "float",
-        "precio_min" => "float",
-        "importe_fijo" => "float",
         "margen" => "float",
         "mostrar_en_presupuesto" => "int",
         "user_created_id" => "int",
diff --git a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
index 3f749913..a6ea7177 100755
--- a/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
+++ b/ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
@@ -9,8 +9,6 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
         "id" => null,
         "nombre" => null,
         "precio" => null,
-        "precio_min" => 0,
-        "importe_fijo" => 0,
         "margen" => 0,
         "mostrar_en_presupuesto" => 1,
         "user_created_id" => 1,
@@ -22,8 +20,6 @@ class TarifapreimpresionEntity extends \CodeIgniter\Entity\Entity
     ];
     protected $casts = [
         "precio" => "float",
-        "precio_min" => "float",
-        "importe_fijo" => "float",
         "margen" => "float",
         "mostrar_en_presupuesto" => "int",
         "user_created_id" => "int",
diff --git a/ci4/app/Language/en/Tarifamanipulado.php b/ci4/app/Language/en/Tarifamanipulado.php
index da383fea..85d90b74 100755
--- a/ci4/app/Language/en/Tarifamanipulado.php
+++ b/ci4/app/Language/en/Tarifamanipulado.php
@@ -13,7 +13,7 @@ return [
 		'nombre' => 'Name',
 		'precioMax' => 'Price Max',
 		'precioMin' => 'Price Min',
-		'precioMin' => 'Min Price',
+		'importeMinimo' => 'Min Price',
     	'importeFijo' => 'Fixed amount',
 		'mostrar_en_presupuesto' => 'Show in budget',
     	'margen' => 'Margin',
diff --git a/ci4/app/Language/es/Tarifamanipulado.php b/ci4/app/Language/es/Tarifamanipulado.php
index 9e391d46..20079ddb 100755
--- a/ci4/app/Language/es/Tarifamanipulado.php
+++ b/ci4/app/Language/es/Tarifamanipulado.php
@@ -10,6 +10,7 @@ return [
     'id' => 'ID',
     'moduleTitle' => 'Tarifas Manipulado',
     'nombre' => 'Nombre',
+    'importeMinimo' => 'Importe mínimo',
     'precioMax' => 'Precio T. Mín',
     'precioMin' => 'Precio T. Máx',
     'importeFijo' => 'Importe Fijo',
diff --git a/ci4/app/Models/Compras/ProveedorModel.php b/ci4/app/Models/Compras/ProveedorModel.php
index 3e4d3fa0..d48e8d8e 100755
--- a/ci4/app/Models/Compras/ProveedorModel.php
+++ b/ci4/app/Models/Compras/ProveedorModel.php
@@ -209,6 +209,7 @@ class ProveedorModel extends \App\Models\BaseModel
         ->select(
             "t1.id AS value, t1.nombre AS label, t1.propiedades AS options")
         ->where("tipo_id", $tipoId)
+        ->where("is_deleted", 0)
         ->orderBy('t1.nombre', 'asc');
 
         return $builder->get()->getResultObject();
diff --git a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
index 08d98bfb..c0dcf401 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoAcabadosModel.php
@@ -283,6 +283,13 @@ class PresupuestoAcabadosModel extends \App\Models\BaseModel
         $total = $precio_unidad * $tirada;
         $margen = floatval($tarifa->margen);
 
+        if($tarifa->tarifa_precio_min > $total){
+            $total = $total-($total * $margen/100.0);
+            $margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
+            $total = floatval($tarifa->tarifa_precio_min);
+            $precio_unidad = round(floatval($total / $tirada), 2);
+        }
+
         if (!$is_POD){
                 $total += floatval($tarifa->tarifa_importe_fijo);    
         } 
diff --git a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php
index f2dc2638..8612e8a4 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoManipuladosModel.php
@@ -84,6 +84,13 @@ class PresupuestoManipuladosModel extends \App\Models\BaseModel
         $total = $precio_unidad * $tirada;
         $margen = floatval($tarifa->margen);
 
+        if($tarifa->tarifa_precio_min > $total){
+            $total = $total-($total * $margen/100.0);
+            $margen = round(100.0 * (floatval($tarifa->tarifa_precio_min) - $total) / floatval($tarifa->tarifa_precio_min), 0);
+            $total = floatval($tarifa->tarifa_precio_min);
+            $precio_unidad = round(floatval($total / $tirada), 2);
+        }
+
         if (!$is_POD){
                 $total += floatval($tarifa->tarifa_importe_fijo);    
         } 
diff --git a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
index 209c0467..a2828855 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoPreimpresionesModel.php
@@ -69,7 +69,6 @@ class PresupuestoPreimpresionesModel extends \App\Models\BaseModel
             ];
             return $ret_array;   
         }
-        return [];
     }
 
     private function calcularTarifa($tarifa){
diff --git a/ci4/app/Models/Tarifas/TarifaextraModel.php b/ci4/app/Models/Tarifas/TarifaextraModel.php
index 94b0c7e8..476550f7 100755
--- a/ci4/app/Models/Tarifas/TarifaextraModel.php
+++ b/ci4/app/Models/Tarifas/TarifaextraModel.php
@@ -15,8 +15,6 @@ class TarifaextraModel extends \App\Models\BaseModel
     protected $allowedFields = [
         "nombre", 
         "precio",
-        "precio_min",
-        "importe_fijo",
         "margen",
         "mostrar_en_presupuesto",
         "deleted_at",
@@ -39,14 +37,6 @@ class TarifaextraModel extends \App\Models\BaseModel
             "label" => "Tarifaextra.nombre",
             "rules" => "trim|required|max_length[255]",
         ],
-        "precio" => [
-            "label" => "Tarifaextra.precio",
-            "rules" => "required|decimal",
-        ],
-        "precio_min" => [
-            "label" => "Tarifaextra.precioMin",
-            "rules" => "required|decimal",
-        ],
         "importe_fijo" => [
             "label" => "Tarifaextra.importeFijo",
             "rules" => "required|decimal",
@@ -66,14 +56,6 @@ class TarifaextraModel extends \App\Models\BaseModel
             "decimal" => "Tarifaextra.validation.precio.decimal",
             "required" => "Tarifaextra.validation.precio.required",
         ],
-        "precio_min" => [
-            "required" => "Tarifaextra.validation.precio_min.required",
-            "decimal" => "Tarifaextra.validation.precio_min.decimal",
-        ],
-        "importe_fijo" => [
-            "required" => "Tarifaextra.validation.importe_fijo.required",
-            "decimal" => "Tarifaextra.validation.importe_fijo.decimal",
-        ],
         "margen" => [
             "required" => "Tarifaextra.validation.margen.required",
             "decimal" => "Tarifaextra.validation.margen.decimal",
diff --git a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php
index bc9f83c9..6bb1391f 100755
--- a/ci4/app/Models/Tarifas/TarifapreimpresionModel.php
+++ b/ci4/app/Models/Tarifas/TarifapreimpresionModel.php
@@ -15,8 +15,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
     protected $allowedFields = [
         "nombre", 
         "precio",
-        "precio_min",
-        "importe_fijo",
         "margen",
         "mostrar_en_presupuesto",
         "deleted_at",
@@ -43,14 +41,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
             "label" => "Tarifapreimpresion.precio",
             "rules" => "required|decimal",
         ],
-        "precio_min" => [
-            "label" => "Tarifapreimpresion.precioMin",
-            "rules" => "required|decimal",
-        ],
-        "importe_fijo" => [
-            "label" => "Tarifapreimpresion.importeFijo",
-            "rules" => "required|decimal",
-        ],
         "margen" => [
             "label" => "Tarifapreimpresion.margen",
             "rules" => "required|decimal",
@@ -66,14 +56,6 @@ class TarifapreimpresionModel extends \App\Models\BaseModel
             "decimal" => "Tarifapreimpresion.validation.precio.decimal",
             "required" => "Tarifapreimpresion.validation.precio.required",
         ],
-        "precio_min" => [
-            "required" => "Tarifapreimpresion.validation.precio_min.required",
-            "decimal" => "Tarifapreimpresion.validation.precio_min.decimal",
-        ],
-        "importe_fijo" => [
-            "required" => "Tarifapreimpresion.validation.importe_fijo.required",
-            "decimal" => "Tarifapreimpresion.validation.importe_fijo.decimal",
-        ],
         "margen" => [
             "required" => "Tarifapreimpresion.validation.margen.required",
             "decimal" => "Tarifapreimpresion.validation.margen.decimal",
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php
index 7980c60e..a51d2a8b 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/extra/_tarifaextraFormItems.php
@@ -31,34 +31,6 @@
             >
         </div><!--//.mb-3 -->
 
-        <div class="mb-3">
-            <label for="precio_min" class="form-label">
-                <?= lang('Tarifaextra.precioMin') ?>*
-            </label>
-            <input
-                    type="text"
-                    id="precio_min"
-                    name="precio_min"
-                    required
-                    class="form-control"
-                    value="<?= old('precio_min', $tarifaextraEntity->precio_min) ?>"
-            >
-        </div><!--//.mb-3 -->
-
-        <div class="mb-3">
-            <label for="importe_fijo" class="form-label">
-                <?= lang('Tarifaextra.importeFijo') ?>*
-            </label>
-            <input
-                    type="text"
-                    id="importe_fijo"
-                    name="importe_fijo"
-                    required
-                    class="form-control"
-                    value="<?= old('importe_fijo', $tarifaextraEntity->importe_fijo) ?>"
-            >
-        </div><!--//.mb-3 -->
-
         <div class="mb-3">
             <label for="margen" class="form-label">
                 <?= lang('Tarifaextra.margen') ?>*
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/extra/viewTarifaextraList.php b/ci4/app/Views/themes/vuexy/form/tarifas/extra/viewTarifaextraList.php
index f249951e..86ecf254 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/extra/viewTarifaextraList.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/extra/viewTarifaextraList.php
@@ -17,8 +17,6 @@
 							<tr>
 								<th><?= lang('Tarifaextra.nombre') ?></th>
 								<th><?= lang('Tarifaextra.precio') ?></th>
-								<th><?= lang('Tarifaextra.precioMin') ?></th>
-								<th><?= lang('Tarifaextra.importeFijo') ?></th>
 								<th><?= lang('Tarifaextra.margen') ?></th>
 								<th><?= lang('Tarifaextra.mostrar_en_presupuesto') ?></th>
 								<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
@@ -33,12 +31,6 @@
 								<td class="align-middle">
 									<?= esc($item->precio) ?>
 								</td>
-								<td class="align-middle">
-									<?= esc($item->precio_min) ?>
-								</td>
-								<td class="align-middle">
-									<?= esc($item->importe_fijo) ?>
-								</td>
 								<td class="align-middle">
 									<?= esc($item->margen) ?>
 								</td>
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php
index 7becab96..ad10fafa 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php
@@ -9,7 +9,7 @@
 
                 <div class="mb-3">
                     <label for="nombre" class="form-label">
-                        <?=lang('Tarifamanipulado.precioMin') ?>*
+                        <?=lang('Tarifamanipulado.importeMinimo') ?>*
                     </label>
                     <input type="text" id="precio_min" name="precio_min" class="form-control" value="<?=old('precio_min', $tarifaManipuladoEntity->precio_min) ?>">
                 </div><!--//.mb-3 -->
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php
index ec52b336..f906ea10 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php
@@ -17,7 +17,7 @@
 						<thead>
 							<tr>
 								<th><?= lang('Tarifamanipulado.nombre') ?></th>
-                                <th><?= lang('Tarifamanipulado.precioMin') ?></th>
+                                <th><?= lang('Tarifamanipulado.importeMinimo') ?></th>
                                 <th><?= lang('Tarifamanipulado.importeFijo') ?></th>
                                 <th><?= lang('Tarifamanipulado.mostrar_en_presupuesto') ?></th>
 								<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
index d4109383..9080ce83 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
@@ -31,34 +31,7 @@
             >
         </div><!--//.mb-3 -->
 
-        <div class="mb-3">
-            <label for="precio_min" class="form-label">
-                <?= lang('Tarifapreimpresion.precioMin') ?>*
-            </label>
-            <input
-                    type="text"
-                    id="precio_min"
-                    name="precio_min"
-                    required
-                    class="form-control"
-                    value="<?= old('precio_min', $tarifapreimpresionEntity->precio_min) ?>"
-            >
-        </div><!--//.mb-3 -->
-
-        <div class="mb-3">
-            <label for="importe_fijo" class="form-label">
-                <?= lang('Tarifapreimpresion.importeFijo') ?>*
-            </label>
-            <input
-                    type="text"
-                    id="importe_fijo"
-                    name="importe_fijo"
-                    required
-                    class="form-control"
-                    value="<?= old('importe_fijo', $tarifapreimpresionEntity->importe_fijo) ?>"
-            >
-        </div><!--//.mb-3 -->
-
+        
         <div class="mb-3">
             <label for="margen" class="form-label">
                 <?= lang('Tarifapreimpresion.margen') ?>*
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
index cf15d2f5..62334363 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php
@@ -17,8 +17,6 @@
 							<tr>
 								<th><?= lang('Tarifapreimpresion.nombre') ?></th>
 								<th><?= lang('Tarifapreimpresion.precio') ?></th>
-								<th><?= lang('Tarifapreimpresion.precioMin') ?></th>
-								<th><?= lang('Tarifapreimpresion.importeFijo') ?></th>
 								<th><?= lang('Tarifapreimpresion.margen') ?></th>
 								<th><?= lang('Tarifapreimpresion.mostrar_en_presupuesto') ?></th>
 								<th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
@@ -33,12 +31,6 @@
 								<td class="align-middle">
 									<?= esc($item->precio) ?>
 								</td>
-								<td class="align-middle">
-									<?= esc($item->precio_min) ?>
-								</td>
-								<td class="align-middle">
-									<?= esc($item->importe_fijo) ?>
-								</td>
 								<td class="align-middle">
 									<?= esc($item->margen) ?>
 								</td>