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 'dev/presupuestos3' into 'dev/fixes'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
#   ci4/app/Language/es/Presupuestos.php
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
This commit is contained in:
Jaime Jimenez Ortega
2023-10-10 09:21:41 +00:00
parent 43e051b135 c9bae54c29
commit 852fe9e2e2
17 changed files with 1787 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Language/en/Maquinas.php
View File

@ -54,12 +54,12 @@ return [
'greater_than' => 'The field {field} must be greater than {param}',
],
'forzar_num_formas_horizontales_portada' => [
'forzar_num_formas_horizontales_cubierta' => [
'integer' => 'The {field} field must contain an integer.',
],
'forzar_num_formas_verticales_portada' => [
'forzar_num_formas_verticales_cubierta' => [
'integer' => 'The {field} field must contain an integer.',
],

28
ci4/app/Language/en/Presupuestos.php
View File

@ -59,6 +59,27 @@ return [
'retractilado5' => 'Shrink-wrapping in packs of 5',
'Guardas' => 'Endpapers',
'fajaColor' => 'Print color band ',
'compInteriorPlana' => 'Interior in flat machine',
'compInteriorRotativa' => 'Interior in rotary',
'compCubiertaSobrecubierta' => 'Cover and dust jacket',
'tipo' => 'Type',
'marca' => 'Brand',
'maquina' => 'Machine',
'numeroPliegos' => 'Sheets No.',
'pliegosPedido' => 'Sheets order',
'precioPliego' => 'Sheets price',
'libro' => 'Book',
'totalPapelPedido' => 'Total paper order',
'lomo' => 'Spine',
'peso' => 'Weight',
'click' => 'Click',
'totalClicks' => 'Total clicks',
'precioPagNegro' => 'Pages black price',
'precioPagColor' => 'Pages color price',
'totalTinta' => 'Total ink',
'totalCorte' => 'Total cut',
'total' => 'Total',
'aFavorFibra' => 'In fiber direction',
'cubierta' => 'Cover',
'sobrecubierta' => 'Dust jacket',
'encuadernacion' => 'Binding',
@ -66,6 +87,13 @@ return [
'solapasAnchoCubierta' => 'Cover dust jacket width',
'1cara' => '1 side',
'2caras' => '2 sides',
'bn' => 'BW',
'bnhq' => 'BWHQ',
'color' => 'Colour',
'colorhq' => 'ColourHQ',
'rotativa' => 'Rotary',
'si' => 'Yes',
'no' => 'No',
/* '4x0' => '4x0',
'4x4' => '4x4',