verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
3,061 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

1239 Commits

Author SHA1 Message Date
Joan Sanchez ebf38e225e Deleted unused filter methods, fixed summary css 2018-07-18 13:18:40 +02:00
gerard 1542e38746 quitada la validacion del dni frances 2018-07-18 09:49:04 +02:00
Joan Sanchez 291c00e2da Show address city & province on ticket summary #414 2018-07-18 09:23:51 +02:00
Bernat c9a43d98b8 update structure 2018-07-17 14:09:59 +02:00
Bernat 8c7f05785c update structure 2018-07-17 13:39:20 +02:00
Javi Gallego 56344ac301 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-17 13:11:20 +02:00
Joan Sanchez ef71f5c7cf item & ticket crud-refactor #372 2018-07-17 08:44:31 +02:00
Bernat 7e1a2025a5 update structure 2018-07-17 08:34:27 +02:00
gerard ee1ee77240 bug solved 2018-07-16 14:24:03 +02:00
Bernat 8040db4d17 update structure 2018-07-16 13:23:54 +02:00
Javi Gallego 77e0494b37 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-16 12:34:03 +02:00
Joan Sanchez 75d7c79af1 item crud model refactor #372 2018-07-16 09:28:32 +02:00
gerard 4cf5777b4e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-16 09:19:44 +02:00
gerard 467df7acbe bugs solved 2018-07-16 09:19:38 +02:00
Joan Sanchez bd37f91c46 client crud-model refactor #372 2018-07-16 08:00:04 +02:00
gerard 84e61c6cdf Bug fixed 2018-07-16 07:55:13 +02:00
gerard 13e9b53a73 #390 Crear nuevo tipo de textfield 2018-07-13 15:21:37 +02:00
gerard ef9b72b78c Bug #331 Revisar los ACL en back-end 2018-07-13 12:37:58 +02:00
Joan Sanchez dce8d16077 Deleted data 2018-07-12 13:53:52 +02:00
Bernat 755e0c1360 update structure 2018-07-12 08:43:41 +02:00
gerard 675c6be73e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-11 13:52:35 +02:00
Bernat c65211de46 update structure DB 2018-07-11 13:52:10 +02:00
gerard 67030370a1 Bug #398 El SPLUR crea los nuevos tickets sin Alias(nickname) 2018-07-11 13:52:04 +02:00
Bernat 26a0ee1096 update ACL 2018-07-11 08:47:20 +02:00
gerard 7ecefab8ce cleanup 2018-07-10 15:36:59 +02:00
gerard 0f795102cb Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-10 14:55:20 +02:00
gerard 1df2daa569 Bug #379 Loopback trata las horas en UTC y deberia tratarlas en CEST 2018-07-10 14:55:13 +02:00
Joan Sanchez 2d020268fe Change dueDay to 5 only with paymethod with iban #341 2018-07-10 14:13:47 +02:00
Bernat 841a72a269 update fixtures 2018-07-10 10:55:35 +02:00
Juan 303290af53 Merge 2018-07-09 18:07:02 +02:00
Juan 542d9dca86 #345 - Filter items by tag 2018-07-09 18:06:25 +02:00
gerard f4417f924a Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-09 13:54:49 +02:00
gerard 18929e379c Tarea #356 Crear Order 2018-07-09 13:54:43 +02:00
Joan Sanchez 10953841ec show grade on client summary + fix insurance datetime #375 2018-07-09 13:01:46 +02:00
gerard e90ba9d785 Bug #379 Loopback guarda las horas en UTC 2018-07-09 12:47:22 +02:00
Joan Sanchez 5608b1bd26 itemDiary alertLevel replaced by state name #384 2018-07-09 09:37:38 +02:00
Juan 96d755cd21 Code linting, code clean 2018-07-06 16:32:23 +02:00
Joan Sanchez 9a87a40293 Fixed ticketPriceDifference, fixed ticketComponentUpdate #385 2018-07-06 12:43:34 +02:00
gerard f3f86c2dff Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-06 08:19:07 +02:00
gerard 4044b13175 Bug #353 El error de usuario web repetido es confuso 2018-07-06 08:18:55 +02:00
Joan Sanchez 059aa3462f Payment method email translation to FR. 2018-07-05 07:34:46 +02:00
gerard 2ac0c34085 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-04 14:44:02 +02:00
gerard 36a3d04216 Tarea #330 Añadir a ticket.line el indicador de problemas 2018-07-04 14:41:01 +02:00
Bernat c9ec2e53a8 update structure DB 2018-07-04 13:35:45 +02:00
Joan Sanchez cdd477a8e5 Recovery recovery on "grade" field #368 2018-07-04 13:33:40 +02:00
Juan 1e54b9e228 Merge 2018-07-04 12:25:24 +02:00
Bernat 902909d8d1 update structure DB 2018-07-04 09:20:10 +02:00
Joan Sanchez 86a8ae0322 itemDiary, filter, grid and new directive repeat-last #346 2018-07-04 08:50:34 +02:00
Bernat 2ab6eb5e83 fix fixtures 2018-07-04 08:30:33 +02:00
Joan Sanchez 28a2c45c46 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:01:19 +02:00
Joan Sanchez 7dc1d5c811 Added saleTracking section #351. CR: Juan + Javi 2018-07-03 15:00:33 +02:00
gerard 237c2afecd Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-03 15:00:25 +02:00
gerard 8a655a7003 Bug #378 Refactorizar marcar como reservado para que no utilice el crud 2018-07-03 15:00:16 +02:00
Bernat 15de049317 update structure DB 2018-07-03 14:28:29 +02:00
Juan 98001b364e vnAutoPaging renamed to vnPagination plus bugs fixed 2018-07-03 13:45:25 +02:00
Bernat d36483875b update structure DB 2018-07-03 12:01:53 +02:00
Bernat 844fa3a682 update structure DB 2018-07-03 11:43:05 +02:00
Javi Gallego f417dba3ba #367 addressesPropagateRe desmarcar campo hasToInvoiceByAddress cr JOAN 2018-07-03 11:13:33 +02:00
Bernat 371c24a9ad update acl 2018-07-03 07:31:01 +02:00
Bernat 963f6df655 update model client 2018-07-02 14:03:42 +02:00
Bernat a9f9509138 update structure DB 2018-07-02 13:42:23 +02:00
Bernat 0c33f3296e update fixtures and fix backend test 2018-07-02 08:18:54 +02:00
Bernat dfff317414 update structure DB 2018-06-29 08:32:22 +02:00
gerard 81988e0753 bug fixed 2018-06-29 08:07:40 +02:00
gerard 19c89ec7d3 changed duplicated scope 2018-06-28 16:00:28 +02:00
gerard 88a2569054 removed console logs (my fault) 2018-06-28 15:56:45 +02:00
gerard 88033a7539 Tarea #373, Tarea #355,Tarea #352 getSalesPersonMana 2018-06-28 15:29:00 +02:00
gerard cebb7030c5 Tarea #373 ticket.sale Modificar precio 2018-06-28 15:27:29 +02:00
gerard ffc8c54899 Tarea #355 ticket.lineas Modificar cantidad 2018-06-28 15:25:09 +02:00
gerard 4bc391e083 Tarea #354 seccion ticket.line menu de mover lineas 2018-06-28 15:24:27 +02:00
gerard accd66f63a Tarea #352 ticket.lines Modificar descuento 2018-06-28 15:21:04 +02:00
Joan Sanchez 9527b839df crud test updated 2018-06-28 14:54:05 +02:00
Bernat fb07f5e860 update structure DB 2018-06-28 12:34:49 +02:00
Bernat b78f83ae30 add new procedure in the DB 2018-06-27 14:22:07 +02:00
Bernat a290857dc1 fix fixtures 2018-06-27 08:28:21 +02:00
Bernat 71a5f8aed3 update acl 2018-06-26 11:34:37 +02:00
Bernat 9e1a591be2 update acl 2018-06-26 11:32:05 +02:00
Bernat 49f8770584 fix test and update fixtures for procedure manaSpelleersRequery 2018-06-26 11:28:29 +02:00
Joan Sanchez dfa1d1edb2 Added new section client contacts #365 - CR: Javi 2018-06-26 09:41:27 +02:00
Bernat f0cb20736b update fixturs for table clientContact 2018-06-25 12:27:27 +02:00
Bernat 656f26abff update squema DB, fix test and update fixtures 2018-06-22 14:52:11 +02:00
Bernat 2b82d37b4b update tblContadores cau7201 2018-06-21 12:01:12 +02:00
Bernat 2d78d1e50e update structure DB 2018-06-21 11:19:20 +02:00
Bernat 56dc43e023 update structure DB and add fixtures for saleTracing 2018-06-21 10:57:37 +02:00
Bernat 7f8ceb6d37 add view saleTracking and ACL for news models 2018-06-21 07:27:17 +02:00
Joan Sanchez 723ea3f57b model saleTracking 2018-06-20 12:47:43 +02:00
gerard 42eacd4905 Tarea #333 Ultimas Entradas 2018-06-20 11:39:29 +02:00
Juan e33df7098d Merge branch 'test' into dev 2018-06-20 09:54:10 +02:00
Juan 6e137283ec salesPerson filter fixed 2018-06-20 09:53:13 +02:00
Bernat 377332a4d7 update procedure itemLastEntries 2018-06-20 09:48:08 +02:00
Bernat 2eeaf9e66b create new modul 'pedidos' update structure DB, fixtures, add hedera to the package and create model Order and orderRow 2018-06-20 08:30:16 +02:00
Joan Sanchez 8f6a88f9b6 Display sale taxes #342 2018-06-19 12:10:38 +02:00
Joan Sanchez 0822f3ce53 back-end tests updated 2018-06-19 09:20:14 +02:00
gerard 1ecb3f3d2b Bug #358 Credit create no da un error comprensible 2018-06-18 13:41:49 +02:00
Juan cd94460168 Merge branch 'test' into dev 2018-06-12 17:01:56 +02:00
Juan cde2458404 nginx SSL 2018-06-12 14:38:27 +02:00
Juan e053515997 Config volume on all containers 2018-06-12 13:45:20 +02:00
Juan f24395f074 Lavels to compose services 2018-06-12 11:24:43 +02:00
Juan 8dbbaafa47 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-11 21:03:56 +02:00
Juan a860873819 Deploy speed inprovements 2018-06-11 14:03:40 +02:00
Juan 281f539aea Improved deploy speed 2018-06-11 12:31:11 +02:00
Juan bf909c6620 Deploy bugs solved 2018-06-11 09:09:47 +02:00
Javi Gallego 80b98f14e5 traduccion grade 2018-06-09 12:15:16 +02:00
Juan 2951a737a7 Merge 2018-06-07 23:56:16 +02:00
Juan 9fa12d4baf Automatic pagination with vnPagination, improved vnSearchbar 2018-06-07 23:47:19 +02:00
Bernat 61eb0d1551 update structure DB 2018-06-07 07:19:27 +02:00
Bernat 905122c864 update structure DB 2018-06-07 07:11:43 +02:00
gerard 8c34dba79e Tarea #296 seccion ticket.line menu de mover lineas 2018-06-06 16:54:40 +02:00
Bernat 16a9201302 update structure db 2018-06-06 15:08:22 +02:00
Bernat f7930ad664 update structure and fixtures 2018-06-06 14:49:31 +02:00
Bernat bde61a8509 update structure DB 2018-06-06 14:28:15 +02:00
Bernat 5c00931952 update ticket state 2018-06-06 09:32:00 +02:00
Bernat 0931cf2906 update structure DB 2018-06-05 12:49:33 +02:00
Bernat 8b7710746b update structure BD and clone.js error 2018-06-05 08:24:53 +02:00
gerard 5e28d0485c removed duplicated model 2018-06-04 12:00:47 +02:00
gerard e0256ccbf0 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-06-04 09:48:52 +02:00
gerard c0c3925470 Tarea #316 Nuevo formulario del registro de compra-venta 2018-06-04 09:48:32 +02:00
Bernat 61137e214b update itemDiary procedure 2018-06-04 08:41:58 +02:00
Bernat 7f99d370f3 update fixtures tbl buy tblContadores and container 2018-06-01 12:36:20 +02:00
Joan Sanchez d316b17899 Merge branch 'dev' into test 2018-05-31 14:58:51 +02:00
Joan Sanchez 4173180fde fixed eslint rules 2018-05-31 14:48:10 +02:00
Juan 3c9d8f32bb Merge 2018-05-31 11:56:52 +02:00
Juan a78bb24e09 Tests fixed, bugs solved, vnCrudModel, vnRestModel, UserError 2018-05-31 11:52:39 +02:00
Joan Sanchez c0167edc3e Credit insurance refactor #328 2018-05-31 07:59:42 +02:00
Joan Sanchez d6f0be2209 Remove ticket from route. Added warehouse to procedure. #326 2018-05-30 10:55:54 +02:00
Juan 3833339cc6 Merge 2018-05-29 17:46:10 +02:00
Joan Sanchez 16cab3579d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-28 14:57:23 +02:00
Joan Sanchez b97eac4978 Mailer & print config fix #257 2018-05-28 14:57:09 +02:00
Bernat 556e4c872f update BD structure 2018-05-28 14:02:17 +02:00
Joan Sanchez 222f7d6249 Printer & mailer volume path 2018-05-28 12:49:56 +02:00
Joan Sanchez 5199ca62f4 Send notification on payment method change. #257 2018-05-28 12:22:35 +02:00
Javi Gallego 1273f92e85 test back fixed 2018-05-28 09:35:05 +02:00
Javi Gallego 8b03ba420f #309 seccion ticket.volume con m3 y sumatorio CR juan 2018-05-28 09:16:06 +02:00
Joan Sanchez 74410d4045 getVolume route should return only data #324 CR: Juan 2018-05-28 08:52:18 +02:00
Juan 117bbdf146 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-28 08:19:46 +02:00
Bernat 8231a935d6 update fixtures and refactor test 2018-05-28 07:55:10 +02:00
Juan 30aea3d086 Tests fixed, watcher refactor, global error handling, angular 1.7 2018-05-25 17:25:35 +02:00
Bernat 756614bd27 update structure DB 2018-05-25 12:59:26 +02:00
Joan Sanchez 7a5d8bdd03 Added warehouse & isDeleted on ticket basic data #322 2018-05-25 11:40:04 +02:00
gerard 7b82c10a1b fixed bug in greuge 2018-05-24 16:03:16 +02:00
Joan Sanchez 6de70378c8 Docker timezone UTC+2 2018-05-24 11:20:32 +02:00
Bernat 0e077314a6 add new procedure in the BD 2018-05-23 08:54:37 +02:00
Juan ab60e78d1c #256 TIN validation only when isTaxDataChecked is set to true 2018-05-22 12:09:53 +02:00
Juan 518a82bf26 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-22 11:44:33 +02:00
Juan 2f1e5b4fb4 #82 Non-generated files removed from generated directory, vnTooltip refactor 2018-05-22 11:44:24 +02:00
Bernat edc3db3f02 update ArticlesUpdateTrigger 2018-05-21 14:38:38 +02:00
Bernat 7566da8421 update ACL 2018-05-21 13:05:03 +02:00
Bernat 4ce1af97df update table ACL 2018-05-18 12:15:31 +02:00
Bernat ec38ed64e5 add new procedure in the BD 2018-05-18 11:58:04 +02:00
Bernat 74751e3ecd drop deprecated views in salix 2018-05-18 09:25:24 +02:00
gerard 8cbe02a1b6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-17 15:37:20 +02:00
gerard bbfa066640 Bug #307 CR JOAN 2018-05-17 15:37:09 +02:00
Bernat 665d819c34 new model itemTypeTag 2018-05-17 14:28:15 +02:00
gerard 983e66d7ee Bug #307 Modificar changeState en ticket.sale 2018-05-17 13:29:18 +02:00
gerard 595d878f93 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-17 13:19:44 +02:00
gerard 5203755fd1 Bug #310 Error en client.credit 2018-05-17 13:18:16 +02:00
Bernat b49b4ce5a8 update ACL 2018-05-17 09:10:56 +02:00
Joan Sanchez fe60481b1f Disabled unused services 2018-05-16 13:26:36 +02:00
Joan Sanchez f0e8b90316 Added description field on item basic data #303 2018-05-16 13:02:19 +02:00
Joan Sanchez 11b7c133a4 Added package & dropdown replaced search regexp with like 2018-05-16 13:01:14 +02:00
gerard 0fdb4a4785 Bug #306 Modificar TicketTracking para tener en cuenta los nuevos ACL 2018-05-16 12:56:46 +02:00
Bernat e6b7cd8516 update tbl tickets 2018-05-16 10:47:25 +02:00
Joan Sanchez 8f9f7c1fe6 Ticket basic data and date-picker refactor 2018-05-16 08:13:39 +02:00
Javi Gallego 63cd55cd66 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-15 14:02:20 +02:00
Javi Gallego 8cffc556d0 bug: al clonar item no clonaba su iva 2018-05-15 14:02:16 +02:00
Bernat d9b43ce84d update fixtures tbl:ticket and ticketTracking 2018-05-14 14:32:58 +02:00
Bernat fa222ab398 refactor fixtures 2018-05-14 07:50:33 +02:00
Bernat b301d07cd6 delete deprecated files 2018-05-11 15:06:31 +02:00
Bernat 4191c97beb update views sale and componenTypeRate 2018-05-11 14:09:24 +02:00
Bernat 0dbba4e159 add model deliveryMethod 2018-05-11 13:08:01 +02:00
Joan Sanchez 35735c15a3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-11 11:34:20 +02:00
Joan Sanchez a990a950a1 Keep SQL comments on docker dump 2018-05-11 11:34:05 +02:00
gerard f841e25b7f Tarea #289 Cuando se modifica el crédito mostrar alerta 2018-05-11 11:30:05 +02:00
gerard 85aa3b0156 Revert "Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta"" 
This reverts commit d9862b8922.
 2018-05-11 11:16:16 +02:00
