Commit Graph

554 Commits

Author SHA1 Message Date
Joan Sanchez 073c457abb Merge branch 'test' 2019-06-05 08:56:56 +02:00
Carlos Jimenez Ruiz 05fc1f08a8 renamed vars according to convention 2019-06-05 07:41:20 +02:00
Bernat c49f72b36c #1493 Refactorizar el método back /Tickets/deleted 2019-06-03 14:54:03 +02:00
Carlos Jimenez Ruiz d06d5cd9c8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-03 12:00:58 +02:00
Carlos Jimenez Ruiz 9671307688 #1486 back test updateDiscount 2019-06-03 12:00:48 +02:00
Bernat 62fe9d760c #1488 #1489 ticket sale updatePrice and backTest 2019-06-03 08:01:24 +02:00
Carlos Jimenez Ruiz a009329bdd removed console logs from spec file 2019-05-31 13:54:05 +02:00
Bernat d4a3a1a72e export production structure and fixtures updated 2019-05-30 13:45:13 +02:00
Carlos Jimenez Ruiz ed3024e144 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-30 08:57:38 +02:00
Carlos Jimenez Ruiz 80d5c923cc #1486 back test updateDiscount 2019-05-30 08:57:25 +02:00
Javi Gallego e01765e34e test back-front fixed 2019-05-30 08:41:08 +02:00
Bernat 24c3b35605 Test #1489 updatePrice backTest skipped 2019-05-30 08:06:52 +02:00
Bernat 726d0ab359 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-30 07:53:23 +02:00
Bernat 4f20716fa3 #1489 updatePrice backTest 2019-05-29 14:59:26 +02:00
Carlos Jimenez Ruiz cfcadc4f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-05-29 13:07:23 +02:00
Carlos Jimenez Ruiz 40654f94c4 #1475 no borrar servicios de tickets no editables 2019-05-29 13:06:42 +02:00
Bernat 7a7ea03bff 1485 refactor updatePrice 2019-05-29 12:41:26 +02:00
Bernat 85761043cd delete console.log 2019-05-29 11:15:08 +02:00
Bernat 84a4b049f0 1453 ticket UpdateDiscount refactor 2019-05-29 11:11:54 +02:00
Bernat 230516b9d4 #1438 fix test back makeInvoice 2019-05-27 10:01:35 +02:00
Bernat 59069749a2 1461 fix test back 2019-05-27 09:19:23 +02:00
Carlos Jimenez Ruiz a3311f6093 #1250 ticket.line al mover todas las lineas delete 2019-05-24 15:30:50 +02:00
Javi Gallego f871879ee5 merge fixtures dinamicas para zoneCalendar 2019-05-23 13:33:06 +02:00
Javi Gallego c311b0ae65 dump y procedimientos volcados 2019-05-23 13:18:15 +02:00
Javi Gallego 94cc7af8b2 merge paso 2 2019-05-23 13:07:59 +02:00
Javi Gallego 3776e0588c merge paso 1 2019-05-23 13:05:02 +02:00
Joan Sanchez cc72432a37 accessType refactor #1460 2019-05-22 12:38:51 +02:00
Joan Sanchez f73b42b0be accessType refactor #1460 2019-05-22 12:35:24 +02:00
Joan Sanchez 52e26eb99d mark manual lines #1449 2019-05-21 12:56:29 +02:00
Bernat bb5c81a3e9 #1409 ticket.weekly add finder 2019-05-21 09:03:57 +02:00
Bernat 1f128797c3 export production to local, fix test and add fixtures 2019-05-09 09:32:04 +02:00
Joan Sanchez 4aff31a165 fixed update discount 2019-05-06 07:40:59 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour 2019-05-03 12:23:57 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Bernat 0eabd9876d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-24 11:36:43 +02:00
Joan Sanchez d88e2e81ca update ticket line discount until invoiced #1365 2019-04-24 11:23:24 +02:00
Bernat 37293ad695 #1364 bug create ticket 2019-04-24 11:02:31 +02:00
Bernat bc005b2310 #1346 fix confirm.js and update item request 2019-04-18 11:02:28 +02:00
Bernat c2b3ff8d81 #1335 worker/filter renamed columns acordantly 2019-04-16 08:42:44 +02:00
Joan Sanchez b5fe7a6fae restore fixtures makeInvoice 2019-04-12 14:53:17 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310 2019-04-12 13:54:31 +02:00
Joan Sanchez 353167734e send message to salesPerson #1315 2019-04-11 09:38:53 +02:00
Gerard 633ab28c41 #1315 item.ticketRequest 2019-04-05 15:20:12 +02:00
Gerard ebe269f41e #1249 ticket.invoice 2019-04-05 12:24:39 +02:00
Gerard a23c636c16 #1279 loggable rawSql 2019-04-02 14:36:49 +02:00
Carlos Jimenez Ruiz 056c07b17c #1181 No modificar ticket.basicData en reparto 2019-04-01 15:04:09 +02:00
Carlos Jimenez Ruiz 62acb534e1 #1181 No modificar ticket.basicData en reparto 2019-04-01 14:49:12 +02:00
Joan Sanchez 5898d07822 Merge branch 'test' into dev 2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277 2019-04-01 09:01:11 +02:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Bernat 4e27581045 cau 10269 fix test and update fixtures 2019-03-27 08:44:15 +01:00
Joan Sanchez a16b43546d fixed volume onLoad errors #1238 2019-03-26 09:33:54 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura 2019-03-25 15:16:56 +01:00
Bernat 981800a0e2 import production structure db to local and fix test 2019-03-20 08:52:54 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion 2019-03-08 08:14:22 +01:00
Gerard 1cc196983e Merge branch 'test' into dev 2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test 2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono 2019-03-06 14:06:36 +01:00
Gerard b2adde4ba3 #1176 ticket.sale actualizar descuento 2019-03-06 08:54:56 +01:00
Gerard 1c7d50fc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-05 15:00:38 +01:00
Gerard dd7ded018b test fixed 2019-03-05 15:00:17 +01:00
Joan Sanchez 11603f8d90 Add services to deliver-note #1201. Renamed receipt 2019-03-05 14:59:18 +01:00
Gerard fbc84f48a1 Merge branch 'test' into dev 2019-03-05 14:44:38 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order 2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz d37d314304 #1202 refactor del cambio de estado de un ticket 2019-03-05 12:01:53 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166 2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back 2019-03-01 11:50:26 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado 2019-03-01 09:07:44 +01:00
Gerard ab6606a624 Merge branch 'test' into dev 2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover 2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method 2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151 2019-02-21 08:43:04 +01:00
Gerard a651142fff Merge branch 'test' into dev 2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento 2019-02-20 18:46:30 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module 2019-02-20 16:30:46 +01:00
Carlos Jimenez Ruiz 3ab0b2eb19 merge 2019-02-15 12:43:18 +01:00
Carlos Jimenez Ruiz 92a645f395 #1122 + worker descriptor popover + small refactors for worker.nickname 2019-02-15 12:39:21 +01:00
Gerard 1144a197a5 #1112 ticket.sale 2019-02-14 12:06:14 +01:00
Bernat bbd4188695 #9848 fix test and update fixtures 2019-02-13 13:19:15 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Gerard 171716806a #1096 back validaciones crear ticket 2019-02-06 16:37:59 +01:00
Gerard 87b3032a4f #1067 error en boton "Importar Reclamacion" 2019-02-06 11:39:22 +01:00
Gerard 3869742fd7 #1088 ticket.descriptor añadir polizon interval server error 2019-02-04 12:41:38 +01:00
Juan Ferrer 84c0002cb1 Hot bugs fixed 2019-02-01 17:11:14 +01:00
Carlos Jimenez Ruiz 00ccf9a4a0 #1069 mostrar el nickname en los sitios donde aparezca nombre solo 2019-01-31 14:14:39 +01:00
Carlos Jimenez Ruiz f4e202dc62 #1069 index now show nicknames 2019-01-30 15:10:52 +01:00
Gerard 21e30bcaef #1064 quitar comprobación isTaxDataChecked 2019-01-30 08:46:05 +01:00
Juan Ferrer e553d63492 #996 worker.descriptor 2019-01-29 21:00:27 +01:00
Juan Ferrer f47fe9c1cc #998 worker.index, back tests fixed 2019-01-29 16:37:59 +01:00
Gerard 6e6b646978 #1022 ticket.create 2019-01-25 11:58:50 +01:00
Carlos Jimenez Ruiz 8cbde4c137 removed global variable serviceRoot 2019-01-24 09:08:28 +01:00
Gerard aeb0f65fec #1037 order.descriptor 2019-01-23 12:30:32 +01:00
Gerard 05ed72661e test fixed 2019-01-23 11:17:18 +01:00
Gerard abea582014 #1017 ticket.index 2019-01-22 16:18:26 +01:00
Gerard 87a0a0bccc #972 ticket.tracking 2019-01-22 10:04:42 +01:00
Gerard ea0504db21 stowaway fixes 2019-01-21 08:44:21 +01:00
Gerard 345acc1353 #951 ticket.descriptor añadir polizon 2019-01-18 13:36:13 +01:00
Gerard 542dd9f280 #973 order.action 2019-01-16 12:55:38 +01:00
Gerard 0fd1149c55 #975 ticket.summary 2019-01-16 12:43:18 +01:00
Bernat 3faf03cf9f fix test and update fixtures 2019-01-11 15:06:18 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Bernat 85b4f46479 structuredb step 2 2019-01-10 07:26:10 +01:00
Juan Ferrer 9cdfe0c5d9 #814 First stable version 2018-12-27 12:54:16 +01:00