 Javi Gallego
|
c736e4de29
|
#1850 descomentar test back
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 12:32:50 +01:00 |
 Carlos Jimenez Ruiz
|
7c199b5d74
|
#1852 worker.time-control
|
2019-11-18 11:00:09 +01:00 |
|
Javi Gallego
|
4b51d607f7
|
error getLanded con drop temporary table
gitea/salix/dev This commit looks good
Details
|
2019-11-15 15:42:00 +01:00 |
 Joan Sanchez
|
c83a97d7ec
|
holidays fix #1853
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:44:11 +01:00 |
|
Carlos Jimenez Ruiz
|
d1b114de59
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-15 10:37:42 +01:00 |
|
Joan Sanchez
|
ddb19cb198
|
added event
gitea/salix/dev This commit looks good
Details
|
2019-11-15 10:03:46 +01:00 |
|
Joan Sanchez
|
6e5f460fab
|
#1867 show warehouses on summary
gitea/salix/dev This commit looks good
Details
|
2019-11-15 07:35:51 +01:00 |
 Juan Ferrer
|
4f5c1404d7
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 15:24:08 +01:00 |
|
Juan Ferrer
|
09a187ecfe
|
Merge
|
2019-11-14 15:05:49 +01:00 |
|
Juan Ferrer
|
2621da8dce
|
Hour formating fix
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 14:40:19 +01:00 |
|
Juan Ferrer
|
64124376f0
|
Final fixes
|
2019-11-14 14:37:18 +01:00 |
|
Carlos Jimenez Ruiz
|
8629b72d55
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-14 14:22:22 +01:00 |
|
Carlos Jimenez Ruiz
|
34bd35ce4e
|
#1852 worker.time-control
|
2019-11-14 14:20:05 +01:00 |
|
Joan Sanchez
|
c028233012
|
ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good
Details
|
2019-11-14 14:19:39 +01:00 |
|
Juan Ferrer
|
4436acec10
|
Merge
|
2019-11-14 14:07:48 +01:00 |
|
Joan Sanchez
|
5561ff169e
|
deprecated worker.sendMessage()
|
2019-11-14 11:21:08 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Carlos Jimenez Ruiz
|
d12f815c80
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 12:31:13 +01:00 |
|
Joan Sanchez
|
c166067888
|
updated tests & email compatibility with phone
gitea/salix/dev This commit looks good
Details
|
2019-11-13 12:18:30 +01:00 |
Bernat
|
dfd29ced70
|
1711 delete references
|
2019-11-13 11:04:52 +01:00 |
|
Carlos Jimenez Ruiz
|
b4669270c4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 08:54:27 +01:00 |
|
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-13 08:09:54 +01:00 |
|
Joan Sanchez
|
603bb034a1
|
Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:56:09 +01:00 |
|
Carlos Jimenez Ruiz
|
65b84d752c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-13 07:51:06 +01:00 |
|
Joan Sanchez
|
7f2af116bc
|
updated translation
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:04:47 +01:00 |
|
Carlos Jimenez Ruiz
|
0730aa1d0e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 15:18:41 +01:00 |
|
Joan Sanchez
|
c3962c3d78
|
updated test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 15:07:37 +01:00 |
|
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-12 14:54:13 +01:00 |
|
Joan Sanchez
|
1b70721b0e
|
#1864 added restrictions, send rocketchat message
|
2019-11-12 14:53:58 +01:00 |
|
Joan Sanchez
|
05c4c9e96a
|
ticket.weekly removed create section already on ticket descriptor #1841
|
2019-11-12 14:48:03 +01:00 |
|
Juan Ferrer
|
1c035ca045
|
All tests fixed
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-12 14:18:46 +01:00 |
|
Carlos Jimenez Ruiz
|
266de44f2f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 13:19:34 +01:00 |
|
Bernat
|
7cbbc4c18e
|
#1870 exportar produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-11-12 11:13:20 +01:00 |
|
Juan Ferrer
|
a4f6c64e59
|
Merge
|
2019-11-12 09:24:08 +01:00 |
|
Juan Ferrer
|
f6050a6c65
|
Merge
|
2019-11-12 09:24:01 +01:00 |
|
Carlos Jimenez Ruiz
|
d284e36ee6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-12 08:52:07 +01:00 |
|
Bernat
|
74a2c58954
|
Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 08:51:50 +01:00 |
|
Juan Ferrer
|
95d943e515
|
E2E fixes
|
2019-11-11 16:32:03 +01:00 |
|
Juan Ferrer
|
efa6ddc0f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-11 16:25:00 +01:00 |
|
Joan Sanchez
|
6cedfceddd
|
Show ticket state #1836
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:51:30 +01:00 |
|
Joan Sanchez
|
42524c7f1d
|
increased width to expand class #1845
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:22:25 +01:00 |
|
Joan Sanchez
|
5b2e407870
|
dialog styles
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-11 12:26:22 +01:00 |
|
Joan Sanchez
|
6f7962935d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-11 11:24:26 +01:00 |
|
Joan Sanchez
|
115156f89d
|
updated unit tests
gitea/salix/1466-print_refactor This commit has test failures
Details
|
2019-11-11 11:23:39 +01:00 |
|
Joan Sanchez
|
0838540789
|
template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-11 11:04:49 +01:00 |
|
Juan Ferrer
|
cf6961f5c5
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures
Details
|
2019-11-10 14:13:55 +01:00 |
|
Juan Ferrer
|
976782738e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-10 13:27:31 +01:00 |
|
Juan Ferrer
|
bee50a6b03
|
Front tests passed
|
2019-11-10 13:10:52 +01:00 |
|
Juan Ferrer
|
515234187a
|
First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit
Details
|
2019-11-10 11:08:44 +01:00 |
|
Carlos Jimenez Ruiz
|
f2de7ddab4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-07 12:17:33 +01:00 |
|
Joan Sanchez
|
5705c37f92
|
show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-07 11:19:05 +01:00 |
|
Bernat
|
84ccfe0422
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-07 07:51:21 +01:00 |
|
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
gitea/salix/dev This commit looks good
Details
|
2019-11-07 07:49:37 +01:00 |
|
Carlos Jimenez Ruiz
|
9442a198b7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-06 15:13:14 +01:00 |
|
Bernat
|
4220c995a9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-06 14:02:26 +01:00 |
|
Javi Gallego
|
729f6cb767
|
changes to zone
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-06 13:44:58 +01:00 |
|
Joan Sanchez
|
3cd92211a1
|
test fixed & export sample table
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 10:55:04 +01:00 |
|
Joan Sanchez
|
3d701f534a
|
updated tests
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-06 09:32:54 +01:00 |
|
Joan Sanchez
|
23f6c8843d
|
#1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 08:20:45 +01:00 |
|
Carlos Jimenez Ruiz
|
76f3dc48e5
|
#1852 worker.time-control
|
2019-11-05 11:57:05 +01:00 |
|
Joan Sanchez
|
cac8cb6a6a
|
dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-05 09:16:16 +01:00 |
|
Carlos Jimenez Ruiz
|
b9be0188d8
|
manual merge
|
2019-11-05 09:05:00 +01:00 |
|
Carlos Jimenez Ruiz
|
03ab88bcd9
|
#1852 worker.time-control
|
2019-11-05 08:59:48 +01:00 |
|
Bernat
|
1be61b16d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-05 08:56:59 +01:00 |
|
Joan Sanchez
|
5d83849e2b
|
unknown provider
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-11-05 07:19:16 +01:00 |
|
Joan Sanchez
|
14cb32d1c8
|
updated reports
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-04 13:55:20 +01:00 |
|
Joan Sanchez
|
fc2abdc0ab
|
change log columns size
gitea/salix/dev This commit looks good
Details
|
2019-11-04 08:05:00 +01:00 |
|
Juan Ferrer
|
026c608f42
|
Faster module loading & vnAgencyCalendar bug fixes
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-11-01 13:02:47 +01:00 |
|
Juan Ferrer
|
4fcaa2e507
|
Jest fixes
gitea/salix/dev This commit looks good
Details
|
2019-10-31 15:38:20 +01:00 |
|
Juan Ferrer
|
f759c1e11a
|
vnDialog bug fixes & front tests, workerTimeControl date fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-31 15:24:28 +01:00 |
|
Juan Ferrer
|
38b4483edf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-31 13:43:15 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Juan Ferrer
|
5a15e65fd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-30 16:57:26 +01:00 |
|
Juan Ferrer
|
c41fb1d0f4
|
#1847 vnDialog refactor
|
2019-10-30 16:57:14 +01:00 |
|
Bernat
|
9353d54b16
|
add alias on weekly filter
|
2019-10-29 14:55:05 +01:00 |
|
Javi Gallego
|
7dfdfc45c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-29 12:58:39 +01:00 |
|
Javi Gallego
|
700c092b90
|
merge
|
2019-10-29 12:58:26 +01:00 |
quique
|
49b06e3472
|
send rocket chat message
gitea/salix/dev This commit looks good
Details
|
2019-10-29 12:39:25 +01:00 |
|
Javi Gallego
|
1a56f0af96
|
zoneRefactor
|
2019-10-29 12:29:38 +01:00 |
|
Joan Sanchez
|
443aa56fed
|
refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-10-29 07:46:44 +01:00 |
|
Juan Ferrer
|
0a4a22ec87
|
vnInputFile fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-28 21:40:24 +01:00 |
|
Juan Ferrer
|
1b2c383502
|
vnDialog opens in body, nightmare extensions with detailed errors
|
2019-10-28 17:31:33 +01:00 |
|
Juan Ferrer
|
47998aaa97
|
vnDialog opens in body
|
2019-10-27 01:30:01 +02:00 |
|
Juan Ferrer
|
dc18c4ba2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-26 12:05:00 +02:00 |
|
Juan Ferrer
|
5ae558e965
|
Watchers performance fixes
|
2019-10-26 12:04:48 +02:00 |
|
Bernat
|
35966afad0
|
refactor travel
gitea/salix/dev This commit looks good
Details
|
2019-10-25 14:06:32 +02:00 |
|
Bernat
|
4eca2e9453
|
merge
gitea/salix/1776travel.basic-data This commit looks good
Details
|
2019-10-25 13:31:01 +02:00 |
|
Bernat
|
d02c79d2e8
|
#1774 travel.index test and refactor
|
2019-10-25 13:29:05 +02:00 |
|
Bernat
|
9fd0ab0bd3
|
#1775 travel.log crear sección historial
|
2019-10-25 13:28:12 +02:00 |
|
Bernat
|
5547193a31
|
#1776 travel.basicData
|
2019-10-25 13:26:38 +02:00 |
|
Juan Ferrer
|
5fdfda47b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-25 00:53:57 +02:00 |
|
Juan Ferrer
|
c7384bb3ac
|
API path prefix, repeated code removed from tests
|
2019-10-25 00:53:53 +02:00 |
|
Bernat
|
eb384425f2
|
#1777 travel.descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-24 14:43:11 +02:00 |
|
Bernat
|
afd7c5684a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good
Details
|
2019-10-24 12:49:23 +02:00 |
|
Bernat
|
7bdb497976
|
#1773 travel.summary & #1774
|
2019-10-24 12:49:18 +02:00 |
|
Juan Ferrer
|
ee196df2ff
|
vnCompent with most common services as properties
gitea/salix/dev This commit looks good
Details
|
2019-10-24 12:44:36 +02:00 |
|
Juan Ferrer
|
4685b4166b
|
Improved event handling
gitea/salix/dev This commit looks good
Details
|
2019-10-24 10:17:32 +02:00 |
|
Juan Ferrer
|
53003246c3
|
Merge with upstream
|
2019-10-23 17:42:41 +02:00 |
|
Juan Ferrer
|
2436bf9488
|
Agency events - First stable version
|
2019-10-23 17:38:35 +02:00 |
|
Carlos Jimenez Ruiz
|
6cbfa895da
|
fixed a typo
gitea/salix/dev This commit looks good
Details
|
2019-10-23 15:04:05 +02:00 |