Commit Graph

6314 Commits

Author SHA1 Message Date
Bernat b7aa8e97a6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 12:37:43 +01:00
Juan Ferrer 637c61063b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 10:57:45 +01:00
Gerard 91b0484c74 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 10:04:20 +01:00
Gerard 8b17524432 changed salesperson definition 2019-01-24 10:04:18 +01:00
Juan Ferrer 1ccffd63a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:25:57 +01:00
Juan Ferrer 498ae5d4fe Keybindings bugs fixed 2019-01-24 09:25:51 +01:00
Carlos Jimenez Ruiz 79ee9bb0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-24 09:08:38 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Gerard e6ee15fc8d console log removed 2019-01-24 08:25:48 +01:00
Gerard bbb7fafed1 fixed default search on ticket index 2019-01-24 08:21:00 +01:00
Bernat 9ad703f625 update structure cau 9511 and fix test 2019-01-24 07:39:23 +01:00
Juan Ferrer 30749f0f4d #981 Back & front tests passed, keybinds on it's own module routes.json 2019-01-23 17:49:28 +01:00
Gerard 288300db41 #1048 ticket.index quitar columnas 2019-01-23 16:51:39 +01:00
Gerard 23d26dec07 updated issue number 2019-01-23 16:32:17 +01:00
Gerard 649c09c551 #1025 item.create al crear articulo nuevo no busca tipo ni color 2019-01-23 15:06:11 +01:00
Gerard cd28d559c4 #1026 ticket.line 2019-01-23 14:12:05 +01:00
Juan Ferrer e080802445 #981 Login unified without passing tests 2019-01-23 13:11:44 +01:00
Gerard 61bd8740ce modal-form class renamed 2019-01-23 12:46:45 +01:00
Gerard 05933781dc #1031 order.create que se puedan crear tickets para clientes con riesgo 2019-01-23 12:34:42 +01:00
Gerard aeb0f65fec #1037 order.descriptor 2019-01-23 12:30:32 +01:00
Gerard e6213fb83f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-23 11:17:35 +01:00
Gerard 05ed72661e test fixed 2019-01-23 11:17:18 +01:00
Joan Sanchez 5bf430400d show results count #992 2019-01-23 11:08:27 +01:00
Gerard 9ebd7a2922 unwanted property deleted 2019-01-23 08:37:52 +01:00
Gerard abea582014 #1017 ticket.index 2019-01-22 16:18:26 +01:00
Carlos Jimenez Ruiz 8f23b0b127 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 14:08:35 +01:00
Carlos Jimenez Ruiz 5f850e76e2 #884 e2e claim.detail + bug fixes en autocompleteSearch extension 2019-01-22 13:18:20 +01:00
Gerard 972f71552a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 12:24:31 +01:00
Gerard b24f0a9442 #1023 claim.detail cantidad total parecer ser erronea 2019-01-22 12:24:19 +01:00
Joan Sanchez 166546564d updated payment-update path Method 2019-01-22 11:30:25 +01:00
Gerard 471374f32d excluded test due changes in mailer #79 2019-01-22 10:31:36 +01:00
Gerard b0a60fc94a #1023 claim.detail cantidad total parecer ser erronea 2019-01-22 10:31:12 +01:00
Gerard 457e68cd3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-22 10:04:53 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Joan Sanchez 4e83172dae added print service part 1 #1001 2019-01-22 09:55:35 +01:00
Juan Ferrer 0f55512918 Style fixes 2019-01-21 16:08:25 +01:00
Juan Ferrer d856a3ae97 Merge 2019-01-21 15:22:20 +01:00
Juan Ferrer 09811d322a Descriptor style fixes 2019-01-21 15:21:24 +01:00
Bernat 643dcc3856 update model sip 2019-01-21 14:53:23 +01:00
Bernat 79a7447030 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 13:47:21 +01:00
Joan Sanchez 5a53195574 agency module 2019-01-21 11:45:53 +01:00
Bernat c87fd81a62 new model sip and fixtures #9474 2019-01-21 11:35:37 +01:00
Joan Sanchez 1989232949 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-21 09:12:33 +01:00
Gerard 2a339185fc stowaway fixes 2019-01-21 08:45:02 +01:00
Gerard ea0504db21 stowaway fixes 2019-01-21 08:44:21 +01:00
Joan Sanchez b73c02c595 client summary red color on negative balance #1007 2019-01-21 08:16:43 +01:00
Juan Ferrer 6e43b11e16 Left menu fixed 2019-01-20 18:48:03 +01:00
Juan Ferrer 2df9579f2c Summary style fixes 2019-01-20 16:47:04 +01:00
Joan Sanchez 9cb298fb08 modules summary were not updating view data #978 2019-01-18 14:04:12 +01:00
Gerard cb650bbdbc added missing locale 2019-01-18 13:38:18 +01:00
Gerard 32743cb1d2 updated description 2019-01-18 13:37:48 +01:00
Gerard 97b2c23179 #952 Ticket.descriptor eliminar polizon 2019-01-18 13:37:26 +01:00
Gerard 345acc1353 #951 ticket.descriptor añadir polizon 2019-01-18 13:36:13 +01:00
Gerard e9bc3f00a1 #954 ticket.descriptor añadir link a polizon 2019-01-18 13:34:50 +01:00
Joan Sanchez fc7b4e4eda changed item diary colors #990 2019-01-18 10:59:33 +01:00
Gerard 0c0a465784 descriptor not showing correctly fixed 2019-01-17 11:11:45 +01:00
Gerard 2b2fe69d0d alert level not available fixed 2019-01-17 11:04:00 +01:00
Juan Ferrer 114c9ded7f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-16 15:48:26 +01:00
Javi Gallego f7cf8cd656 Bug #976 2019-01-16 15:38:50 +01:00
Juan Ferrer d02dc68c3e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-16 15:29:13 +01:00
Juan Ferrer 47b7596381 #938 Searchbar fixes 2019-01-16 15:29:01 +01:00
Gerard 175926d7fb #965 claim.index colores 2019-01-16 15:05:35 +01:00
Gerard 542dd9f280 #973 order.action 2019-01-16 12:55:38 +01:00
Gerard 0fd1149c55 #975 ticket.summary 2019-01-16 12:43:18 +01:00
Gerard ef7660162c #966 loggable 2019-01-16 12:09:43 +01:00
Gerard 140e7b4f92 #968 ticket/servicios 2019-01-16 10:49:49 +01:00
Carlos Jimenez f586a30a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-16 08:53:05 +01:00
Carlos Jimenez 8ea3278a10 #875 e2e ticket create 2019-01-16 08:52:56 +01:00
Gerard 601295a170 #936 item.create 2019-01-16 08:46:40 +01:00
Gerard 13d9a57635 autocomplete not pointing to the correct endpoint fixed 2019-01-16 08:17:22 +01:00
Gerard c0170628f4 autopcomplete not pointing to the right endpoint fixed 2019-01-16 08:11:28 +01:00
Gerard 3b5ea47848 bug not opening search panel solved 2019-01-15 14:53:38 +01:00
Javi Gallego b60deafff1 actualiza fuentes a 1.19 2019-01-15 13:22:31 +01:00
Bernat b4b630118a merge 2019-01-15 12:38:07 +01:00
Bernat bb8a9e2035 fix test and update fixtures #9153 2019-01-15 12:28:13 +01:00
Juan Ferrer f402bb5afb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 12:17:47 +01:00
Juan Ferrer 9767ca7b71 #255 Download PDFs improvements 2019-01-15 12:17:33 +01:00
Gerard 7db288a8c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 12:06:35 +01:00
Gerard 08a9233e8d #964 claim bugs solved 2019-01-15 12:06:19 +01:00
Juan Ferrer 1c6fee22d2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2019-01-15 12:04:45 +01:00
Juan Ferrer 48f11f942e #255 Download invoice PDF bug fixed 2019-01-15 12:04:34 +01:00
Gerard 90d308afd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-15 11:26:08 +01:00
Gerard 7383a377aa ticket services hidden 2019-01-15 11:26:05 +01:00
Juan Ferrer be5a8803ec #255 Download icon fixes 2019-01-15 11:15:30 +01:00
Gerard f5d44bbbd1 ids removed due duplicities 2019-01-15 08:56:20 +01:00
Juan Ferrer 67ebc6c7fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-14 17:40:15 +01:00
Juan Ferrer d539a345b0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2019-01-14 17:27:11 +01:00
Juan Ferrer 40b485da41 #255 Download invoices 2019-01-14 17:26:59 +01:00
Gerard 60c368baa2 fixed typo 2019-01-14 15:04:30 +01:00
Gerard a32b1ba71e temporally excluded test 2019-01-14 15:03:51 +01:00
Gerard 80fbd14c78 test temporally excluded 2019-01-14 15:01:35 +01:00
Gerard 8633f76017 fdescribe deleted 2019-01-14 14:59:50 +01:00
Gerard 8d0366e7bf test fixed 2019-01-14 14:59:14 +01:00
Gerard 35e237fb4f fixed bug showing null instead id 2019-01-14 13:40:39 +01:00
Gerard 24837b231f added missing autoload property 2019-01-14 11:47:34 +01:00
Gerard 1d5cd1c86d #960 order.line bugs solved 2019-01-14 11:35:48 +01:00
Bernat 3faf03cf9f fix test and update fixtures 2019-01-11 15:06:18 +01:00
Bernat f7244cc22b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-11 12:26:06 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Gerard aa03c686e5 added log of ticket packaging 2019-01-11 08:30:44 +01:00
Gerard 100871edf6 clients autocompletes now order by id 2019-01-11 08:03:36 +01:00
Gerard 81ef984597 added missing method getAgenciesWithWarehouse 2019-01-11 07:36:38 +01:00
Bernat 85b4f46479 structuredb step 2 2019-01-10 07:26:10 +01:00
Gerard 7f745de314 #927 order.basic-data 2019-01-07 16:53:34 +01:00
Gerard 360ef4837f #931 ticket.create 2019-01-07 16:47:26 +01:00
Gerard 007516b0cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-07 16:28:24 +01:00
Gerard 650becf455 #945 en salix no se pueden modificar los consignatarios antiguos 2019-01-07 16:28:18 +01:00
Joan 2b2b0ab103 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-07 15:08:08 +01:00
Joan 6cffc0f633 fixed order catalog item category 2019-01-07 15:08:05 +01:00
Gerard db95eea71d #932 client.descriptor 2019-01-07 08:49:01 +01:00
Juan Ferrer 2ead6f145d Merge 2018-12-27 12:55:54 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00
Juan Ferrer f2fc5b6b2b #841 Client modules mixed with service modules 2018-12-22 11:59:26 +01:00
Juan Ferrer 97e0b33d0d #814 Service modules moved to project root, models reclassified 2018-12-21 20:22:13 +01:00