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

Merge branch 'dev' into 3607-supplier_agencyTerm
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Carlos Jimenez Ruiz 2022-03-29 07:54:00 +00:00
parent b72d26f214 81a3ea7646
commit e4ae263d42
8 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/ticket/front/descriptor-menu/index.html
View File

@ -32,6 +32,12 @@
translate> translate>
as PDF as PDF
</a> </a>
<vn-item
ng-if="!$ctrl.hasDocuwareFile"
ng-click="$ctrl.showPdfDeliveryNote('withoutPrices')"
translate>
as PDF without prices
</vn-item>
<vn-item <vn-item
ng-click="$ctrl.showCsvDeliveryNote()" ng-click="$ctrl.showCsvDeliveryNote()"
translate> translate>

1
modules/ticket/front/descriptor-menu/locale/es.yml
View File

@ -2,6 +2,7 @@ Show Delivery Note...: Ver albarán...
Send Delivery Note...: Enviar albarán... Send Delivery Note...: Enviar albarán...
as PDF: como PDF as PDF: como PDF
as CSV: como CSV as CSV: como CSV
as PDF without prices: como PDF sin precios
Send PDF: Enviar PDF Send PDF: Enviar PDF
Send CSV: Enviar CSV Send CSV: Enviar CSV
Send CSV Delivery Note: Enviar albarán en CSV Send CSV Delivery Note: Enviar albarán en CSV

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

@ -77,10 +77,10 @@
<th width="5%">{{$t('reference')}}</th> <th width="5%">{{$t('reference')}}</th>
<th class="number">{{$t('quantity')}}</th> <th class="number">{{$t('quantity')}}</th>
<th width="50%">{{$t('concept')}}</th> <th width="50%">{{$t('concept')}}</th>
<th class="number">{{$t('price')}}</th> <th class="number" v-if="showPrices">{{$t('price')}}</th>
<th class="centered" width="5%">{{$t('discount')}}</th> <th class="centered" width="5%" v-if="showPrices">{{$t('discount')}}</th>
<th class="centered">{{$t('vat')}}</th> <th class="centered" v-if="showPrices">{{$t('vat')}}</th>
<th class="number">{{$t('amount')}}</th> <th class="number" v-if="showPrices">{{$t('amount')}}</th>
</tr> </tr>
</thead> </thead>
<tbody v-for="sale in sales" class="no-page-break"> <tbody v-for="sale in sales" class="no-page-break">
@ -88,10 +88,10 @@
<td width="5%">{{sale.itemFk | zerofill('000000')}}</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" v-if="showPrices">{{sale.price | currency('EUR', $i18n.locale)}}</td>
<td class="centered" width="5%">{{(sale.discount / 100) | percentage}}</td> <td class="centered" width="5%" v-if="showPrices">{{(sale.discount / 100) | percentage}}</td>
<td class="centered">{{sale.vatType}}</td> <td class="centered" v-if="showPrices">{{sale.vatType}}</td>
<td class="number">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}</td> <td class="number" v-if="showPrices">{{sale.price * sale.quantity * (1 - sale.discount / 100) | currency('EUR', $i18n.locale)}}</td>
</tr> </tr>
<tr class="description font light-gray"> <tr class="description font light-gray">
<td colspan="7"> <td colspan="7">
@ -107,7 +107,7 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot v-if="showPrices">
<tr> <tr>
<td colspan="6" class="font bold"> <td colspan="6" class="font bold">
<span class="pull-right">{{$t('subtotal')}}</span> <span class="pull-right">{{$t('subtotal')}}</span>
@ -181,7 +181,7 @@
</div> </div>
<!-- End of packages block --> <!-- End of packages block -->
</div> </div>
<div class="columns vn-mt-xl"> <div class="columns vn-mt-xl" v-if="showPrices">
<!-- Taxes block --> <!-- Taxes block -->
<div id="taxes" class="size50 pull-right no-page-break" v-if="taxes"> <div id="taxes" class="size50 pull-right no-page-break" v-if="taxes">
<table class="column-oriented"> <table class="column-oriented">

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

@ -45,6 +45,9 @@ module.exports = {
return total; return total;
}, },
showPrices() {
return this.type != 'withoutPrices';
},
footerType() { footerType() {
const translatedType = this.$t(this.type); const translatedType = this.$t(this.type);
return `${translatedType} ${this.ticketId}`; return `${translatedType} ${this.ticketId}`;

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

@ -1,6 +1,7 @@
reportName: delivery-note reportName: delivery-note
deliveryNote: Delivery note deliveryNote: Delivery note
proforma: Proforma proforma: Proforma
withoutPrices: Delivery note
clientId: Client clientId: Client
deliveryAddress: Delivery address deliveryAddress: Delivery address
fiscalData: Fiscal data fiscalData: Fiscal data

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

@ -1,6 +1,7 @@
reportName: albaran reportName: albaran
deliveryNote: Albarán deliveryNote: Albarán
proforma: Proforma proforma: Proforma
withoutPrices: Albarán
clientId: Cliente clientId: Cliente
deliveryAddress: Dirección de entrega deliveryAddress: Dirección de entrega
fiscalData: Datos fiscales fiscalData: Datos fiscales

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

@ -1,6 +1,7 @@
reportName: bon-de-livraison reportName: bon-de-livraison
deliveryNote: Bon de livraison deliveryNote: Bon de livraison
proforma: Proforma proforma: Proforma
withoutPrices: Bon de livraison
clientId: Client clientId: Client
deliveryAddress: Adresse de livraison deliveryAddress: Adresse de livraison
fiscalData: Coordonnées fiscalData: Coordonnées

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

@ -1,6 +1,7 @@
reportName: nota-de-entrega reportName: nota-de-entrega
deliveryNote: Nota de Entrega deliveryNote: Nota de Entrega
proforma: Proforma proforma: Proforma
withoutPrices: Nota de Entrega
clientId: Cliente clientId: Cliente
deliveryAddress: Morada de Entrega deliveryAddress: Morada de Entrega
fiscalData: Dados Fiscais fiscalData: Dados Fiscais