Commit Graph

615 Commits

Author SHA1 Message Date
Joan Sanchez 5898d07822 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-04-01 09:02:13 +02:00
Joan Sanchez dfe1a68d35 fix ticket basic data allow change company #1277
gitea/salix/test This commit looks good Details
2019-04-01 09:01:11 +02:00
Joan Sanchez 6d51ef4187 fixed absence test
gitea/salix/dev This commit looks good Details
2019-04-01 08:56:18 +02:00
Gerard 164093af48 Merge branch 'test' into dev
gitea/salix/dev This commit has test failures Details
2019-04-01 08:43:22 +02:00
Gerard 034bd77d52 Date is visible always
gitea/salix/test This commit looks good Details
2019-04-01 08:42:19 +02:00
Carlos Jimenez Ruiz a191ddebf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-29 13:15:06 +01:00
Carlos Jimenez Ruiz 0fb95bc8d2 test repairs plus some traductions 2019-03-29 13:14:48 +01:00
Joan Sanchez 75cb05865b filter by firstName & lastName
gitea/salix/dev This commit looks good Details
2019-03-29 13:07:06 +01:00
Carlos Jimenez Ruiz d2331ccd68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-29 10:51:13 +01:00
Carlos Jimenez Ruiz 14bd970fbc #1265 worker.pbx da error si no tiene extensión 2019-03-29 10:51:02 +01:00
Joan Sanchez 8db51fdf64 added shrink class to item index #1278
gitea/salix/dev This commit looks good Details
2019-03-29 08:01:15 +01:00
Gerard 8bf4190d12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-03-29 07:37:23 +01:00
Gerard 280efdae50 #732 Loggable now inserts the correct values for FK values 2019-03-29 07:36:26 +01:00
Joan Sanchez 8110325af8 send sms from ticket descriptor & ticket line #991
gitea/salix/dev This commit looks good Details
2019-03-29 07:29:09 +01:00
Carlos Jimenez Ruiz 2263da2e05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-28 11:55:31 +01:00
Carlos Jimenez Ruiz a14ba28629 #1263 invoiceOut.summary 2019-03-28 11:55:23 +01:00
Gerard 3b3e4a96e9 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-27 10:03:53 +01:00
Gerard 59d99db6b4 #1272 ticket.index
gitea/salix/test This commit looks good Details
2019-03-27 09:58:58 +01:00
Joan Sanchez 8433e15875 show client id on ticket summary header #1273
gitea/salix/dev This commit looks good Details
2019-03-27 09:06:21 +01:00
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
Joan Sanchez 56f352686c added sms endpoint #1149
gitea/salix/dev This commit looks good Details
2019-03-27 08:48:13 +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
Gerard b24a6a6255 #1262 invoiceOut.descriptor
gitea/salix/dev This commit looks good Details
2019-03-26 14:27:08 +01:00
Gerard eaec968aa4 Now you can change the shipped hour of a ticket 2019-03-26 12:25:06 +01:00
Joan Sanchez 2ca5def095 build english locale on dist directory #1268
gitea/salix/dev This commit looks good Details
2019-03-26 12:05:53 +01:00
Bernat 4e1e3bdeeb cau 10270 refactor fixtures and fix test
gitea/salix/dev This commit looks good Details
2019-03-26 10:25:11 +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
Joan Sanchez 500105675c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-26 07:29:57 +01:00
Joan Sanchez 3df5f4cae9 replaced numeric fields with input-number #1138 2019-03-26 07:29:45 +01:00
Gerard 40cbb60673 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 16:30:43 +01:00
Gerard f31be20bd3 changed wrong descriptions 2019-03-25 16:30:40 +01:00
Carlos Jimenez Ruiz de7c1f3d95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 16:26:06 +01:00
Carlos Jimenez Ruiz 1e150dbc8f #1264 cambiar ruta invoice a invoiceOut 2019-03-25 16:25:59 +01:00
Gerard 2c7b9968eb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 15:49:10 +01:00
Gerard aa0f04b47f Changed wrong english label of two properties 2019-03-25 15:45:59 +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 462879a40b #1241 summary refactor
gitea/salix/dev This commit looks good Details
2019-03-25 13:16:34 +01:00
Bernat 3340163315 refactor worker fixtures
gitea/salix/dev This commit looks good Details
2019-03-25 10:00:49 +01:00
Gerard f4ddf3544d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-25 09:36:30 +01:00
Gerard 649b7f0e21 log added to ticket module models 2019-03-25 09:36:24 +01:00
Carlos Jimenez Ruiz 92738759a3 #1235 route.basic-data
gitea/salix/dev This commit has test failures Details
2019-03-23 16:16:47 +01:00
Carlos Jimenez Ruiz ce43bd63c9 #1234 route.create 2019-03-22 16:47:20 +01:00
Carlos Jimenez Ruiz ae9ad7a6cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-22 16:04:59 +01:00
Joan Sanchez 4a4b997e1b added subName to fetched-tags #1246
gitea/salix/dev This commit looks good Details
2019-03-22 15:05:15 +01:00
Carlos Jimenez Ruiz 80f59eeeb7 merge 2019-03-22 14:08:01 +01:00
Joan Sanchez 6c9f1cfdfa fix claim regularize & message.send methods #1242
gitea/salix/dev This commit looks good Details
2019-03-22 13:45:17 +01:00
Joan Sanchez c5e953f922 worker calendar front & back unit tests #1248
gitea/salix/dev This commit looks good Details
2019-03-22 12:51:44 +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 e23a184166 styles added 2019-03-22 11:56:21 +01:00
Gerard f4476ca690 #1236 route.summary
gitea/salix/dev This commit looks good Details
2019-03-22 11:10:23 +01:00
Gerard 7ae011b3b6 #1240 route.descriptor 2019-03-22 11:07:44 +01:00
Joan Sanchez 6eaf317b5e added worker calendar #1147
gitea/salix/dev This commit looks good Details
2019-03-22 08:28:57 +01:00
Carlos Jimenez Ruiz 40cabdd3bd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-21 15:02:12 +01:00
Carlos Jimenez Ruiz 82683a09b5 corredted typo 2019-03-21 15:02:06 +01:00
Javi Gallego 0dd7e528dd #1245 bug ticket line
gitea/salix/dev This commit looks good Details
2019-03-21 14:56:09 +01:00
Carlos Jimenez Ruiz bbb00b98dc #1233 route.index
gitea/salix/dev This commit looks good Details
2019-03-21 13:47:33 +01:00
Carlos Jimenez Ruiz 92347cd9c4 #1233 route.index 2019-03-21 13:46:14 +01:00
Bernat 504dc954d0 update model vehicle
gitea/salix/dev This commit looks good Details
2019-03-21 12:50:34 +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 6b11f26296 test refactor to async await
gitea/salix/dev This commit looks good Details
2019-03-21 08:53:12 +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 30333a914e #957 ticket.descriptor stowaway singlepage nav e2e 2019-03-20 12:23:38 +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 41e1505b1a #1233 new models and fixtures
gitea/salix/dev This commit looks good Details
2019-03-20 10:10:36 +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
Carlos Jimenez Ruiz d7d8bff92b #1196 worker.descriptor correo 2019-03-15 12:58:26 +01:00
Joan Sanchez 6b5d91f545 fixed translations
gitea/salix/dev This commit looks good Details
2019-03-15 08:12:36 +01:00
Joan Sanchez 274d744b69 added clone zone button #1159
gitea/salix/dev This commit looks good Details
2019-03-14 15:07:24 +01:00
Carlos Jimenez Ruiz b165f0d06b removed unexpected fdescribe
gitea/salix/dev There was a failure building this commit Details
2019-03-14 08:29:35 +01:00
Carlos Jimenez Ruiz 53bbba49d7 removed key bind from invoices as requested.
gitea/salix/dev This commit looks good Details
2019-03-14 08:25:38 +01:00
Carlos Jimenez Ruiz dcf22303ea #1179 invoice.index crear el módulo
gitea/salix/dev This commit looks good Details
2019-03-14 08:10:14 +01:00
Gerard f48e3260bd Merge branch 'test' into dev
gitea/salix/dev There was a failure building this commit Details
2019-03-13 16:15:18 +01:00
Gerard 5fcb9f61ab Merge branch 'master' into test
gitea/salix/test This commit looks good Details
2019-03-13 16:09:14 +01:00
Gerard 0a95f1b299 #1229 general search of worker searckpanel now searchs users
gitea/salix/master This commit looks good Details
2019-03-13 16:08:04 +01:00
Joan Sanchez 12308de5d1 catalog filter by item id #1219
gitea/salix/dev This commit looks good Details
2019-03-13 15:09:10 +01:00
Carlos Jimenez Ruiz 98f73fc5d2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-13 14:16:26 +01:00
Carlos Jimenez Ruiz f4b74abe3b #1179 invoice.index crear el módulo 2019-03-13 14:10:45 +01:00
Gerard fd4fe288a5 has visible disabled temporally
gitea/salix/master This commit looks good Details
2019-03-13 12:03:06 +01:00
Joan Sanchez aa37a9f66a Added zone.isVolumetric #1227
gitea/salix/dev There was a failure building this commit Details
gitea/salix/test This commit looks good Details
2019-03-13 11:27:45 +01:00
Joan Sanchez 5f5ce1a765 required if for checked data
gitea/salix/dev This commit looks good Details
2019-03-13 08:35:25 +01:00
Joan Sanchez 92170c34d5 worker department #1133
gitea/salix/dev This commit has test failures Details
2019-03-12 15:04:09 +01:00
Gerard fb75ff0eae #1222 Activar log en el modulo ítem
gitea/salix/dev This commit looks good Details
2019-03-12 11:47:53 +01:00
Gerard 41a34421df ship menu now open the stowaways in new tabs
gitea/salix/dev This commit looks good Details
2019-03-11 11:29:31 +01:00
Joan Sanchez 891c4b201a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 11:10:28 +01:00
Joan Sanchez 91f8f337f5 removed clog
gitea/salix/test This commit looks good Details
2019-03-11 11:09:59 +01:00
Gerard 926ee532ae Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:40:59 +01:00
Gerard 987fc1e4e3 tranlations added
gitea/salix/test This commit looks good Details
2019-03-11 08:40:35 +01:00
Gerard 562403cd0a Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-11 08:15:00 +01:00
Gerard 63787a7beb showing client tickets from client descriptor works again
gitea/salix/test This commit looks good Details
2019-03-11 08:11:48 +01:00
Gerard 3afedbd89b merge
gitea/salix/dev This commit looks good Details
2019-03-11 08:02:06 +01:00
Gerard f6eb8315a3 #999 worker.index buscador
gitea/salix/test This commit looks good Details
2019-03-11 08:00:49 +01:00
Carlos Jimenez Ruiz 7323ed03e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-08 14:46:14 +01:00
Carlos Jimenez Ruiz 78103137bb Test #1221 e2e worker.pbx 2019-03-08 14:46:01 +01:00
Gerard cd86b78596 Merge branch 'test' into dev 2019-03-08 13:46:59 +01:00
Gerard d1ce85c81e taxclass field temporally removed as it slows the query
gitea/salix/test This commit looks good Details
2019-03-08 13:46:33 +01:00
Gerard 9d85094ccd Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-08 13:12:33 +01:00
Gerard 720803facb #1220 item.index añadir campos a buscador avanzado
gitea/salix/test This commit looks good Details
2019-03-08 13:12:13 +01:00
Carlos Jimenez Ruiz aceecd9c7a Tarea #1197 worker.centralita 2019-03-08 09:41:53 +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 759cca3989 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-08 08:04:20 +01:00
Gerard 7d8879a979 deleted default query on item index 2019-03-08 07:52:43 +01:00
Carlos Jimenez Ruiz 6bb4f04bd1 #1211 client.billingData
gitea/salix/dev This commit looks good Details
2019-03-07 12:11:06 +01:00
Carlos Jimenez Ruiz 75fba75688 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-07 11:00:48 +01:00
Carlos Jimenez Ruiz 8e28bb4312 #1211 client.billingData 2019-03-07 09:55:22 +01:00
Bernat b709930db5 cau 10041 update fixtures for workers and fix test
gitea/salix/dev This commit looks good Details
2019-03-07 07:51:29 +01:00
Gerard b04dc02c61 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-03-06 16:29:15 +01:00
Gerard af960e5f5f fonts updated to 1.26 version
gitea/salix/test This commit looks good Details
2019-03-06 16:28:09 +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
Carlos Jimenez Ruiz fdfddd260a #1208 Cambiar componente de icono papelera vn-icon por vn-icon-button 2019-03-06 12:27:56 +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 8923970e75 e2e fixed
gitea/salix/dev This commit looks good Details
2019-03-06 08:54:04 +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 17654ef71e #1183 Crear enlace a client summary en /order/descriptor
gitea/salix/dev This commit looks good Details
2019-03-05 12:37:43 +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 e7ca55fea3 Merge branch 'dev' into test
gitea/salix/test This commit looks good Details
2019-03-05 11:12:44 +01:00
Joan Sanchez 8e45858cd0 Disable & create new mandate when sending a new core sample #1207
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-05 10:10:43 +01:00
Carlos Jimenez Ruiz f8a4ad0f28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-04 16:49:41 +01:00
Carlos Jimenez Ruiz d1d11233ad #1039 ticket.summary 2019-03-04 16:34:41 +01:00
Gerard d6683918bb #1165 Añadir al buscador avanzado de order la búsqueda por ticket
gitea/salix/dev This commit looks good Details
2019-03-04 16:06:41 +01:00
Gerard 96704cc4df Merge branch 'test' into dev 2019-03-04 14:29:18 +01:00
Gerard 2f7c544c52 changed showfield of salesperson autocomplete
gitea/salix/dev This commit looks good Details
2019-03-05 12:25:37 +01:00
Gerard 025c0810be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-05 12:13:59 +01:00
Gerard 32893b49c1 #1174 item.index buscador avanzado mostrar comprador 2019-03-05 12:13:46 +01:00
Gerard 00f9754c1e #1171 item.index mostrar campos medida y nicho
gitea/salix/dev This commit looks good Details
2019-03-05 12:03:34 +01:00
Gerard 7f10a509e0 #1188 item.index filtering doesnt work for some params
gitea/salix/dev This commit looks good Details
2019-03-05 11:34:05 +01:00
Gerard 9be6f1351a updated steps
gitea/salix/master This commit looks good Details
2019-03-05 08:42:05 +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
Gerard 1b2f851525 #1191 item not available icon added
gitea/salix/dev This commit has test failures Details
2019-03-04 20:00:12 +01:00
Bernat 11c6fd2da7 Cau 8402 fix test and update structure
gitea/salix/dev This commit looks good Details
2019-03-01 12:19:12 +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
Carlos Jimenez Ruiz daa65e967f typo corrected
gitea/salix/dev This commit looks good Details
2019-03-01 11:09:20 +01:00
Carlos Jimenez Ruiz 443da0c44c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-03-01 10:51:12 +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
Carlos Jimenez Ruiz 0762b734fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-03-01 07:33:31 +01:00
Joan Sanchez dbc582a410 Merge branch 'test' into dev 2019-03-01 07:30:30 +01:00
Joan Sanchez 4fe4c7886b fixed samples visible scope
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-03-01 07:27:29 +01:00
Carlos Jimenez Ruiz 4026004ecf #987 client.billing-data ALPHA 2019-02-28 14:30:29 +01:00
Gerard 9ef3eac480 #1136 item.buscador Avanzado añadir campo visible y isActive
gitea/salix/dev This commit looks good Details
2019-02-28 13:50:39 +01:00
Gerard 08650a177e client index not being able to open summary popover fixed
gitea/salix/test This commit looks good Details
2019-02-28 11:29:24 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +01:00
Joan Sanchez d19d360ca6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-02-28 10:17:28 +01:00
Joan Sanchez d336fd0eb1 fixed address 2019-02-28 10:17:09 +01:00
Gerard 624733dcfb changed order of ticket index
gitea/salix/dev This commit has test failures Details
2019-02-28 10:01:54 +01:00