diff --git a/modules/claim/front/action/index.html b/modules/claim/front/action/index.html index 25343b310..5f187c05b 100644 --- a/modules/claim/front/action/index.html +++ b/modules/claim/front/action/index.html @@ -57,7 +57,7 @@ Id Ticket Destination - Landed + Landed Quantity Description Price @@ -92,7 +92,7 @@ show-field="description"> - {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} {{::saleClaimed.sale.concept}} {{::saleClaimed.sale.price | currency: 'EUR':2}} diff --git a/modules/claim/front/detail/index.html b/modules/claim/front/detail/index.html index e364801bf..88c8232c7 100644 --- a/modules/claim/front/detail/index.html +++ b/modules/claim/front/detail/index.html @@ -22,7 +22,7 @@ - Landed + Landed Quantity Claimed Description @@ -34,7 +34,7 @@ - {{::saleClaimed.sale.ticket.landed | date:'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date:'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} Id Client - Created + Created Worker State @@ -29,7 +29,7 @@ {{::claim.name}} - {{::claim.created | date:'dd/MM/yyyy'}} + {{::claim.created | date:'dd/MM/yyyy'}} Item - Landed + Landed Quantity Claimed Description @@ -70,7 +70,7 @@ {{::saleClaimed.sale.itemFk | zeroFill:6}} - {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} + {{::saleClaimed.sale.ticket.landed | date: 'dd/MM/yyyy'}} {{::saleClaimed.sale.quantity}} {{::saleClaimed.quantity}} {{::saleClaimed.sale.concept}} diff --git a/modules/client/front/balance/index/index.html b/modules/client/front/balance/index/index.html index d94c444d5..ac9c39d7f 100644 --- a/modules/client/front/balance/index/index.html +++ b/modules/client/front/balance/index/index.html @@ -46,8 +46,8 @@ - Date - Creation date + Date + Creation date Employee Reference Bank @@ -60,12 +60,12 @@ - + {{::balance.payed | date:'dd/MM/yyyy'}} - + {{::balance.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/client/front/consumption/index.html b/modules/client/front/consumption/index.html index 4bc4c34c3..1038d4a60 100644 --- a/modules/client/front/consumption/index.html +++ b/modules/client/front/consumption/index.html @@ -41,7 +41,7 @@ Item Ticket - Fecha + Fecha Description Quantity @@ -63,7 +63,7 @@ {{::sale.ticketFk}} - {{::sale.shipped | date: 'dd/MM/yyyy'}} + {{::sale.shipped | date: 'dd/MM/yyyy'}} Original File Employee - Created + Created @@ -70,7 +70,7 @@ ng-click="workerDescriptor.show($event, document.dms.workerFk)"> {{::document.dms.worker.user.name | dashIfEmpty}} - + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/client/front/greuge/index/index.html b/modules/client/front/greuge/index/index.html index 463ac6303..01ff8577c 100644 --- a/modules/client/front/greuge/index/index.html +++ b/modules/client/front/greuge/index/index.html @@ -28,7 +28,7 @@ - Date + Date Comment Type Amount @@ -36,7 +36,7 @@ - {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} + {{::greuge.shipped | date:'dd/MM/yyyy HH:mm' }} {{::greuge.description}} diff --git a/modules/client/front/mandate/index.html b/modules/client/front/mandate/index.html index 3084646da..e6a9b97fe 100644 --- a/modules/client/front/mandate/index.html +++ b/modules/client/front/mandate/index.html @@ -18,8 +18,8 @@ Id Company Type - Register date - End date + Register date + End date @@ -27,8 +27,8 @@ {{::mandate.id}} {{::mandate.company.code}} {{::mandate.mandateType.name}} - {{::mandate.created | date:'dd/MM/yyyy HH:mm' }} - {{::mandate.finished | date:'dd/MM/yyyy HH:mm' || '-'}} + {{::mandate.created | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} + {{::mandate.finished | date:'dd/MM/yyyy HH:mm' | dashIfEmpty}} diff --git a/modules/client/front/web-payment/index.html b/modules/client/front/web-payment/index.html index ef0e568c5..7caa44881 100644 --- a/modules/client/front/web-payment/index.html +++ b/modules/client/front/web-payment/index.html @@ -16,7 +16,7 @@ State Id - Date + Date Amount @@ -36,7 +36,7 @@ {{::transaction.id}} - {{::transaction.created | date:'dd/MM/yyyy HH:mm'}} + {{::transaction.created | date:'dd/MM/yyyy HH:mm'}} {{::transaction.amount | currency: 'EUR':2}} Id - Landed + Landed Reference Supplier Currency @@ -40,7 +40,7 @@ {{::entry.id}} - + diff --git a/modules/invoiceOut/front/index/index.html b/modules/invoiceOut/front/index/index.html index d5b911153..b9049a2a2 100644 --- a/modules/invoiceOut/front/index/index.html +++ b/modules/invoiceOut/front/index/index.html @@ -3,18 +3,18 @@ + class="vn-w-lg"> Reference - Issued + Issued Amount Client - Created + Created Company - Due date + Due date @@ -24,7 +24,7 @@ class="clickable vn-tr search-result" ui-sref="invoiceOut.card.summary({id: {{::invoiceOut.id}}})"> {{::invoiceOut.ref | dashIfEmpty}} - {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.issued | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.amount | currency: 'EUR': 2 | dashIfEmpty}} - {{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.created | date:'dd/MM/yyyy' | dashIfEmpty}} {{::invoiceOut.companyCode | dashIfEmpty}} - {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::invoiceOut.dued | date:'dd/MM/yyyy' | dashIfEmpty}} Ticket id Alias - Shipped + Shipped Amount @@ -66,7 +66,7 @@ {{ticket.nickname}} - {{ticket.shipped | date: 'dd/MM/yyyy'}} + {{ticket.shipped | date: 'dd/MM/yyyy' | dashIfEmpty} {{ticket.total | currency: 'EUR': 2}} diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html index 8e64b4b0c..0ef698855 100644 --- a/modules/order/front/index/index.html +++ b/modules/order/front/index/index.html @@ -13,10 +13,10 @@ Sales person Client Confirmed - Created - Landed - T. Hour - Real hour + Created + Landed + T. Hour + Real hour Total @@ -46,14 +46,14 @@ disabled="true"> - {{::order.created | date: 'dd/MM/yyyy HH:mm'}} - + {{::order.created | date: 'dd/MM/yyyy HH:mm'}} + {{::order.landed | date:'dd/MM/yyyy'}} - {{::order.hourTheoretical | date: 'HH:mm'}} - {{::ticket.hourEffective | date: 'HH:mm'}} + {{::order.hourTheoretical | date: 'HH:mm' | dashIfEmpty}} + {{::ticket.hourEffective | date: 'HH:mm' | dashIfEmpty}} {{::order.total | currency: 'EUR': 2 | dashIfEmpty}} Id Description Warehouse - Shipped + Shipped Quantity Price Amount @@ -51,7 +51,7 @@ {{::row.warehouse.name}} - {{::row.shipped | date: 'dd/MM/yyyy'}} + {{::row.shipped | date: 'dd/MM/yyyy'}} {{::row.quantity}} {{::row.price | currency: 'EUR':2}} diff --git a/modules/order/front/locale/es.yml b/modules/order/front/locale/es.yml index c35898378..5ecc1093f 100644 --- a/modules/order/front/locale/es.yml +++ b/modules/order/front/locale/es.yml @@ -24,4 +24,6 @@ Search order by id: Buscar el pedido por identificador order: pedido Confirm lines: Confirmar las lineas Confirm: Confirmar -Real hour: Hora real \ No newline at end of file +Real hour: Hora real +T. Hour: Hora T. +Theoretical hour: Hora Teórica \ No newline at end of file diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index f27e2e510..e66d1024b 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -1,5 +1,9 @@ -
{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} - {{$ctrl.summary.client.salesPerson.id}} +
+ + Ticket #{{$ctrl.summary.id}} - {{$ctrl.summary.client.name}} + ({{$ctrl.summary.client.salesPersonFk}}) + - + + + {{$ctrl.summary.address.nickname}} + @@ -101,3 +109,6 @@ + + diff --git a/modules/order/front/summary/style.scss b/modules/order/front/summary/style.scss index d0f7a3d03..63de20fe9 100644 --- a/modules/order/front/summary/style.scss +++ b/modules/order/front/summary/style.scss @@ -18,13 +18,13 @@ vn-order-summary .summary{ flex: none } } - & > div > vn-horizontal > vn-one { - min-width: 160px !important; + & > vn-horizontal > vn-one { + min-width: 160px; &.taxes { border: $border-thin-light; text-align: right; - padding: 8px !important; + padding: 8px; & > p { font-size: 1.2rem; diff --git a/modules/route/front/index/index.html b/modules/route/front/index/index.html index d095fed09..479662944 100644 --- a/modules/route/front/index/index.html +++ b/modules/route/front/index/index.html @@ -17,7 +17,7 @@ Worker Agency Vehicle - Date + Date m³ Description @@ -43,7 +43,7 @@ {{::route.agencyName | dashIfEmpty}} {{::route.vehiclePlateNumber | dashIfEmpty}} - {{::route.created | date:'dd/MM/yyyy' | dashIfEmpty}} + {{::route.created | date:'dd/MM/yyyy' | dashIfEmpty}} {{::route.m3 | dashIfEmpty}} {{::route.description | dashIfEmpty}} diff --git a/modules/route/front/summary/index.html b/modules/route/front/summary/index.html index 4c45d3985..a6d482a2c 100644 --- a/modules/route/front/summary/index.html +++ b/modules/route/front/summary/index.html @@ -62,7 +62,7 @@ Alias Packages m³ - Warehouse + Warehouse PC Street @@ -87,7 +87,7 @@ {{ticket.packages}} {{ticket.volume}} - {{ticket.warehouse.name}} + {{ticket.warehouse.name}} {{ticket.address.postalCode}} {{ticket.address.street}} diff --git a/modules/ticket/front/dms/index/index.html b/modules/ticket/front/dms/index/index.html index 851276a6b..203ceb635 100644 --- a/modules/ticket/front/dms/index/index.html +++ b/modules/ticket/front/dms/index/index.html @@ -21,7 +21,7 @@ Original File Employee - Created + Created @@ -69,7 +69,7 @@ {{::document.dms.worker.user.name | dashIfEmpty}} - + {{::document.dms.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/expedition/index.html b/modules/ticket/front/expedition/index.html index fc7b473cc..9f3d1b11a 100644 --- a/modules/ticket/front/expedition/index.html +++ b/modules/ticket/front/expedition/index.html @@ -19,7 +19,7 @@ Package type Counter Worker - Created + Created @@ -48,7 +48,7 @@ {{::expedition.userNickname | dashIfEmpty}} - {{::expedition.created | date:'dd/MM/yyyy HH:mm'}} + {{::expedition.created | date:'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/request/index/index.html b/modules/ticket/front/request/index/index.html index 3335a8a06..dadc96325 100644 --- a/modules/ticket/front/request/index/index.html +++ b/modules/ticket/front/request/index/index.html @@ -19,7 +19,7 @@ Id Description - Created + Created Requester Atender Quantity @@ -39,7 +39,7 @@ on-change="$ctrl.updateData()"> - {{::request.created | date: 'dd/MM/yyyy'}} + {{::request.created | date: 'dd/MM/yyyy'}} Original Worker State - Created + Created @@ -57,7 +57,7 @@ {{::sale.state}} - {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} + {{::sale.created | date: 'dd/MM/yyyy HH:mm'}} diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 2961644ad..5ebfb7638 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -60,7 +60,7 @@ - + @@ -89,7 +89,7 @@ ng-if="$ctrl.summary.client.mobile != null" value="{{$ctrl.summary.client.mobile}}"> - + + +

Purchase request

diff --git a/modules/travel/front/index/index.html b/modules/travel/front/index/index.html index b1af5c8dd..d4d28233e 100644 --- a/modules/travel/front/index/index.html +++ b/modules/travel/front/index/index.html @@ -13,10 +13,10 @@ Reference Agency Warehouse Out - Shipped + Shipped Delivered Warehouse In - Landed + Landed Received @@ -29,10 +29,10 @@ {{::travel.ref}} {{::travel.agencyModeName}} {{::travel.warehouseOutName}} - {{::travel.shipped | date:'dd/MM/yyyy'}} + {{::travel.shipped | date:'dd/MM/yyyy'}} {{::travel.warehouseInName}} - {{::travel.landed | date:'dd/MM/yyyy'}} + {{::travel.landed | date:'dd/MM/yyyy'}} diff --git a/modules/travel/front/summary/index.html b/modules/travel/front/summary/index.html index 7e055a0f1..18f1af435 100644 --- a/modules/travel/front/summary/index.html +++ b/modules/travel/front/summary/index.html @@ -131,7 +131,7 @@ Temperature State Destination - Created + Created @@ -140,7 +140,7 @@ {{thermograph.temperature}} {{thermograph.result}} {{thermograph.warehouse.name}} - {{thermograph.created | date: 'dd/MM/yyyy'}} + {{thermograph.created | date: 'dd/MM/yyyy'}} diff --git a/modules/travel/front/thermograph/index/index.html b/modules/travel/front/thermograph/index/index.html index 98a44bf79..9dbb7dcbf 100644 --- a/modules/travel/front/thermograph/index/index.html +++ b/modules/travel/front/thermograph/index/index.html @@ -17,7 +17,7 @@ Temperature State Destination - Created + Created @@ -27,7 +27,7 @@ {{::thermograph.temperature}} {{::thermograph.result}} {{::thermograph.warehouse.name}} - {{::thermograph.created | date: 'dd/MM/yyyy'}} + {{::thermograph.created | date: 'dd/MM/yyyy'}} Description Original File - Created + Created @@ -50,7 +50,7 @@ {{::document.file}} - + {{::document.created | date:'dd/MM/yyyy HH:mm'}}