Commit Graph

560 Commits

Author SHA1 Message Date
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