 Joan Sanchez
|
fee0d674a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 11:06:31 +01:00 |
 Carlos Jimenez Ruiz
|
c04640bd62
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
|
2019-11-21 09:19:15 +01:00 |
|
Carlos Jimenez Ruiz
|
52a8d5e0c2
|
#1891 tests for worker time control function
|
2019-11-21 09:19:03 +01:00 |
Bernat
|
d1dfa126c0
|
#1711 Eliminar referencias al esquema vn2008
|
2019-11-21 09:08:43 +01:00 |
|
Carlos Jimenez Ruiz
|
6929e3d497
|
#1889 absences() unit test fixed + refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-20 14:22:44 +01:00 |
|
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:14:11 +01:00 |
|
Joan Sanchez
|
c6d1536500
|
recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures
Details
|
2019-11-20 06:53:37 +01:00 |
 Juan Ferrer
|
59fddb5c55
|
vnAgencyEvents: console.log removed
gitea/salix/dev This commit looks good
Details
|
2019-11-19 15:44:33 +01:00 |
|
Juan Ferrer
|
c47f3137c1
|
Delivery days fixes
gitea/salix/dev This commit looks good
Details
|
2019-11-19 13:49:10 +01:00 |
|
Bernat
|
9743b61f63
|
delete endpoint getWorkerInfo
gitea/salix/dev Build queued...
Details
|
2019-11-19 11:51:47 +01:00 |
|
Bernat
|
12825f0503
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-19 11:43:00 +01:00 |
|
Joan Sanchez
|
cba578d42e
|
fixed zoom photo url #1884
gitea/salix/dev This commit looks good
Details
|
2019-11-19 09:24:53 +01:00 |
|
Carlos Jimenez Ruiz
|
f998a04808
|
#1852 worker.time-control
|
2019-11-18 16:37:33 +01:00 |
|
Carlos Jimenez Ruiz
|
eeead2cc86
|
corrected a typo
|
2019-11-18 16:37:03 +01:00 |
|
Carlos Jimenez Ruiz
|
04b4f60c48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 16:35:21 +01:00 |
|
Juan Ferrer
|
4d4e4f31f4
|
vnZoneEvents refactor
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:31:37 +01:00 |
 Javi Gallego
