Commit Graph

922 Commits

Author SHA1 Message Date
Gerard 8fc9581b8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-27 08:56:39 +01:00
Gerard 650e5b8626 #1257 route.log 2019-03-27 08:56:25 +01:00
Bernat 4e27581045 cau 10269 fix test and update fixtures
gitea/salix/dev This commit looks good Details
2019-03-27 08:44:15 +01:00
Joan Sanchez a16b43546d fixed volume onLoad errors #1238
gitea/salix/dev This commit looks good Details
2019-03-26 09:33:54 +01:00
Carlos Jimenez Ruiz d322c941a4 #1226 Ticket.index advanced filter añadir factura
gitea/salix/dev This commit looks good Details
2019-03-25 15:16:56 +01:00
Gerard 649b7f0e21 log added to ticket module models 2019-03-25 09:36:24 +01:00
Gerard 37546e7a26 #1236 revision con pepe
gitea/salix/dev This commit looks good Details
2019-03-22 12:34:42 +01:00
Gerard bb321995fa deleted wrongly an unused relation alertLevel
gitea/salix/dev This commit looks good Details
2019-03-21 12:05:27 +01:00
Carlos Jimenez Ruiz 7a5124aca2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-20 12:27:36 +01:00
Carlos Jimenez Ruiz d38ca72fd8 orden de resultados por defecto DESC de id y fecha 2019-03-20 11:49:11 +01:00
Bernat 981800a0e2 import production structure db to local and fix test
gitea/salix/dev This commit looks good Details
2019-03-20 08:52:54 +01:00
Gerard 7f0d3279d1 #1189 ticket.index mostrar mas informacion
gitea/salix/dev This commit looks good Details
2019-03-08 08:14:22 +01:00
Gerard 1cc196983e Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 14:13:58 +01:00
Gerard f8d6d2fe98 Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-06 14:10:36 +01:00
Gerard 0e3d568743 #1218 ticket.new quitar restricciones al crear un ticket abono
gitea/salix/master This commit looks good Details
2019-03-06 14:06:36 +01:00
Gerard b2adde4ba3 #1176 ticket.sale actualizar descuento
gitea/salix/dev This commit looks good Details
2019-03-06 08:54:56 +01:00
Gerard 1c7d50fc25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev This commit has test failures Details
2019-03-05 14:59:18 +01:00
Gerard fbc84f48a1 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-03-05 14:44:38 +01:00
Gerard 52c64e9c1d tricks with hours deleted and changed order
gitea/salix/test This commit looks good Details
2019-03-05 14:43:59 +01:00
Carlos Jimenez Ruiz d37d314304 #1202 refactor del cambio de estado de un ticket
gitea/salix/dev This commit looks good Details
2019-03-05 12:01:53 +01:00
Joan Sanchez 3c6d27a285 order sales by concept #1166
gitea/salix/dev This commit looks good Details
2019-03-04 12:04:23 +01:00
Carlos Jimenez Ruiz acbe9b8488 #1184 Propagar done en afterAll() de los test back
gitea/salix/dev This commit looks good Details
2019-03-01 11:50:26 +01:00
Javi Gallego a5b60a9016 instalacion impresora revisado
gitea/salix/dev This commit has test failures Details
2019-03-01 09:07:44 +01:00
Joan Sanchez 4729dda5f6 isDefaultAddress to defaultAddressFk migration #1108
gitea/salix/dev This commit looks good Details
2019-02-28 08:55:34 +01:00
Gerard 9a7bd834df date offset fixed
gitea/salix/test This commit looks good Details
2019-02-27 17:04:32 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Gerard ab6606a624 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-02-21 10:07:27 +01:00
Gerard 8d6fdc4b2f added envialia and solved problems with worker popover
gitea/salix/test This commit looks good Details
2019-02-21 10:06:38 +01:00
Joan Sanchez c9746521dc removed unused getSubTotal() method
gitea/salix/dev This commit has test failures Details
2019-02-21 08:44:03 +01:00
Joan Sanchez 06be535115 ticket subtotal should check service prices #1151
gitea/salix/dev This commit has test failures Details
2019-02-21 08:43:04 +01:00
Gerard a651142fff Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 18:50:08 +01:00
Gerard 4b54b82a9d #1150 descriptor popover intentar abrir con id movimiento
gitea/salix/test This commit looks good Details
2019-02-20 18:46:30 +01:00
Gerard 79cf4afb3e #1116 loggable now works with transaction and log enabled on ticket module
gitea/salix/dev This commit has test failures Details
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 5b50bbd5d0 Merge branch 'test' into dev 2019-02-12 14:36:24 +01:00
Gerard 41d950eaef hotfix errors creting tickets 2019-02-12 14:23:04 +01:00
Bernat d994bd8e9d #9783 update model and fixtures 2019-02-11 10:39:53 +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
Javi Gallego f9982047aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-02-06 07:58:43 +01:00
Javi Gallego 60c5d3062f expedition.json new externalId field 2019-02-06 07:56:10 +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 e9bc3f00a1 #954 ticket.descriptor añadir link a polizon 2019-01-18 13:34:50 +01:00
Gerard 2b2fe69d0d alert level not available fixed 2019-01-17 11:04:00 +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
Gerard 140e7b4f92 #968 ticket/servicios 2019-01-16 10:49:49 +01:00
Bernat 3faf03cf9f fix test and update fixtures 2019-01-11 15:06:18 +01:00
Bernat f7244cc22b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-01-11 12:26:06 +01:00
Bernat f678bfea37 exportDB step 3 2019-01-11 12:25:53 +01:00
Gerard aa03c686e5 added log of ticket packaging 2019-01-11 08:30:44 +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