jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix/planning-plana

Browse Source
This commit is contained in:
amazuecos
2025-05-30 11:46:56 +02:00
parent 52c53e6920 3b43551064
commit 2f1b34f668
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ci4/app/Services/PresupuestoService.php
View File

@ -2077,7 +2077,10 @@ class PresupuestoService extends BaseService
$merma = 0; $merma = 0;
if ($tirada > $POD) { if ($tirada == 0) {
$merma = 0;
}
else if ($tirada > $POD) {
$merma = $tirada * 0.1; $merma = $tirada * 0.1;
} else { } else {
$merma_lineas = []; $merma_lineas = [];

7
httpdocs/assets/js/safekat/pages/presupuestoAdmin/presupuestoAdminAdd.js
View File

@ -162,7 +162,12 @@ class PresupuestoAdminAdd {
const POD = parseInt($('#POD').val()); const POD = parseInt($('#POD').val());
let merma = 0; let merma = 0;
merma = tirada * 0.1 <= POD ? tirada * 0.1 : POD; if (tirada == 1) {
merma = 0;
}
else if (tirada > POD) {
merma = tirada * 0.1 <= POD ? tirada * 0.1 : POD;
}
$('#mermacubierta').val(parseInt(merma)) $('#mermacubierta').val(parseInt(merma))
$('#merma').val(parseInt(merma)) $('#merma').val(parseInt(merma))

5
httpdocs/assets/js/safekat/pages/presupuestoAdmin/sections/datosLibro.js
View File

@ -623,7 +623,10 @@ class DatosLibro {
let merma = 0; let merma = 0;
let htmlString = ''; let htmlString = '';
if (tirada > POD) { if (tirada == 1) {
merma = 0;
}
else if (tirada > POD) {
merma = tirada * 0.1 <= POD ? tirada * 0.1 : POD; merma = tirada * 0.1 <= POD ? tirada * 0.1 : POD;
} }
else { else {