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

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1791_dreprecate_boot-salixjs

This commit is contained in:
Carlos Jimenez Ruiz 2020-05-21 09:25:19 +02:00
parent 44cd2f743f 80a5200281
commit 4df8d78a4b
19 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/changes/10180-holyWeek/00-claimState.sql
View File

@ -15,3 +15,14 @@ UPDATE `vn`.`claimState` SET `code` = 'resolved' WHERE (`id` = '3');
UPDATE `vn`.`claimState` SET `code` = 'disputed' WHERE (`id` = '5');
UPDATE `vn`.`claimState` SET `code` = 'mana' WHERE (`id` = '6');
UPDATE `vn`.`claimState` SET `code` = 'managed' WHERE (`id` = '2');
ALTER TABLE `vn`.`claimState`
ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');

10
db/changes/10190-postRegulation/00-claimState.sql
View File

@ -1,10 +0,0 @@
ALTER TABLE `vn`.`claimState`
ADD COLUMN `priority` INT NOT NULL DEFAULT 1 AFTER `roleFk`;
UPDATE `vn`.`claimState` SET `priority` = '1' WHERE (`id` = '1');
UPDATE `vn`.`claimState` SET `priority` = '5' WHERE (`id` = '2');
UPDATE `vn`.`claimState` SET `priority` = '7' WHERE (`id` = '3');
UPDATE `vn`.`claimState` SET `priority` = '6' WHERE (`id` = '4');
UPDATE `vn`.`claimState` SET `priority` = '3' WHERE (`id` = '5');
UPDATE `vn`.`claimState` SET `priority` = '4' WHERE (`id` = '6');
UPDATE `vn`.`claimState` SET `priority` = '2' WHERE (`id` = '7');

3
db/tests/vn/workerTimeControlCheck.spec.js
View File

@ -1,7 +1,8 @@
const app = require('vn-loopback/server/server');
const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
describe('worker workerTimeControl_check()', () => {
// #2257 xdescribe dbtest workerTimeControl_check()
xdescribe('worker workerTimeControl_check()', () => {
it(`should throw an error if the worker can't sign on that tablet`, async() => {
let stmts = [];
let stmt;

1
front/core/components/searchbar/locale/en.yml Normal file
View File

@ -0,0 +1 @@
Search by: Search by {{module | translate}}

1
front/core/components/searchbar/locale/es.yml Normal file
View File

@ -0,0 +1 @@
Search by: Buscar por {{module | translate}}

2
front/core/components/searchbar/searchbar.html
View File

@ -1,7 +1,7 @@
<form ng-submit="$ctrl.onSubmit()">
<vn-textfield
class="dense standout"
placeholder="{{::'Search' | translate}}"
placeholder="{{::'Search by' | translate: {module: $ctrl.baseState} }}"
ng-model="$ctrl.searchString">
<prepend>
<vn-icon

1
front/core/components/searchbar/searchbar.js
View File

@ -136,7 +136,6 @@ export default class Searchbar extends Component {
fromBar() {
let filter = {};
if (this.searchString)
filter.search = this.searchString;

1
modules/claim/front/locale/es.yml
View File

@ -14,4 +14,5 @@ Send Pickup order: Enviar orden de recogida
Show Pickup order: Ver orden de recogida
Search claim by id or client name: Buscar reclamaciones por identificador o nombre de cliente
Claim deleted!: Reclamación eliminada!
claim: reclamacióm

1
modules/client/front/balance/index/locale/en.yml Normal file
View File

@ -0,0 +1 @@
BILL: N/INV {{ref}}

1
modules/client/front/locale/es.yml
View File

@ -1,6 +1,7 @@
Active: Activo
Amount: Importe
Client: Cliente
client: cliente
Comercial Name: Comercial
Has to invoice: Factura
Invoice by mail: Factura via e-mail

2
modules/entry/front/locale/es.yml
View File

@ -1,3 +1,5 @@
#Ordenar alfabeticamente
entry: entrada
# Sections

1
modules/invoiceOut/front/locale/es.yml
View File

@ -1,2 +1,3 @@
Invoice out: Facturas
invoiceOut: factura
Search invoices by reference: Buscar facturas por referencia

1
modules/item/front/locale/es.yml
View File

@ -1,4 +1,5 @@
Item: Artículo
item: artículo
View item: Ver artículo
Category: Reino
Description: Descripción

3
modules/order/front/locale/es.yml
View File

@ -20,4 +20,5 @@ Color and price: Color y precio
Ascendant: Ascendente
Descendant: Descendente
Created from: Creado desde
Search orders by id: Buscar en la cesta por identificador
Search order by id: Buscar el pedido por identificador
order: pedido

1
modules/route/front/locale/es.yml
View File

@ -1,3 +1,4 @@
Routes: Rutas
Search routes by id: Buscar rutas por identificador
New route: Nueva ruta
route: ruta

1
modules/ticket/front/locale/es.yml
View File

@ -61,6 +61,7 @@ Invoice: Factura
You are going to delete this ticket: Vas a eliminar este ticket
Ticket deleted: Ticket borrado
Search ticket by id or alias: Buscar tickets por identificador o alias
ticket: ticket
#sections
List: Listado

2
modules/travel/front/locale/es.yml
View File

@ -13,6 +13,8 @@ Received: Recibido
Travel id: Id envío
Search travels by id: Buscar envíos por identificador
New travel: Nuevo envío
travel: envio
# Sections
Travels: Envíos
Log: Historial

1
modules/worker/front/locale/es.yml
View File

@ -18,3 +18,4 @@ User id: Id de usuario
View worker: Ver trabajador
Worker id: Id trabajador
Workers: Trabajadores
worker: trabajador

1
modules/zone/front/locale/es.yml
View File

@ -30,3 +30,4 @@ Warehouse: Almacén
Warehouses: Almacenes
Week days: Días de la semana
Zones: Zonas
zone: zona