Commit Graph

762 Commits

Author SHA1 Message Date
Juan Ferrer 4da83ef963 Hotfixes: vnTicketSale menu, vnItemDiary width 2019-12-17 12:23:31 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Joan Sanchez 8808e49a10 updated unit test
gitea/salix/1919-ticket_service_type This commit looks good Details
2019-12-13 12:07:36 +01:00
Joan Sanchez 780f1e4773 renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit Details
2019-12-13 11:59:25 +01:00
Joan Sanchez af47ab6cac fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit Details
2019-12-12 08:22:04 +01:00
Bernat f38210ddd2 udate structure db 2019-12-04 11:09:36 +01:00
Joan Sanchez 974bf67e8d removed focus
gitea/salix/dev This commit looks good Details
2019-11-25 07:46:00 +01:00
Joan Sanchez 27cab0e722 added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good Details
2019-11-21 14:00:27 +01:00
Joan Sanchez 423240ac7d open dialog 2019-11-21 13:02:46 +01:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 12:00:56 +01:00
Joan Sanchez fee0d674a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 11:06:31 +01:00
Joan Sanchez 5bb7f7f14a deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures Details
2019-11-20 11:14:11 +01:00
Joan Sanchez c6d1536500 recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures Details
2019-11-20 06:53:37 +01:00
Carlos Jimenez Ruiz eeead2cc86 corrected a typo 2019-11-18 16:37:03 +01:00
Javi Gallego f12b1b8595 test fron arreglados
gitea/salix/dev This commit looks good Details
2019-11-18 16:03:10 +01:00
Javi Gallego c736e4de29 #1850 descomentar test back
gitea/salix/dev There was a failure building this commit Details
2019-11-18 12:32:50 +01:00
Juan Ferrer 4f5c1404d7 E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good Details
2019-11-14 15:24:08 +01:00
Juan Ferrer 09a187ecfe Merge 2019-11-14 15:05:49 +01:00
Joan Sanchez c028233012 ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good Details
2019-11-14 14:19:39 +01:00
Juan Ferrer 4436acec10 Merge 2019-11-14 14:07:48 +01:00
Joan Sanchez 236dcbf207 changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good Details
2019-11-13 13:22:39 +01:00
Joan Sanchez c166067888 updated tests & email compatibility with phone
gitea/salix/dev This commit looks good Details
2019-11-13 12:18:30 +01:00
Joan Sanchez 308c4dfb88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-13 08:09:54 +01:00
Joan Sanchez 603bb034a1 Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good Details
2019-11-13 07:56:09 +01:00
Joan Sanchez 7f2af116bc updated translation
gitea/salix/dev This commit looks good Details
2019-11-13 07:04:47 +01:00
Joan Sanchez c3962c3d78 updated test
gitea/salix/dev This commit looks good Details
2019-11-12 15:07:37 +01:00
Joan Sanchez b320d64462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-11-12 14:54:13 +01:00
Joan Sanchez 1b70721b0e #1864 added restrictions, send rocketchat message 2019-11-12 14:53:58 +01:00
Joan Sanchez 05c4c9e96a ticket.weekly removed create section already on ticket descriptor #1841 2019-11-12 14:48:03 +01:00
Juan Ferrer a4f6c64e59 Merge 2019-11-12 09:24:08 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Juan Ferrer 95d943e515 E2E fixes 2019-11-11 16:32:03 +01:00
Juan Ferrer efa6ddc0f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-11 16:25:00 +01:00
Joan Sanchez 42524c7f1d increased width to expand class #1845
gitea/salix/dev This commit looks good Details
2019-11-11 13:22:25 +01:00
Joan Sanchez 6f7962935d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor 2019-11-11 11:24:26 +01:00
Juan Ferrer cf6961f5c5 E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures Details
2019-11-10 14:13:55 +01:00
Juan Ferrer 976782738e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor 2019-11-10 13:27:31 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +01:00
Bernat 84ccfe0422 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-07 07:51:21 +01:00
Javi Gallego eaa2ef4570 zone warehouse error
gitea/salix/dev This commit looks good Details
2019-11-07 07:49:37 +01:00
Joan Sanchez 3d701f534a updated tests
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-06 09:32:54 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Joan Sanchez cac8cb6a6a dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-05 09:16:16 +01:00
Bernat 1be61b16d5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-11-05 08:56:59 +01:00
Juan Ferrer 38b4483edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-31 13:43:15 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good Details
2019-10-31 12:54:16 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Bernat 9353d54b16 add alias on weekly filter 2019-10-29 14:55:05 +01:00
Joan Sanchez 443aa56fed refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-29 07:46:44 +01:00
Juan Ferrer 0a4a22ec87 vnInputFile fixed
gitea/salix/dev This commit looks good Details
2019-10-28 21:40:24 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer 5ae558e965 Watchers performance fixes 2019-10-26 12:04:48 +02:00
Juan Ferrer 5fdfda47b2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-25 00:53:57 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Bernat afd7c5684a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good Details
2019-10-24 12:49:23 +02:00
Joan Sanchez 2ed4cf3e4a Item request refactor #1818
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-10-22 13:44:36 +02:00
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit Details
2019-10-21 14:21:52 +02:00
Bernat 939c507fba #1810 El método listPackaging filtrar por isPackagingReturnable 2019-10-21 09:16:52 +02:00
Joan Sanchez e2a7c09e4a Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good Details
2019-10-21 08:31:14 +02:00
Joan Sanchez 55f3390f85 added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures Details
2019-10-21 07:08:47 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer 17a150370c Style fixes
gitea/salix/dev This commit has test failures Details
2019-10-18 21:54:13 +02:00
Juan Ferrer 43fd8fe75e Merge 2019-10-18 21:37:28 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Joan Sanchez 04785d3f72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:28:07 +02:00
Joan Sanchez b2b76b05d8 css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 13:27:50 +02:00
Carlos Jimenez Ruiz 8ce804a099 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-17 11:56:12 +02:00
Carlos Jimenez Ruiz e0d9f69aef corrected a description 2019-10-16 10:59:42 +02:00
Juan Ferrer a2881e5b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 16:19:38 +02:00
Juan Ferrer 3bf44d08de vnDatePicker refactor 2019-10-15 16:19:35 +02:00
Bernat ed1ed7f50b #1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good Details
2019-10-15 07:23:34 +02:00
Joan Sanchez 300ba61fd3 #1759 Forzar desenrutado al cambiar datos básicos de ticket 2019-10-14 14:43:10 +02:00
Joan Sanchez ecda659a8c Bug #1796 fixed edit discount dialog position
gitea/salix/dev This commit looks good Details
2019-10-14 14:17:18 +02:00
Joan Sanchez 81097287fa #1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good Details
2019-10-14 11:44:54 +02:00
Joan Sanchez 4a2d61ddcb #1769 removed route report from ticket descriptor
gitea/salix/dev This commit looks good Details
2019-10-14 08:52:48 +02:00
Juan Ferrer 7dfd1fe6f2 Merge
gitea/salix/dev This commit looks good Details
2019-10-11 17:43:29 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Joan Sanchez 9bfc87f1e2 changed state to stowaway ticket
gitea/salix/dev This commit looks good Details
2019-10-10 09:59:28 +02:00
Joan Sanchez 756acd41ef added data-viewer
gitea/salix/dev This commit has test failures Details
2019-10-10 09:26:44 +02:00
Joan Sanchez 21c32b0af2 dialog css fixes
gitea/salix/dev This commit has test failures Details
2019-10-10 08:07:11 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer fc09d76422 Merge 2019-10-08 23:57:54 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Joan Sanchez c0403873e7 stowaway changed to correct field name
gitea/salix/dev This commit has test failures Details
2019-10-08 14:36:02 +02:00
Joan Sanchez c7d2c33ffb merge
gitea/salix/test There was a failure building this commit Details
gitea/salix/dev This commit looks good Details
2019-10-08 11:48:13 +02:00
Joan Sanchez edecadc78e #1756 stowaway no muestra resultados
gitea/salix/dev This commit looks good Details
2019-10-08 11:41:17 +02:00
Juan Ferrer eeef468964 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
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
gitea/salix/dev This commit looks good Details
2019-10-04 17:49:51 +02:00
Joan Sanchez b4c23b86a2 fixed summary button
gitea/salix/dev This commit looks good Details
2019-10-04 11:39:24 +02:00
Joan Sanchez 7b7d7664e1 disabled autoload on stowaway model #1747
gitea/salix/dev This commit looks good Details
2019-10-04 11:18:07 +02:00
Joan Sanchez 69ef2c2e27 update zone and shipped on #1746
gitea/salix/dev This commit looks good Details
2019-10-04 09:28:09 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit has test failures Details
2019-10-01 11:06:20 +02:00
Joan Sanchez fe95406594 Ticket list order by zone hour #1728
gitea/salix/dev This commit has test failures Details
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
gitea/salix/1719-claim-detail This commit looks good Details
2019-09-26 12:07:40 +02:00
Carlos Jimenez Ruiz e57210fdfc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-26 11:52:42 +02:00
Joan Sanchez b64a6fd05c Mostrar fotos de reclamaciones en el summary #1732
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-09-25 11:26:12 +02:00
Carlos Jimenez Ruiz 92eef27f37 #1723 ticket.index si el total es menor de 50€
gitea/salix/dev This commit looks good Details
2019-09-24 16:38:57 +02:00
Carlos Jimenez Ruiz 0c27b90c5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-09-24 14:22:46 +02:00
Joan Sanchez d627a8ba25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-09-24 13:25:18 +02:00
Joan Sanchez 3af26900e3 watcher preventing claim creation
gitea/salix/dev This commit looks good Details
2019-09-24 11:55:36 +02:00
Joan Sanchez 5851784e41 Create new order now opens on new window
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-09-24 08:51:21 +02:00
Carlos Jimenez Ruiz 0f04aed2fe #1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev This commit looks good Details
2019-09-13 11:27:32 +02:00
Bernat c6507fc2bb #1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good Details
2019-09-13 07:40:27 +02:00
Joan Sanchez 8b8463e936 Updated dms colums size #1692
gitea/salix/dev This commit looks good Details
2019-09-12 12:12:39 +02:00
Joan Sanchez f6bd915ae6 Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good Details
2019-09-12 11:47:56 +02:00
Bernat c344d8088b merge
gitea/salix/dev This commit looks good Details
2019-09-11 14:18:21 +02:00
Joan Sanchez ff626764d8 fixed back unit tests
gitea/salix/dev This commit looks good Details
2019-09-11 08:24:28 +02:00
Joan Sanchez 342886942f fixed sale loggable transaction error #1686
gitea/salix/dev This commit has test failures Details
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
gitea/salix/dev This commit looks good Details
2019-09-09 10:57:10 +02:00
Carlos Jimenez Ruiz 3c9fe334c9 #1655 e2e ticket.sale Añadir lineas
gitea/salix/dev This commit looks good Details
2019-09-06 14:56:56 +02:00
Carlos Jimenez Ruiz 56c291a160 merge
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-09-05 13:06:40 +02:00
Joan Sanchez 59c6952025 Implement watcher on ticket sales #1678
gitea/salix/dev This commit looks good Details
2019-09-05 09:00:55 +02:00
Joan Sanchez 0d21519523 updated transfer css
gitea/salix/dev This commit looks good Details
2019-09-04 14:37:29 +02:00
Joan Sanchez db1113ab0b added scrollbar to transfer popover
gitea/salix/dev This commit looks good Details
2019-09-04 14:08:08 +02:00
Joan Sanchez d3441fa1b3 Ticket step one refactor #1669
gitea/salix/dev This commit looks good Details
2019-09-04 08:04:31 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good Details
2019-09-03 14:42:52 +02:00
Carlos Jimenez Ruiz 219614b44f #1656 ticket.regularizar eliminar ticket + tests
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit has test failures Details
2019-09-02 14:36:54 +02:00
Joan Sanchez 37b9c5c4ce Added zone inflation field #1641
gitea/salix/dev This commit looks good Details
2019-09-02 11:25:31 +02:00
Carlos Jimenez Ruiz 11b99d9a5f #1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good Details
2019-08-20 14:18:32 +02:00
Bernat 7eea9d1d2c Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit Details
2019-08-19 07:56:20 +02:00
Bernat 4032bde243 fix bug ticket.sale
gitea/salix/dev This commit looks good Details
2019-08-13 14:03:02 +02:00
Bernat d9c63e3bc0 Tarea #1501 ticket / delete
gitea/salix/dev This commit looks good Details
2019-08-13 12:44:34 +02:00
Bernat d08a43bc23 #1630 state.isEditable
gitea/salix/dev This commit looks good Details
2019-08-12 13:28:27 +02:00
Bernat 2e89af9795 #1630 state.isEditable
gitea/salix/dev This commit has test failures Details
2019-08-12 13:26:44 +02:00
Bernat b6cc769df3 Test #1636 refactor test de back isEditable y editableState
gitea/salix/dev This commit has test failures Details
2019-08-12 12:31:31 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251
gitea/salix/dev This commit looks good Details
2019-08-09 08:04:44 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598
gitea/salix/dev This commit looks good Details
2019-08-08 08:37:03 +02:00
Bernat 2f1472b9ee Tarea #1574
gitea/salix/dev This commit looks good Details
ticket.sale editableState
2019-08-08 08:33:27 +02:00
Bernat 8f519fd15b Bug #900 Ticket.picture lineas vacias cuando no tiene tags
gitea/salix/dev This commit looks good Details
2019-08-07 09:58:05 +02:00
Joan Sanchez e52a0ac5da ticket.sale split show active tickets
gitea/salix/dev There was a failure building this commit Details
2019-08-06 07:36:26 +02:00
Joan Sanchez efeba38fb4 back errors fixed
gitea/salix/dev There was a failure building this commit Details
2019-08-01 11:52:53 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures Details
2019-07-31 07:46:24 +02:00
Joan Sanchez 82d3ac27cf ticket basicData change zone on date update
gitea/salix/dev This commit looks good Details
2019-07-30 12:43:21 +02:00
Joan Sanchez fb4ce77c01 claim upload pictures #1593
gitea/salix/dev This commit looks good Details
2019-07-30 08:51:38 +02:00
Joan Sanchez 07af2271c2 ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good Details
2019-07-29 13:12:36 +02:00
Joan Sanchez 64a4e5f43d ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good Details
2019-07-26 11:48:01 +02:00
Carlos Jimenez Ruiz e1cbf781e1 #1608 item.request
gitea/salix/dev This commit has test failures Details
2019-07-25 09:55:09 +02:00
Bernat 8089c32ec2 Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good Details
2019-07-23 14:56:57 +02:00
Bernat 97f2229090 Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good Details
2019-07-23 11:15:06 +02:00
Bernat 16257e9918 fix test front
gitea/salix/dev There was a failure building this commit Details
2019-07-23 07:36:10 +02:00
Bernat 6a23a5429c Tarea #1562 ticket.line isEditable
gitea/salix/dev There was a failure building this commit Details
2019-07-22 13:14:00 +02:00
Joan Sanchez 970c8ab5ec show dms order number #1601
gitea/salix/dev This commit looks good Details
2019-07-19 08:13:52 +02:00
Joan Sanchez 51734db404 ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit Details
2019-07-17 15:01:38 +02:00
Joan Sanchez f56423bac9 disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good Details
2019-07-17 10:55:58 +02:00
Joan Sanchez 145e596d16 fixed dms unit tests
gitea/salix/dev This commit has test failures Details
2019-07-16 14:12:58 +02:00
Joan Sanchez 4f73d1eb5a dms fixes
gitea/salix/dev There was a failure building this commit Details
2019-07-16 13:37:25 +02:00
Joan Sanchez 72fcf807b0 7z mimetype
gitea/salix/dev This commit has test failures Details
2019-07-16 07:22:29 +02:00
Joan Sanchez b85aa6d3da fixed icons column size
gitea/salix/dev This commit has test failures Details
2019-07-15 13:20:50 +02:00
Joan Sanchez dae49f52b6 removed download file conditional
gitea/salix/dev This commit looks good Details
2019-07-15 11:56:17 +02:00
Joan Sanchez 588250b1c1 dms update files
gitea/salix/dev This commit looks good Details
2019-07-15 11:40:11 +02:00
Joan Sanchez 23f5ff0c5c merge
gitea/salix/dev Something is wrong with the build of this commit Details
2019-07-12 14:02:38 +02:00
Joan Sanchez c21532e5f7 ticket.index filters
gitea/salix/master This commit looks good Details
2019-07-12 14:00:32 +02:00
Joan Sanchez eefa4b9f5b apply default filters
gitea/salix/master This commit looks good Details
2019-07-12 12:56:00 +02:00
Joan Sanchez 6b9286d1b0 fixed ticket.index
gitea/salix/master This commit looks good Details
2019-07-12 12:32:02 +02:00
Joan Sanchez c4fcaeb908 ticket.index filter by date if no filters were entered
gitea/salix/master This commit looks good Details
2019-07-12 12:20:55 +02:00
Joan Sanchez 29744c52f3 fixed ticket.index
gitea/salix/master This commit looks good Details
2019-07-12 11:43:10 +02:00
Joan Sanchez e135ae039a changed closure field
gitea/salix/dev This commit looks good Details
2019-07-12 09:42:06 +02:00
Joan Sanchez 25014654b1 changed closure field
gitea/salix/master This commit looks good Details
2019-07-12 09:39:59 +02:00
Joan Sanchez 659a441f47 ticket index show zone closure hour
gitea/salix/master This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-07-12 09:06:19 +02:00
Joan Sanchez 2a6de77e17 ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit Details
2019-07-12 08:49:44 +02:00
Joan Sanchez 1b8a407916 show expeditions fix
gitea/salix/master This commit looks good Details
2019-07-11 11:21:12 +02:00
Joan Sanchez 62ef2dccd8 show expeditions fix
gitea/salix/dev This commit looks good Details
2019-07-11 11:20:41 +02:00
Joan Sanchez 8ecc88b516 hide download button for dms without a file attached #1590
gitea/salix/master This commit looks good Details
2019-07-11 09:54:42 +02:00
Joan Sanchez 3ce59c0b73 hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good Details
2019-07-11 09:53:16 +02:00
Joan Sanchez 6f3b023644 Create postcode form #1585
gitea/salix/dev This commit looks good Details
2019-07-08 14:07:09 +02:00
Carlos Jimenez Ruiz a35533687f removed unused spec files
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-07-01 11:56:16 +02:00
Carlos Jimenez Ruiz bd76840cb3 #1446 e2e ticket.summary
gitea/salix/dev This commit looks good Details
2019-06-27 15:33:15 +02:00
Carlos Jimenez Ruiz 8c26a89516 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz 5270693bdd #1387 e2e Ticket Edit sale path
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-06-25 14:00:55 +02:00
Carlos Jimenez Ruiz 2ce442a022 #1555 ticket.lines transer to a new ticket
gitea/salix/dev This commit looks good Details
2019-06-25 11:17:58 +02:00
Bernat 1227f7ac83 Test #1549 Arreglar test de back
gitea/salix/dev This commit looks good Details
2019-06-21 13:19:51 +02:00
Javi Gallego 289f588923 #1550 ticket.descriptor polizon cambia estado
gitea/salix/dev This commit has test failures Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev This commit looks good Details
2019-06-18 12:09:43 +02:00
Bernat 53f6db7a4a Refactor #1527 claim/detail, ticket/sale updateDiscount y updatePrice
gitea/salix/dev This commit looks good Details
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
gitea/salix/master This commit looks good Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit looks good Details
2019-06-07 07:45:12 +02:00
Joan Sanchez c28734ff61 added dms tasks #1499, #1469, #1468, #1484
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev This commit looks good Details
2019-06-05 15:20:56 +02:00