 Carlos Jimenez Ruiz
|
cfcadc4f28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-05-29 13:07:23 +02:00 |
|
Carlos Jimenez Ruiz
|
40654f94c4
|
#1475 no borrar servicios de tickets no editables
|
2019-05-29 13:06:42 +02:00 |
Bernat
|
7a7ea03bff
|
1485 refactor updatePrice
gitea/salix/dev This commit has test failures
Details
|
2019-05-29 12:41:26 +02:00 |
|
Bernat
|
85761043cd
|
delete console.log
gitea/salix/dev This commit looks good
Details
|
2019-05-29 11:15:08 +02:00 |
|
Bernat
|
84a4b049f0
|
1453 ticket UpdateDiscount refactor
gitea/salix/dev This commit looks good
Details
|
2019-05-29 11:11:54 +02:00 |
|
Bernat
|
69434caa52
|
#1470 update fixtures, client.dms gestdoc
gitea/salix/dev This commit looks good
Details
|
2019-05-28 11:26:54 +02:00 |
|
Bernat
|
230516b9d4
|
#1438 fix test back makeInvoice
gitea/salix/dev This commit looks good
Details
|
2019-05-27 10:01:35 +02:00 |
|
Bernat
|
59069749a2
|
1461 fix test back
gitea/salix/dev This commit looks good
Details
|
2019-05-27 09:19:23 +02:00 |
|
Carlos Jimenez Ruiz
|
16c8d2fd2a
|
removed service name from end points
gitea/salix/dev This commit looks good
Details
|
2019-05-27 08:46:11 +02:00 |
|
Carlos Jimenez Ruiz
|
a3311f6093
|
#1250 ticket.line al mover todas las lineas delete
|
2019-05-24 15:30:50 +02:00 |
 Javi Gallego
|
f871879ee5
|
merge fixtures dinamicas para zoneCalendar
|
2019-05-23 13:33:06 +02:00 |
|
Javi Gallego
|
c311b0ae65
|
dump y procedimientos volcados
|
2019-05-23 13:18:15 +02:00 |
|
Javi Gallego
|
94cc7af8b2
|
merge paso 2
|
2019-05-23 13:07:59 +02:00 |
|
Javi Gallego
|
3776e0588c
|
merge paso 1
|
2019-05-23 13:05:02 +02:00 |
 Joan Sanchez