gerard d9862b8922 Revert "Tarea #289 Cuando se modifica el crédito mostrar alerta" 
This reverts commit 9b07cd444c.
 2018-05-11 11:10:15 +02:00
gerard 9b07cd444c Tarea #289 Cuando se modifica el crédito mostrar alerta 2018-05-11 11:09:07 +02:00
Joan Sanchez 700fea1d54 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-05-10 14:07:28 +02:00
Joan Sanchez b14154b4e2 Prevent container shutdown forcing SQL import 2018-05-10 14:07:25 +02:00
gerard 4ebca3f3cb pequeño refactor CR JOAN 2018-05-10 13:39:11 +02:00
Bernat 52b3567b47 update Local schema from Production schema and update fixtures bugs 2018-05-10 12:04:08 +02:00
Bernat dfd4242c00 update fixtures tbl clientCredit 2018-05-09 14:42:51 +02:00
Bernat 86766b88e0 update fixtures tbl recovery 2018-05-09 14:22:21 +02:00
Bernat 0c4378f562 update fixtures 2018-05-09 14:17:33 +02:00
Bernat a74eff251f update fixtures tbl agencyHour and saleComponent 2018-05-09 12:20:40 +02:00
Bernat 806ba305f0 add ACl for workerMana 2018-05-09 11:27:47 +02:00
Bernat 868dac95a2 add new ACL for workerMana 2018-05-09 11:19:54 +02:00
Bernat f6a7efae0c update fixtures and schema 2018-05-09 07:20:30 +02:00
Joan Sanchez 3c839cea07 gulp docker && docker-build tasks updated 2018-05-08 11:34:50 +02:00
gerard 5111efa2b9 refactorizacion InstallCrudModel CR: JUAN 2018-05-08 09:57:11 +02:00
gerard ba5a135434 CRUD para Tarea #284 2018-05-08 09:56:25 +02:00
gerard a9ade07aa0 Cambiado ticketTracking por tracking CR JUAN 2018-05-08 09:40:37 +02:00
gerard b37dbfb9f7 ACL para Tarea #265 2018-05-08 09:32:30 +02:00
gerard 024a248797 #265 Añadir boton ok y estado CR: JUAN 2018-05-08 09:25:15 +02:00
Bernat 68b13efb83 add new fixtures and update BD schema 2018-05-07 12:31:48 +02:00
Joan Sanchez e1bc434f34 Added front-end & back-end "order" service #267 2018-05-07 09:08:46 +02:00
Joan Sanchez 22250984ae CSS class ellipsize with max-width 20em 2018-05-04 14:27:45 +02:00
Joan Sanchez 681731e886 back-end refactor & item search fix. #260 2018-05-04 11:46:03 +02:00
Bernat 7732dfc5ec new model ticketWeekly with fixtures 2018-05-03 13:24:35 +02:00
Daniel Herrero 628dd5a99b Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-30 13:57:14 +02:00
Daniel Herrero a7e5f1a623 new component for infinite scroll vnAutoPaging 2018-04-30 13:57:10 +02:00
Bernat c31d1ed888 update fixtures and dumpedfixtures with table vn.state 2018-04-30 12:48:29 +02:00
Bernat 09a731c812 refactor docker for mac users CR: Joan 2018-04-30 08:46:41 +02:00
Bernat 3ff20d48d7 refactor back end test,failed because of new fixtures 2018-04-29 13:50:42 +02:00
Bernat f7b2bf9794 add fixtures and model for workerMana 2018-04-29 13:47:33 +02:00
Carlos Jimenez 57123f4887 #266 popover for item descriptor on ticket section plus some minor refactors on inte tags relations 2018-04-26 16:41:08 +02:00
Joan Sanchez e4b536e439 Added gulp task docker-image. 2018-04-26 15:13:56 +02:00
Bernat 9f3609a3be update fixutes table itemTag ans sale with more items 2018-04-25 09:13:47 +02:00
Bernat 73e92d3c5b update fixtures table invoiceOut 2018-04-25 07:47:30 +02:00
Bernat d3ad20055e update dumpedFixtures and create model for updateTicketAction 2018-04-24 14:03:43 +02:00
Carlos Jimenez e11c0936bc eslint errors corrected 2018-04-24 12:46:07 +02:00
Bernat 93653ca67e update fixtures and dumpedfixtures with table vn.state 2018-04-24 12:36:20 +02:00
Bernat c9941ac1a7 update fixtures #211 2018-04-24 07:54:30 +02:00
Carlos Jimenez 64bddaa0b4 #269 back end unit test for creditClassification/insurance transaction CR Joan 2018-04-23 14:50:06 +02:00
Carlos Jimenez 03c61bb30f Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-04-20 16:26:06 +02:00
Joan Sanchez 12e67b7b60 Added method to send message to salesPerson on credit classification. 2018-04-20 15:16:03 +02:00
Carlos Jimenez 1fb366d11c #190 install crud model backend unit test CR Mr Joan 2018-04-20 12:53:30 +02:00
Javi Gallego de40c400b4 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-19 16:32:59 +02:00
Javi Gallego 59979b87bd #263 No mostrar sumatorio en client.factura CR Juan 2018-04-19 16:31:47 +02:00
Carlos Jimenez 4748f594de Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-04-19 15:48:29 +02:00
Carlos Jimenez b959982911 #192 item clone test CR Joan 2018-04-19 15:48:19 +02:00
Gerard 1e15826f8d Bug #211 Forzar a ciertos tags 2018-04-19 15:12:39 +02:00
Gerard 592b34a879 Bug #243 Indice de Tickets 2018-04-19 14:56:05 +02:00
Gerard 79fafa7dfc merge 2018-04-19 14:51:21 +02:00
Carlos Jimenez 6f162c774e fixes and refactor in several spec files 2018-04-19 11:20:41 +02:00
Gerard b4af50cc48 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-19 09:31:28 +02:00
Joan Sanchez ded1ab5d93 Sql messageSend() and messageSendWithUser() 2018-04-18 15:11:05 +02:00
Gerard 25d099513d fix wrong type of data 2018-04-18 14:42:48 +02:00
Carlos Jimenez bf66dcbf10 disabled clone spec while investigating how to extend loopback methods 2018-04-18 14:42:30 +02:00
Gerard 2d5cd04b8a fix wrong type of the id after a change iin the fixtures 2018-04-18 14:42:11 +02:00
Carlos Jimenez e5bd430ff8 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-04-18 14:37:23 +02:00
Carlos Jimenez f3eecf53b7 #192 refactor on back end unit test helpers to ready loopback methods extensions CR Joan 2018-04-18 14:37:17 +02:00
Javi Gallego 9e6aaf8ac6 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-18 13:59:28 +02:00
Javi Gallego f5014b7824 # 186 CANCEL button en secciones pertinentes CR juan 2018-04-18 13:47:45 +02:00
Bernat 78b79b6fde update fixtures and refactor ticketVolume and backend test 2018-04-18 13:40:09 +02:00
Joan Sanchez 228239b027 Added step-control component and basic data step controllers 2018-04-18 09:47:05 +02:00
Joan Sanchez 5e09df1c9d Ticket summary. #213 2018-04-17 14:49:55 +02:00
Joan Sanchez f95a2f646b Refactor back-end unit test + helpers 2018-04-17 13:38:40 +02:00
Joan Sanchez 808ff40794 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-04-17 12:19:51 +02:00
Joan Sanchez 136a5e26a3 Created component vn-label-value and replaced vn-label on descriptors 2018-04-17 12:19:40 +02:00
Bernat 7426bc9e04 update fixtures with table cache.calc and dumpedfixtures with table cache 2018-04-17 11:20:00 +02:00
Bernat ba22900908 update fixtures, table ticket 2018-04-17 08:17:37 +02:00
Carlos Jimenez 18cf6eb739 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-04-16 16:47:24 +02:00
Carlos Jimenez 03b2a75a84 #236 client side unit test for ticket volumes 2018-04-16 16:47:04 +02:00
Bernat ae9c545796 refactor fixtures and delete outdated files 2018-04-16 15:16:30 +02:00
Carlos Jimenez 3e8b26c91e #235 back end unit tests for getAverageInvoiced 2018-04-16 11:21:13 +02:00
Carlos Jimenez 9928521557 #235 getMana back unit test plus helpers setup 2018-04-13 18:32:20 +02:00
Carlos Jimenez dafb554792 #232 components section plus unit tests 2018-04-13 16:03:43 +02:00
Bernat 946aa7d8e8 update fixtures 2018-04-13 13:07:52 +02:00
Bernat d663013f60 update fixtures and dumpedFixtures with tarifaComponent and tarifaTypeCompoennt 2018-04-13 12:59:05 +02:00
Bernat d05dfc5da8 update fixtures and dumpedFixtures adding componentRate and componentTypeRate 2018-04-13 12:44:00 +02:00