verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity
3,320 Commits 268 Branches 0 Tags 125 MiB
Commit Graph

1409 Commits

Author SHA1 Message Date
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
Carlos Jimenez b4d2e29d5f #537 updateQuantity.js Backend unit tests 2018-08-10 12:05:36 +02:00
Joan Sanchez a3d15965ab packaging & component back tests 2018-08-10 11:40:48 +02:00
Joan Sanchez f15d8c3087 front & back tests 2018-08-09 12:54:29 +02:00
Joan Sanchez 2fc7c0a807 Fixed translations 2018-08-09 08:57:16 +02:00
gerard feb80006ab Tarea #562 /order/getVolumes.js 2018-08-08 16:15:53 +02:00
gerard 505ad27217 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-08 14:45:39 +02:00
gerard 4b0a75cc0c Bug #422 refactorizar el summary y el card de item y añadir el visible y el available 2018-08-08 14:44:45 +02:00
gerard 1d15e82a64 Bug #422 refactorizar el summary de item 2018-08-08 14:42:57 +02:00
Joan Sanchez 671c6bd3ff Ticket list refactor. Ticket problems, ticket total #245 & #461 2018-08-08 14:26:54 +02:00
Bernat 3fef95aeef update fixtures ticket 21 changes for Gerard 2018-08-07 18:57:32 +02:00
gerard 93810c381b translations added 2018-08-07 16:10:10 +02:00
gerard 65ffade0a3 Tarea #438 order.line 2018-08-07 16:04:42 +02:00
gerard da9a783843 Tarea #438 order.line 2018-08-07 15:48:55 +02:00
gerard 4c45db1c16 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-07 15:41:42 +02:00
gerard f2be6cac17 Tarea #545 /ticket/isEditable.js Backend unit tests 2018-08-07 15:38:44 +02:00
Carlos Jimenez e094fe4456 #568 ticket-packaging.js Backend unit tests 2018-08-07 15:04:06 +02:00
Carlos Jimenez a44719c1ec #552 account.js backend unit tests 2018-08-07 12:17:34 +02:00
Carlos Jimenez 9bd69baaf1 #569 ticket tracking back unit tests plus tiny refactor 2018-08-07 11:06:40 +02:00
Bernat 3b3bc52b53 add procedure orderListTax 2018-08-06 21:00:44 +02:00
Bernat e067420255 update fixtures, change id item 6 for 71 2018-08-06 20:10:39 +02:00
Carlos Jimenez 1a7930308c the test now fails if the tests fails to get into the catch and an item gets cloned 2018-08-06 14:34:44 +02:00
Joan Sanchez 8228f49eed Fixed ticket basic data message type 2018-08-06 14:25:11 +02:00
Joan Sanchez a0bae4ab46 Updated letter-debtor sample 2018-08-06 14:09:37 +02:00
Carlos Jimenez 084896c69a #524 backend clone.js unit tests 2018-08-06 12:00:29 +02:00
Carlos Jimenez ddf138007b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-03 12:02:39 +02:00
Carlos Jimenez 1d4de8c3bd added selectors for #459 e2e lineas de ticket 2018-08-03 12:02:04 +02:00
Bernat c177bc7ab9 fix test and fixtures for itemTags updated 2018-08-03 08:29:38 +02:00
gerard 19e72c86cf added translations 2018-08-02 15:35:48 +02:00
gerard 9e39c28b51 Translations updated 2018-08-02 11:06:30 +02:00
gerard 71a559783c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-02 10:54:08 +02:00
gerard 49ea108771 Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado 2018-08-02 10:54:03 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
Bernat bde19ffdc8 update fixtures, fix problems with item Visible and Available 2018-08-01 19:33:22 +02:00
Carlos Jimenez d8fb0b2d95 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-01 14:01:59 +02:00
Carlos Jimenez d799ac8100 renamed spec files accordingly plus linter and indentation corrections 2018-08-01 14:01:42 +02:00
Bernat 0c6ae08d4a change idWorker from to users and fix back unit test 2018-08-01 13:24:38 +02:00
Bernat 0447d2f521 update fixtures 2018-07-31 15:03:53 +02:00
Carlos Jimenez 5aae572566 renamed spec files plus fixtures update for ticket basicdata #462 e2e 2018-07-31 13:49:54 +02:00
Joan Sanchez 4103f7fcf6 Added sample create #440 2018-07-31 11:08:22 +02:00
Bernat 81c6546e96 update fixtures 2018-07-30 20:45:26 +02:00
Bernat 8e1ef327c2 add model ClaimDevelopment 2018-07-30 20:16:25 +02:00
Bernat c3956b2354 add model ClaimDevelopment 2018-07-30 15:41:02 +02:00
Bernat 1ec3777f4a update fixtures and fix test 2018-07-30 15:21:12 +02:00
Bernat 23b7e5a0cc update fixtures and add new models for claim module 2018-07-30 14:10:09 +02:00
gerard 97cbb4fb25 Iban validation for french clients desactivated 2018-07-27 15:13:01 +02:00
Joan Sanchez 23993ce717 updated model sample & clientSample 2018-07-27 11:18:27 +02:00
Bernat 4e2ff17121 add new models and fixtures 2018-07-25 20:47:07 +02:00
Joan Sanchez 2433d7684d Change page title #426 2018-07-25 15:14:03 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 81dc09999f Tarea #406 order.volumen 2018-07-24 12:57:07 +02:00
gerard a7ec730216 bug with barcodes solved 2018-07-24 12:56:07 +02:00
Joan Sanchez bea6378f6a Change shipment date on landed data selection. #410 2018-07-24 12:14:35 +02:00
gerard dc60156277 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-07-24 11:36:28 +02:00
gerard 7e62f2afa7 excluded french TIN test as it has been disabled 2018-07-24 11:36:07 +02:00
Bernat 6b73a6392f update fixtures 2018-07-24 11:32:10 +02:00
gerard 3dfa4bfc04 Bug #425 Split no funciona en produccion 2018-07-24 11:27:04 +02:00
Joan Sanchez 896c033594 added order catalogue #408 2018-07-24 09:35:23 +02:00
Bernat d2904bd065 update fixtures 2018-07-24 08:11:55 +02:00
Bernat 65bf807195 update fixtures 2018-07-24 08:01:04 +02:00
Bernat 78f3376c20 export production structure DB to local 2018-07-24 07:34:14 +02:00
gerard 72d9212262 Bug #422 refactorizar el summary de item y añadir el visible y avaible 2018-07-23 09:58:07 +02:00
gerard 9a80f22e93 Tarea #405 crear order 2018-07-20 16:32:34 +02:00
Bernat 4ba541bec2 update structure 2018-07-20 11:30:55 +02:00
Bernat 62988fade8 update structure 2018-07-20 09:42:08 +02:00
Joan Sanchez 2c9ace654e payment update mail fr translation 2018-07-19 14:16:51 +02:00
Bernat eb159453cf update structure 2018-07-19 09:44:58 +02:00
gerard 51e96d0bbf Tarea #417 quitar de item.clone la foto 2018-07-18 14:34:45 +02:00
gerard 3c3abb9063 Tarea #405 crear order 2018-07-18 14:21:58 +02:00
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