diff --git a/print/common/css/layout.css b/print/common/css/layout.css index 6be065a14..b85589a81 100644 --- a/print/common/css/layout.css +++ b/print/common/css/layout.css @@ -157,6 +157,22 @@ table { border-spacing: 0; } +/** + * Prevent page break fix + */ +tbody { + page-break-inside: avoid; + break-inside: avoid; + display: block; + width: 100% +} + +thead, tbody tr { + table-layout: fixed; + display: table; + width: 100%; +} + .row-oriented, .column-oriented { text-align: left; width: 100% @@ -181,6 +197,10 @@ table { background-color: #e5e5e5 } +.column-oriented tbody { + border-bottom: 1px solid #DDD; +} + .column-oriented tfoot { border-top: 2px solid #808080; } @@ -190,7 +210,6 @@ table { } .column-oriented .description { - border-bottom: 1px solid #DDD; font-size: 0.8em } diff --git a/print/common/css/misc.css b/print/common/css/misc.css index 093d5a974..09d7706b3 100644 --- a/print/common/css/misc.css +++ b/print/common/css/misc.css @@ -42,6 +42,7 @@ font-weight: bold } -.non-page-break { +.no-page-break { page-break-inside: avoid; + break-inside: avoid } \ No newline at end of file diff --git a/print/templates/reports/campaign-metrics/campaign-metrics.html b/print/templates/reports/campaign-metrics/campaign-metrics.html index 7a0f30948..ee1908164 100644 --- a/print/templates/reports/campaign-metrics/campaign-metrics.html +++ b/print/templates/reports/campaign-metrics/campaign-metrics.html @@ -59,37 +59,35 @@
{{$t('type')}} | -{{$t('taxBase')}} | +{{$t('type')}} | ++ {{$t('taxBase')}} + | {{$t('tax')}} | {{$t('fee')}} | ||
{{tax.name}} | -{{tax.Base | currency('EUR', locale)}} | +{{tax.name}} | ++ {{tax.Base | currency('EUR', locale)}} + | {{tax.vatPercent | percentage}} | {{tax.tax | currency('EUR', locale)}} | ||
{{$t('subtotal')}} | -{{getTotalBase() | currency('EUR', locale)}} | +{{$t('subtotal')}} | ++ {{getTotalBase() | currency('EUR', locale)}} + | {{getTotalTax()| currency('EUR', locale)}} |
{{$t('order')}} | {{$t('ticket')}} | -{{$t('client')}} | +{{$t('client')}} | {{$t('address')}} | {{$t('packages')}} |
{{ticket.priority}} | {{ticket.id}} | -{{ticket.clientFk}} {{ticket.addressName}} | +{{ticket.clientFk}} {{ticket.addressName}} | {{ticket.addressFk.toString().substr(0, ticket.addressFk.toString().length - 3)}} @@ -141,7 +141,7 @@ | |
{{$t('import')}} | -{{ticket.import}} | +{{ticket.import | currency('EUR', locale)}} |
---|
{{$t('boxes')}} | +{{$t('boxes')}} | {{$t('packing')}} | -{{$t('concept')}} | +{{$t('concept')}} | {{$t('quantity')}} | {{$t('price')}} | {{$t('amount')}} |
{{buy.box}} | -{{buy.packing}} | -{{buy.itemName}} | -{{buy.quantity}} | -{{buy.buyingValue | currency('EUR', locale)}} | -{{buy.buyingValue * buy.quantity | currency('EUR', locale)}} | -||
-
- {{buy.tag5}}
- {{buy.value5}}
-
- |
-
-
- {{buy.tag6}}
- {{buy.value6}}
-
- |
-
-
- {{buy.tag7}}
- {{buy.value7}}
-
- |
- |||||
{{buy.box}} | +{{buy.packing}} | +{{buy.itemName}} | +{{buy.quantity}} | +{{buy.buyingValue | currency('EUR', locale)}} | +{{buy.buyingValue * buy.quantity | currency('EUR', locale)}} | +||
+
+ {{buy.tag5}}
+ {{buy.value5}}
+
+ |
+
+
+ {{buy.tag6}}
+ {{buy.value6}}
+
+ |
+
+
+ {{buy.tag7}}
+ {{buy.value7}}
+
+ |
+ |||||
{{client.id}} | |||||||
---|---|---|---|---|---|---|---|
{{$t('dated')}} | +{{$t('date')}} | {{dated}} | {{$t('balance')}} | - -||||
{{sale.issued | date('%d-%m-%Y')}} | {{sale.ref}} | {{sale.debtOut}} | diff --git a/print/templates/reports/letter-debtor/locale/es.yml b/print/templates/reports/letter-debtor/locale/es.yml index 09a31ee5b..a9bd8c796 100644 --- a/print/templates/reports/letter-debtor/locale/es.yml +++ b/print/templates/reports/letter-debtor/locale/es.yml @@ -2,7 +2,7 @@ title: Extracto claimId: ReclamaciĆ³n clientId: Cliente clientData: Datos del cliente -dated: Fecha +date: Fecha concept: Concepto invoiced: Facturado payed: Pagado