Commit Graph

6130 Commits

Author SHA1 Message Date
Joan Sanchez c33906ca10 descuadre de horas #1766 rollback
gitea/salix/master This commit looks good Details
2019-10-16 07:56:46 +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
Carlos Jimenez Ruiz 2d90af906f #1771 rpt-delivery-note campo tasa con 2 decimales
gitea/salix/dev This commit looks good Details
2019-10-15 09:48:02 +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 Exposito 713073a48e Merge branch '1763-worker_time_control_add' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
LGTM
2019-10-15 05:35:52 +00: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
Bernat 9a65cafe19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 07:07:21 +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
Carlos Jimenez Ruiz 7d99b8dd59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-14 13:44:09 +02:00
Carlos Jimenez Ruiz 8291e97d74 removed todo coments as per #1782 2019-10-14 12:01:19 +02:00
Bernat 97fcb7e133 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-14 11:59:31 +02:00
Bernat b4123a1b3e fix e2e error 2019-10-14 11:59:26 +02:00
Joan Sanchez 2a3d6dcd76 fixed transaction params
gitea/salix/master This commit looks good Details
2019-10-14 11:54:28 +02:00
Joan Sanchez 0e40d11c6d Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-10-14 11:53:35 +02:00
Joan Sanchez 82b406be5f fixed e2e
gitea/salix/dev Something is wrong with the build of this commit Details
2019-10-14 11:51:26 +02:00
Joan Sanchez 1f8f5af301 fixed transaction params
gitea/salix/dev Build queued... Details
2019-10-14 11:50:45 +02:00
Joan Sanchez 8f7b01ca11 translation
gitea/salix/dev This commit looks good Details
2019-10-14 11:49:23 +02:00
Joan Sanchez c12ef09d0b translation
gitea/salix/dev This commit looks good Details
2019-10-14 11:47:48 +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
Carlos Jimenez Ruiz 4353d0d18a nightmare opens electron devTools option added
gitea/salix/dev This commit looks good Details
2019-10-14 08:25:04 +02:00
Joan Sanchez c60d8b563e Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-10-14 07:39:11 +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 9f608b725b Merge branch '1763-worker_time_control_add' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
LGTM
2019-10-10 12:19:50 +00: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 f34742c18c changed warehouse from ticket id 17 2019-10-10 10:00:34 +02:00
Joan Sanchez 9899edffc6 changed state to stowaway ticket
gitea/salix/test This commit looks good Details
2019-10-10 10:00:18 +02:00
Joan Sanchez 777baf38a8 changed warehouse from ticket id 17 2019-10-10 10:00:08 +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 05d0f50606 changed warehouse from ticket id 17
gitea/salix/dev This commit looks good Details
2019-10-10 09:58:34 +02:00