Commit Graph

5001 Commits

Author SHA1 Message Date
Bernat 97f3761e0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-16 08:36:16 +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 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
Juan Ferrer faa0dc2b8d Popover relocate() fixes 2019-04-11 11:54:34 +02:00
Carlos Jimenez Ruiz 5a8afa19a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-11 11:45:55 +02:00
Carlos Jimenez Ruiz 7dc23f6e27 e2e renamed correctly 2019-04-11 11:45:21 +02:00
Bernat 6d9fee06f6 new models and cau 10507 2019-04-11 11:44:34 +02:00
Joan Sanchez 2f38f6e88f Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-11 11:34:25 +02:00
Joan Sanchez 84151d6527 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-04-11 11:24:46 +02:00
Joan Sanchez bed6721643 changed credit min value to zero
gitea/salix/master This commit looks good Details
2019-04-11 11:24:10 +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
Joan Sanchez 1dd8fdd96b input number select value when is zero
gitea/salix/dev This commit looks good Details
2019-04-11 08:05:46 +02:00
Joan Sanchez 3fbdd3a186 Merge branch 'master' into dev
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-04-11 07:56:01 +02:00
Joan Sanchez 7c3052d17b fixed input time & input number
gitea/salix/master This commit looks good Details
2019-04-11 07:42:27 +02:00
Joan Sanchez da473c921d input time refactor #1292
gitea/salix/master This commit looks good Details
2019-04-11 07:32:58 +02:00
Joan Sanchez 3d71165682 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-11 07:29:43 +02:00
Joan Sanchez 1e06a19884 input time refactor #1292 2019-04-11 07:29:41 +02:00
Juan Ferrer c3b4c18ba7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 15:47:39 +02:00
Juan Ferrer c1b103d170 Popover fixes 2019-04-10 15:47:23 +02:00
Javi Gallego 016f0e6d92 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 14:44:46 +02:00
Javi Gallego 50d70f0f6f Tarea #1259 crear modelo ticketServiceType 2019-04-10 14:44:41 +02:00
Carlos Jimenez Ruiz 340b8b309a e2e fixes
gitea/salix/dev This commit looks good Details
2019-04-10 13:19:28 +02:00
Joan Sanchez 49ef341eb6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-04-10 12:04:22 +02:00
Joan Sanchez 6f98d81db1 fixed input time 2019-04-10 12:04:11 +02:00
Carlos Jimenez Ruiz e9102249be #1328 module home refactor
gitea/salix/dev This commit looks good Details
2019-04-10 11:49:39 +02:00
Carlos Jimenez Ruiz 9db389329d renamed the it statement 2019-04-10 10:53:00 +02:00
Carlos Jimenez Ruiz a248f722a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-10 10:43:19 +02:00
Carlos Jimenez Ruiz 98e704adf8 #1326 enlazar en ticket.descriptor tres puntos 2019-04-10 10:43:11 +02:00
Bernat 2be3481138 #1309 add icon in routes module
gitea/salix/dev This commit looks good Details
2019-04-10 10:02:28 +02:00
Carlos Jimenez Ruiz 0343aea2a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-10 09:48:52 +02:00
Carlos Jimenez Ruiz 17f5e46497 #1284 Print - Informe zona 2019-04-10 09:45:45 +02:00