 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
|
18b0ae034c
|
#1815 - show summary correct photos on claim index
gitea/salix/dev This commit looks good
Details
|
2019-10-18 09:53:30 +02:00 |
 Carlos Jimenez Ruiz
|
bdbadaf61a
|
#1819 fixtures
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-17 14:30:52 +02:00 |
|
Joan Sanchez
|
f78fec42cc
|
Merge branch '1757-drag_and_drop_department' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
LGTM
|
2019-10-17 12:13:18 +00:00 |
|
Joan Sanchez
|
f2a05ff915
|
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 14:08:29 +02:00 |
|
Joan Sanchez
|
2a9158a593
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-17 14:06:52 +02:00 |
|
Joan Sanchez
|
703c882bc1
|
solved conflicts
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-10-17 14:06:24 +02:00 |
|
Joan Sanchez
|
43a2c2e939
|
insert timeControl from procedure
gitea/salix/master This commit looks good
Details
|
2019-10-17 14:03:22 +02:00 |
|
Joan Sanchez
|
6f691353a3
|
solved conflicts
gitea/salix/test Something is wrong with the build of this commit
Details
|
2019-10-17 14:03:07 +02:00 |
|
Joan Sanchez
|
e1cea99cc0
|
insert timeControl from procedure
gitea/salix/dev This commit looks good
Details
|
2019-10-17 14:01:23 +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 |
|
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 |
|
Carlos Jimenez Ruiz
|
e0d9f69aef
|
corrected a description
|
2019-10-16 10:59:42 +02:00 |
|
Juan Ferrer
|
dbe6161c69
|
Tests fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-16 09:54:02 +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
|
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 |