Commit Graph

5179 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz 02c63b0d5f refactor tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:46:59 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Bernat 97f3761e0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 08:36:16 +02:00
Joan Sanchez 2e325310d8 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-04-16 08:26:09 +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 eac9980ee3 import db changes on master
gitea/salix/dev There was a failure building this commit Details
2019-04-16 08:11:27 +02:00
Javi Gallego ce2615e2d0 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 08:09:20 +02:00
Javi Gallego 28bbc024b2 #1195 claim.action regularize 2019-04-16 08:09:16 +02:00
Bernat 0d680bdaed #1343 update worker filter 2019-04-16 07:59:29 +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
Carlos Jimenez Ruiz f5fd929970 jasmine no focused test lint rule enabled 2019-04-15 11:45:30 +02:00
Joan Sanchez 34a630dcde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-15 11:35:10 +02:00
Joan Sanchez 45055034dc invoiceOutMake in prod 2019-04-15 11:35:00 +02:00
Bernat 6a68003d84 #1212 refactor claim filter
gitea/salix/dev This commit looks good Details
2019-04-15 11:06:42 +02:00
Joan Sanchez 5a946af1ff error when sending to a salesPerson pay-method changes #1338
gitea/salix/test This commit looks good Details
2019-04-15 10:45:14 +02:00
Joan Sanchez 79f9dfb515 error when sending to a salesPerson pay-method changes #1338
gitea/salix/dev This commit looks good Details
2019-04-15 08:46:20 +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
Javi Gallego 6eef192929 añade opcion mana con permisos
gitea/salix/dev This commit looks good Details
2019-04-11 12:44:43 +02:00
Bernat c6203a0654 fix test ticketservice, update selectors and acl
gitea/salix/dev This commit looks good Details
2019-04-11 12:25:01 +02:00
Juan Ferrer a4e9555dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-11 11:54:48 +02:00