|
cc72432a37
|
accessType refactor #1460
gitea/salix/master This commit looks good
Details
|
2019-05-22 12:38:51 +02:00 |
|
Joan Sanchez
|
f73b42b0be
|
accessType refactor #1460
gitea/salix/dev This commit looks good
Details
|
2019-05-22 12:35:24 +02:00 |
|
Carlos Jimenez Ruiz
|
4c8aa7ff6e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-22 11:59:14 +02:00 |
|
Carlos Jimenez Ruiz
|
bb1c85459e
|
removed unused code
|
2019-05-21 13:09:30 +02:00 |
|
Joan Sanchez
|
52e26eb99d
|
mark manual lines #1449
gitea/salix/dev This commit looks good
Details
|
2019-05-21 12:56:29 +02:00 |
|
Bernat
|
bb5c81a3e9
|
#1409 ticket.weekly add finder
gitea/salix/dev This commit looks good
Details
|
2019-05-21 09:03:57 +02:00 |
|
Carlos Jimenez Ruiz
|
32555c47d0
|
#1434 agency.index explota por zoneFk al cargar
gitea/salix/dev This commit looks good
Details
|
2019-05-20 15:04:33 +02:00 |
|
Bernat
|
b86cf1d98a
|
1354 refactor item-descriptor-popover
gitea/salix/master This commit looks good
Details
|
2019-05-17 07:34:25 +02:00 |
|
Carlos Jimenez Ruiz
|
c7ad52f7b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-16 14:07:42 +02:00 |
|
Carlos Jimenez Ruiz
|
43bf6b45cf
|
#1260 ticket.service textfield por autocomplete
|
2019-05-16 14:07:16 +02:00 |
|
Joan Sanchez
|
2ac654fa53
|
parse scopeDays integer on ticket.index #1439
gitea/salix/master This commit looks good
Details
|
2019-05-16 12:53:49 +02:00 |
|
Joan Sanchez
|
599084a8be
|
parse scopeDays integer on ticket.index #1439
|
2019-05-16 12:33:41 +02:00 |
|
Carlos Jimenez Ruiz
|
2358c94aae
|
#1402 route.ticket
|
2019-05-15 13:07:32 +02:00 |
|
Joan Sanchez
|
5cc78ce5ac
|
ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good
Details
gitea/salix/master This commit looks good
Details
|
2019-05-14 08:14:37 +02:00 |
|
Joan Sanchez
|
790577acaf
|
ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures
Details
|
2019-05-14 08:13:04 +02:00 |
|
Bernat
|
e6d6e63255
|
1413 ticket.summary refactor checkbox triple state
gitea/salix/dev This commit looks good
Details
|
2019-05-09 14:40:59 +02:00 |
|
Javi Gallego
|
0d0f354902
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-05-09 11:25:51 +02:00 |
|
Javi Gallego
|
ac5b17be31
|
ticket View
|
2019-05-09 11:25:46 +02:00 |
|
Bernat
|
1f128797c3
|
export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good
Details
|
2019-05-09 09:32:04 +02:00 |
|
Bernat
|
83898c9ba7
|
1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good
Details
|
2019-05-07 11:32:35 +02:00 |
|
Joan Sanchez
|
4aff31a165
|
fixed update discount
gitea/salix/dev This commit looks good
Details
|
2019-05-06 07:40:59 +02:00 |
|
Bernat
|
91e8b1f81b
|
update fixtures, #1388 ticket descript change shiiped hour
gitea/salix/dev This commit looks good
Details
|
2019-05-03 12:23:57 +02:00 |
|
Joan Sanchez
|
2b7287dabb
|
added ticket.dms #1373
gitea/salix/dev This commit looks good
Details
|
2019-05-01 18:49:39 +02:00 |
|
Joan Sanchez
|
a572130b6c
|
propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-30 08:00:27 +02:00 |
|
Carlos Jimenez Ruiz
|
85dc6e51af
|
#1258 ticket.index sumatorio removed unused code
gitea/salix/dev This commit looks good
Details
|
2019-04-29 10:35:46 +02:00 |
|
Carlos Jimenez Ruiz
|
774d8524cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-29 10:21:54 +02:00 |
|
Carlos Jimenez Ruiz
|
10669f01f3
|
#1258 ticket.index sumatorio unit test fixed
|
2019-04-29 10:21:36 +02:00 |
|
Bernat
|
5bc6f5107e
|
#1370 ticket.descriptor change shipped hour
gitea/salix/dev This commit looks good
Details
|
2019-04-29 07:48:59 +02:00 |
|
Carlos Jimenez Ruiz
|
2ca85394f3
|
#1385 excluded tests
gitea/salix/dev This commit looks good
Details
|
2019-04-26 16:10:51 +02:00 |
|
Joan Sanchez
|
16bf0b3448
|
regenerate invoice #1342
gitea/salix/dev This commit looks good
Details
|
2019-04-26 08:52:43 +02:00 |
|
Javi Gallego
|
24fedff62f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-25 18:30:17 +02:00 |
|
Javi Gallego
|
a920bc1d8f
|
tablas dms
|
2019-04-25 18:30:11 +02:00 |
|
Carlos Jimenez Ruiz
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
|
Javi Gallego
|
47e55580ad
|
#1258 ticket.index sumatorio
gitea/salix/dev This commit looks good
Details
|
2019-04-25 07:57:26 +02:00 |
|
Bernat
|
0eabd9876d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-24 11:36:43 +02:00 |
|
Bernat
|
4ac36e6bf2
|
#1362 ticket.packaging negative quantity
|
2019-04-24 11:36:13 +02:00 |
|
Joan Sanchez
|
d88e2e81ca
|
update ticket line discount until invoiced #1365
gitea/salix/dev This commit looks good
Details
|
2019-04-24 11:23:24 +02:00 |
|
Bernat
|
37293ad695
|
#1364 bug create ticket
|
2019-04-24 11:02:31 +02:00 |
|
Joan Sanchez
|
6747a80943
|
fixed available/visible icon on ticket sales #1363
gitea/salix/dev This commit looks good
Details
|
2019-04-24 09:54:25 +02:00 |
|
Bernat
|
94480a8189
|
#1329 fix test and fixtures, update ticket-service
gitea/salix/dev This commit looks good
Details
|
2019-04-24 07:43:11 +02:00 |
|
Bernat
|
75c9d1122c
|
#1329 ticket.services validation
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 11:25:49 +02:00 |
|
Carlos Jimenez Ruiz
|
5501ff8f4f
|
test repairs
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 09:08:28 +02:00 |
|
Carlos Jimenez Ruiz
|
2b04eebe84
|
#1334 E2E ticket.descriptor - Make invoice
|
2019-04-23 08:58:49 +02:00 |
|
Carlos Jimenez Ruiz
|
0176fbc2d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-18 11:47:41 +02:00 |
|
Carlos Jimenez Ruiz
|
2107b57764
|
small typo
|
2019-04-18 11:12:48 +02:00 |
|
Bernat
|
bc005b2310
|
#1346 fix confirm.js and update item request
gitea/salix/dev This commit looks good
Details
|
2019-04-18 11:02:28 +02:00 |
|
Carlos Jimenez Ruiz
|
1f5fe891e4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-17 07:16:13 +02:00 |
|
Carlos Jimenez Ruiz
|
d52f5077b0
|
#1306 Renombrar controladores, rutas y carpeta
|
2019-04-16 15:00:21 +02:00 |
|
Bernat
|
c2b3ff8d81
|
#1335 worker/filter renamed columns acordantly
|
2019-04-16 08:42:44 +02:00 |
|
Joan Sanchez
|
6573e61a7c
|
fixed karma tests
gitea/salix/dev This commit looks good
Details
|
2019-04-16 08:21:20 +02:00 |
|
Joan Sanchez
|
f814584f6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-16 07:59:15 +02:00 |
|
Joan Sanchez
|
90bbe1bd02
|
Log sent sms #1324
|
2019-04-16 07:59:12 +02:00 |
|
Carlos Jimenez Ruiz
|
9c596b06c8
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-04-15 14:37:12 +02:00 |
|
Carlos Jimenez Ruiz
|
82ed0078d2
|
#1339 Print - Hoja de rutas
|
2019-04-15 14:34:33 +02:00 |
|
Bernat
|
a68174c456
|
#1337 refactor checkbox in ticketRequest
gitea/salix/dev This commit looks good
Details
|
2019-04-15 14:21:52 +02:00 |
|
Joan Sanchez
|
b5fe7a6fae
|
restore fixtures makeInvoice
gitea/salix/dev This commit looks good
Details
|
2019-04-12 14:53:17 +02:00 |
|
Bernat
|
dbe56b2496
|
#1330 add info in the search panel
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 14:33:08 +02:00 |
|
Joan Sanchez
|
ac8a27d2f4
|
Added ticket invoice #1310
gitea/salix/dev This commit has test failures
Details
|
2019-04-12 13:54:31 +02:00 |
|
Joan Sanchez
|
353167734e
|
send message to salesPerson #1315
gitea/salix/dev This commit looks good
Details
|
2019-04-11 09:38:53 +02:00 |
|
Javi Gallego
|
50d70f0f6f
|
Tarea #1259 crear modelo ticketServiceType
|
2019-04-10 14:44:41 +02:00 |
|
Carlos Jimenez Ruiz
|
98e704adf8
|
#1326 enlazar en ticket.descriptor tres puntos
|
2019-04-10 10:43:11 +02:00 |
|
Joan Sanchez
|
4f1a1ae004
|
Merge branch 'master' into dev
|
2019-04-09 13:19:34 +02:00 |
|
Joan Sanchez
|
a6308c7f1e
|
input-number refactor #1311
gitea/salix/master This commit looks good
Details
|
2019-04-09 13:18:55 +02:00 |
|
Joan Sanchez
|
33e6467c44
|
fixed zone descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-04-08 10:57:01 +02:00 |
Gerard
|
633ab28c41
|
#1315 item.ticketRequest
gitea/salix/dev This commit looks good
Details
|
2019-04-05 15:20:12 +02:00 |
|
Gerard
|
ebe269f41e
|
#1249 ticket.invoice
gitea/salix/dev This commit looks good
Details
|
2019-04-05 12:24:39 +02:00 |
|
Gerard
|
93bca3b3f0
|
merge master
gitea/salix/dev This commit looks good
Details
|
2019-04-04 12:47:02 +02:00 |
|
Gerard
|
4861b789f7
|
Loggable now inserts the correct values for FK values
gitea/salix/master This commit looks good
Details
|
2019-04-04 12:38:54 +02:00 |
|
Carlos Jimenez Ruiz
|
971a2ab891
|
#1270
ticket.index advanced search mostrar dias en el futuro
|
2019-04-03 15:16:32 +02:00 |
|
Gerard
|
a23c636c16
|
#1279 loggable rawSql
gitea/salix/dev This commit looks good
Details
|
2019-04-02 14:36:49 +02:00 |
|
Javi Gallego
|
0b977d3b0b
|
#1293 ticket.components solo muestra base
gitea/salix/dev This commit looks good
Details
|
2019-04-02 08:00:16 +02:00 |
|
Carlos Jimenez Ruiz
|
056c07b17c
|
#1181 No modificar ticket.basicData en reparto
gitea/salix/dev This commit looks good
Details
|
2019-04-01 15:04:09 +02:00 |
|
Carlos Jimenez Ruiz
|
62acb534e1
|
#1181 No modificar ticket.basicData en reparto
|
2019-04-01 14:49:12 +02:00 |
|
Joan Sanchez
|
3f1889daa3
|
fix open client card from ticket descriptor #1291
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:48:22 +02:00 |
|
Joan Sanchez
|
5898d07822
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-01 09:02:13 +02:00 |
|
Joan Sanchez
|
dfe1a68d35
|
fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good
Details
|
2019-04-01 09:01:11 +02:00 |
|
Joan Sanchez
|
8db51fdf64
|
added shrink class to item index #1278
gitea/salix/dev This commit looks good
Details
|
2019-03-29 08:01:15 +01:00 |
|
Gerard
|
8bf4190d12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-03-29 07:37:23 +01:00 |
|
Gerard
|
280efdae50
|
#732 Loggable now inserts the correct values for FK values
|
2019-03-29 07:36:26 +01:00 |
|
Joan Sanchez
|
8110325af8
|
send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good
Details
|
2019-03-29 07:29:09 +01:00 |
|
Carlos Jimenez Ruiz
|
2263da2e05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-28 11:55:31 +01:00 |
|
Carlos Jimenez Ruiz
|
a14ba28629
|
#1263 invoiceOut.summary
|
2019-03-28 11:55:23 +01:00 |
|
Gerard
|
3b3e4a96e9
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-27 10:03:53 +01:00 |
|
Gerard
|
59d99db6b4
|
#1272 ticket.index
gitea/salix/test This commit looks good
Details
|
2019-03-27 09:58:58 +01:00 |
|
Joan Sanchez
|
8433e15875
|
show client id on ticket summary header #1273
gitea/salix/dev This commit looks good
Details
|
2019-03-27 09:06:21 +01:00 |
|
Gerard
|
8fc9581b8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-03-27 08:56:39 +01:00 |