 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 |
Bernat
|
fabe4f396f
|
#1371 claim descriptor hour
gitea/salix/dev This commit looks good
Details
|
2019-04-25 14:51:22 +02:00 |
 Carlos Jimenez Ruiz
|
3cb7319efa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-25 14:24:08 +02:00 |
|
Carlos Jimenez Ruiz
|
511e33b835
|
#1350 route.index worker descriptor + filters
|
2019-04-25 14:24:02 +02:00 |
 Joan Sanchez
|
4465f48afe
|
fix search by string barcode #1381
gitea/salix/dev This commit looks good
Details
|
2019-04-25 13:51:34 +02:00 |
|
Joan Sanchez
|
aec46bb855
|
fix send notification to salesPerson #1382
gitea/salix/dev This commit looks good
Details
|
2019-04-25 13:32:14 +02:00 |
 Juan Ferrer
|
b6c95f262f
|
Merge branch 'test' into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-25 13:23:19 +02:00 |
|
Juan Ferrer
|
2ebc5de441
|
Nginx now logs original proxy src/dst hosts
gitea/salix/test This commit looks good
Details
|
2019-04-25 13:22:49 +02:00 |
|
Carlos Jimenez Ruiz
|
8384a6cb2a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-25 09:26:52 +02:00 |
|
Javi Gallego
|
59e8990db9
|
bug solved
gitea/salix/dev This commit looks good
Details
|
2019-04-25 09:26:42 +02:00 |
|
Carlos Jimenez Ruiz
|
da925eb9b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-25 08:28:33 +02:00 |
|
Carlos Jimenez Ruiz
|
e11d33eb27
|
worker descriptor refactor
|
2019-04-25 08:28:23 +02:00 |
|
Carlos Jimenez Ruiz
|
4e5c6ff882
|
#1356 advanced search refactor
|
2019-04-25 08:28:08 +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 |
|
Joan Sanchez
|
00c11a95c6
|
fixed catalog filter bugs #1352
gitea/salix/dev This commit looks good
Details
|
2019-04-24 09:21:24 +02:00 |
|
Bernat
|
b2f88872fa
|
#1366 bug in claim-index
gitea/salix/dev This commit looks good
Details
|
2019-04-24 09:10:56 +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 |
|
Carlos Jimenez Ruiz
|
a6fa9f98fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-04-23 13:30:43 +02:00 |
|
Carlos Jimenez Ruiz
|
8d5cc93ddb
|
#1359 refactor absences
|
2019-04-23 13:29:52 +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
|
c2badeacd0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-23 09:04:30 +02:00 |
|
Carlos Jimenez Ruiz
|
2b04eebe84
|
#1334 E2E ticket.descriptor - Make invoice
|
2019-04-23 08:58:49 +02:00 |
|
Joan Sanchez
|
76269a8a16
|
added drag & drop directives on worker department #1319
gitea/salix/dev This commit has test failures
Details
|
2019-04-23 08:29:23 +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
|
fb30a01fde
|
#1348 invoiceOut.summary
|
2019-04-18 11:47:31 +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
|
2876f19101
|
#1348 invoiceOut.summary
|
2019-04-17 11:44:00 +02:00 |
|
Carlos Jimenez Ruiz
|
7595905c5e
|
front unit test from invoiceOut now included in the index file
gitea/salix/dev This commit looks good
Details
|
2019-04-17 11:31:37 +02:00 |
|
Carlos Jimenez Ruiz
|
e34cb8ce84
|
#1351 e2e order.catalog
gitea/salix/dev This commit looks good
Details
|
2019-04-17 09:37:55 +02:00 |
|
Carlos Jimenez Ruiz
|
bafbd92802
|
Bug/Test #1331 cambio de rol
gitea/salix/dev This commit looks good
Details
|
2019-04-17 08:21:58 +02:00 |
|
Carlos Jimenez Ruiz
|
7707acb43a
|
#1306 Renombrar controladores, rutas y carpetas
gitea/salix/dev This commit looks good
Details
|
2019-04-17 07:30:38 +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 |
|
Carlos Jimenez Ruiz
|
ab70201795
|
#1306 Renombrar controladores, rutas y carpetas
|
2019-04-16 15:00:12 +02:00 |
|
Carlos Jimenez Ruiz
|
9baa37b833
|
#1306 Renombrar controladores, rutas y carpetas
|
2019-04-16 14:30:01 +02:00 |
|
Carlos Jimenez Ruiz
|
85851e7a33
|
#1306 Renombrar controladores, rutas y carpetas
|
2019-04-16 13:40:26 +02:00 |
|
Bernat
|
9a86929e3a
|
#1344 create test for worker filter
gitea/salix/dev This commit looks good
Details
|
2019-04-16 13:10:06 +02:00 |
|
Carlos Jimenez Ruiz
|
5770bed5af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-16 12:44:12 +02:00 |
|
Bernat
|
54f65a9227
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-04-16 12:21:58 +02:00 |
|
Joan Sanchez
|
fb517cb923
|
fixed catalog price popover
gitea/salix/test This commit looks good
Details
|
2019-04-16 12:13:33 +02:00 |
|
Joan Sanchez
|
842101e239
|
fixed catalog price popover
gitea/salix/dev This commit looks good
Details
|
2019-04-16 12:11:06 +02:00 |
|
Carlos Jimenez Ruiz
|
a326fd2a65
|
#1306 Renombrar controladores, rutas y carpetas
|
2019-04-16 11:32:45 +02:00 |