Commit Graph

8275 Commits

Author SHA1 Message Date
Juan Ferrer 84572dc398 Merge & fixes 2019-09-30 13:02:03 +02:00
Carlos Jimenez Ruiz 300dfc5772 #1726 client.index añadir icono de Listado tickets
gitea/salix/dev This commit looks good Details
2019-09-30 11:47:39 +02:00
Juan Ferrer 55133ded68 Fixes 2019-09-30 11:31:10 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Bernat e380e4466c #1717 route.basic-data añadir campo description
gitea/salix/dev This commit looks good Details
2019-09-30 08:26:51 +02:00
Joan Sanchez a98a8831ed prevent popover focus propagation #1718
gitea/salix/dev This commit looks good Details
2019-09-30 07:53:38 +02:00
Carlos Jimenez Ruiz cae2a0a148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-27 16:55:49 +02:00
Carlos Jimenez Ruiz 6e50c1fad9 #1685 ticket.transferSale 2019-09-27 16:55:40 +02:00
Bernat 907b4a4991 #1729 client.webPayment mostrar hora
gitea/salix/dev This commit looks good Details
2019-09-27 11:04:27 +02:00
Carlos Jimenez Ruiz 641dad2ced Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-26 16:09:06 +02:00
Juan Ferrer 83c6d15eb1 Calendar fixes
gitea/salix/dev This commit looks good Details
2019-09-26 15:39:08 +02:00
Carlos Jimenez Ruiz f3d2313464 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 14:52:54 +02:00
Juan Ferrer 455d953e9a Tests fixed
gitea/salix/dev This commit looks good Details
2019-09-26 14:51:45 +02:00
Carlos Jimenez Ruiz 38a58af3ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 14:23:31 +02:00
Carlos Jimenez Ruiz d5d7b1ef96 Bug/Test #1736 back errors 2019-09-26 13:45:42 +02:00
Juan Ferrer dbd70da866 Merge
gitea/salix/dev This commit looks good Details
2019-09-26 13:36:22 +02:00
Juan Ferrer 60f611b76b Merge branch 'test' into dev 2019-09-26 12:47:45 +02:00
Juan Ferrer 445668d57f Refactor agency SQL scripts 2019-09-26 12:47:16 +02:00
Joan Sanchez 51a9ad951f Merge branch '1719-claim-detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-26 10:16:43 +00: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 52552ec502 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 11:07:38 +02:00
Carlos Jimenez Ruiz 2a2c5ae3c4 #1719 claim.detail cambiar descuento falla 2019-09-26 10:56:49 +02:00
Joan Sanchez ca4009088d Descuadre de meses componente calendar #1733
gitea/salix/dev This commit looks good Details
2019-09-26 10:43:06 +02:00
Juan Ferrer 5262cd7e43 Merge branch 'test' into dev 2019-09-26 10:09:17 +02:00
Juan Ferrer c0f39ba87f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-26 10:09:07 +02:00
Juan Ferrer 3d4b7601be SQL scripts 2019-09-26 10:08:37 +02:00
Bernat f28305de9b Refactor #1698 claim.basic-data al llamar a updateClaim tener en cuenta el campo roleFk
gitea/salix/dev This commit looks good Details
2019-09-26 09:13:18 +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
Juan Ferrer 91e4e62a1c Merge branch 'test' into dev 2019-09-26 08:44:00 +02:00
Juan Ferrer 2a0cc1dc8b Style/i18n fixes 2019-09-25 23:09:10 +02:00
Juan Ferrer dba4ae14d5 Query delivery days by province 2019-09-25 22:35:21 +02:00
Juan Ferrer 54839782f3 Style fix 2019-09-25 20:14:43 +02:00
Juan Ferrer 91b5ad5a3e Merge 2019-09-25 20:11:14 +02:00
Juan Ferrer 98cc3ce00e Agency events, delivery days viewer 2019-09-25 20:06:42 +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