Merge pull request '2906 - Number of packages' (#667) from 2906-deliveryNote_packages into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #667 Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
This commit is contained in:
commit
962724a29e
|
@ -16,9 +16,6 @@
|
|||
"type": "number",
|
||||
"required": true
|
||||
},
|
||||
"amountUnpaid": {
|
||||
"type": "number"
|
||||
},
|
||||
"payed": {
|
||||
"type": "date",
|
||||
"required": true
|
||||
|
|
|
@ -30,6 +30,10 @@
|
|||
<td class="font gray uppercase">{{$t('date')}}</td>
|
||||
<th>{{ticket.shipped | date('%d-%m-%Y')}}</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="font gray uppercase">{{$t('packages')}}</td>
|
||||
<th>{{ticket.packages}}</th>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
@ -24,4 +24,5 @@ services: Services
|
|||
vatType: VAT Type
|
||||
digitalSignature: Digital signature
|
||||
ticket: Delivery note {0}
|
||||
plantPassport: Plant passport
|
||||
plantPassport: Plant passport
|
||||
packages: Packages
|
|
@ -24,4 +24,5 @@ services: Servicios
|
|||
vatType: Tipo de IVA
|
||||
digitalSignature: Firma digital
|
||||
ticket: Albarán {0}
|
||||
plantPassport: Pasaporte fitosanitario
|
||||
plantPassport: Pasaporte fitosanitario
|
||||
packages: Bultos
|
|
@ -24,4 +24,5 @@ services: Service
|
|||
vatType: Type de TVA
|
||||
digitalSignature: Signature numérique
|
||||
ticket: BL {0}
|
||||
plantPassport: Passeport phytosanitaire
|
||||
plantPassport: Passeport phytosanitaire
|
||||
packages: Paquets
|
|
@ -24,4 +24,5 @@ services: Serviços
|
|||
vatType: Tipo de IVA
|
||||
digitalSignature: Assinatura digital
|
||||
ticket: Nota de Entrega {0}
|
||||
plantPassport: Passaporte vegetal
|
||||
plantPassport: Passaporte vegetal
|
||||
packages: Pacotes
|
|
@ -1,7 +1,8 @@
|
|||
SELECT
|
||||
t.id,
|
||||
t.shipped,
|
||||
c.code companyCode
|
||||
c.code companyCode,
|
||||
t.packages
|
||||
FROM ticket t
|
||||
JOIN company c ON c.id = t.companyFk
|
||||
WHERE t.id = ?
|
Loading…
Reference in New Issue