Bernat
|
cb17a1dc79
|
update structure db
|
2018-09-19 12:57:46 +02:00 |
 Javi Gallego
|
87447661b2
|
merge
|
2018-09-19 07:42:53 +02:00 |
|
Javi Gallego
|
68e075c496
|
#654 Permisos en claim.basicData
|
2018-09-19 07:41:07 +02:00 |
gerard
|
8d6b6cd2a8
|
updated translations
|
2018-09-18 14:38:17 +02:00 |
|
gerard
|
834d779154
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-18 14:37:15 +02:00 |
|
gerard
|
fa9c3f4759
|
Tarea #602 Investigar hook
|
2018-09-18 14:36:41 +02:00 |
 Joan Sanchez
|
9aff95904d
|
Added model rewriteDbError() method & fixed tag bug #597 & #662
|
2018-09-18 10:11:51 +02:00 |
Carlos Jimenez
|
f1e5fdfa0b
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-09-18 08:58:26 +02:00 |
|
Carlos Jimenez
|
7bc2d0339d
|
order is now deleted upon execution
|
2018-09-18 08:58:15 +02:00 |
|
Joan Sanchez
|
f387673b80
|
catalogFilter back unit test fixed with different orderFk
|
2018-09-18 08:55:39 +02:00 |
|
gerard
|
18fe2e16af
|
updated test
|
2018-09-17 15:10:46 +02:00 |
|
gerard
|
4fb31f9522
|
Tarea #658 dialogo de añadir cantidad
|
2018-09-17 14:30:39 +02:00 |
|
Bernat
|
702690e949
|
update fixtures cau 8198
|
2018-09-17 13:13:33 +02:00 |
|
Bernat
|
df02c35068
|
update fixtures
|
2018-09-14 14:59:14 +02:00 |
|
gerard
|
df85500ab5
|
added UserError
|
2018-09-14 14:45:29 +02:00 |
|
gerard
|
0926e481ed
|
Tarea #601 dialogo de añadir cantidad
|
2018-09-14 14:44:46 +02:00 |
|
Bernat
|
ec960eab76
|
update structure db
|
2018-09-14 13:47:50 +02:00 |
|
Carlos Jimenez
|
e90af6b851
|
#593 Refactor card/descriptor/descriptor-popover
|
2018-09-14 13:43:51 +02:00 |
|
Joan Sanchez
|
8feba9f5eb
|
catalogFilter back test
|
2018-09-14 09:37:54 +02:00 |
|
Joan Sanchez
|
fa31010069
|
catalog filters #598
|
2018-09-14 09:10:30 +02:00 |
|
gerard
|
3fafadf5c8
|
Bug #657 mandar una notificacion al comercial de un cliente falla
|
2018-09-14 08:08:38 +02:00 |
|
gerard
|
d60308f72b
|
Bug #651 test
|
2018-09-13 15:29:38 +02:00 |
|
gerard
|
d39365b63b
|
Bug #651 Al borrar un ticket no se cambia su estado a eliminado test
|
2018-09-13 15:13:42 +02:00 |
|
Carlos Jimenez
|
447044faf9
|
task updated #651 Al borrar un ticket no se cambia su estado a eliminado
|
2018-09-13 14:33:09 +02:00 |
|
Carlos Jimenez
|
7211277b25
|
amends on spec file
|
2018-09-13 14:29:59 +02:00 |
|
gerard
|
a2506a787e
|
updated description
|
2018-09-13 12:39:56 +02:00 |
|
gerard
|
910d758117
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-09-13 12:36:59 +02:00 |
|
gerard
|
fe80a6b8c8
|
Bug #651 Al borrar un ticket no se cambia su estado a eliminado
|
2018-09-13 12:36:52 +02:00 |
|
Bernat
|
24f89156e4
|
update fixtures, fix test and selectors
|
2018-09-13 12:32:33 +02:00 |
|
Bernat
|
e6bc71ee33
|
update fixtures table packaging
|
2018-09-13 11:08:31 +02:00 |
|
gerard
|
7e309e5f62
|
Bug #650 En la seccion claim detail no aparecen las sales reclamables
|
2018-09-13 10:05:39 +02:00 |
|
Carlos Jimenez
|
516552c59f
|
removed a console log
|
2018-09-12 15:40:52 +02:00 |
|
Carlos Jimenez
|
fe6eb7dfd7
|
fixtures update for #604 create claim part of the path
|
2018-09-12 15:19:53 +02:00 |
|
Bernat
|
367604654c
|
update fixtures and fix test
|
2018-09-11 15:09:15 +02:00 |
|
Javi Gallego
|
6169486bb0
|
fix test createFromSales
|
2018-09-11 13:56:40 +02:00 |
|
Javi Gallego
|
b6cc8c2fe0
|
merge
|
2018-09-11 13:44:49 +02:00 |
|
Javi Gallego
|
c9ec4aee7e
|
#612 añadir reclamacion
|
2018-09-11 12:49:31 +02:00 |
|
gerard
|
0102c4f673
|
Tarea #601 boton + abrir el cuadro de dialogo de añadir cantidad
|
2018-09-11 09:38:37 +02:00 |
|
Joan Sanchez
|
a4c730cf65
|
enabled routes module #616
|
2018-09-07 09:40:45 +02:00 |
|
gerard
|
92b47466d7
|
Bug #645 no se pueden añadir greuges desde salix
|
2018-09-07 08:27:26 +02:00 |
|
gerard
|
8f4592f71f
|
Tarea #596 /sale/getClaimableFromTicket.js Backend
|
2018-09-06 16:49:13 +02:00 |
|
gerard
|
767a1b02d9
|
Tarea #603 /item/getDiary.js Backend unit tests
|
2018-09-06 16:18:17 +02:00 |
|
Bernat
|
d38540a53f
|
itemDiary procedure fixed in local
|
2018-09-06 15:13:34 +02:00 |
|
Joan Sanchez
|
cee940f4fa
|
order client descriptor #609
|
2018-09-06 12:47:25 +02:00 |
|
Bernat
|
3d6593b020
|
update structure db local
|
2018-09-06 11:51:24 +02:00 |
|
Javi Gallego
|
588308cf1e
|
merge
|
2018-09-06 11:15:53 +02:00 |
|
Bernat
|
ee4e6b0b19
|
update fixtures table ticket
|
2018-09-06 11:09:26 +02:00 |
|
Bernat
|
aef4bfaf4f
|
update structure DB, fixturesDB and fix test
|
2018-09-06 10:42:43 +02:00 |
|
gerard
|
c424e845d1
|
Tarea #606 claim.summary
|
2018-09-05 13:47:15 +02:00 |
Juan
|
bf0e1eeaf3
|
CrudModel: improved, docs, bugs fixed
|
2018-09-05 13:01:21 +02:00 |
|
gerard
|
dacdc39a28
|
Tarea #447 claim.action
|
2018-09-05 11:35:34 +02:00 |
|
Bernat
|
a98ae9d4ae
|
add new fixtures for table sample
|
2018-09-05 11:07:05 +02:00 |
|
Carlos Jimenez
|
9b6b08400f
|
lint warnings corrected + en json
|
2018-09-05 08:27:50 +02:00 |
|
Carlos Jimenez
|
566c8e619e
|
#604 e2e de la seccion ticket.sale fallo de traducciones
|
2018-09-04 16:59:46 +02:00 |
|
Joan Sanchez
|
d3406fecde
|
claim search-panel & connector-mysql fix date
|
2018-09-04 15:08:36 +02:00 |
|
Bernat
|
ba51c0cc97
|
update fixtures table sale, saleComponent and fix test
|
2018-09-04 14:52:38 +02:00 |
|
Bernat
|
21903c6414
|
update fixtures table sale and fix test
|
2018-09-04 14:10:59 +02:00 |
|
Carlos Jimenez
|
eab15e7598
|
the removed line was making the translation to work on the opposite way
|
2018-09-04 13:53:04 +02:00 |
|
Javi Gallego
|
dda12c4b62
|
#460 expedition
|
2018-09-04 11:57:41 +02:00 |
|
Bernat
|
b2317491f5
|
update fixtures tickets alias and fix test
|
2018-09-04 09:50:39 +02:00 |
|
Joan Sanchez
|
6c682875a0
|
mailer css removed justify text. Fixed chrome image content-type.
|
2018-09-03 13:54:18 +02:00 |
|
Joan Sanchez
|
1597d3c847
|
ticket filter fix
|
2018-08-31 15:18:53 +02:00 |
|
Joan Sanchez
|
8879005854
|
fixed ticket list pagination
|
2018-08-31 12:39:57 +02:00 |
|
Carlos Jimenez
|
bc2554e6f9
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-31 11:25:30 +02:00 |
|
Joan Sanchez
|
ff3c37f692
|
itemDiary procedure
|
2018-08-31 08:07:01 +02:00 |
|
Joan Sanchez
|
f3fc211dfa
|
removed unused routes, filter and crud routes #409
|
2018-08-31 07:53:38 +02:00 |
|
Carlos Jimenez
|
58042027cf
|
small refactors
|
2018-08-30 16:15:30 +02:00 |
|
Javi Gallego
|
87b0908ee4
|
cambio asociado al warehouse
|
2018-08-30 11:44:39 +02:00 |
|
Javi Gallego
|
c4e0fc74a3
|
Bug #452 quitamos servicio production
|
2018-08-30 11:02:50 +02:00 |
|
Carlos Jimenez
|
aff9f57833
|
#444 claim basic data
|
2018-08-29 09:45:37 +02:00 |
|
Carlos Jimenez
|
b9cd86af11
|
traducciones
|
2018-08-29 08:29:54 +02:00 |
|
gerard
|
67afda853c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-23 12:31:14 +02:00 |
|
gerard
|
b558d79757
|
Tarea #551 /workerMana/getCurrentWorkerMana.js
|
2018-08-23 12:31:04 +02:00 |
|
Joan Sanchez
|
d39ef8827f
|
fixed ticket filter back-end test
|
2018-08-23 10:48:44 +02:00 |
|
Joan Sanchez
|
c7ff42b409
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-23 10:08:15 +02:00 |
|
Joan Sanchez
|
be6b2aa247
|
updated ticket filter #461
|
2018-08-23 10:08:06 +02:00 |
|
Carlos Jimenez
|
d8075a09e2
|
refactor of spec file
|
2018-08-23 09:09:37 +02:00 |
|
Carlos Jimenez
|
be85c784ed
|
#529 item/updateTaxes.js Backend unit tests
|
2018-08-23 09:09:21 +02:00 |
|
Carlos Jimenez
|
f03cdba029
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-22 14:38:31 +02:00 |
|
Carlos Jimenez
|
7a86beb16a
|
#546 services/loopback/common/methods/ticket/list.js Backend unit tests
|
2018-08-22 14:38:19 +02:00 |
|
gerard
|
8ff2e40998
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-22 14:24:47 +02:00 |
|
gerard
|
399d43ce79
|
Tarea #551 /workerMana/getCurrentWorkerMana.js Backend unit tests
|
2018-08-22 14:24:33 +02:00 |
|
Joan Sanchez
|
997c4c52f9
|
added backend summary test #520
|
2018-08-22 13:28:01 +02:00 |
|
gerard
|
e391b22eaf
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-22 12:41:25 +02:00 |
|
Carlos Jimenez
|
700e5f1dfb
|
#525 item/filter.js Backend unit tests
|
2018-08-22 11:12:36 +02:00 |
|
gerard
|
e38e45c3fe
|
temporally desactivated waiting for fixtures changes
|
2018-08-22 09:56:59 +02:00 |
|
Carlos Jimenez
|
05ae6bd534
|
#548 ticket/summary.js Backend unit tests
|
2018-08-22 09:20:34 +02:00 |
|
gerard
|
5a4f6e2e1e
|
Tarea #528 /item/getSummary.js Backend unit tests
|
2018-08-22 09:09:16 +02:00 |
|
gerard
|
1dd4ffcc13
|
method updated
|
2018-08-22 09:08:11 +02:00 |
|
gerard
|
0fcbb383ee
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-22 08:25:03 +02:00 |
|
gerard
|
05c1528195
|
Tarea #533 /sale/removes.js Backend unit tests
|
2018-08-22 08:24:54 +02:00 |
|
Carlos Jimenez
|
22666af20b
|
removed unused tests
|
2018-08-22 07:30:44 +02:00 |
|
Carlos Jimenez
|
76a44a6543
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-21 15:02:05 +02:00 |
|
Carlos Jimenez
|
1c19e6c3a9
|
#553 address backend unit tests
|
2018-08-21 14:59:04 +02:00 |
|
gerard
|
e7f544b459
|
Revert "updated backend test"
This reverts commit fdefb2eb21.
|
2018-08-21 14:28:42 +02:00 |
|
gerard
|
5ef47060c7
|
updated backend test
|
2018-08-21 14:22:19 +02:00 |
|
gerard
|
fdefb2eb21
|
updated backend test
|
2018-08-21 14:20:38 +02:00 |
|
gerard
|
e359fd4d16
|
Tarea #542 /methods/ticket/getSales.js Backend unit tests
|
2018-08-21 14:03:58 +02:00 |
|
Joan Sanchez
|
300b2c2a07
|
catalog filter #581
|
2018-08-21 13:38:16 +02:00 |
|
gerard
|
46eb1e6f98
|
Tarea #528 /methods/item/getSummary.js Backend unit tests
|
2018-08-21 13:31:25 +02:00 |
|
gerard
|
6f8fa86786
|
Tarea #533 /sale/removes.js Backend unit tests
|
2018-08-21 12:56:32 +02:00 |
|
gerard
|
ea785bd9a1
|
Tarea #542
|
2018-08-21 11:29:42 +02:00 |
|
gerard
|
c48b8c4b99
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-21 11:27:54 +02:00 |
|
gerard
|
8d1cf0c02f
|
Tarea #567 /ticket-tracking/changeState.js Backend unit tests
|
2018-08-21 11:27:42 +02:00 |
|
Carlos Jimenez
|
0ca8d1a2ad
|
#544 /ticket/getTotalVolume.js Backend unit tests
|
2018-08-21 09:35:14 +02:00 |
|
gerard
|
48670b9724
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-21 08:13:45 +02:00 |
|
gerard
|
1bc7ea4815
|
Bug #589 Si cambia el estado de un ticket no se guarda el historico
|
2018-08-21 08:13:35 +02:00 |
|
Carlos Jimenez
|
d2eaa62461
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-21 08:08:49 +02:00 |
|
Carlos Jimenez
|
e925146c73
|
#547 ticket/new.js Backend unit tests plus order new refactor
|
2018-08-21 08:08:39 +02:00 |
|
gerard
|
ca523e634c
|
Bug #589 cambiar el estado desde ticket.sales no guarda el historico
|
2018-08-21 07:39:01 +02:00 |
|
gerard
|
d364025b19
|
added translations
|
2018-08-20 14:51:13 +02:00 |
|
Carlos Jimenez
|
f942732d48
|
#555 item model back unit test
|
2018-08-20 10:06:00 +02:00 |
|
Carlos Jimenez
|
065f2126bf
|
#564 new.js Backend unit tests
|
2018-08-17 16:12:05 +02:00 |
|
Joan Sanchez
|
7c4eda87a2
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-17 15:03:53 +02:00 |
|
Joan Sanchez
|
a60720d1ed
|
Ticket packaging refactor + front test updated
|
2018-08-17 14:53:25 +02:00 |
|
Bernat
|
42fa3d0e69
|
update fixtures table client
|
2018-08-17 14:52:54 +02:00 |
|
Carlos Jimenez
|
d0fff2135e
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-17 13:26:07 +02:00 |
|
Carlos Jimenez
|
8706f5c6c0
|
#531 moveToTicket.js Backend unit tests
|
2018-08-17 13:23:07 +02:00 |
|
Bernat
|
77641666da
|
update fixtures table client
|
2018-08-17 13:14:10 +02:00 |
|
Carlos Jimenez
|
8ccab773c0
|
corrected a problem where dynamic dates were giving false test failures
|
2018-08-17 09:56:50 +02:00 |
|
Carlos Jimenez
|
a6be927a1f
|
small refactor
|
2018-08-17 09:29:00 +02:00 |
|
Joan Sanchez
|
4fff408e68
|
back test priceDifference
|
2018-08-17 08:41:30 +02:00 |
|
Bernat
|
6e6cf47c5a
|
update procedure agencyHourGetLanded
|
2018-08-16 14:31:11 +02:00 |
|
Carlos Jimenez
|
5e9c3461e6
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-16 14:00:50 +02:00 |
|
Carlos Jimenez
|
2e88957c8b
|
#534 reserve.js Backend unit tests
|
2018-08-16 14:00:37 +02:00 |
|
Joan Sanchez
|
611f612068
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-16 13:12:20 +02:00 |
|
Joan Sanchez
|
1786602187
|
Change landed on shipped change #458
|
2018-08-16 13:12:18 +02:00 |
|
Carlos Jimenez
|
51e5e76edd
|
#527 getLastEntries.js unit tests + fixtures + threeKastActive refactor
|
2018-08-16 12:10:56 +02:00 |
|
Carlos Jimenez
|
8f385798b6
|
corrected errors
|
2018-08-14 14:52:39 +02:00 |
|
Carlos Jimenez
|
5cfd5c7605
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-14 14:32:40 +02:00 |
|
Carlos Jimenez
|
25b5cfe99f
|
#549 threeLastActive.js Backend unit tests
|
2018-08-14 14:32:27 +02:00 |
|
Joan Sanchez
|
0efa85c2fb
|
updated ticket filter
|
2018-08-14 13:36:02 +02:00 |
|
Carlos Jimenez
|
35a8a7d7dc
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-14 12:50:10 +02:00 |
|
Carlos Jimenez
|
0c3072fb13
|
#536 updatePrice.js backend unit test
|
2018-08-14 12:48:12 +02:00 |
|
Bernat
|
829f9d33cd
|
add new procedure agencyHourGetLanded
|
2018-08-14 12:03:20 +02:00 |
|
Carlos Jimenez
|
be132e33cb
|
#561 getTotalVolume.js back unit test + servicesDir added to spec files
|
2018-08-14 11:52:10 +02:00 |
|
Carlos Jimenez
|
c14fe295d7
|
#474 descriptor-popover Front unit test and refactor of other test
|
2018-08-14 09:12:28 +02:00 |
|
Carlos Jimenez
|
27bc339721
|
#522 updateBillingData.js Backend unit tests
|
2018-08-13 16:54:34 +02:00 |
|
Carlos Jimenez
|
24ad4a83a1
|
#521 updateBasicData.js Backend unit tests
|
2018-08-13 14:52:05 +02:00 |
|
Carlos Jimenez
|
9268fdb2da
|
#523 updateFiscalData.js Backend unit tests plus refactor
|
2018-08-13 14:10:03 +02:00 |
|
Carlos Jimenez
|
bd2befe3ef
|
removed an fdescribe, added servicesDir to some spec files and refactors
|
2018-08-13 13:11:37 +02:00 |
|
Carlos Jimenez
|
51f7958612
|
removed unexpected focus on describe
|
2018-08-13 12:46:56 +02:00 |
|
Carlos Jimenez
|
fbe0cf2111
|
#556 state back end unit test
|
2018-08-13 12:46:11 +02:00 |
|
gerard
|
c62ed68d28
|
Tarea #541 /methods/ticket/deleted.js Backend unit tests
|
2018-08-10 17:18:21 +02:00 |
|
gerard
|
4076934644
|
Tarea #541 /methods/ticket/deleted.js
|
2018-08-10 17:17:53 +02:00 |
|
gerard
|
ac90bb3b18
|
/ticket/getSalesPersonMana.js Backend unit tests
|
2018-08-10 16:31:44 +02:00 |
|
gerard
|
06a3f0b6bc
|
/order/getTotal.js Backend unit tests
|
2018-08-10 16:30:18 +02:00 |
|
gerard
|
3875f4298c
|
filter modified to get the prices of a product
|
2018-08-10 16:15:17 +02:00 |
|
gerard
|
9b2a2b7a9f
|
translations added
|
2018-08-10 13:22:11 +02:00 |
|
Carlos Jimenez
|
b43f8d2d58
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-10 12:05:48 +02:00 |