Commit Graph

56 Commits

Author SHA1 Message Date
Gerard a78ffbdaa5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-15 13:20:18 +02:00
Joan Sanchez 589be52c6a Order filter & added model getSetValues() #722 2018-10-15 11:43:57 +02:00
Gerard 5729f19a52 Bug #730 test 2018-10-15 11:33:23 +02:00
Gerard f32f63f3c5 Bug #730 test 2018-10-15 11:29:17 +02:00
Gerard 7ed52d455d Bug #730 order.catalog no añade lineas 2018-10-15 10:48:06 +02:00
Gerard a016d4de31 Tarea #723 TESTS 2018-10-10 14:13:53 +02:00
Gerard 060ab04084 #723 order.summary 2018-10-10 12:55:04 +02:00
Gerard 5dabb5625c merge 2018-10-10 11:50:30 +02:00
Bernat d391d86f02 update fixtures table orderRow and rowcomponent, fix test 2018-10-10 11:17:55 +02:00
Joan Sanchez 31d655b130 Create ticket with transaction 2018-10-10 09:59:42 +02:00
Gerard 274e44368e #723 Added getTaxes to get the total taxes of an order 2018-10-08 15:21:06 +02:00
Gerard ead7397bb3 console logs removed 2018-10-05 13:05:34 +02:00
Carlos Jimenez cba95e6c76 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 11:46:54 +02:00
Carlos Jimenez 91237a87ef refactor on spec files 2018-10-03 11:40:51 +02:00
Bernat bbb221cc0c update fixtures orders and fix test 2018-10-03 08:12:34 +02:00
Bernat 6fc85b0e5a refactor fixtures, and fix / refactor test 2018-09-21 15:01:51 +02:00
Carlos Jimenez f1e5fdfa0b Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-09-18 08:58:26 +02:00
Carlos Jimenez 7bc2d0339d order is now deleted upon execution 2018-09-18 08:58:15 +02:00
Joan Sanchez f387673b80 catalogFilter back unit test fixed with different orderFk 2018-09-18 08:55:39 +02:00
gerard 18fe2e16af updated test 2018-09-17 15:10:46 +02:00
gerard 4fb31f9522 Tarea #658 dialogo de añadir cantidad 2018-09-17 14:30:39 +02:00
Bernat 702690e949 update fixtures cau 8198 2018-09-17 13:13:33 +02:00
Bernat df02c35068 update fixtures 2018-09-14 14:59:14 +02:00
gerard df85500ab5 added UserError 2018-09-14 14:45:29 +02:00
gerard 0926e481ed Tarea #601 dialogo de añadir cantidad 2018-09-14 14:44:46 +02:00
Joan Sanchez 8feba9f5eb catalogFilter back test 2018-09-14 09:37:54 +02:00
Joan Sanchez fa31010069 catalog filters #598 2018-09-14 09:10:30 +02:00
gerard 0102c4f673 Tarea #601 boton + abrir el cuadro de dialogo de añadir cantidad 2018-09-11 09:38:37 +02:00
Joan Sanchez cee940f4fa order client descriptor #609 2018-09-06 12:47:25 +02:00
Bernat aef4bfaf4f update structure DB, fixturesDB and fix test 2018-09-06 10:42:43 +02:00
Juan bf0e1eeaf3 CrudModel: improved, docs, bugs fixed 2018-09-05 13:01:21 +02:00
gerard 5ef47060c7 updated backend test 2018-08-21 14:22:19 +02:00
Joan Sanchez 300b2c2a07 catalog filter #581 2018-08-21 13:38:16 +02:00
Carlos Jimenez e925146c73 #547 ticket/new.js Backend unit tests plus order new refactor 2018-08-21 08:08:39 +02:00
Carlos Jimenez 065f2126bf #564 new.js Backend unit tests 2018-08-17 16:12:05 +02:00
Carlos Jimenez a6be927a1f small refactor 2018-08-17 09:29:00 +02:00
Carlos Jimenez be132e33cb #561 getTotalVolume.js back unit test + servicesDir added to spec files 2018-08-14 11:52: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 51f7958612 removed unexpected focus on describe 2018-08-13 12:46:56 +02:00
gerard 06a3f0b6bc /order/getTotal.js Backend unit tests 2018-08-10 16:30:18 +02:00
gerard 3875f4298c filter modified to get the prices of a product 2018-08-10 16:15:17 +02:00
Joan Sanchez f15d8c3087 front & back tests 2018-08-09 12:54:29 +02:00
gerard feb80006ab Tarea #562 /order/getVolumes.js 2018-08-08 16:15:53 +02:00
gerard 93810c381b translations added 2018-08-07 16:10:10 +02:00
gerard 65ffade0a3 Tarea #438 order.line 2018-08-07 16:04:42 +02:00
gerard da9a783843 Tarea #438 order.line 2018-08-07 15:48:55 +02:00
Joan Sanchez ff0f0436af Fixed locales: client & back-end validations, back-end UserError. #464 2018-08-02 09:49:00 +02:00
gerard b68f34d3d4 Tarea #427 mover create order de ticket a order 2018-07-24 13:48:31 +02:00
gerard 81dc09999f Tarea #406 order.volumen 2018-07-24 12:57:07 +02:00
Joan Sanchez 896c033594 added order catalogue #408 2018-07-24 09:35:23 +02:00