Commit Graph

5984 Commits

Author SHA1 Message Date
Joan Sanchez 94566b7ef4 fixed worker calendar error for local holidays
gitea/salix/master This commit looks good Details
2019-04-30 11:44:24 +02:00
Joan Sanchez c8bf9d0d7b fixed worker calendar error for local holidays
gitea/salix/dev This commit looks good Details
2019-04-30 11:43:26 +02:00
Joan Sanchez 1a524e33b1 regenerate invoiceOut ACL
gitea/salix/dev This commit looks good Details
2019-04-30 11:29:57 +02:00
Joan Sanchez 1218551a8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-30 11:20:40 +02:00
Joan Sanchez 6db35d744d multicheck checking all elements on pagination if checked 2019-04-30 11:20:37 +02:00
Bernat a81e705251 #1341 invoiceOut.descriptor book invoiceOut
gitea/salix/dev This commit looks good Details
2019-04-30 11:03:48 +02:00
Joan Sanchez 6c3cea56aa fixed multi-check karma unit tests
gitea/salix/dev This commit looks good Details
2019-04-30 09:19:40 +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 6b6faff383 #1386 e2e Item regularize path
gitea/salix/dev This commit looks good Details
2019-04-29 13:22:32 +02:00
Joan Sanchez 69403223d8 fixed treeview #1374
gitea/salix/dev This commit looks good Details
2019-04-29 11:49:43 +02:00
Bernat a8a5193a86 1389 update fixtures for invoiceOut and fix test
gitea/salix/dev This commit looks good Details
2019-04-29 11:40:54 +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
Carlos Jimenez Ruiz b6a1e884df #1383 Drop down selectors
gitea/salix/dev This commit looks good Details
2019-04-26 14:15:37 +02:00
Joan Sanchez 145a5e85eb dropdown element name without translation
gitea/salix/dev This commit looks good Details
2019-04-26 12:41:30 +02:00
Juan Ferrer 0a37922b94 Nginx now logs original proxy src/dst hosts
gitea/salix/master This commit looks good Details
2019-04-26 12:21:08 +02:00
Bernat ed8705a50c #1340 invoiceOut.descriptor delete invoiceOut
gitea/salix/dev This commit looks good Details
2019-04-26 12:05:49 +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
Bernat fabe4f396f #1371 claim descriptor hour
gitea/salix/dev This commit looks good Details
2019-04-25 14:51:22 +02:00
Joan Sanchez be9f2f6694 fix send notification to salesPerson #1382
gitea/salix/master This commit looks good Details
2019-04-25 14:48:29 +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 7b59164fed negative package quantity
gitea/salix/master This commit looks good Details
2019-04-24 12:17:11 +02:00
Joan Sanchez bd605a5d9d update ticket line discount until invoiced #1365 2019-04-24 12:16:03 +02:00
Bernat 1eae903b69 #1364 bug create ticket 2019-04-24 12:14:53 +02:00
Joan Sanchez 2186f8409e fixed available/visible icon on ticket sales #1363 2019-04-24 12:14:39 +02:00
Joan Sanchez d2006e60bb fixed catalog filter bugs #1352 2019-04-24 12:14:30 +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