Merge pull request '2906 - Number of packages' (#667) from 2906-deliveryNote_packages into dev
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:
Carlos Jimenez Ruiz 2021-06-18 08:32:46 +00:00
commit 962724a29e
7 changed files with 14 additions and 8 deletions

View File

@ -16,9 +16,6 @@
"type": "number",
"required": true
},
"amountUnpaid": {
"type": "number"
},
"payed": {
"type": "date",
"required": true

View File

@ -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>

View File

@ -25,3 +25,4 @@ vatType: VAT Type
digitalSignature: Digital signature
ticket: Delivery note {0}
plantPassport: Plant passport
packages: Packages

View File

@ -25,3 +25,4 @@ vatType: Tipo de IVA
digitalSignature: Firma digital
ticket: Albarán {0}
plantPassport: Pasaporte fitosanitario
packages: Bultos

View File

@ -25,3 +25,4 @@ vatType: Type de TVA
digitalSignature: Signature numérique
ticket: BL {0}
plantPassport: Passeport phytosanitaire
packages: Paquets

View File

@ -25,3 +25,4 @@ vatType: Tipo de IVA
digitalSignature: Assinatura digital
ticket: Nota de Entrega {0}
plantPassport: Passaporte vegetal
packages: Pacotes

View File

@ -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 = ?