Commit Graph

826 Commits

Author SHA1 Message Date
Joan Sanchez c7d2c33ffb merge 2019-10-08 11:48:13 +02:00
Joan Sanchez edecadc78e #1756 stowaway no muestra resultados 2019-10-08 11:41:17 +02:00
Juan Ferrer eeef468964 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-05 00:17:10 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Carlos Jimenez Ruiz 4fa532abb8 #1744 ticket.index ocultar columnas expendables 2019-10-04 17:49:51 +02:00
Joan Sanchez b4c23b86a2 fixed summary button 2019-10-04 11:39:24 +02:00
Joan Sanchez 7b7d7664e1 disabled autoload on stowaway model #1747 2019-10-04 11:18:07 +02:00
Joan Sanchez 69ef2c2e27 update zone and shipped on #1746 2019-10-04 09:28:09 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes 2019-10-02 21:02:49 +02:00
Juan Ferrer 76604744d1 Global & client style fixes 2019-10-01 16:17:57 +02:00
Juan Ferrer a4892845e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-01 13:46:16 +02:00
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Carlos Jimenez Ruiz fb846baaa4 #1740 Intermitencia test de back 2019-10-01 13:19:22 +02:00
Juan Ferrer daeb4bed09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-01 11:15:25 +02:00
Juan Ferrer 0bd852604a Refactor: vnCheck, vnRadio, vnTreeview, vnNumber 2019-10-01 11:15:15 +02:00
Carlos Jimenez Ruiz e8a9de6acd ticket.index.total warning css range from 1 to 50 2019-10-01 11:06:20 +02:00
Joan Sanchez fe95406594 Ticket list order by zone hour #1728 2019-10-01 08:14:08 +02:00
Juan Ferrer a177ad8e26 Fixes 2019-09-30 13:02:11 +02:00
Juan Ferrer 84572dc398 Merge & fixes 2019-09-30 13:02:03 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Carlos Jimenez Ruiz 6e50c1fad9 #1685 ticket.transferSale 2019-09-27 16:55:40 +02:00
Carlos Jimenez Ruiz a8c6c57b7e #1719 claim.detail final amends and tests 2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz e57210fdfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 11:52:42 +02:00
Joan Sanchez b64a6fd05c Mostrar fotos de reclamaciones en el summary #1732 2019-09-26 11:41:56 +02:00
Carlos Jimenez Ruiz 2a2c5ae3c4 #1719 claim.detail cambiar descuento falla 2019-09-26 10:56:49 +02:00
Carlos Jimenez Ruiz 156c9ec3ab #1716 ticket.summary añadir link a la Ruta 2019-09-26 09:05:54 +02:00
Carlos Jimenez Ruiz 65981099b6 #1719 claim.detail cambiar descuento falla 2019-09-26 09:05:18 +02:00
Carlos Jimenez Ruiz 1841e4edb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-25 11:53:42 +02:00
Carlos Jimenez Ruiz be65c5acad #1719 claim.detail cambiar descuento falla 2019-09-25 11:53:12 +02:00
Joan Sanchez 73eca9905e fixed #1734 canHaveStowaway validation 2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz 92eef27f37 #1723 ticket.index si el total es menor de 50€ 2019-09-24 16:38:57 +02:00
Carlos Jimenez Ruiz 0c27b90c5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 14:39:22 +02:00
Carlos Jimenez Ruiz b3bd40e2dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 14:25:56 +02:00
Carlos Jimenez Ruiz 99ef8a6010 #1719 claim.detail cambiar descuento falla 2019-09-24 14:23:21 +02:00
Bernat de0034f145 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 14:22:46 +02:00
Joan Sanchez d627a8ba25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 14:03:42 +02:00
Joan Sanchez d0fc74cefd updated e2e and unit tests 2019-09-24 14:03:30 +02:00
Bernat 2b80c4f7bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-24 13:56:31 +02:00
Bernat bf5a9967cf Refactor #1682 modificar modelos componentRate y componentTypeRate 2019-09-24 13:45:54 +02:00
Carlos Jimenez Ruiz d56c7ff540 #1727 ticlet.line foco en cambiar hora 2019-09-24 13:25:18 +02:00
Joan Sanchez 3af26900e3 watcher preventing claim creation 2019-09-24 11:55:36 +02:00
Joan Sanchez 5851784e41 Create new order now opens on new window 2019-09-24 11:41:00 +02:00
Juan Ferrer 52a6221b59 recover getLeaves 2019-09-24 10:38:05 +02:00
Joan Sanchez 15183df65f transfer sales error fixed 2019-09-24 08:51:21 +02:00
Carlos Jimenez Ruiz 0f04aed2fe #1670 Crear icono isDeleted para ticket.descriptor 2019-09-20 17:20:54 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Bernat 2e1b329584 #1681 delete comment 2019-09-13 11:27:32 +02:00
Bernat c6507fc2bb #1681 crear test para el endpoint getPossibleStowaways 2019-09-13 07:40:27 +02:00
Joan Sanchez 8b8463e936 Updated dms colums size #1692 2019-09-12 12:12:39 +02:00
Joan Sanchez f6bd915ae6 Ticket dms CSS fixes #1692 2019-09-12 11:47:56 +02:00
Bernat c344d8088b merge 2019-09-11 14:18:21 +02:00
Joan Sanchez ff626764d8 fixed back unit tests 2019-09-11 08:24:28 +02:00
Joan Sanchez 342886942f fixed sale loggable transaction error #1686 2019-09-11 08:12:27 +02:00
Bernat ac6d1ed829 #1663 update ticketLog 2019-09-10 14:43:00 +02:00
Bernat 8932aa4e5a Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log 2019-09-10 13:27:41 +02:00
Joan Sanchez 73f438c300 reset watcher on changes #1678 2019-09-09 12:35:59 +02:00
Joan Sanchez 1f5a75b285 fixed karma unit tests 2019-09-09 10:57:10 +02:00
Carlos Jimenez Ruiz 3c9fe334c9 #1655 e2e ticket.sale Añadir lineas 2019-09-06 14:56:56 +02:00
Carlos Jimenez Ruiz 56c291a160 merge 2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz ce9fb14b62 #1655 e2e ticket.sale Añadir lineas 2019-09-06 11:43:15 +02:00
Joan Sanchez f31d544cd7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-06 11:06:57 +02:00
Joan Sanchez 7fad401624 Send delivery note to client #1332 2019-09-06 11:06:44 +02:00
Bernat e8cb57e27a #1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen 2019-09-06 09:47:58 +02:00
Bernat 751c945575 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-06 09:35:27 +02:00
Bernat ec2a457849 ticket.weekly add order 2019-09-06 08:00:19 +02:00
Joan Sanchez 176750046a Scroll component #643 2019-09-05 13:06:40 +02:00
Joan Sanchez 59c6952025 Implement watcher on ticket sales #1678 2019-09-05 09:00:55 +02:00
Joan Sanchez 0d21519523 updated transfer css 2019-09-04 14:37:29 +02:00
Joan Sanchez db1113ab0b added scrollbar to transfer popover 2019-09-04 14:08:08 +02:00
Joan Sanchez d3441fa1b3 Ticket step one refactor #1669 2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables 2019-09-03 14:42:52 +02:00
Carlos Jimenez Ruiz 219614b44f #1656 ticket.regularizar eliminar ticket + tests 2019-09-03 13:27:02 +02:00
Carlos Jimenez Ruiz e1b5b449ce #1656 ticket.regularizar eliminar ticket 2019-09-03 09:57:53 +02:00
Joan Sanchez d93974f481 ticket.basicData Update zone on changes + fixes #1668 2019-09-02 14:36:54 +02:00
Joan Sanchez 37b9c5c4ce Added zone inflation field #1641 2019-09-02 11:25:31 +02:00
Carlos Jimenez Ruiz 11b99d9a5f #1618 e2e ticket.basicData.stepOne 2019-08-20 14:18:32 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js 2019-08-19 07:56:20 +02:00
Bernat 4032bde243 fix bug ticket.sale 2019-08-13 14:03:02 +02:00
Bernat d9c63e3bc0 Tarea #1501 ticket / delete 2019-08-13 12:44:34 +02:00
Bernat d08a43bc23 #1630 state.isEditable 2019-08-12 13:28:27 +02:00
Bernat 2e89af9795 #1630 state.isEditable 2019-08-12 13:26:44 +02:00
Bernat b6cc769df3 Test #1636 refactor test de back isEditable y editableState 2019-08-12 12:31:31 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251 2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598 2019-08-08 08:37:03 +02:00
Bernat 2f1472b9ee Tarea #1574
ticket.sale editableState
2019-08-08 08:33:27 +02:00
Bernat 8f519fd15b Bug #900 Ticket.picture lineas vacias cuando no tiene tags 2019-08-07 09:58:05 +02:00
Joan Sanchez e52a0ac5da ticket.sale split show active tickets 2019-08-06 07:36:26 +02:00
Joan Sanchez efeba38fb4 back errors fixed 2019-08-01 11:52:53 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test 2019-07-31 07:46:24 +02:00
Joan Sanchez 82d3ac27cf ticket basicData change zone on date update 2019-07-30 12:43:21 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593 2019-07-30 08:51:38 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612 2019-07-29 13:12:36 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604 2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz e1cbf781e1 #1608 item.request 2019-07-25 09:55:09 +02:00
Bernat 8089c32ec2 Tarea #1611 export db roduction to local 2019-07-23 14:56:57 +02:00
Bernat 97f2229090 Tarea #1603 ticket.index ticket.sales problems icon 2019-07-23 11:15:06 +02:00
Bernat 16257e9918 fix test front 2019-07-23 07:36:10 +02:00
Bernat 6a23a5429c Tarea #1562 ticket.line isEditable 2019-07-22 13:14:00 +02:00
Joan Sanchez 970c8ab5ec show dms order number #1601 2019-07-19 08:13:52 +02:00
Joan Sanchez 51734db404 ticket dms local warehouse and company 2019-07-17 15:01:38 +02:00
Joan Sanchez f56423bac9 disabled hasFile checkbox for dms edit forms 2019-07-17 10:55:58 +02:00
Joan Sanchez 145e596d16 fixed dms unit tests 2019-07-16 14:12:58 +02:00
Joan Sanchez 4f73d1eb5a dms fixes 2019-07-16 13:37:25 +02:00
Joan Sanchez 72fcf807b0 7z mimetype 2019-07-16 07:22:29 +02:00
Joan Sanchez b85aa6d3da fixed icons column size 2019-07-15 13:20:50 +02:00
Joan Sanchez dae49f52b6 removed download file conditional 2019-07-15 11:56:17 +02:00
Joan Sanchez 588250b1c1 dms update files 2019-07-15 11:40:11 +02:00
Joan Sanchez 23f5ff0c5c merge 2019-07-12 14:02:38 +02:00
Joan Sanchez c21532e5f7 ticket.index filters 2019-07-12 14:00:32 +02:00
Joan Sanchez eefa4b9f5b apply default filters 2019-07-12 12:56:00 +02:00
Joan Sanchez 6b9286d1b0 fixed ticket.index 2019-07-12 12:32:02 +02:00
Joan Sanchez c4fcaeb908 ticket.index filter by date if no filters were entered 2019-07-12 12:20:55 +02:00
Joan Sanchez 29744c52f3 fixed ticket.index 2019-07-12 11:43:10 +02:00
Joan Sanchez e135ae039a changed closure field 2019-07-12 09:42:06 +02:00
Joan Sanchez 25014654b1 changed closure field 2019-07-12 09:39:59 +02:00
Joan Sanchez 659a441f47 ticket index show zone closure hour 2019-07-12 09:29:22 +02:00
Joan Sanchez 6634cdf059 ticket.index show zone hour & minute. Show only tickets from today 2019-07-12 09:29:16 +02:00
Joan Sanchez 14a69e47c9 ticket index show zone closure hour 2019-07-12 09:06:19 +02:00
Joan Sanchez 2a6de77e17 ticket.index show zone hour & minute. Show only tickets from today 2019-07-12 08:49:44 +02:00
Joan Sanchez 1b8a407916 show expeditions fix 2019-07-11 11:21:12 +02:00
Joan Sanchez 62ef2dccd8 show expeditions fix 2019-07-11 11:20:41 +02:00
Joan Sanchez 8ecc88b516 hide download button for dms without a file attached #1590 2019-07-11 09:54:42 +02:00
Joan Sanchez 3ce59c0b73 hide download button for dms without a file attached #1590 2019-07-11 09:53:16 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585 2019-07-08 14:07:09 +02:00
Carlos Jimenez Ruiz a35533687f removed unused spec files 2019-07-03 11:53:03 +02:00
Carlos Jimenez Ruiz a2a9dfd7e5 #1567 refactor logs - worker descriptor 2019-07-03 11:08:44 +02:00
Bernat 65ec629221 Tarea #1518 route.tickets al eliminar un ticket de la ruta, tiene que logearse 2019-07-03 08:29:40 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Bernat dd38a21e8d Refactor #1569 claim.delete, update fixtures and fix test 2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz bd76840cb3 #1446 e2e ticket.summary 2019-06-27 15:33:15 +02:00
Carlos Jimenez Ruiz 8c26a89516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-27 09:44:29 +02:00
Carlos Jimenez Ruiz a7c5a9e598 #1566 ticket.sales state autocomplete 2019-06-27 09:44:19 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent 2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz 5270693bdd #1387 e2e Ticket Edit sale path 2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz c352a12d49 merge 2019-06-26 15:02:22 +02:00
Carlos Jimenez Ruiz d27402d4e6 #1558 ticket.sales mark/unmark as reserved 2019-06-26 13:56:40 +02:00
Bernat 682a75ac76 #1533 update fixtures and fix test 2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket 2019-06-25 11:17:58 +02:00
Bernat 1227f7ac83 Test #1549 Arreglar test de back 2019-06-21 13:19:51 +02:00
Javi Gallego 289f588923 #1550 ticket.descriptor polizon cambia estado 2019-06-21 07:41:03 +02:00
Carlos Jimenez Ruiz 7d0c42c077 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-20 14:41:58 +02:00
Carlos Jimenez Ruiz 594268183b #1517 ticket.index 2019-06-20 14:35:47 +02:00
Joan Sanchez 7fd6c850d7 lock controls #1533 2019-06-20 13:50:58 +02:00
Carlos Jimenez Ruiz 9162ef9c1e #1517 ticket.index hot fix 2019-06-20 11:31:03 +02:00
Carlos Jimenez Ruiz 73ccf9a107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-19 14:42:59 +02:00
Carlos Jimenez Ruiz 560cce7c8c #1537 refactor fixtures 2019-06-19 14:40:47 +02:00
Carlos Jimenez Ruiz 63febf8bd0 #1537 refactor fixtures + e2e fixes 2019-06-19 09:03:45 +02:00
Bernat c3f5b2c4dd Bug/Test #1543 ticket.request.create precio con decimales 2019-06-18 12:09:43 +02:00
Bernat 53f6db7a4a Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice 2019-06-17 12:13:05 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Juan Ferrer 89a563eaf9 Merge 2019-06-13 09:21:36 +02:00
Juan Ferrer 58cc90929f TX fixes, debug disabled, glob transaction timeout 2019-06-12 17:31:45 +02:00
Carlos Jimenez Ruiz 921af523f8 #1526 refactor fixtures 2019-06-12 11:38:31 +02:00
Bernat 2504d06bab Bug/Test #1515 Dump structure de production a dev 2019-06-11 12:23:55 +02:00
Joan Sanchez 43e87a1cb1 mege from test to dev - no structure 2019-06-07 13:07:23 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00
Bernat ea38ff221d #1467 ticket filter with hours 2019-06-07 07:45:12 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484 2019-06-06 13:59:11 +02:00
Carlos Jimenez Ruiz cd6b60015f #1486 back test updateDiscount 2019-06-06 09:48:08 +02:00
Carlos Jimenez Ruiz 3082ce2556 #1486 back test updateDiscount 2019-06-06 09:34:36 +02:00
Carlos Jimenez Ruiz 55ea445f02 #1486 back test updateDiscount 2019-06-05 15:20:56 +02:00
Carlos Jimenez Ruiz 7bcd4b53e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-05 15:09:00 +02:00
Bernat 082c292ed7 fix updatePrice 2019-06-05 15:05:07 +02:00
Bernat 3a338739d1 Tarea #1462 Route.descriptior Añadir menú - actualizar m3 2019-06-05 13:51:34 +02:00
Carlos Jimenez Ruiz 605dabbe19 #1486 back test updateDiscount 2019-06-05 13:39:15 +02:00
Joan Sanchez 073c457abb Merge branch 'test' 2019-06-05 08:56:56 +02:00
Carlos Jimenez Ruiz 05fc1f08a8 renamed vars according to convention 2019-06-05 07:41:20 +02:00
Bernat c49f72b36c #1493 Refactorizar el método back /Tickets/deleted 2019-06-03 14:54:03 +02:00
Carlos Jimenez Ruiz d06d5cd9c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-03 12:00:58 +02:00
Carlos Jimenez Ruiz 9671307688 #1486 back test updateDiscount 2019-06-03 12:00:48 +02:00
Bernat 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest 2019-06-03 08:01:24 +02:00
Carlos Jimenez Ruiz a009329bdd removed console logs from spec file 2019-05-31 13:54:05 +02:00
Bernat d4a3a1a72e export production structure and fixtures updated 2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz ed3024e144 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-30 08:57:38 +02:00
Carlos Jimenez Ruiz 80d5c923cc #1486 back test updateDiscount 2019-05-30 08:57:25 +02:00
Javi Gallego e01765e34e test back-front fixed 2019-05-30 08:41:08 +02:00
Bernat 24c3b35605 Test #1489 updatePrice backTest skipped 2019-05-30 08:06:52 +02:00
Bernat 726d0ab359 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-30 07:53:23 +02:00
Bernat 4f20716fa3 #1489 updatePrice backTest 2019-05-29 14:59:26 +02:00
Carlos Jimenez Ruiz cfcadc4f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Bernat 7a7ea03bff 1485 refactor updatePrice 2019-05-29 12:41:26 +02:00
Bernat 85761043cd delete console.log 2019-05-29 11:15:08 +02:00
Bernat 84a4b049f0 1453 ticket UpdateDiscount refactor 2019-05-29 11:11:54 +02:00
Bernat 69434caa52 #1470 update fixtures, client.dms gestdoc 2019-05-28 11:26:54 +02:00
Bernat 230516b9d4 #1438 fix test back makeInvoice 2019-05-27 10:01:35 +02:00
Bernat 59069749a2 1461 fix test back 2019-05-27 09:19:23 +02:00
Carlos Jimenez Ruiz 16c8d2fd2a removed service name from end points 2019-05-27 08:46:11 +02:00
Carlos Jimenez Ruiz a3311f6093 #1250 ticket.line al mover todas las lineas delete 2019-05-24 15:30:50 +02:00
Javi Gallego f871879ee5 merge fixtures dinamicas para zoneCalendar 2019-05-23 13:33:06 +02:00
Javi Gallego c311b0ae65 dump y procedimientos volcados 2019-05-23 13:18:15 +02:00
Javi Gallego 94cc7af8b2 merge paso 2 2019-05-23 13:07:59 +02:00
Javi Gallego 3776e0588c merge paso 1 2019-05-23 13:05:02 +02:00
Joan Sanchez cc72432a37 accessType refactor #1460 2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460 2019-05-22 12:35:24 +02:00
Carlos Jimenez Ruiz 4c8aa7ff6e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-22 11:59:14 +02:00
Carlos Jimenez Ruiz bb1c85459e removed unused code 2019-05-21 13:09:30 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449 2019-05-21 12:56:29 +02:00
Bernat bb5c81a3e9 #1409 ticket.weekly add finder 2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz 32555c47d0 #1434 agency.index explota por zoneFk al cargar 2019-05-20 15:04:33 +02:00
Bernat b86cf1d98a 1354 refactor item-descriptor-popover 2019-05-17 07:34:25 +02:00
Carlos Jimenez Ruiz c7ad52f7b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz 43bf6b45cf #1260 ticket.service textfield por autocomplete 2019-05-16 14:07:16 +02:00
Joan Sanchez 2ac654fa53 parse scopeDays integer on ticket.index #1439 2019-05-16 12:53:49 +02:00
Joan Sanchez 599084a8be parse scopeDays integer on ticket.index #1439 2019-05-16 12:33:41 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +02:00
Joan Sanchez 5cc78ce5ac ticket & order index fixes #1422 & #1423 2019-05-14 08:14:37 +02:00
Joan Sanchez 790577acaf ticket & order index fixes #1422 & #1423 2019-05-14 08:13:04 +02:00
Bernat e6d6e63255 1413 ticket.summary refactor checkbox triple state 2019-05-09 14:40:59 +02:00
Javi Gallego 0d0f354902 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-09 11:25:51 +02:00
Javi Gallego ac5b17be31 ticket View 2019-05-09 11:25:46 +02:00
Bernat 1f128797c3 export production to local, fix test and add fixtures 2019-05-09 09:32:04 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover 2019-05-07 11:32:35 +02:00
Joan Sanchez 4aff31a165 fixed update discount 2019-05-06 07:40:59 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour 2019-05-03 12:23:57 +02:00
Joan Sanchez 2b7287dabb added ticket.dms #1373 2019-05-01 18:49:39 +02:00
Joan Sanchez a572130b6c propagate check value to multicheck component for intermediate value #1305 2019-04-30 08:00:27 +02:00
Carlos Jimenez Ruiz 85dc6e51af #1258 ticket.index sumatorio removed unused code 2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz 774d8524cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz 10669f01f3 #1258 ticket.index sumatorio unit test fixed 2019-04-29 10:21:36 +02:00
Bernat 5bc6f5107e #1370 ticket.descriptor change shipped hour 2019-04-29 07:48:59 +02:00
Carlos Jimenez Ruiz 2ca85394f3 #1385 excluded tests 2019-04-26 16:10:51 +02:00
Joan Sanchez 16bf0b3448 regenerate invoice #1342 2019-04-26 08:52:43 +02:00
Javi Gallego 24fedff62f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-25 18:30:17 +02:00
Javi Gallego a920bc1d8f tablas dms 2019-04-25 18:30:11 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Javi Gallego 47e55580ad #1258 ticket.index sumatorio 2019-04-25 07:57:26 +02:00
Bernat 0eabd9876d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-24 11:36:43 +02:00
Bernat 4ac36e6bf2 #1362 ticket.packaging negative quantity 2019-04-24 11:36:13 +02:00
Joan Sanchez d88e2e81ca update ticket line discount until invoiced #1365 2019-04-24 11:23:24 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Joan Sanchez 6747a80943 fixed available/visible icon on ticket sales #1363 2019-04-24 09:54:25 +02:00
Bernat 94480a8189 #1329 fix test and fixtures, update ticket-service 2019-04-24 07:43:11 +02:00
Bernat 75c9d1122c #1329 ticket.services validation 2019-04-23 11:25:49 +02:00
Carlos Jimenez Ruiz 5501ff8f4f test repairs 2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz 2b04eebe84 #1334 E2E ticket.descriptor - Make invoice 2019-04-23 08:58:49 +02:00
Carlos Jimenez Ruiz 0176fbc2d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-18 11:47:41 +02:00
Carlos Jimenez Ruiz 2107b57764 small typo 2019-04-18 11:12:48 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request 2019-04-18 11:02:28 +02:00
Carlos Jimenez Ruiz 1f5fe891e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-17 07:16:13 +02:00
Carlos Jimenez Ruiz d52f5077b0 #1306 Renombrar controladores, rutas y carpeta 2019-04-16 15:00:21 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Joan Sanchez 6573e61a7c fixed karma tests 2019-04-16 08:21:20 +02:00
Joan Sanchez f814584f6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 07:59:15 +02:00
Joan Sanchez 90bbe1bd02 Log sent sms #1324 2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz 9c596b06c8 merge 2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz 82ed0078d2 #1339 Print - Hoja de rutas 2019-04-15 14:34:33 +02:00
Bernat a68174c456 #1337 refactor checkbox in ticketRequest 2019-04-15 14:21:52 +02:00
Joan Sanchez b5fe7a6fae restore fixtures makeInvoice 2019-04-12 14:53:17 +02:00
Bernat dbe56b2496 #1330 add info in the search panel 2019-04-12 14:33:08 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310 2019-04-12 13:54:31 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315 2019-04-11 09:38:53 +02:00
Javi Gallego 50d70f0f6f Tarea #1259 crear modelo ticketServiceType 2019-04-10 14:44:41 +02:00
Carlos Jimenez Ruiz 98e704adf8 #1326 enlazar en ticket.descriptor tres puntos 2019-04-10 10:43:11 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311 2019-04-09 13:18:55 +02:00
Joan Sanchez 33e6467c44 fixed zone descriptor 2019-04-08 10:57:01 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest 2019-04-05 15:20:12 +02:00
Gerard ebe269f41e #1249 ticket.invoice 2019-04-05 12:24:39 +02:00
Gerard 93bca3b3f0 merge master 2019-04-04 12:47:02 +02:00
Gerard 4861b789f7 Loggable now inserts the correct values for FK values 2019-04-04 12:38:54 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270
ticket.index advanced search mostrar dias en el futuro
2019-04-03 15:16:32 +02:00
Gerard a23c636c16 #1279 loggable rawSql 2019-04-02 14:36:49 +02:00
Javi Gallego 0b977d3b0b #1293 ticket.components solo muestra base 2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz 056c07b17c #1181 No modificar ticket.basicData en reparto 2019-04-01 15:04:09 +02:00
Carlos Jimenez Ruiz 62acb534e1 #1181 No modificar ticket.basicData en reparto 2019-04-01 14:49:12 +02:00
Joan Sanchez 3f1889daa3 fix open client card from ticket descriptor #1291 2019-04-01 09:48:22 +02:00
Joan Sanchez 5898d07822 Merge branch 'test' into dev 2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277 2019-04-01 09:01:11 +02:00
Joan Sanchez 8db51fdf64 added shrink class to item index #1278 2019-03-29 08:01:15 +01:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-29 07:37:23 +01:00
Gerard 280efdae50 #732 Loggable now inserts the correct values for FK values 2019-03-29 07:36:26 +01:00
Joan Sanchez 8110325af8 send sms from ticket descriptor & ticket line #991 2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Gerard 3b3e4a96e9 Merge branch 'test' into dev 2019-03-27 10:03:53 +01:00
Gerard 59d99db6b4 #1272 ticket.index 2019-03-27 09:58:58 +01:00
Joan Sanchez 8433e15875 show client id on ticket summary header #1273 2019-03-27 09:06:21 +01:00
Gerard 8fc9581b8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-27 08:56:39 +01:00
Gerard 650e5b8626 #1257 route.log 2019-03-27 08:56:25 +01:00
Bernat 4e27581045 cau 10269 fix test and update fixtures 2019-03-27 08:44:15 +01:00
Gerard eaec968aa4 Now you can change the shipped hour of a ticket 2019-03-26 12:25:06 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268 2019-03-26 12:05:53 +01:00
Joan Sanchez a16b43546d fixed volume onLoad errors #1238 2019-03-26 09:33:54 +01:00
Joan Sanchez 500105675c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-26 07:29:57 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura 2019-03-25 15:16:56 +01:00
Gerard f4ddf3544d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-25 09:36:30 +01:00
Gerard 649b7f0e21 log added to ticket module models 2019-03-25 09:36:24 +01:00
Joan Sanchez 4a4b997e1b added subName to fetched-tags #1246 2019-03-22 15:05:15 +01:00
Gerard 37546e7a26 #1236 revision con pepe 2019-03-22 12:34:42 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147 2019-03-22 08:28:57 +01:00
Javi Gallego 0dd7e528dd #1245 bug ticket line 2019-03-21 14:56:09 +01:00
Gerard bb321995fa deleted wrongly an unused relation alertLevel 2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz 7a5124aca2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz 30333a914e #957 ticket.descriptor stowaway singlepage nav e2e 2019-03-20 12:23:38 +01:00
Carlos Jimenez Ruiz d38ca72fd8 orden de resultados por defecto DESC de id y fecha 2019-03-20 11:49:11 +01:00
Bernat 981800a0e2 import production structure db to local and fix test 2019-03-20 08:52:54 +01:00
Gerard 41a34421df ship menu now open the stowaways in new tabs 2019-03-11 11:29:31 +01:00
Joan Sanchez 891c4b201a Merge branch 'test' into dev 2019-03-11 11:10:28 +01:00
Joan Sanchez 91f8f337f5 removed clog 2019-03-11 11:09:59 +01:00
Gerard 562403cd0a Merge branch 'test' into dev 2019-03-11 08:15:00 +01:00
Gerard 63787a7beb showing client tickets from client descriptor works again 2019-03-11 08:11:48 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion 2019-03-08 08:14:22 +01:00
Gerard 1cc196983e Merge branch 'test' into dev 2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test 2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono 2019-03-06 14:06:36 +01:00
Carlos Jimenez Ruiz fdfddd260a #1208 Cambiar componente de icono papelera vn-icon por vn-icon-button 2019-03-06 12:27:56 +01:00
Gerard b2adde4ba3 #1176 ticket.sale actualizar descuento 2019-03-06 08:54:56 +01:00
Gerard 8923970e75 e2e fixed 2019-03-06 08:54:04 +01:00
Gerard 1c7d50fc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-05 15:00:38 +01:00
Gerard dd7ded018b test fixed 2019-03-05 15:00:17 +01:00
Joan Sanchez 11603f8d90 Add services to deliver-note #1201. Renamed receipt 2019-03-05 14:59:18 +01:00
Gerard fbc84f48a1 Merge branch 'test' into dev 2019-03-05 14:44:38 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order 2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz d37d314304 #1202 refactor del cambio de estado de un ticket 2019-03-05 12:01:53 +01:00
Carlos Jimenez Ruiz f8a4ad0f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz d1d11233ad #1039 ticket.summary 2019-03-04 16:34:41 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166 2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back 2019-03-01 11:50:26 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado 2019-03-01 09:07:44 +01:00
Gerard 7dd08dc6e5 merge test 2019-02-28 10:19:31 +01:00
Gerard 624733dcfb changed order of ticket index 2019-02-28 10:01:54 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108 2019-02-28 08:55:34 +01:00
Gerard 9a7bd834df date offset fixed 2019-02-27 17:04:32 +01:00
Gerard 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Gerard 4de73fb2a8 #1152 refactor ticket.sale 2019-02-26 17:32:32 +01:00
Gerard d404fc92c8 dates fixed, deleted tricks to change the hours 2019-02-26 12:51:01 +01:00
Juan Ferrer 26419e75c9 Style fixes 2019-02-22 16:15:54 +01:00
Juan Ferrer 961eb6edaf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test 2019-02-22 14:38:45 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard 9370142731 styles fixed 2019-02-22 12:43:08 +01:00
Gerard 1e199e9d5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-21 12:58:05 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge 2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Gerard ab6606a624 Merge branch 'test' into dev 2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover 2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method 2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151 2019-02-21 08:43:04 +01:00
Gerard a651142fff Merge branch 'test' into dev 2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento 2019-02-20 18:46:30 +01:00
Gerard a3dab9013c Merge branch 'test' into dev 2019-02-20 17:53:10 +01:00
Gerard 0cca3bb9ce #1137 ticket.summary, ticket.sale 2019-02-20 17:52:36 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module 2019-02-20 16:30:46 +01:00
Juan Ferrer 752a703cdb Merge 2019-02-20 14:34:56 +01:00
Juan Ferrer 8f1e41e744 Style fixes 2019-02-20 14:34:16 +01:00
Joan Sanchez 646e6c7b46 Disabled delivery-note preview 2019-02-20 13:26:31 +01:00
Gerard 23e08331fc fetched tags not sowing title and displaying wrong fixed 2019-02-20 12:12:16 +01:00
Gerard 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker 2019-02-19 15:09:50 +01:00
Carlos Jimenez Ruiz 2d2ce304b5 merge 2019-02-19 08:16:36 +01:00
Joan Sanchez 5eb4eb2e79 Merge branch 'dev' into test 2019-02-18 08:38:14 +01:00
Carlos Jimenez Ruiz 4186fbacb3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-16 17:15:03 +01:00
Joan Sanchez 42e3fede23 fixed ng-repeat transition 2019-02-15 17:33:03 +01:00
Carlos Jimenez Ruiz b034a8fab7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 15:33:11 +01:00
Gerard 8bed065f62 My team checkbox now has three states 2019-02-15 13:59:44 +01:00
Gerard b01f401286 Merge branch 'dev' into jgallego 2019-02-15 13:33:24 +01:00
Javi Gallego 7f7f47d861 bug no results duplicado 2019-02-15 13:25:23 +01:00
Carlos Jimenez Ruiz d6a8cd68d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-15 13:19:21 +01:00
Javi Gallego 8bea3afbfb karma reparado 2019-02-15 13:13:23 +01:00
Carlos Jimenez Ruiz 3ab0b2eb19 merge 2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Gerard db6a5cfc3e changed hide for on-hide binding 2019-02-14 20:18:10 +01:00
Gerard 1144a197a5 #1112 ticket.sale 2019-02-14 12:06:14 +01:00
Juan Ferrer f3e3c1bbae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 14:01:38 +01:00
Juan Ferrer 1f759b6b8c Style fixes 2019-02-13 14:01:37 +01:00
Bernat df452ff345 merge 2019-02-13 13:28:02 +01:00
Bernat bbd4188695 #9848 fix test and update fixtures 2019-02-13 13:19:15 +01:00
Carlos Jimenez Ruiz fb4a4cd3de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-13 08:19:44 +01:00
Juan Ferrer d65a6fd59e Ticket summary fix: lines with no claim 2019-02-12 15:39:37 +01:00
Carlos Jimenez Ruiz 3a5b5096da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-12 14:40:22 +01:00
Carlos Jimenez Ruiz 9c0613e8e7 #1127 2019-02-12 14:40:13 +01:00
Gerard 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 208936f979 Merge branch 'master' into test 2019-02-12 14:29:45 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Carlos Jimenez Ruiz b0e22febd3 #1127 mover ticket.descriptor al modulo ticket 2019-02-12 09:03:56 +01:00
Gerard 93aa94c5a0 fixed typo 2019-02-11 13:14:02 +01:00
Bernat d994bd8e9d #9783 update model and fixtures 2019-02-11 10:39:53 +01:00
Juan Ferrer c0dd1624f6 Table style 2019-02-10 22:52:35 +01:00
Juan Ferrer f52d306db4 Color style unified 2019-02-08 17:49:51 +01:00
Gerard 8bef242a54 fixed lines icon not preventing event default 2019-02-07 09:33:54 +01:00
Gerard 171716806a #1096 back validaciones crear ticket 2019-02-06 16:37:59 +01:00
Gerard d714c34f59 #1049 ticket.sale 2019-02-06 11:42:22 +01:00
Gerard 9573c875e2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:40:43 +01:00
Gerard 87b3032a4f #1067 error en boton "Importar Reclamacion" 2019-02-06 11:39:22 +01:00
Juan Ferrer 91d83bc132 Merge 2019-02-06 11:25:36 +01:00
Juan Ferrer 2bf9244770 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 11:24:31 +01:00
Juan Ferrer 03406a7d9b Style fixes 2019-02-06 11:24:29 +01:00
Gerard 6d54c860cd #1029 ir a lineas pedido en ticket.index 2019-02-06 09:55:17 +01:00
Gerard 3b4126ee79 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 09:25:40 +01:00
Javi Gallego f9982047aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 07:58:43 +01:00
Javi Gallego 60c5d3062f expedition.json new externalId field 2019-02-06 07:56:10 +01:00
Gerard 391c5e42c0 #1101 ticket.index 2019-02-05 17:01:01 +01:00
Gerard 69edf3fc43 Merge branch 'master' into test 2019-02-05 12:24:34 +01:00
Gerard d51ed26025 tracking edit not showing hotfix 2019-02-05 12:20:03 +01:00