diff --git a/client/client/src/risk/index/index.html b/client/client/src/risk/index/index.html index 500a2f8b7..239f22ca4 100644 --- a/client/client/src/risk/index/index.html +++ b/client/client/src/risk/index/index.html @@ -48,7 +48,7 @@ Reference Bank Debit - Credit + Havings Balance Conciliated diff --git a/client/client/src/risk/index/locale/es.yml b/client/client/src/risk/index/locale/es.yml index 78af91b1a..f0eb2cd52 100644 --- a/client/client/src/risk/index/locale/es.yml +++ b/client/client/src/risk/index/locale/es.yml @@ -3,4 +3,5 @@ Reference: Referencia Bank: Caja Debit: Debe Conciliated: Conciliado -New payment: Añadir pago \ No newline at end of file +New payment: Añadir pago +Havings: Haber \ No newline at end of file diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index 52b08ca09..df68d0f73 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -252,7 +252,6 @@ INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created (10, 101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)), (11, 101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -11 MONTH)), (12, 102, 9, 800, CURDATE()), - (13, 103, 9, 200, CURDATE()), (14, 104, 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), (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), - (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`) VALUES diff --git a/services/loopback/common/methods/order/specs/new.spec.js b/services/loopback/common/methods/order/specs/new.spec.js index 8aa9a85d0..527192ebd 100644 --- a/services/loopback/common/methods/order/specs/new.spec.js +++ b/services/loopback/common/methods/order/specs/new.spec.js @@ -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 () => { let error; - let params = {addressFk: 123}; + let params = { + addressFk: 123, + landed: new Date() + }; await app.models.Order.new(params) .catch(e => {