Commit Graph

3086 Commits

Author SHA1 Message Date
Carlos Jimenez 3d533b04ea Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-21 09:06:52 +02:00
Carlos Jimenez 2b4959ce36 #512 /main-menu/main-menu.js Front unit test 2018-08-21 09:03:51 +02:00
gerard 48670b9724 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-21 08:13:45 +02:00
gerard 1bc7ea4815 Bug #589 Si cambia el estado de un ticket no se guarda el historico 2018-08-21 08:13:35 +02:00
Carlos Jimenez d2eaa62461 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-21 08:08:49 +02:00
Carlos Jimenez e925146c73 #547 ticket/new.js Backend unit tests plus order new refactor 2018-08-21 08:08:39 +02:00
gerard ca523e634c Bug #589 cambiar el estado desde ticket.sales no guarda el historico 2018-08-21 07:39:01 +02:00
gerard 2d6932fe49 Little refactor 2018-08-20 14:52:37 +02:00
gerard d364025b19 added translations 2018-08-20 14:51:13 +02:00
gerard 2bbbdcb55e Added missing file 2018-08-20 14:48:21 +02:00
gerard b677108e46 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-20 13:02:11 +02:00
gerard 83bf54569c Bug #575 ng-click se llama en los vn-button deshabilitados 2018-08-20 13:01:36 +02:00
Carlos Jimenez 254bfe3b6b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-20 10:06:17 +02:00
Carlos Jimenez f942732d48 #555 item model back unit test 2018-08-20 10:06:00 +02:00
gerard fd313a3134 Tarea #429 order.catalog click en boton + abrir añadir cantidad 2018-08-20 09:01:38 +02:00
Carlos Jimenez 065f2126bf #564 new.js Backend unit tests 2018-08-17 16:12:05 +02:00
Joan Sanchez 7c4eda87a2 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-17 15:03:53 +02:00
Joan Sanchez a60720d1ed Ticket packaging refactor + front test updated 2018-08-17 14:53:25 +02:00
Bernat 42fa3d0e69 update fixtures table client 2018-08-17 14:52:54 +02:00
Carlos Jimenez d0fff2135e Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-17 13:26:07 +02:00
Carlos Jimenez 8706f5c6c0 #531 moveToTicket.js Backend unit tests 2018-08-17 13:23:07 +02:00
Bernat 77641666da update fixtures table client 2018-08-17 13:14:10 +02:00
Joan Sanchez 4b7c87e6d0 left menu front test #511 2018-08-17 11:05:09 +02:00
Carlos Jimenez 8ccab773c0 corrected a problem where dynamic dates were giving false test failures 2018-08-17 09:56:50 +02:00
Carlos Jimenez a6be927a1f small refactor 2018-08-17 09:29:00 +02:00
Joan Sanchez 4fff408e68 back test priceDifference 2018-08-17 08:41:30 +02:00
Bernat 6e6cf47c5a update procedure agencyHourGetLanded 2018-08-16 14:31:11 +02:00
Carlos Jimenez 5e9c3461e6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-16 14:00:50 +02:00
Carlos Jimenez 2e88957c8b #534 reserve.js Backend unit tests 2018-08-16 14:00:37 +02:00
Joan Sanchez 611f612068 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-16 13:12:20 +02:00
Joan Sanchez 1786602187 Change landed on shipped change #458 2018-08-16 13:12:18 +02:00
Carlos Jimenez 51e5e76edd #527 getLastEntries.js unit tests + fixtures + threeKastActive refactor 2018-08-16 12:10:56 +02:00
Carlos Jimenez b4321816be #515 descriptor client unit test 2018-08-16 07:40:25 +02:00
Carlos Jimenez 8f385798b6 corrected errors 2018-08-14 14:52:39 +02:00
Carlos Jimenez 5cfd5c7605 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-14 14:32:40 +02:00
Carlos Jimenez 25b5cfe99f #549 threeLastActive.js Backend unit tests 2018-08-14 14:32:27 +02:00
Joan Sanchez 0efa85c2fb updated ticket filter 2018-08-14 13:36:02 +02:00
Carlos Jimenez 35a8a7d7dc Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-14 12:50:10 +02:00
Carlos Jimenez 0c3072fb13 #536 updatePrice.js backend unit test 2018-08-14 12:48:12 +02:00
Bernat 829f9d33cd add new procedure agencyHourGetLanded 2018-08-14 12:03:20 +02:00
Carlos Jimenez be132e33cb #561 getTotalVolume.js back unit test + servicesDir added to spec files 2018-08-14 11:52:10 +02:00
Joan Sanchez a6d7eff637 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-08-14 11:36:48 +02:00
Joan Sanchez 7e312a14d2 fixed npm eslint command 2018-08-14 11:36:10 +02:00
Carlos Jimenez c14fe295d7 #474 descriptor-popover Front unit test and refactor of other test 2018-08-14 09:12:28 +02:00
Carlos Jimenez 3916c2bf09 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-08-14 08:51:50 +02:00
Carlos Jimenez 8d9a907383 subidas versiones de nodemon, jasmine, eslint de jasmine y electron 2018-08-14 08:24:07 +02:00
Joan Sanchez cae48a68d7 updated eslint to ECMAS 2018 2018-08-14 08:05:17 +02:00
Carlos Jimenez 27bc339721 #522 updateBillingData.js Backend unit tests 2018-08-13 16:54:34 +02:00
Carlos Jimenez 24ad4a83a1 #521 updateBasicData.js Backend unit tests 2018-08-13 14:52:05 +02:00
Carlos Jimenez 9268fdb2da #523 updateFiscalData.js Backend unit tests plus refactor 2018-08-13 14:10:03 +02:00