verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity

Añadir bloque fitosanitario en albaranes #479

Merged
joan merged 3 commits from 2664-note_phytosanitary into dev 2020-12-16 11:40:42 +00:00
Conversation 0 Commits 3 Files Changed 26 +309 -239
26 changed files with 309 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db/dump/fixtures.sql
View File

@ -442,13 +442,13 @@ INSERT INTO `vn`.`supplierAccount`(`id`, `supplierFk`, `iban`, `bankEntityFk`)
VALUES VALUES
(241, 442, 'ES111122333344111122221111', 128); (241, 442, 'ES111122333344111122221111', 128);
INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`) INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`, `expired`, `phytosanitary`)
VALUES VALUES
(69 , 'CCs', NULL, 30, NULL, 0, NULL), (69 , 'CCs', NULL, 30, NULL, 0, NULL, NULL),
(442 , 'VNL', 241, 30, 2 , 1, NULL), (442 , 'VNL', 241, 30, 2 , 1, NULL, 'VNL Company - Plant passport'),
(567 , 'VNH', NULL, 30, NULL, 4, NULL), (567 , 'VNH', NULL, 30, NULL, 4, NULL, 'VNH Company - Plant passport'),
(791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30'), (791 , 'FTH', NULL, 30, NULL, 3, '2015-11-30', NULL),
(1381, 'ORN', NULL, 30, NULL, 7, NULL); (1381, 'ORN', NULL, 30, NULL, 7, NULL, 'ORN Company - Plant passport');
INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`) INSERT INTO `vn`.`invoiceOut`(`id`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `hasPdf`)
VALUES VALUES

29
print/common/css/layout.css
View File

@ -4,7 +4,7 @@
*/ */
.grid { .grid {
font-family: Arial, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: 16px !important; font-size: 16px !important;
width: 100% width: 100%
} }
@ -63,7 +63,6 @@
.panel { .panel {
position: relative; position: relative;
margin-bottom: 15px; margin-bottom: 15px;
padding-top: 10px;
break-inside: avoid; break-inside: avoid;
break-before: always; break-before: always;
break-after: always; break-after: always;
@ -72,10 +71,11 @@
.panel .header { .panel .header {
background-color: #FFF; background-color: #FFF;
padding: 2.5px 10px; padding: 2.5px 10px;
position: absolute; position: relative;
font-weight: bold; font-weight: bold;
top: 0px; display: inline-block;
left: 17.5px; left: 17.5px;
top: 10px;
} }
.panel .body { .panel .body {
@ -168,18 +168,22 @@ table {
.column-oriented td, .column-oriented td,
.column-oriented th { .column-oriented th {
padding: 5px 10px padding: 10px
} }
.column-oriented thead { .column-oriented thead {
display: table-header-group; display: table-header-group
background-color: #e5e5e5
} }
.column-oriented thead tr { .column-oriented thead tr {
border-bottom: 1px solid #808080; border-top: 1px solid #AFB1B2;
border-top: 1px solid #808080; background-color: #BABDBD;
background-color: #e5e5e5 border-bottom: 1px solid #AFB1B2;
}
.column-oriented thead.light tr {
background-color: #FFF;
color: #AFB1B2
} }
.column-oriented tfoot { .column-oriented tfoot {
@ -193,13 +197,10 @@ table {
} }
.column-oriented tfoot tr:first-child td { .column-oriented tfoot tr:first-child td {
border-top: 2px solid #AFB1B2;
padding-top: 20px !important; padding-top: 20px !important;
} }
.column-oriented tfoot tr:first-child {
border-top: 2px solid #808080;
}
.column-oriented .description { .column-oriented .description {
font-size: 0.8em font-size: 0.8em
} }

2
print/common/css/report.css
View File

@ -9,6 +9,6 @@ body {
.title { .title {
margin-bottom: 20px; margin-bottom: 20px;
font-weight: 100; font-weight: 100;
font-size: 2em; font-size: 3em;
margin-top: 0 margin-top: 0
} }

1
print/core/components/report-footer/report-footer.html
View File

@ -5,7 +5,6 @@
<div class="centerText" v-if="centerText" class="uppercase">{{centerText}}</div> <div class="centerText" v-if="centerText" class="uppercase">{{centerText}}</div>
<div class="pageCount" v-html="$t('numPages')"></div> <div class="pageCount" v-html="$t('numPages')"></div>
</div> </div>
<p class="phytosanitary" v-if="showPhytosanitary">{{phytosanitary}}</p>
<p class="privacy" v-html="$t('law.privacy')"></p> <p class="privacy" v-html="$t('law.privacy')"></p>
</div> </div>
</div> </div>

16
print/core/components/report-footer/report-footer.js
View File

@ -1,18 +1,4 @@
const db = require('../../database');
module.exports = { module.exports = {
name: 'report-footer', name: 'report-footer',
async serverPrefetch() { props: ['leftText', 'centerText']
const companyCode = this.companyCode || 'VNL';
this.phytosanitary = await this.getPhytosanitary(companyCode);
},
methods: {
getPhytosanitary(code) {
return db.findValue(`
SELECT phytosanitary FROM company c
WHERE c.code = :code`, {code});
}
},
props: ['companyCode', 'showPhytosanitary', 'leftText', 'centerText']
}; };

1
print/core/filters/index.js
View File

@ -4,4 +4,5 @@ require('./uppercase');
require('./currency'); require('./currency');
require('./percentage'); require('./percentage');
require('./number'); require('./number');
require('./zerofill');

9
print/core/filters/specs/zerofill.spec.js Normal file
View File

@ -0,0 +1,9 @@
import zerofill from '../zerofill.js';
describe('zerofill filter', () => {
const superDuperNumber = 1984;
it('should filter the number filling it with zeros up to 6 characters length', () => {
expect(zerofill(superDuperNumber, '000000')).toEqual('001984');
});
});

11
print/core/filters/zerofill.js Normal file
View File

@ -0,0 +1,11 @@
const {KeyValueModel} = require('loopback');
const Vue = require('vue');
const zerofill = function(value, pad) {
const valueStr = String(value);
return pad.substring(0, pad.length - valueStr.length) + valueStr;
};
Vue.filter('zerofill', zerofill);
module.exports = zerofill;

8
print/templates/reports/campaign-metrics/assets/css/style.css
View File

@ -9,3 +9,11 @@
.bottom-line tr:nth-last-child() { .bottom-line tr:nth-last-child() {
border-bottom: none; border-bottom: none;
} }
.report-info {
font-size: 20px
}
.description strong {
text-transform: uppercase;
}

35
print/templates/reports/campaign-metrics/campaign-metrics.html
View File

@ -14,7 +14,7 @@
<div class="size50"> <div class="size50">
<h1 class="title uppercase">{{$t('title')}}</h1> <h1 class="title uppercase">{{$t('title')}}</h1>
<div class="size75"> <div class="size75">
<table class="row-oriented"> <table class="row-oriented report-info">
<tbody> <tbody>
<tr> <tr>
<td class="font gray">{{$t('Client')}}</td> <td class="font gray">{{$t('Client')}}</td>
@ -59,29 +59,22 @@
</tr> </tr>
</thead> </thead>
<tbody v-for="sale in sales"> <tbody v-for="sale in sales">
<tr class="font bold"> <tr>
<td>{{sale.itemFk}}</td> <td>{{sale.itemFk | zerofill('000000')}}</td>
<td class="number">{{Math.trunc(sale.subtotal)}}</td> <td class="number">{{Math.trunc(sale.subtotal)}}</td>
<td width="50%">{{sale.concept}}</td> <td width="50%">{{sale.concept}}</td>
</tr> </tr>
<tr class="description"> <tr class="description font light-gray">
<td> <td colspan="7">
<div v-if="sale.value5"> <span v-if="sale.value5">
<strong class="font gray">{{sale.tag5}}</strong> <strong>{{sale.tag5}}</strong> {{sale.value5}}
<span>{{sale.value5}}</span> </span>
</div> <span v-if="sale.value6">
</td> <strong>{{sale.tag6}}</strong> {{sale.value6}}
<td class="centered"> </span>
<div v-if="sale.value6"> <span v-if="sale.value7">
<strong class="font gray">{{sale.tag6}}</strong> <strong>{{sale.tag7}}</strong> {{sale.value7}}
<span>{{sale.value6}}</span> </span>
</div>
</td>
<td class="align-right">
<div v-if="sale.value7">
<strong class="font gray">{{sale.tag7}}</strong>
<span>{{sale.value7}}</span>
</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>

4
print/templates/reports/claim-pickup-order/assets/css/style.css
View File

@ -1,7 +1,3 @@
table.column-oriented {
margin-top: 50px !important
}
.sign { .sign {
margin: 150px auto; margin: 150px auto;
width: 300px width: 300px

38
print/templates/reports/claim-pickup-order/claim-pickup-order.html
View File

@ -12,25 +12,23 @@
<div class="grid-block"> <div class="grid-block">
<div class="columns"> <div class="columns">
<div class="size50"> <div class="size50">
<div class="size75"> <h1 class="title uppercase">{{$t('title')}}</h1>
<h1 class="title uppercase">{{$t('title')}}</h1> <table class="row-oriented">
<table class="row-oriented"> <tbody>
<tbody> <tr>
<tr> <td class="font gray uppercase">{{$t('claimId')}}</td>
<td class="font gray uppercase">{{$t('claimId')}}</td> <th>{{claimId}}</th>
<th>{{claimId}}</th> </tr>
</tr> <tr>
<tr> <td class="font gray uppercase">{{$t('clientId')}}</td>
<td class="font gray uppercase">{{$t('clientId')}}</td> <th>{{client.id}}</th>
<th>{{client.id}}</th> </tr>
</tr> <tr>
<tr> <td class="font gray uppercase">{{$t('date')}}</td>
<td class="font gray uppercase">{{$t('date')}}</td> <th>{{dated}}</th>
<th>{{dated}}</th> </tr>
</tr> </tbody>
</tbody> </table>
</table>
</div>
</div> </div>
<div class="size50"> <div class="size50">
<div class="panel"> <div class="panel">
@ -51,7 +49,7 @@
</div> </div>
</div> </div>
<table class="column-oriented"> <table class="column-oriented vn-mt-lg">
<thead> <thead>
<tr> <tr>
<th>{{$t('reference')}}</th> <th>{{$t('reference')}}</th>

25
print/templates/reports/delivery-note/assets/css/style.css
View File

@ -9,15 +9,32 @@
max-width: 150px max-width: 150px
} }
.description.phytosanitary { .description strong {
background-color: #e5e5e5 text-transform: uppercase;
} }
h3 { h2 {
font-weight: 100; font-weight: 100;
color: #555 color: #555
} }
.ticket-info { .ticket-info {
font-size: 20px font-size: 26px
}
#phytosanitary {
padding-right: 10px
}
#phytosanitary .flag img {
width: 100%
}
#phytosanitary .flag .flag-text {
padding-left: 10px;
box-sizing: border-box;
}
.phytosanitary-info {
margin-top: 10px
} }

BIN
print/templates/reports/delivery-note/assets/images/europe.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

197
print/templates/reports/delivery-note/delivery-note.html
View File

@ -14,7 +14,7 @@
<div class="grid-block"> <div class="grid-block">
<div class="columns"> <div class="columns">
<div class="size50"> <div class="size50">
<div class="size75"> <div class="size75 vn-mt-lg">
<h1 class="title uppercase">{{$t('title')}}</h1> <h1 class="title uppercase">{{$t('title')}}</h1>
<table class="row-oriented ticket-info"> <table class="row-oriented ticket-info">
<tbody> <tbody>
@ -66,59 +66,46 @@
</div> </div>
<!-- Sales block --> <!-- Sales block -->
<h3>{{$t('saleLines')}}</h3> <h2>{{$t('saleLines')}}</h2>
<table class="column-oriented"> <table class="column-oriented">
<thead> <thead>
<tr> <tr>
<td>{{$t('reference')}}</td> <th width="5%">{{$t('reference')}}</th>
<td class="number">{{$t('quantity')}}</td> <th class="number">{{$t('quantity')}}</th>
<td width="50%">{{$t('concept')}}</td> <th width="50%">{{$t('concept')}}</th>
<td class="number">{{$t('price')}}</td> <th class="number">{{$t('price')}}</th>
<td class="centered">{{$t('discount')}}</td> <th class="centered" width="5%">{{$t('discount')}}</th>
<td class="centered">{{$t('vat')}}</td> <th class="centered">{{$t('vat')}}</th>
<td class="number">{{$t('amount')}}</td> <th class="number">{{$t('amount')}}</th>
</tr> </tr>
</thead> </thead>
<tbody v-for="sale in sales"> <tbody v-for="sale in sales" class="no-page-break">
<tr class="font bold"> <tr>
<td>{{sale.itemFk}}</td> <td width="5%">{{sale.itemFk | zerofill('000000')}}</td>
<td class="number">{{sale.quantity}}</td> <td class="number">{{sale.quantity}}</td>
<td width="50%">{{sale.concept}}</td> <td width="50%">{{sale.concept}}</td>
<td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td> <td class="number">{{sale.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered">{{(sale.discount / 100) | percentage}}</td> <td class="centered" width="5%">{{(sale.discount / 100) | percentage}}</td>
<td class="centered">{{sale.vatType}}</td> <td class="centered">{{sale.vatType}}</td>
<td class="number">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}</td> <td class="number">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
<tr class="description"> <tr class="description font light-gray">
<td colspan="2" class="centered">
<div v-if="sale.value5">
<strong class="font gray">{{sale.tag5}}</strong>
<span>{{sale.value5}}</span>
</div>
</td>
<td colspan="3" class="centered">
<div v-if="sale.value6">
<strong class="font gray">{{sale.tag6}}</strong>
<span>{{sale.value6}}</span>
</div>
</td>
<td colspan="2" class="centered">
<div v-if="sale.value7">
<strong class="font gray">{{sale.tag7}}</strong>
<span>{{sale.value7}}</span>
</div>
</td>
</tr>
<tr class="description phytosanitary" v-if="sale.passportNumber">
<td colspan="7"> <td colspan="7">
{{sale.ediBotanic}} {{sale.denomination}} {{sale.countryCode}}-{{sale.passportNumber}} <span v-if="sale.value5">
<span v-if="sale.isProtectedZone">ZP</span> <strong>{{sale.tag5}}</strong> {{sale.value5}}
</span>
<span v-if="sale.value6">
<strong>{{sale.tag6}}</strong> {{sale.value6}}
</span>
<span v-if="sale.value7">
<strong>{{sale.tag7}}</strong> {{sale.value7}}
</span>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="6"> <td colspan="6" class="font bold">
<span class="pull-right">{{$t('subtotal')}}</span> <span class="pull-right">{{$t('subtotal')}}</span>
</td> </td>
<td class="number">{{getSubTotal() | currency('EUR', $i18n.locale)}}</td> <td class="number">{{getSubTotal() | currency('EUR', $i18n.locale)}}</td>
@ -130,52 +117,89 @@
<div class="columns"> <div class="columns">
<!-- Services block--> <!-- Services block-->
<div class="size100 no-page-break" v-if="services.length > 0"> <div class="size100 no-page-break" v-if="services.length > 0">
<h3>{{$t('services')}}</h3> <h2>{{$t('services')}}</h2>
<table class="column-oriented"> <table class="column-oriented">
<thead> <thead>
<tr> <tr>
<td>{{$t('concept')}}</td> <th width="5%"></th>
<td class="number">{{$t('quantity')}}</td> <th class="number">{{$t('quantity')}}</th>
<td>{{$t('vatType')}}</td> <th width="50%">{{$t('concept')}}</th>
<td class="number">{{$t('amount')}}</td> <th class="number">{{$t('price')}}</th>
<th class="centered" width="5%"></th>
<th class="centered">{{$t('vat')}}</th>
<th class="number">{{$t('amount')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="service in services"> <tr v-for="service in services">
<td>{{service.description}}</td> <td width="5%"></td>
<td class="number">{{service.quantity}}</td> <td class="number">{{service.quantity}}</td>
<td>{{service.taxDescription}}</td> <td width="50%">{{service.description}}</td>
<td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered" width="5%"></td>
<td class="centered">{{service.taxDescription}}</td>
<td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td> <td class="number">{{service.price | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="3"></td> <td colspan="6" class="font bold">
<td class="number">{{$t('total')}} {{serviceTotal | currency('EUR', $i18n.locale)}}</td> <span class="pull-right">{{$t('subtotal')}}</span>
</td>
<td class="number">{{serviceTotal | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div> </div>
<!-- End of services block --> <!-- End of services block -->
</div>
<!-- Taxes block --> <div class="columns">
<div id="taxes" class="size50 pull-right no-page-break" v-if="taxes"> <!-- Packages block -->
<h3>{{$t('taxBreakdown')}}</h3> <div id="packagings" class="size100 no-page-break" v-if="packagings.length > 0">
<h2>{{$t('packagings')}}</h2>
<table class="column-oriented"> <table class="column-oriented">
<thead> <thead>
<tr> <tr>
<td width="45%">{{$t('type')}}</td> <th>{{$t('reference')}}</th>
<td width="20%" class="number"> <th class="number">{{$t('quantity')}}</th>
<th wihth="75%">{{$t('concept')}}</th>
</tr>
</thead>
<tbody>
<tr v-for="packaging in packagings">
<td>{{packaging.itemFk | zerofill('000000')}}</td>
<td class="number">{{packaging.quantity}}</td>
<td width="85%">{{packaging.name}}</td>
</tr>
</tbody>
</table>
</div>
<!-- End of packages block -->
</div>
<div class="columns vn-mt-xl">
<!-- Taxes block -->
<div id="taxes" class="size50 pull-right no-page-break" v-if="taxes">
<!-- <h2>{{$t('taxBreakdown')}}</h2> -->
<table class="column-oriented">
<thead>
<tr>
<th colspan="4">{{$t('taxBreakdown')}}</th>
</tr>
</thead>
<thead class="light">
<tr>
<th width="45%">{{$t('type')}}</th>
<th width="25%" class="number">
{{$t('taxBase')}} {{$t('taxBase')}}
</td> </th>
<td>{{$t('tax')}}</td> <th>{{$t('tax')}}</th>
<td class="number">{{$t('fee')}}</td> <th class="number">{{$t('fee')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="tax in taxes"> <tr v-for="tax in taxes">
<td width="45%">{{tax.name}}</td> <td width="45%">{{tax.name}}</td>
<td width="20%" class="number"> <td width="25%" class="number">
{{tax.Base | currency('EUR', $i18n.locale)}} {{tax.Base | currency('EUR', $i18n.locale)}}
</td> </td>
<td>{{tax.vatPercent | percentage}}</td> <td>{{tax.vatPercent | percentage}}</td>
@ -199,29 +223,45 @@
</table> </table>
</div> </div>
<!-- End of taxes block --> <!-- End of taxes block -->
<!-- Packages block --> <!-- Phytosanitary block -->
<div id="packagings" class="size100 no-page-break" v-if="packagings.length > 0"> <div id="phytosanitary" class="size50 pull-left no-page-break">
<h3>{{$t('packagings')}}</h3> <div class="panel">
<table class="column-oriented"> <div class="body">
<thead> <div class="flag">
<tr> <div class="columns">
<td>Id</td> <div class="size25">
<td>{{$t('concept')}}</td> <img v-bind:src="getReportSrc('europe.png')"/>
<td class="number">{{$t('quantity')}}</td> </div>
</tr> <div class="size75 flag-text">
</thead> <strong>{{$t('plantPassport')}}</strong><br/>
<tbody> </div>
<tr v-for="packaging in packagings"> </div>
<td>{{packaging.itemFk}}</td> </div>
<td>{{packaging.name}}</td> <div class="phytosanitary-info">
<td class="number">{{packaging.quantity}}</td> <div>
</tr> <strong>A</strong>
</tbody> <span>{{getBotanical()}}</span>
</table> </div>
<div>
<strong>B</strong>
<span>ES17462130</span>
</div>
<div>
<strong>C</strong>
<span>{{ticket.id}}</span>
</div>
<div>
<strong>D</strong>
<span>ES</span>
</div>
</div>
</div>
</div>
</div> </div>
<!-- End of packages block --> <!-- End of phytosanitary block -->
</div>
<div class="columns">
<!-- Signature block --> <!-- Signature block -->
<div class="size50 pull-left no-page-break"> <div class="size50 pull-left no-page-break">
<div id="signature" class="panel" v-if="signature && signature.id"> <div id="signature" class="panel" v-if="signature && signature.id">
@ -239,7 +279,6 @@
<!-- Footer block --> <!-- Footer block -->
<report-footer id="pageFooter" <report-footer id="pageFooter"
v-bind:company-code="ticket.companyCode" v-bind:company-code="ticket.companyCode"
v-bind:show-phytosanitary="true"
v-bind:left-text="$t('ticket', [ticket.id])" v-bind:left-text="$t('ticket', [ticket.id])"
v-bind:center-text="client.socialName" v-bind:center-text="client.socialName"
v-bind="$props"> v-bind="$props">

16
print/templates/reports/delivery-note/delivery-note.js
View File

@ -95,6 +95,22 @@ module.exports = {
}, },
getTotal() { getTotal() {
return this.getTotalBase() + this.getTotalTax(); return this.getTotalBase() + this.getTotalTax();
},
getBotanical() {
let phytosanitary = [];
this.sales.forEach(sale => {
let itemPhytosanitary;
if (sale.latinGenusName || sale.latinSpeciesName)
itemPhytosanitary = [sale.latinGenusName, sale.latinSpeciesName].filter(Boolean).join(' ');
else if (sale.botanical)
itemPhytosanitary = sale.botanical;
phytosanitary.push(itemPhytosanitary);
});
return phytosanitary.filter((item, index) =>
phytosanitary.indexOf(item) == index
).join(', ');
} }
}, },
components: { components: {

3
print/templates/reports/delivery-note/locale/en.yml
View File

@ -23,4 +23,5 @@ packagings: Buckets and packaging
services: Services services: Services
vatType: VAT Type vatType: VAT Type
digitalSignature: Digital signature digitalSignature: Digital signature
ticket: Delivery note {0} ticket: Delivery note {0}
plantPassport: Plant passport

3
print/templates/reports/delivery-note/locale/es.yml
View File

@ -23,4 +23,5 @@ packagings: Cubos y embalajes
services: Servicios services: Servicios
vatType: Tipo de IVA vatType: Tipo de IVA
digitalSignature: Firma digital digitalSignature: Firma digital
ticket: Albarán {0} ticket: Albarán {0}
plantPassport: Pasaporte fitosanitario

3
print/templates/reports/delivery-note/locale/fr.yml
View File

@ -23,4 +23,5 @@ packagings: Bacs et emballages
services: Service services: Service
vatType: Type de TVA vatType: Type de TVA
digitalSignature: Signature numérique digitalSignature: Signature numérique
ticket: BL {0} ticket: BL {0}
plantPassport: Passeport phytosanitaire

3
print/templates/reports/delivery-note/locale/pt.yml
View File

@ -23,4 +23,5 @@ packagings: Baldes e Embalagens
services: Serviços services: Serviços
vatType: Tipo de IVA vatType: Tipo de IVA
digitalSignature: Assinatura digital digitalSignature: Assinatura digital
ticket: Nota de Entrega {0} ticket: Nota de Entrega {0}
plantPassport: Passaporte vegetal

23
print/templates/reports/delivery-note/sql/sales.sql
View File

@ -14,10 +14,9 @@ SELECT
i.inkFk, i.inkFk,
s.ticketFk, s.ticketFk,
tcl.code vatType, tcl.code vatType,
ibwg.ediBotanic, ib.botanical,
ppa.denomination, eg.latinGenusName,
pp.number passportNumber, es.latinSpeciesName,
be.isProtectedZone, c.code AS countryCode,
i.tag5, i.tag5,
i.value5, i.value5,
i.tag6, i.tag6,
@ -34,20 +33,14 @@ FROM vn.sale s
LEFT JOIN country c ON c.id = o.countryFk LEFT JOIN country c ON c.id = o.countryFk
LEFT JOIN supplier sp ON sp.id = t.companyFk LEFT JOIN supplier sp ON sp.id = t.companyFk
LEFT JOIN itemType it ON it.id = i.typeFk LEFT JOIN itemType it ON it.id = i.typeFk
LEFT JOIN itemCategory ic ON ic.id = it.categoryFk
LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id LEFT JOIN itemTaxCountry itc ON itc.itemFk = i.id
AND itc.countryFk = sp.countryFk AND itc.countryFk = sp.countryFk
LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk LEFT JOIN taxClass tcl ON tcl.id = itc.taxClassFk
LEFT JOIN plantpassport pp ON pp.producerFk = i.producerFk LEFT JOIN itemBotanical ib ON ib.itemFk = i.id
LEFT JOIN plantpassportAuthority ppa ON ppa.id = pp.plantpassportAuthorityFk AND ic.code = 'plant'
LEFT JOIN itemBotanicalWithGenus ibwg ON ibwg.itemFk = i.id LEFT JOIN ediGenus eg ON eg.id = ib.genusFk
LEFT JOIN botanicExport be ON be.restriction = 'pasaporte fitosanitario' LEFT JOIN ediSpecie es ON es.id = ib.specieFk
LEFT JOIN ediGenus eg ON eg.id = be.ediGenusFk
LEFT JOIN ediSpecie es ON es.id = be.ediSpecieFk
AND ibwg.ediBotanic LIKE CONCAT(
IFNULL(eg.latinGenusName, ''),
IF(es.latinSpeciesName > '',
CONCAT(' ', es.latinSpeciesName), ''),
'%')
WHERE s.ticketFk = ? WHERE s.ticketFk = ?
GROUP BY s.id GROUP BY s.id
ORDER BY (it.isPackaging), s.concept, s.itemFk ORDER BY (it.isPackaging), s.concept, s.itemFk

2
print/templates/reports/delivery-note/sql/services.sql
View File

@ -1,5 +1,5 @@
SELECT SELECT
tc.description taxDescription, tc.code taxDescription,
ts.description, ts.description,
ts.quantity, ts.quantity,
ts.price ts.price

10
print/templates/reports/driver-route/driver-route.html
View File

@ -86,11 +86,11 @@
<table class="column-oriented repeatable"> <table class="column-oriented repeatable">
<thead> <thead>
<tr> <tr>
<td class="number">{{$t('order')}}</td> <th class="number">{{$t('order')}}</th>
<td class="number">{{$t('ticket')}}</td> <th class="number">{{$t('ticket')}}</th>
<td width="50%">{{$t('client')}}</td> <th width="50%">{{$t('client')}}</th>
<td class="number">{{$t('address')}}</td> <th class="number">{{$t('address')}}</th>
<td class="number">{{$t('packages')}}</td> <th class="number">{{$t('packages')}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
print/templates/reports/driver-route/locale/es.yml
View File

@ -21,4 +21,4 @@ import: Importe
stowaway: Encajado dentro del ticket stowaway: Encajado dentro del ticket
route: Ruta route: Ruta
routeId: Ruta {0} routeId: Ruta {0}
ticket: Tiquet ticket: Ticket

8
print/templates/reports/entry-order/assets/css/style.css
View File

@ -3,4 +3,12 @@
h3 { h3 {
font-weight: 100; font-weight: 100;
color: #555 color: #555
}
.report-info {
font-size: 20px
}
.description strong {
text-transform: uppercase;
} }

87
print/templates/reports/entry-order/entry-order.html
View File

@ -14,26 +14,24 @@
<div class="grid-block"> <div class="grid-block">
<div class="columns"> <div class="columns">
<div class="size50"> <div class="size50">
<div class="size75"> <div class="body">
<div class="body"> <h1 class="title uppercase">{{$t('title')}}</h1>
<h1 class="title uppercase">{{$t('title')}}</h1> <table class="row-oriented report-info">
<table class="row-oriented"> <tbody>
<tbody> <tr>
<tr> <td class="font gray uppercase">{{$t('entryId')}}</td>
<td class="font gray uppercase">{{$t('entryId')}}</td> <th>{{entry.id}}</th>
<th>{{entry.id}}</th> </tr>
</tr> <tr>
<tr> <td class="font gray uppercase">{{$t('date')}}</td>
<td class="font gray uppercase">{{$t('date')}}</td> <th>{{entry.landed | date('%d-%m-%Y')}}</th>
<th>{{entry.landed | date('%d-%m-%Y')}}</th> </tr>
</tr> <tr>
<tr> <td class="font gray uppercase">{{$t('ref')}}</td>
<td class="font gray uppercase">{{$t('ref')}}</td> <th>{{entry.ref}}</th>
<th>{{entry.ref}}</th> </tr>
</tr> </tbody>
</tbody> </table>
</table>
</div>
</div> </div>
</div> </div>
<div class="size50"> <div class="size50">
@ -56,50 +54,43 @@
</div> </div>
<!-- Buy block --> <!-- Buy block -->
<table class="column-oriented"> <table class="column-oriented vn-mt-lg">
<thead> <thead>
<tr> <tr>
<td class="number">{{$t('boxes')}}</td> <th class="number">{{$t('boxes')}}</th>
<td class="number">{{$t('packing')}}</td> <th class="number">{{$t('packing')}}</th>
<td width="50%">{{$t('concept')}}</td> <th width="50%">{{$t('concept')}}</th>
<td width="10%" class="number">{{$t('quantity')}}</td> <th width="10%" class="number">{{$t('quantity')}}</th>
<td width="15%" class="number">{{$t('price')}}</td> <th width="15%" class="number">{{$t('price')}}</th>
<td width="15%" class="number">{{$t('amount')}}</td> <th width="15%" class="number">{{$t('amount')}}</th>
</tr> </tr>
</thead> </thead>
<tbody v-for="buy in buys"> <tbody v-for="buy in buys">
<tr class="font bold"> <tr>
<td class="number">{{buy.box}}</td> <td class="number">{{buy.box}}</td>
<td class="number">{{buy.packing}}</td> <td class="number">{{buy.packing}}</td>
<td width="50%">{{buy.itemName}}</td> <td width="50%">{{buy.itemName}}</td>
<td width="10%" class="number">{{buy.quantity | number}}</td> <td width="10%" class="number">{{buy.quantity | number($i18n.locale)}}</td>
<td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td> <td width="15%" class="number">{{buy.buyingValue | currency('EUR', $i18n.locale)}}</td>
<td width="15%" class="number">{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}</td> <td width="15%" class="number">{{buy.buyingValue * buy.quantity | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
<tr class="description"> <tr class="description font light-gray">
<td colspan="2"> <td colspan="7">
<div v-if="buy.value5"> <span v-if="buy.value5">
<strong class="font gray">{{buy.tag5}}</strong> <strong>{{buy.tag5}}</strong> {{buy.value5}}
<span>{{buy.value5}}</span> </span>
</div> <span v-if="buy.value6">
</td> <strong>{{buy.tag6}}</strong> {{buy.value6}}
<td colspan="2" class="centered"> </span>
<div v-if="buy.value6"> <span v-if="buy.value7">
<strong class="font gray">{{buy.tag6}}</strong> <strong>{{buy.tag7}}</strong> {{buy.value7}}
<span>{{buy.value6}}</span> </span>
</div>
</td>
<td colspan="2" class="align-right">
<div v-if="buy.value7">
<strong class="font gray">{{buy.tag7}}</strong>
<span>{{buy.value7}}</span>
</div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="5"> <td colspan="5" class="font bold">
<span class="pull-right">{{$t('total')}}</span> <span class="pull-right">{{$t('total')}}</span>
</td> </td>
<td class="number">{{getTotal() | currency('EUR', $i18n.locale)}}</td> <td class="number">{{getTotal() | currency('EUR', $i18n.locale)}}</td>