Commit Graph

1204 Commits

Author SHA1 Message Date
Joan Sanchez 4ca001d98e 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 11:09:03 +02:00
Joan Sanchez 79f9e616d2 added treeview unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-17 11:08:40 +02:00
Joan Sanchez 6d159c50a0 css fixes
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 09:52:46 +02:00
Joan Sanchez dadfc92ebd pull from dev 2019-10-16 09:52:32 +02:00
Joan Sanchez 7aaa8f4a5e refactor drag & drop treeview
gitea/salix/1757-drag_and_drop_department This commit looks good Details
2019-10-16 08:56:13 +02:00
Juan Ferrer e1e65e8b2e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-16 08:23:16 +02:00
Carlos Jimenez Ruiz a501cb8887 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-10-16 08:03:09 +02:00
Carlos Jimenez Ruiz b37e308a4b #1811 send.js unit test 2019-10-16 08:01:34 +02:00
Joan Sanchez 6ed5695063 Added zoneFk to routes. solved #1713
gitea/salix/dev This commit looks good Details
2019-10-16 07:18:05 +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 25bd28990a Refactor #1812 refactor phone
gitea/salix/dev This commit looks good Details
2019-10-15 14:44:00 +02:00
Bernat c6a078d82d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 14:35:58 +02:00
Carlos Jimenez Ruiz 3595524286 #1794 index de balance pierde la companyFk
gitea/salix/dev This commit looks good Details
2019-10-15 13:18:56 +02:00
Joan Sanchez 3853fc7404 descuadre de horas #1766 rollback
gitea/salix/dev This commit looks good Details
2019-10-15 08:50:11 +02:00
Bernat fe5a77257f #1758 Añadir los alias como prefijos en los filtros 2019-10-15 08:32:25 +02:00
Carlos Jimenez Ruiz c46797d57e removed third party endpoint test
gitea/salix/dev This commit looks good Details
2019-10-15 08:15:04 +02:00
Carlos Jimenez Ruiz 1086d3d362 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 07:43:51 +02:00
Bernat 793dd06e8d merge
gitea/salix/1763-worker_time_control_add This commit looks good Details
2019-10-15 07:30:23 +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
Carlos Jimenez Ruiz c57583e64b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-14 15:20:10 +02:00
Carlos Jimenez Ruiz 5b47eb54b2 #1767 client.balance.index, campo referencia 2019-10-14 15:20:03 +02:00
Joan Sanchez e79456374c fixed item-popover width
gitea/salix/dev This commit looks good Details
2019-10-14 14:54:11 +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 1f8f5af301 fixed transaction params
gitea/salix/dev Build queued... Details
2019-10-14 11:50:45 +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
Carlos Jimenez Ruiz 4a6ff9ca20 removed useless FIXME comments as per #1782
gitea/salix/dev This commit looks good Details
2019-10-14 10:59:10 +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
Joan Sanchez cd2b02b0c6 Bug/Test #1753 - Added dateTime filter 2019-10-14 08:52:48 +02:00
Bernat e267bf93a4 merge
gitea/salix/dev This commit looks good Details
2019-10-14 07:01:29 +02:00
Bernat d637ed2599 1717, route basic data 2019-10-14 06:58:02 +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 8af7f13ac6 #1763 insert from procedure
gitea/salix/1763-worker_time_control_add This commit looks good Details
2019-10-10 14:11:23 +02:00
Javi Gallego 3e71338d94 borra tabla temporal
gitea/salix/dev This commit looks good Details
2019-10-10 12:14:21 +02:00
Joan Sanchez 144f13c400 changed state to stowaway ticket
gitea/salix/master This commit looks good Details
2019-10-10 10:00:38 +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
Carlos Jimenez Ruiz 7db4945a6d #1702 Autocomplete data refresh and #1754 watcher
gitea/salix/dev This commit has test failures Details
2019-10-08 17:27:27 +02:00
Joan Sanchez 6422d25ad6 stowaway changed to correct field name
gitea/salix/master This commit looks good Details
2019-10-08 14:37:38 +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 cc71f51f45 added invoiceOut alias
gitea/salix/master This commit looks good Details
2019-10-08 13:52:50 +02:00
Joan Sanchez 1186654fba added invoiceOut alias
gitea/salix/dev This commit looks good Details
2019-10-08 13:51:16 +02:00
Joan Sanchez 90ca883962 solved conflicts
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:06:50 +02:00
Joan Sanchez 9358602471 #15 Updated changes width dev
gitea/salix/1625-worker_department_treeview This commit looks good Details
2019-10-08 13:03:19 +02:00