 Juan Ferrer
|
de9a8443ca
|
Style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-18 22:28:08 +02:00 |
|
Juan Ferrer
|
485bc43b13
|
Style fixes
|
2019-10-18 22:07:55 +02:00 |
|
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 |
Bernat
|
85bcb356d4
|
1778 Refactor worker.phone
|
2019-10-18 13:52:15 +02:00 |
|
Bernat
|
b78447bdd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-18 13:51:24 +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 |
|
Bernat
|
1cedd6cbfd
|
merge
|
2019-10-18 08:38:25 +02:00 |
|
Bernat
|
7a89ab5335
|
#1778 Refactor worker.phone
|
2019-10-18 08:36:33 +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
|
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 |
|
Bernat
|
7ee03d91f8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-17 14:01:58 +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 |
|
Bernat
|
24861fe5b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-17 11:55:36 +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 |
|
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 |
|
Bernat
|
061e978a26
|
#1758 Añadir los alias como prefijos en los filtros
|
2019-10-16 08:08:10 +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 |
|
Joan Sanchez
|
4025c624b3
|
#15 WIP fixed requested changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 12:48:12 +02:00 |
|
Joan Sanchez
|
c7d2c33ffb
|
merge
gitea/salix/test There was a failure building this commit
Details
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:48:13 +02:00 |
|
Joan Sanchez
|
05aa9151eb
|
fixed stowaway list
gitea/salix/master This commit looks good
Details
|
2019-10-08 11:45:00 +02:00 |
|
Joan Sanchez
|
edecadc78e
|
#1756 stowaway no muestra resultados
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:41:17 +02:00 |
|
Joan Sanchez
|
eb655215f4
|
merge pull changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 09:23:29 +02:00 |
|
Joan Sanchez
|
b32cf4a386
|
last refactor
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-08 07:22:38 +02:00 |
|
Carlos Jimenez Ruiz
|
7449f288b3
|
#1751 order.summary mostrar campo sourceapp
gitea/salix/dev This commit looks good
Details
|
2019-10-07 10:35:34 +02:00 |
|
Juan Ferrer
|
4f92cafe30
|
CSS border style classes
gitea/salix/dev This commit has test failures
Details
|
2019-10-06 20:13:24 +02:00 |
|
Juan Ferrer
|
c2dcae5577
|
client.note.index style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-05 00:44:25 +02:00 |
|
Juan Ferrer
|
eeef468964
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-05 00:17:10 +02:00 |
|
Juan Ferrer
|
b12a666653
|
CSS padding/margin refactor, glob styles in core
|
2019-10-05 00:16:57 +02:00 |
|
Carlos Jimenez Ruiz
|
4fa532abb8
|
#1744 ticket.index ocultar columnas expendables
gitea/salix/dev This commit looks good
Details
|
2019-10-04 17:49:51 +02:00 |
|
Juan Ferrer
|
9b385f4b90
|
#1749 Fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-04 13:12:53 +02:00 |
|
Joan Sanchez
|
b4c23b86a2
|
fixed summary button
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:39:24 +02:00 |
|
Joan Sanchez
|
9c3e7f50ec
|
disabled autoload on stowaway model #1747
gitea/salix/master This commit looks good
Details
|
2019-10-04 11:21:24 +02:00 |
|
Joan Sanchez
|
7b7d7664e1
|
disabled autoload on stowaway model #1747
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:18:07 +02:00 |
|
Carlos Jimenez Ruiz
|
e158bd5811
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-04 10:07:59 +02:00 |
|
Carlos Jimenez Ruiz
|
da2c763573
|
#1705 item.index optimizar velocidad
|
2019-10-04 10:07:45 +02:00 |
|
Joan Sanchez
|
6b44686ff4
|
update zone and shipped on #1746
gitea/salix/master This commit looks good
Details
|
2019-10-04 09:45:30 +02:00 |
|
Joan Sanchez
|
69ef2c2e27
|
update zone and shipped on #1746
gitea/salix/dev This commit looks good
Details
|
2019-10-04 09:28:09 +02:00 |
|
Joan Sanchez
|
9919f9a46e
|
add & remove childs
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-04 07:41:24 +02:00 |
|
Juan Ferrer
|
c6e8498281
|
ModelProxy.status, Paging removed, locale fixes
gitea/salix/dev This commit looks good
Details
|
2019-10-03 19:34:24 +02:00 |
|
Joan Sanchez
|
a8f2000f3f
|
Cambios mockup #1745
gitea/salix/dev This commit looks good
Details
|
2019-10-03 11:37:44 +02:00 |
|
Juan Ferrer
|
ec9797a4b3
|
vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good
Details
|
2019-10-02 21:02:49 +02:00 |
|
Juan Ferrer
|
87add6cd33
|
vnDataViewer
|
2019-10-02 19:24:42 +02:00 |
|
Joan Sanchez
|
2e22c79e18
|
fixed #1734 canHaveStowaway validation
gitea/salix/master This commit looks good
Details
|
2019-10-02 14:36:24 +02:00 |
|
Joan Sanchez
|
6a184496d6
|
treeview refactor 2
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-02 14:12:17 +02:00 |
|
Joan Sanchez
|
9473636b5b
|
treeview refactor
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-02 09:54:52 +02:00 |
|
Juan Ferrer
|
ac5d9b909b
|
Agency exclusions & style fixes
gitea/salix/dev This commit looks good
Details
|
2019-10-01 16:48:01 +02:00 |
|
Juan Ferrer
|
0e88343649
|
Agency events bug fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-01 16:31:33 +02:00 |