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

back test fixed

This commit is contained in:
Gerard 2018-12-10 09:31:32 +01:00
parent 3d383b806a
commit f5b36c5d20
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/client/src/risk/index/index.html
View File

@ -48,7 +48,7 @@
<vn-th>Reference</vn-th> <vn-th>Reference</vn-th>
<vn-th>Bank</vn-th> <vn-th>Bank</vn-th>
<vn-th>Debit</vn-th> <vn-th>Debit</vn-th>
<vn-th>Credit</vn-th> <vn-th>Havings</vn-th>
<vn-th>Balance</vn-th> <vn-th>Balance</vn-th>
<vn-th>Conciliated</vn-th> <vn-th>Conciliated</vn-th>
</vn-tr> </vn-tr>

3
client/client/src/risk/index/locale/es.yml
View File

@ -3,4 +3,5 @@ Reference: Referencia
Bank: Caja Bank: Caja
Debit: Debe Debit: Debe
Conciliated: Conciliado Conciliated: Conciliado
New payment: Añadir pago New payment: Añadir pago
Havings: Haber

3
services/db/install/dump/fixtures.sql
View File

@ -252,7 +252,6 @@ INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created
(10, 101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)), (10, 101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)),
(11, 101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -11 MONTH)), (11, 101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -11 MONTH)),
(12, 102, 9, 800, CURDATE()), (12, 102, 9, 800, CURDATE()),
(13, 103, 9, 200, CURDATE()),
(14, 104, 9, 90 , CURDATE()), (14, 104, 9, 90 , CURDATE()),
(15, 105, 9, 90 , CURDATE()); (15, 105, 9, 90 , CURDATE());
@ -1014,7 +1013,7 @@ INSERT INTO `vn`.`receipt`(`id`, `invoiceFk`, `amountPaid`, `amountUnpaid`, `pay
(1, 'Cobro web', 100.50, 0.00, CURDATE(), 9, 1, 101, CURDATE(), 442, 1), (1, 'Cobro web', 100.50, 0.00, CURDATE(), 9, 1, 101, CURDATE(), 442, 1),
(2, 'Cobro web', 200.50, 0.00, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 9, 1, 101, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 442, 1), (2, 'Cobro web', 200.50, 0.00, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 9, 1, 101, DATE_ADD(CURDATE(), INTERVAL -5 DAY), 442, 1),
(3, 'Cobro en efectivo', 300.00, 100.00, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 9, 1, 102, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 442, 0), (3, 'Cobro en efectivo', 300.00, 100.00, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 9, 1, 102, DATE_ADD(CURDATE(), INTERVAL -10 DAY), 442, 0),
(4, 'Cobro en efectivo', 400.00, -50.00, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 9, 1, 103, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 442, 0); (4, 'Cobro en efectivo', -400.00, -50.00, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 9, 1, 103, DATE_ADD(CURDATE(), INTERVAL -15 DAY), 442, 0);
INSERT INTO `vn2008`.`workerTeam`(`id`, `team`, `user`) INSERT INTO `vn2008`.`workerTeam`(`id`, `team`, `user`)
VALUES VALUES

5
services/loopback/common/methods/order/specs/new.spec.js
View File

@ -46,7 +46,10 @@ describe('order new()', () => {
it('should throw an error if the client isnt frozen and is active, has data checked but has a debt', async () => { it('should throw an error if the client isnt frozen and is active, has data checked but has a debt', async () => {
let error; let error;
let params = {addressFk: 123}; let params = {
addressFk: 123,
landed: new Date()
};
await app.models.Order.new(params) await app.models.Order.new(params)
.catch(e => { .catch(e => {