Commit Graph

22273 Commits

Author SHA1 Message Date
Javi Gallego 2e94ab28de Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-11 13:56:45 +02:00
Javi Gallego 6169486bb0 fix test createFromSales 2018-09-11 13:56:40 +02:00
gerard f105ffa2d6 watchers reduced 2018-09-11 13:48:05 +02:00
Javi Gallego b6cc8c2fe0 merge 2018-09-11 13:44:49 +02:00
Javi Gallego c9ec4aee7e #612 añadir reclamacion 2018-09-11 12:49:31 +02:00
Bernat c2543cae39 add new selectors 2018-09-11 10:53:57 +02:00
gerard 0102c4f673 Tarea #601 boton + abrir el cuadro de dialogo de añadir cantidad 2018-09-11 09:38:37 +02:00
Carlos Jimenez 2179572620 #604 e2e ticket.sale excludid as its in progress 2018-09-10 13:38:14 +02:00
Carlos Jimenez a3d63825d9 indentation fix 2018-09-10 13:00:01 +02:00
Carlos Jimenez f8ec125958 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-10 10:23:42 +02:00
Carlos Jimenez d2e77eecdb #604 nightmare extensions plus 1 e2e excluded instead of commented +task 2018-09-10 10:23:26 +02:00
Carlos Jimenez 4005c58ac3 #604 e2e ticket.sale selectors 2018-09-10 10:22:20 +02:00
Joan Sanchez 366b00a8de added chip component #624 2018-09-07 12:20:57 +02:00
Joan Sanchez a4c730cf65 enabled routes module #616 2018-09-07 09:40:45 +02:00
gerard 92b47466d7 Bug #645 no se pueden añadir greuges desde salix 2018-09-07 08:27:26 +02:00
gerard 8f4592f71f Tarea #596 /sale/getClaimableFromTicket.js Backend 2018-09-06 16:49:13 +02:00
gerard a86120c055 Tarea #615 test multicheck 2018-09-06 16:38:49 +02:00
gerard 767a1b02d9 Tarea #603 /item/getDiary.js Backend unit tests 2018-09-06 16:18:17 +02:00
Bernat d38540a53f itemDiary procedure fixed in local 2018-09-06 15:13:34 +02:00
Joan Sanchez ca97d76adf itemDiary warehouseFk url param #622 2018-09-06 15:08:02 +02:00
Carlos Jimenez 3de82bc8f8 #604 e2e de la seccion ticket.sale selectors 2018-09-06 14:39:08 +02:00
Joan Sanchez dff0c561bc Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-06 12:47:27 +02:00
Joan Sanchez cee940f4fa order client descriptor #609 2018-09-06 12:47:25 +02:00
gerard c33e741c14 fixed typo 2018-09-06 12:33:37 +02:00
Joan Sanchez 660310693f ticket sale translation fix 2018-09-06 12:22:12 +02:00
Bernat 3d6593b020 update structure db local 2018-09-06 11:51:24 +02:00
Javi Gallego 588308cf1e merge 2018-09-06 11:15:53 +02:00
Bernat ee4e6b0b19 update fixtures table ticket 2018-09-06 11:09:26 +02:00
Bernat aef4bfaf4f update structure DB, fixturesDB and fix test 2018-09-06 10:42:43 +02:00
Joan Sanchez f330c77cc6 added span to descriptor-popover links #637 2018-09-06 08:04:43 +02:00
gerard 6f3140059f claim icons added 2018-09-05 16:15:12 +02:00
gerard b2d0832daa Added missing success mesage 2018-09-05 16:14:13 +02:00
gerard 5d7c6ef250 fixed typo 2018-09-05 16:13:30 +02:00
gerard d3ce915b5d refactor to add disable 2018-09-05 13:56:07 +02:00
gerard f23ea2d821 fixed typo 2018-09-05 13:48:18 +02:00
gerard 1bfd6a8ec0 updated acl 2018-09-05 13:47:53 +02:00
gerard c04616d6dc updated acl 2018-09-05 13:47:35 +02:00
gerard c424e845d1 Tarea #606 claim.summary 2018-09-05 13:47:15 +02:00
Juan b12fa80aa2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-05 13:01:30 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard 4221410ff5 claim detail addItem selector fixed 2018-09-05 12:54:21 +02:00
gerard b5448aaa5a Tarea #446 claim.development 2018-09-05 11:48:38 +02:00
gerard 0333ba96b0 Tarea #445 claim.detail 2018-09-05 11:45:33 +02:00
gerard dacdc39a28 Tarea #447 claim.action 2018-09-05 11:35:34 +02:00
gerard 02f612b4d5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-09-05 11:34:35 +02:00
gerard 732c100096 Tarea #447 claim.action 2018-09-05 11:34:23 +02:00
Bernat a98ae9d4ae add new fixtures for table sample 2018-09-05 11:07:05 +02:00
Joan Sanchez 515b36e5bb gulp install 2018-09-05 09:05:55 +02:00
Joan Sanchez b3bba5401f jenkins install dev dependencies 2018-09-05 08:33:08 +02:00
Carlos Jimenez 3e1b6b82d4 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-05 08:28:00 +02:00