verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 73 Releases Wiki Activity

2517-clientBalanceCompensaciones #506

Merged
carlosjr merged 49 commits from 2517-clientBalanceCompensaciones into dev 2021-02-01 11:13:57 +00:00
Conversation 0 Commits 49 Files Changed 34 +6 -7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1884dc8789 - Show all commits

10
db/dump/fixtures.sql
View File

@ -151,21 +151,19 @@ INSERT INTO `vn`.`shelving` (`code`, `parkingFk`, `isPrinted`, `priority`, `park
INSERT INTO `vn`.`accountingType`(`id`, `description`, `receiptDescription`,`code`)
VALUES
(1, 'CC y Polizas de crédito', NULL, NULL),
(2, 'Caja registradora', NULL, NULL),
(3, 'Tarjeta de credito', NULL, NULL),
(2, 'Caja registradora', NULL, 'cash'),
(3, 'Tarjeta de credito', NULL, 'creditCard'),
(4, 'Lineas de financiacion', NULL, NULL),
(5, 'Otros productos', NULL, NULL),
(6, 'Prestamos', NULL, NULL),
(7, 'Leasing', NULL, NULL),
(8, 'Compensaciones', 'Compensation', 'compensation'),
(9, 'Cash', 'Cash', 'cash'),
(10, 'Card', 'Pay on receipt', NULL);
(8, 'Compensaciones', 'Compensation', 'compensation');
INSERT INTO `vn`.`bank`(`id`, `bank`, `account`, `cash`, `entityFk`, `isActive`, `currencyFk`)
VALUES
(1, 'Pay on receipt', '0000000000', 3, 0, 1, 1),
(2, 'Cash', '1111111111', 2, 0, 1, 1),
(3, 'Compensation', '0000000000', 7, 0, 1, 1);
(3, 'Compensation', '0000000000', 8, 0, 1, 1);
INSERT INTO `vn`.`deliveryMethod`(`id`, `code`, `description`)
VALUES

3
loopback/locale/es.json
View File

@ -166,5 +166,6 @@
"You can not select this payment method without a registered bankery account": "No se puede utilizar este método de pago si no has registrado una cuenta bancaria",
"You can't upload images on the test environment": "No puedes subir imágenes en el entorno de pruebas",
"The selected ticket is not suitable for this route": "El ticket seleccionado no es apto para esta ruta",
"Sorts whole route": "Reordena ruta entera"
"Sorts whole route": "Reordena ruta entera",
"Invalid account": "Cuenta inválida"
}