 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 |
|
Carlos Jimenez Ruiz
|
d1acd60d5a
|
added a precise selector #1680
gitea/salix/dev This commit looks good
Details
|
2019-09-24 13:22:01 +02:00 |
|
Bernat
|
faf355fab8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 12:38:26 +02:00 |
|
Bernat
|
7384fabec0
|
Tarea #1724 order/index buscar por alias
|
2019-09-24 12:10:03 +02:00 |
|
Carlos Jimenez Ruiz
|
e3dd482457
|
Merge branch 'dev' into test
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-09-24 12:09:35 +02:00 |
|
Carlos Jimenez Ruiz
|
92463b0ccd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 12:08:39 +02:00 |
|
Carlos Jimenez Ruiz
|
ebc4dd5616
|
#1696 formulario que se envia a los clientes
|
2019-09-24 12:08:21 +02:00 |
|
Joan Sanchez
|
9606f039e0
|
Merge branch 'dev' into test
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-09-24 11:56:14 +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 |
|
Joan Sanchez
|
310f2bae70
|
Create new order now opens on new window
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-09-24 11:35:46 +02:00 |
|
Joan Sanchez
|
e6f6c262fa
|
Merge branch 'dev' into test
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-09-24 10:43:16 +02:00 |
|
Juan Ferrer
|
a319eed5f6
|
Zone.getLeaves() refactor
gitea/salix/dev This commit looks good
Details
|
2019-09-24 10:41:25 +02:00 |