|
f12b1b8595
|
test fron arreglados
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:03:10 +01:00 |
|
Carlos Jimenez Ruiz
|
3c2ad2df48
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-18 12:35:30 +01:00 |
|
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 |
|
Carlos Jimenez Ruiz
|
c84625b0d5
|
#1713 route.tickets boton mas bajo derecha
gitea/salix/dev This commit looks good
Details
|
2019-10-23 09:25:28 +02:00 |
|
Joan Sanchez
|
d1e8f5fb1c
|
removed endpoints
gitea/salix/dev This commit looks good
Details
|
2019-10-23 07:18:09 +02:00 |
|
Joan Sanchez
|
b6d666d223
|
removed IOS worker-time-controls endpoints
gitea/salix/dev This commit has test failures
Details
|
2019-10-23 07:14:12 +02:00 |
|
Joan Sanchez
|
137f701434
|
changed order
gitea/salix/test This commit looks good
Details
gitea/salix/dev This commit looks good
Details
|
2019-10-22 14:20:50 +02:00 |
|
Joan Sanchez
|
2ed4cf3e4a
|
Item request refactor #1818
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-22 13:44:36 +02:00 |
|
Joan Sanchez
|
58a763acf5
|
added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 14:21:52 +02:00 |
|
Joan Sanchez
|
8e1d594a13
|
was saving data on page load #1820
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 13:43:17 +02:00 |
|
Joan Sanchez
|
188f4ae3bf
|
mark item diary line
gitea/salix/dev This commit looks good
Details
|
2019-10-21 11:08:41 +02:00 |
|
Bernat
|
939c507fba
|
#1810 El método listPackaging filtrar por isPackagingReturnable
|
2019-10-21 09:16:52 +02:00 |
|
Bernat
|
6adeb689eb
|
Tarea #1814 refactor fixtures userPhone
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:52:42 +02:00 |
|
Bernat
|
e9f65cd2a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:42:30 +02:00 |
|
Joan Sanchez
|
e2a7c09e4a
|
Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:31:14 +02:00 |
|
Bernat
|
6477a1458d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-21 07:24:56 +02:00 |
|
Joan Sanchez
|
55f3390f85
|
added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures
Details
|
2019-10-21 07:08:47 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures
Details
|
2019-10-19 01:18:25 +02:00 |
|
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 |
|
Juan Ferrer
|
34e141e159
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 16:21:20 +02:00 |
|
Juan Ferrer
|
21992d3e69
|
Minimal style fixes
|
2019-10-01 16:21:08 +02:00 |
|
Juan Ferrer
|
76604744d1
|
Global & client style fixes
|
2019-10-01 16:17:57 +02:00 |
|
Joan Sanchez
|
199529b3b9
|
fiscal name ignore case
gitea/salix/master This commit looks good
Details
|
2019-10-01 15:12:58 +02:00 |
|
Joan Sanchez
|
1ec2362dbf
|
fiscal name ignore case
gitea/salix/dev This commit looks good
Details
|
2019-10-01 15:12:02 +02:00 |
|
Joan Sanchez
|
183d770483
|
first changes
gitea/salix/1625-worker_department_treeview This commit looks good
Details
|
2019-10-01 15:09:55 +02:00 |
|
Juan Ferrer
|
a4892845e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 13:46:16 +02:00 |
|
Juan Ferrer
|
4e4919c1e2
|
Agency fixes & exclusion with left calendar
|
2019-10-01 13:45:43 +02:00 |
|
Carlos Jimenez Ruiz
|
eb80721ec4
|
removed x from test + merge
gitea/salix/dev This commit looks good
Details
|
2019-10-01 13:21:27 +02:00 |
|
Carlos Jimenez Ruiz
|
fb846baaa4
|
#1740 Intermitencia test de back
|
2019-10-01 13:19:22 +02:00 |
|
Juan Ferrer
|
daeb4bed09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 11:15:25 +02:00 |
|
Juan Ferrer
|
0bd852604a
|
Refactor: vnCheck, vnRadio, vnTreeview, vnNumber
|
2019-10-01 11:15:15 +02:00 |
|
Carlos Jimenez Ruiz
|
e8a9de6acd
|
ticket.index.total warning css range from 1 to 50
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 11:06:20 +02:00 |
|
Carlos Jimenez Ruiz
|
cef28307d0
|
#1660 ticket.log si el usuario es un cliente falla
|
2019-10-01 10:47:06 +02:00 |
|
Joan Sanchez
|
26be791cf0
|
fixed styles
gitea/salix/dev This commit has test failures
Details
gitea/salix/test This commit looks good
Details
|
2019-10-01 10:35:27 +02:00 |
|
Carlos Jimenez Ruiz
|
d96f67254f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 08:15:04 +02:00 |
|
Joan Sanchez
|
fe95406594
|
Ticket list order by zone hour #1728
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 08:14:08 +02:00 |
|
Carlos Jimenez Ruiz
|
6c438a9109
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-01 07:56:26 +02:00 |
|
Juan Ferrer
|
9319067697
|
Front tests & DMS imports fixed
gitea/salix/dev This commit has test failures
Details
|
2019-09-30 20:55:41 +02:00 |
|
Juan Ferrer
|
eba854f0e3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-30 20:46:34 +02:00 |
|
Juan Ferrer
|
679c6af0df
|
#1297 Angular material removed from project
|
2019-09-30 20:46:22 +02:00 |
|
Carlos Jimenez Ruiz
|
4658c843cf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-30 15:24:25 +02:00 |
|
Joan Sanchez
|
6d54e7a89d
|
Claim dms upload file with drag & drop #1731
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-30 14:57:54 +02:00 |
|
Carlos Jimenez Ruiz
|
303f18d359
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-30 14:49:22 +02:00 |
|
Carlos Jimenez Ruiz
|
5b38889a72
|
#1739 claim.detail dialog add cambiar campos
|
2019-09-30 14:49:04 +02:00 |
|
Carlos Jimenez Ruiz
|
ae4533c61e
|
#1726 client.index añadir icono de Listado tickets
|
2019-09-30 13:16:31 +02:00 |
|
Juan Ferrer
|
c72381f9c1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-30 13:02:21 +02:00 |
|
Juan Ferrer
|
a177ad8e26
|
Fixes
|
2019-09-30 13:02:11 +02:00 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Juan Ferrer
|
c0f39ba87f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-26 10:09:07 +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 |
|
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 |
|
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 |
|
Juan Ferrer
|
a319eed5f6
|
Zone.getLeaves() refactor
gitea/salix/dev This commit looks good
Details
|
2019-09-24 10:41:25 +02:00 |
|
Juan Ferrer
|
4b58078798
|
Zone.getLeaves refactor & fixes
|
2019-09-24 10:38:07 +02:00 |
|
Juan Ferrer
|
52a6221b59
|
recover getLeaves
|
2019-09-24 10:38:05 +02:00 |
|
Joan Sanchez
|
15183df65f
|
transfer sales error fixed
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:51:21 +02:00 |
|
Joan Sanchez
|
314b609060
|
fixed family translation
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:34:14 +02:00 |
|
Joan Sanchez
|
a091674f08
|
allowed numbers on fiscal name
gitea/salix/dev This commit looks good
Details
|
2019-09-24 07:47:06 +02:00 |
|
Carlos Jimenez Ruiz
|
6c1fdb444a
|
removed fdescribe
gitea/salix/dev This commit looks good
Details
|
2019-09-24 07:03:22 +02:00 |
|
Joan Sanchez
|
e55b8b7b6b
|
precio por kilo #1690
gitea/salix/dev This commit looks good
Details
|
2019-09-23 14:41:54 +02:00 |
|
Joan Sanchez
|
36d7e514ff
|
Allow spanish characters on socialName #1712
|
2019-09-23 09:27:58 +02:00 |
|
Carlos Jimenez Ruiz
|
0f04aed2fe
|
#1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 17:20:54 +02:00 |
|
Carlos Jimenez Ruiz
|
7bcc908708
|
#1704 item.basicData
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 16:39:20 +02:00 |
|
Juan Ferrer
|
6d50012fab
|
agency.location fixes
gitea/salix/master This commit looks good
Details
|
2019-09-19 18:00:40 +02:00 |
|
Juan Ferrer
|
40c555702d
|
Zone.getLeaves() refactor
gitea/salix/master This commit looks good
Details
|
2019-09-19 17:49:46 +02:00 |
|
Juan Ferrer
|
05fec10cf2
|
Zone.getLeaves refactor & fixes
gitea/salix/master This commit looks good
Details
|
2019-09-19 17:30:16 +02:00 |
|
Juan Ferrer
|
e0ffef70b1
|
Method ZoneGeo.getLeaves optimized
gitea/salix/master This commit looks good
Details
|
2019-09-19 15:51:39 +02:00 |
|
Juan Ferrer
|
afb06dd4a5
|
#1167 Fixed
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 12:32:34 +02:00 |
|
Joan Sanchez
|
d6d825ebf1
|
fixed automerge
gitea/salix/master This commit looks good
Details
|
2019-09-19 10:52:23 +02:00 |
|
Joan Sanchez
|
f67006e526
|
changed fiscal name translation
gitea/salix/master This commit looks good
Details
|
2019-09-19 09:44:50 +02:00 |
|
Joan Sanchez
|
9ce18fbd0a
|
double start pick
|
2019-09-19 09:44:18 +02:00 |
|
Joan Sanchez
|
4d894365eb
|
Fixed production errors #1699
|
2019-09-19 09:42:41 +02:00 |
|
Joan Sanchez
|
8cb10759d3
|
updated transactions
|
2019-09-19 09:42:32 +02:00 |
|
Joan Sanchez
|
2edfb66423
|
changed fiscal name translation
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:41:02 +02:00 |
|
Joan Sanchez
|
fa549630c4
|
Bug/Test #1700
gitea/salix/dev This commit has test failures
Details
|
2019-09-19 09:37:02 +02:00 |
|
Joan Sanchez
|
a85e653f34
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:24:27 +02:00 |
|
Joan Sanchez
|
5a4c6bf66f
|
updated back unit tests
|
2019-09-19 09:17:21 +02:00 |
|
Bernat
|
526e4e34fa
|
skip e2e #1702
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-19 09:05:11 +02:00 |
|
Joan Sanchez
|
73b1f18759
|
Fixed production errors #1699
|
2019-09-19 08:58:42 +02:00 |
|
Bernat
|
c773ddc499
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-19 06:56:47 +02:00 |
|
Joan Sanchez
|
335f92173c
|
updated transactions
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-18 15:11:09 +02:00 |
|
Bernat
|
86d793b9ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-18 11:11:53 +02:00 |
|
Bernat
|
7af4f3626d
|
#1691 item.basicData - Añadir campo hasKgPrice
|
2019-09-18 11:11:47 +02:00 |
|
Joan Sanchez
|
f56e4f4b7d
|
pick
gitea/salix/master This commit looks good
Details
|
2019-09-18 10:37:54 +02:00 |
|
Joan Sanchez
|
86ef44c90d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-09-18 10:35:49 +02:00 |
|
Joan Sanchez
|
031dbcb63a
|
Unlocked from autocomplete city and postcode fields #1703
|
2019-09-18 10:35:46 +02:00 |
|
Carlos Jimenez Ruiz
|
4c33f07e42
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-18 09:42:45 +02:00 |
|
Carlos Jimenez Ruiz
|
b12d0388c9
|
#1074 Undo changes button for forms
|
2019-09-18 09:41:25 +02:00 |
|
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
|
Joan Sanchez
|
c7423f5580
|
pick2
gitea/salix/master This commit looks good
Details
|
2019-09-17 07:15:34 +02:00 |
|
Joan Sanchez
|
dd0c34d31b
|
allowed null parent
|
2019-09-17 07:13:37 +02:00 |
|
Joan Sanchez
|
043fe80254
|
cherry 1
|
2019-09-17 07:12:45 +02:00 |
|
Carlos Jimenez Ruiz
|
206dec59a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-13 16:09:27 +02:00 |
|
Carlos Jimenez Ruiz
|
2251fb65ad
|
#1615 migrar karma a jest
|
2019-09-13 16:09:14 +02:00 |
|
Joan Sanchez
|
a529efc783
|
getleaves fix
gitea/salix/dev This commit looks good
Details
|
2019-09-13 13:26:50 +02:00 |
|
Joan Sanchez
|
a25652293d
|
changed initial leaves depth
gitea/salix/dev This commit looks good
Details
|
2019-09-13 12:26:37 +02:00 |
|
Joan Sanchez
|
7f23e006fa
|
allowed null parent
gitea/salix/dev This commit looks good
Details
|
2019-09-13 12:16:38 +02:00 |
|
Bernat
|
2e1b329584
|
#1681 delete comment
gitea/salix/dev This commit looks good
Details
|
2019-09-13 11:27:32 +02:00 |
|
Bernat
|
c6507fc2bb
|
#1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good
Details
|
2019-09-13 07:40:27 +02:00 |
|
Bernat
|
2172bdee4e
|
#1689
|
2019-09-12 12:27:19 +02:00 |
|
Joan Sanchez
|
8b8463e936
|
Updated dms colums size #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 12:12:39 +02:00 |
|
Joan Sanchez
|
f6bd915ae6
|
Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 11:47:56 +02:00 |
|
Joan Sanchez
|
e16d43b2fc
|
Allow disable log on model properties
gitea/salix/dev This commit looks good
Details
|
2019-09-12 09:49:02 +02:00 |
|
Joan Sanchez
|
9bf54f34dd
|
Added fruit translation
gitea/salix/dev This commit looks good
Details
|
2019-09-12 07:26:15 +02:00 |
|
Joan Sanchez
|
5d980f5129
|
Added fruit translation
gitea/salix/master This commit looks good
Details
|
2019-09-12 07:25:05 +02:00 |
|
Bernat
|
c344d8088b
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-09-11 14:18:21 +02:00 |
|
Joan Sanchez
|
ff626764d8
|
fixed back unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-11 08:24:28 +02:00 |
|
Joan Sanchez
|
342886942f
|
fixed sale loggable transaction error #1686
gitea/salix/dev This commit has test failures
Details
|
2019-09-11 08:12:27 +02:00 |
|
Bernat
|
03c44d4ef9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-10 14:43:10 +02:00 |
|
Bernat
|
ac6d1ed829
|
#1663 update ticketLog
|
2019-09-10 14:43:00 +02:00 |
|
Joan Sanchez
|
b36846994d
|
Server error on change paymethod #1687
gitea/salix/master This commit looks good
Details
|
2019-09-10 14:13:45 +02:00 |
|
Joan Sanchez
|
0ed240df0b
|
Server error on change paymethod #1687
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-10 14:12:03 +02:00 |
|
Bernat
|
8932aa4e5a
|
Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log
|
2019-09-10 13:27:41 +02:00 |
|
Joan Sanchez
|
7ecb67052d
|
item.diary css chip fixed #1676
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-10 08:47:46 +02:00 |
|
Joan Sanchez
|
197e89ae5a
|
Added fiscal data validate translation
gitea/salix/dev This commit looks good
Details
|
2019-09-09 12:45:09 +02:00 |
|
Joan Sanchez
|
73f438c300
|
reset watcher on changes #1678
|
2019-09-09 12:35:59 +02:00 |
|
Joan Sanchez
|
1f5a75b285
|
fixed karma unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-09 10:57:10 +02:00 |
|
Joan Sanchez
|
7a1ae9177b
|
Special characters not allowed on socialName #1635
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-09 09:05:13 +02:00 |
|
Carlos Jimenez Ruiz
|
3c9fe334c9
|
#1655 e2e ticket.sale Añadir lineas
gitea/salix/dev This commit looks good
Details
|
2019-09-06 14:56:56 +02:00 |
|
Carlos Jimenez Ruiz
|
56c291a160
|
merge
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-06 11:45:55 +02:00 |
|
Carlos Jimenez Ruiz
|
ce9fb14b62
|
#1655 e2e ticket.sale Añadir lineas
|
2019-09-06 11:43:15 +02:00 |
|
Joan Sanchez
|
f31d544cd7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-06 11:06:57 +02:00 |
|
Joan Sanchez
|
7fad401624
|
Send delivery note to client #1332
|
2019-09-06 11:06:44 +02:00 |
|
Bernat
|
e8cb57e27a
|
#1674 ticket.descriptor stowaway sólo debe de aparecer la opcion en el menu en el almacen
gitea/salix/dev This commit looks good
Details
|
2019-09-06 09:47:58 +02:00 |
|
Bernat
|
751c945575
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-06 09:35:27 +02:00 |
|
Bernat
|
ec2a457849
|
ticket.weekly add order
|
2019-09-06 08:00:19 +02:00 |
|
Joan Sanchez
|
176750046a
|
Scroll component #643
gitea/salix/dev This commit looks good
Details
|
2019-09-05 13:06:40 +02:00 |
|
Bernat
|
9db989d191
|
ticket.sale ok state fixed
gitea/salix/master This commit looks good
Details
|
2019-09-05 11:12:33 +02:00 |
|
Joan Sanchez
|
59c6952025
|
Implement watcher on ticket sales #1678
gitea/salix/dev This commit looks good
Details
|
2019-09-05 09:00:55 +02:00 |
|
Joan Sanchez
|
0d21519523
|
updated transfer css
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:37:29 +02:00 |
|
Joan Sanchez
|
db1113ab0b
|
added scrollbar to transfer popover
gitea/salix/dev This commit looks good
Details
|
2019-09-04 14:08:08 +02:00 |
|
Joan Sanchez
|
81072ce7e8
|
fixed claim refund
gitea/salix/master This commit looks good
Details
|
2019-09-04 13:49:16 +02:00 |
|
Joan Sanchez
|
6f508838c9
|
claim.action falla el boton import #1679
gitea/salix/dev This commit looks good
Details
|
2019-09-04 13:39:01 +02:00 |
|
Javi Gallego
|
2b14a9050e
|
Bug/Test #1679 claim.action falla el boton import
gitea/salix/dev This commit has test failures
Details
|
2019-09-04 12:17:33 +02:00 |
|
Joan Sanchez
|
93286663ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-04 09:41:27 +02:00 |
|
Bernat
|
a2228fa15f
|
Tarea #1673 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-09-04 09:06:08 +02:00 |
|
Joan Sanchez
|
693c204e21
|
Calendar last day selection fixed #1465
|
2019-09-04 08:42:01 +02:00 |
|
Joan Sanchez
|
d3441fa1b3
|
Ticket step one refactor #1669
gitea/salix/dev This commit looks good
Details
|
2019-09-04 08:04:31 +02:00 |
|
Bernat
|
f0447c18ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-03 14:54:29 +02:00 |
|
Carlos Jimenez Ruiz
|
c1cca30a26
|
bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good
Details
|
2019-09-03 14:42:52 +02:00 |
|
Bernat
|
fc872a2b21
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-03 14:38:40 +02:00 |
|
Carlos Jimenez Ruiz
|
219614b44f
|
#1656 ticket.regularizar eliminar ticket + tests
gitea/salix/dev This commit looks good
Details
|
2019-09-03 13:27:02 +02:00 |
|
Bernat
|
36d9d320c0
|
Tarea #1672 route.ticket
|
2019-09-03 10:54:52 +02:00 |
|
Carlos Jimenez Ruiz
|
e1b5b449ce
|
#1656 ticket.regularizar eliminar ticket
|
2019-09-03 09:57:53 +02:00 |
|
Joan Sanchez
|
7b40fe2942
|
ticket.basicData Update zone on changes + fixes #1668
gitea/salix/master This commit looks good
Details
|
2019-09-02 14:37:30 +02:00 |
|
Joan Sanchez
|
d93974f481
|
ticket.basicData Update zone on changes + fixes #1668
gitea/salix/dev This commit has test failures
Details
|
2019-09-02 14:36:54 +02:00 |
|
Joan Sanchez
|
50c989a267
|
Add attendedBy and salesPerson filters #1661
gitea/salix/dev This commit looks good
Details
|
2019-09-02 12:23:49 +02:00 |
|
Joan Sanchez
|
37b9c5c4ce
|
Added zone inflation field #1641
gitea/salix/dev This commit looks good
Details
|
2019-09-02 11:25:31 +02:00 |
|
Bernat
|
b6edcde589
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-02 09:43:30 +02:00 |
|
Bernat
|
2a21e9d60e
|
#1654
|
2019-09-02 09:43:22 +02:00 |
|
Joan Sanchez
|
8726aa70c5
|
removed autocompletion on change postal code #1638
gitea/salix/master This commit looks good
Details
|
2019-09-02 09:35:03 +02:00 |
|
Bernat
|
82c569cfc0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-02 09:25:25 +02:00 |
|
Bernat
|
fb62128a80
|
Refactor #1652 client.addres.index
|
2019-09-02 09:25:18 +02:00 |
|
Joan Sanchez
|
e2b972431a
|
removed autocompletion on change postal code #1638
gitea/salix/dev This commit looks good
Details
|
2019-09-02 09:11:40 +02:00 |
|
Carlos Jimenez Ruiz
|
8dbcf917a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-08-29 13:16:53 +02:00 |
|
Carlos Jimenez Ruiz
|
b9234fc1a8
|
#1642 order.summary en el descriptor
|
2019-08-29 13:16:38 +02:00 |
|
Bernat
|
b656db3a84
|
#1645 refactor search panel
gitea/salix/dev This commit looks good
Details
|
2019-08-29 08:32:46 +02:00 |
|
Bernat
|
6daabed202
|
#1645 first part, delete hasVisible
gitea/salix/dev This commit looks good
Details
|
2019-08-28 12:17:06 +02:00 |
|
Carlos Jimenez Ruiz
|
5e69fc0aa5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-08-28 08:10:49 +02:00 |
|
Carlos Jimenez Ruiz
|
5e3b8fe1f0
|
#1648 claim.detail add cambiar campos
|
2019-08-28 08:08:30 +02:00 |
|
Bernat
|
15097313a2
|
#1651 worker.json
gitea/salix/dev This commit looks good
Details
|
2019-08-27 11:12:17 +02:00 |
|
Carlos Jimenez Ruiz
|
11b99d9a5f
|
#1618 e2e ticket.basicData.stepOne
gitea/salix/dev This commit looks good
Details
|
2019-08-20 14:18:32 +02:00 |
|
Bernat
|
7eea9d1d2c
|
Refactor #1630 state.js
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-19 07:56:20 +02:00 |
|
Bernat
|
4032bde243
|
fix bug ticket.sale
gitea/salix/dev This commit looks good
Details
|
2019-08-13 14:03:02 +02:00 |
|
Bernat
|
d9c63e3bc0
|
Tarea #1501 ticket / delete
gitea/salix/dev This commit looks good
Details
|
2019-08-13 12:44:34 +02:00 |
|
Bernat
|
b749cb80df
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-13 07:45:29 +02:00 |
|
Bernat
|
f05f3a3df7
|
Bug/Test #1634 cesta.catalogo
gitea/salix/dev This commit looks good
Details
|
2019-08-12 14:58:46 +02:00 |
|
Bernat
|
d08a43bc23
|
#1630 state.isEditable
gitea/salix/dev This commit looks good
Details
|
2019-08-12 13:28:27 +02:00 |
|
Bernat
|
2e89af9795
|
#1630 state.isEditable
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 13:26:44 +02:00 |
|
Bernat
|
b6cc769df3
|
Test #1636 refactor test de back isEditable y editableState
gitea/salix/dev This commit has test failures
Details
|
2019-08-12 12:31:31 +02:00 |
|
Joan Sanchez
|
0918f154e9
|
transfer partially sale #1251
gitea/salix/dev This commit looks good
Details
|
2019-08-09 08:04:44 +02:00 |
|
Joan Sanchez
|
a5486ec694
|
Get allowed content-types from model #1598
gitea/salix/dev This commit looks good
Details
|
2019-08-08 08:37:03 +02:00 |
|
Bernat
|
2f1472b9ee
|
Tarea #1574
gitea/salix/dev This commit looks good
Details
ticket.sale editableState
|
2019-08-08 08:33:27 +02:00 |
|
Bernat
|
8f519fd15b
|
Bug #900 Ticket.picture lineas vacias cuando no tiene tags
gitea/salix/dev This commit looks good
Details
|
2019-08-07 09:58:05 +02:00 |
|
Bernat
|
fa4fd15450
|
Tarea #1573 order.catalog No deben de mostrar familias vacias
|
2019-08-07 07:27:00 +02:00 |
|
Bernat
|
7e1eba53f1
|
Refactor #1627 worker.timeControl
|
2019-08-06 12:25:53 +02:00 |
|
Joan Sanchez
|
72a02112b5
|
fixed fiscal data postcode selection
gitea/salix/master There was a failure building this commit
Details
|
2019-08-06 12:12:51 +02:00 |
|
Joan Sanchez
|
3d88d41bd0
|
fixed fiscal data postcode selection
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-06 12:07:48 +02:00 |
|
Joan Sanchez
|
e011c120db
|
ticket.sale split show active tickets
gitea/salix/master This commit looks good
Details
|
2019-08-06 07:37:30 +02:00 |
|
Joan Sanchez
|
e52a0ac5da
|
ticket.sale split show active tickets
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-06 07:36:26 +02:00 |
|
Bernat
|
4e329a4201
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/master This commit looks good
Details
|
2019-08-02 12:24:08 +02:00 |
|
Joan Sanchez
|
2ff374e7ba
|
postcode autocompletion fixes
gitea/salix/master This commit looks good
Details
|
2019-08-02 08:28:44 +02:00 |
|
Joan Sanchez
|
2c71a983e3
|
postcode autocompletion fixes
gitea/salix/dev This commit looks good
Details
|
2019-08-02 08:27:55 +02:00 |
|
Joan Sanchez
|
e7511aefdc
|
back errors fixed
gitea/salix/master This commit looks good
Details
|
2019-08-01 11:53:33 +02:00 |
|
Joan Sanchez
|
efeba38fb4
|
back errors fixed
gitea/salix/dev There was a failure building this commit
Details
|
2019-08-01 11:52:53 +02:00 |
|
Joan Sanchez
|
e3c4536183
|
timeControl calendar fixed #1623
gitea/salix/master This commit looks good
Details
|
2019-08-01 10:29:26 +02:00 |
|
Joan Sanchez
|
31b5f689df
|
timeControl calendar fixed #1623
gitea/salix/dev This commit looks good
Details
|
2019-08-01 09:58:59 +02:00 |
|
Bernat
|
098dd7b235
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-07-31 10:45:03 +02:00 |
|
Joan Sanchez
|
77d8ac82a5
|
contabilize worker.calenday holidays, updated styles
gitea/salix/test This commit looks good
Details
|
2019-07-31 09:51:08 +02:00 |
|
Joan Sanchez
|
eccf381e56
|
contabilize worker.calenday holidays, updated styles
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 09:50:47 +02:00 |
|
Bernat
|
116a34d04a
|
fix test
|
2019-07-31 09:17:26 +02:00 |
|
Bernat
|
7571cd6e1b
|
Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures
Details
|
2019-07-31 07:46:24 +02:00 |
|
Joan Sanchez
|
5974f6e0c2
|
ticket basicData change zone on date update
gitea/salix/test This commit looks good
Details
|
2019-07-30 12:44:25 +02:00 |
|
Joan Sanchez
|
82d3ac27cf
|
ticket basicData change zone on date update
gitea/salix/dev This commit looks good
Details
|
2019-07-30 12:43:21 +02:00 |
|
Joan Sanchez
|
fb4ce77c01
|
claim upload pictures #1593
gitea/salix/dev This commit looks good
Details
|
2019-07-30 08:51:38 +02:00 |
|
Joan Sanchez
|
07af2271c2
|
ticket.weekly Add ticket #1612
gitea/salix/dev This commit looks good
Details
|
2019-07-29 13:12:36 +02:00 |
|
Joan Sanchez
|
2c6ba0089b
|
merge
gitea/salix/test This commit looks good
Details
|
2019-07-29 08:35:58 +02:00 |
|
Joan Sanchez
|
f4a3b8e9b2
|
client.create not showing all postcodes, changed autocomplete #1619
gitea/salix/dev This commit looks good
Details
|
2019-07-26 13:05:22 +02:00 |
|
Joan Sanchez
|
64a4e5f43d
|
ticket.basicData Select zone for productionBoss #1604
gitea/salix/dev This commit looks good
Details
|
2019-07-26 11:48:01 +02:00 |
|
Carlos Jimenez Ruiz
|
c2573d6853
|
css amends for item-request
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 11:25:01 +02:00 |
|
Carlos Jimenez Ruiz
|
e1cbf781e1
|
#1608 item.request
gitea/salix/dev This commit has test failures
Details
|
2019-07-25 09:55:09 +02:00 |
|
Joan Sanchez
|
6d5412227a
|
Changed invoiceOut pdf to hasPdf
gitea/salix/dev This commit has test failures
Details
|
2019-07-24 12:42:33 +02:00 |
|
Bernat
|
8089c32ec2
|
Tarea #1611 export db roduction to local
gitea/salix/dev This commit looks good
Details
|
2019-07-23 14:56:57 +02:00 |
|
Bernat
|
97f2229090
|
Tarea #1603 ticket.index ticket.sales problems icon
gitea/salix/dev This commit looks good
Details
|
2019-07-23 11:15:06 +02:00 |
|
Bernat
|
16257e9918
|
fix test front
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-23 07:36:10 +02:00 |
|
Bernat
|
6a23a5429c
|
Tarea #1562 ticket.line isEditable
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-22 13:14:00 +02:00 |
|
Joan Sanchez
|
85049c126b
|
catalogFilter show items without color
gitea/salix/dev This commit looks good
Details
|
2019-07-19 09:25:59 +02:00 |
|
Joan Sanchez
|
970c8ab5ec
|
show dms order number #1601
gitea/salix/dev This commit looks good
Details
|
2019-07-19 08:13:52 +02:00 |
|
Joan Sanchez
|
51734db404
|
ticket dms local warehouse and company
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-17 15:01:38 +02:00 |
|
Joan Sanchez
|
f56423bac9
|
disabled hasFile checkbox for dms edit forms
gitea/salix/dev This commit looks good
Details
|
2019-07-17 10:55:58 +02:00 |
|
Joan Sanchez
|
c51c4383ce
|
fixed unit tests
gitea/salix/dev This commit looks good
Details
|
2019-07-17 07:39:08 +02:00 |
|
Joan Sanchez
|
e99bae89b4
|
fixed e2e tests
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-17 07:33:46 +02:00 |
|
Joan Sanchez
|
145e596d16
|
fixed dms unit tests
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 14:12:58 +02:00 |
|
Joan Sanchez
|
89a3c399c1
|
merge with dev
gitea/salix/test This commit looks good
Details
|
2019-07-16 13:41:34 +02:00 |
|
Joan Sanchez
|
4f73d1eb5a
|
dms fixes
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-16 13:37:25 +02:00 |
|
Joan Sanchez
|
3c3f4bfeae
|
address.edit fixed location autocompletion
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 08:26:57 +02:00 |
|
Joan Sanchez
|
72fcf807b0
|
7z mimetype
gitea/salix/dev This commit has test failures
Details
|
2019-07-16 07:22:29 +02:00 |
|
Joan Sanchez
|
b85aa6d3da
|
fixed icons column size
gitea/salix/dev This commit has test failures
Details
|
2019-07-15 13:20:50 +02:00 |
|
Joan Sanchez
|
aa19e54a16
|
removed download file conditional
gitea/salix/test This commit looks good
Details
|
2019-07-15 11:56:46 +02:00 |
|
Joan Sanchez
|
dae49f52b6
|
removed download file conditional
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:56:17 +02:00 |
|
Joan Sanchez
|
fefb389872
|
dms update files
gitea/salix/test This commit looks good
Details
|
2019-07-15 11:48:03 +02:00 |
|
Joan Sanchez
|
588250b1c1
|
dms update files
gitea/salix/dev This commit looks good
Details
|
2019-07-15 11:40:11 +02:00 |
|
Joan Sanchez
|
88b698f3eb
|
merge with dev
gitea/salix/test This commit looks good
Details
|
2019-07-15 09:04:11 +02:00 |
|
Joan Sanchez
|
23f5ff0c5c
|
merge
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2019-07-12 14:02:38 +02:00 |
|
Joan Sanchez
|
c21532e5f7
|
ticket.index filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 14:00:32 +02:00 |
|
Joan Sanchez
|
eefa4b9f5b
|
apply default filters
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:56:00 +02:00 |
|
Joan Sanchez
|
6b9286d1b0
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:32:02 +02:00 |
|
Joan Sanchez
|
c4fcaeb908
|
ticket.index filter by date if no filters were entered
gitea/salix/master This commit looks good
Details
|
2019-07-12 12:20:55 +02:00 |
|
Joan Sanchez
|
29744c52f3
|
fixed ticket.index
gitea/salix/master This commit looks good
Details
|
2019-07-12 11:43:10 +02:00 |
|
Joan Sanchez
|
e135ae039a
|
changed closure field
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:42:06 +02:00 |
|
Joan Sanchez
|
25014654b1
|
changed closure field
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:39:59 +02:00 |
|
Joan Sanchez
|
659a441f47
|
ticket index show zone closure hour
gitea/salix/master This commit looks good
Details
|
2019-07-12 09:29:22 +02:00 |
|
Joan Sanchez
|
6634cdf059
|
ticket.index show zone hour & minute. Show only tickets from today
|
2019-07-12 09:29:16 +02:00 |
|
Joan Sanchez
|
14a69e47c9
|
ticket index show zone closure hour
gitea/salix/dev This commit looks good
Details
|
2019-07-12 09:06:19 +02:00 |
|
Joan Sanchez
|
18ca64a7d9
|
ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/test This commit looks good
Details
|
2019-07-12 08:50:51 +02:00 |
|
Joan Sanchez
|
2a6de77e17
|
ticket.index show zone hour & minute. Show only tickets from today
gitea/salix/dev There was a failure building this commit
Details
|
2019-07-12 08:49:44 +02:00 |
|
Joan Sanchez
|
1b8a407916
|
show expeditions fix
gitea/salix/master This commit looks good
Details
|
2019-07-11 11:21:12 +02:00 |
|
Joan Sanchez
|
62ef2dccd8
|
show expeditions fix
gitea/salix/dev This commit looks good
Details
|
2019-07-11 11:20:41 +02:00 |
|
Joan Sanchez
|
8ecc88b516
|
hide download button for dms without a file attached #1590
gitea/salix/master This commit looks good
Details
|
2019-07-11 09:54:42 +02:00 |
|
Joan Sanchez
|
3ce59c0b73
|
hide download button for dms without a file attached #1590
gitea/salix/dev This commit looks good
Details
|
2019-07-11 09:53:16 +02:00 |
|
Joan Sanchez
|
cb23fd28fa
|
updated unit tests
|
2019-07-11 07:18:07 +02:00 |
|
Joan Sanchez
|
8a5e0c5402
|
Notify password changes #1588
|
2019-07-11 07:06:53 +02:00 |
|
Javi Gallego
|
f79b638e49
|
#1564 client.summary defaulting cantidad
gitea/salix/test This commit looks good
Details
|
2019-07-09 09:31:08 +02:00 |
|
Joan Sanchez
|
6f3b023644
|
Create postcode form #1585
gitea/salix/dev This commit looks good
Details
|
2019-07-08 14:07:09 +02:00 |
|
Bernat
|
b98b534eec
|
Tarea #1583 exportar produccio a la local
gitea/salix/dev This commit looks good
Details
|
2019-07-05 14:16:33 +02:00 |
|
Joan Sanchez
|
8ec61bf31f
|
fixed unit test for weekends
gitea/salix/dev This commit looks good
Details
|
2019-07-05 11:18:08 +02:00 |
|
Bernat
|
061f0cb39c
|
Refactor #1581 client.balance.create
gitea/salix/dev This commit looks good
Details
|
2019-07-04 10:34:19 +02:00 |