Commit Graph

554 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz c2b95b093a removed focus describe
gitea/salix/dev This commit has test failures Details
2019-02-28 09:37:42 +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 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Carlos Jimenez Ruiz ac6851bf4a eslint rules passed
gitea/salix/dev This commit looks good Details
2019-02-27 16:50:14 +01:00
Carlos Jimenez Ruiz 1e89b6977a #1070 Renombrar columnas de la vista vn.worker
gitea/salix/dev This commit looks good Details
2019-02-27 13:10:26 +01:00
Carlos Jimenez Ruiz 048c5c2ad8 #1104 order.index mostar mas campos
gitea/salix/dev This commit looks good Details
2019-02-27 12:03:54 +01:00
Carlos Jimenez Ruiz c227784877 typoe fixed 2019-02-27 10:05:49 +01:00
Gerard a37fdd1e33 EQTAX restriction deleted CR Javi 2019-02-26 17:32:58 +01:00
Gerard 4de73fb2a8 #1152 refactor ticket.sale 2019-02-26 17:32:32 +01:00
Joan Sanchez 4d53564602 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-26 14:26:47 +01:00
Joan Sanchez 4853c8fd60 zone calendar date picker
gitea/salix/test This commit looks good Details
2019-02-26 14:11:30 +01:00
Gerard d404fc92c8 dates fixed, deleted tricks to change the hours
gitea/salix/test This commit looks good Details
2019-02-26 12:51:01 +01:00
Gerard 43f26d1bc9 input number now has a option to hide the controls
gitea/salix/test This commit looks good Details
2019-02-25 15:56:42 +01:00
Joan Sanchez 2862501475 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-25 15:08:42 +01:00
Carlos Jimenez Ruiz 4b37b0fc1e #1155 item.index añadir grouping y packing
gitea/salix/dev This commit looks good Details
2019-02-25 14:55:06 +01:00
Gerard 8a137e7713 grouping and packing added
gitea/salix/dev This commit looks good Details
2019-02-25 13:40:53 +01:00
Joan Sanchez 23ed5e4ddf added offset calendar remove selection
gitea/salix/test This commit looks good Details
2019-02-25 12:22:04 +01:00
Joan Sanchez ac1e619b06 fixed zone bugs 2019-02-25 10:03:50 +01:00
Juan Ferrer c3f20dba3c Small fix
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-22 17:23:03 +01:00
Juan Ferrer 26419e75c9 Style fixes
gitea/salix/test This commit looks good Details
2019-02-22 16:15:54 +01:00
Juan Ferrer 961eb6edaf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/test This commit looks good Details
2019-02-22 14:38:45 +01:00
Juan Ferrer 9fc6a2c4c2 Style fixes 2019-02-22 14:34:11 +01:00
Gerard ea9d194368 traduction added
gitea/salix/test This commit looks good Details
2019-02-22 13:18:53 +01:00
Gerard 9370142731 styles fixed
gitea/salix/test This commit looks good Details
2019-02-22 12:43:08 +01:00
Gerard 86b3407e35 item barcode to item created
gitea/salix/test This commit looks good Details
2019-02-22 08:32:18 +01:00
Gerard c590dc6270 traduction added
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-21 14:08:32 +01:00
Gerard 1324d53e1b claim action now shows ticket
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-02-21 13:48:34 +01:00
Gerard 1e199e9d5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
gitea/salix/test This commit looks good Details
2019-02-21 12:58:05 +01:00
Gerard 6fb936a08a ticket log disabled temporally 2019-02-21 12:57:19 +01:00
Carlos Jimenez Ruiz 413d2f2855 merge
gitea/salix/dev This commit has test failures Details
2019-02-21 11:53:19 +01:00
Carlos Jimenez Ruiz 050c5c1126 #1131 Refactor vn-icon a vn-icon-button en las templates. 2019-02-21 11:40:27 +01:00
Gerard 506c857b70 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-21 10:17:54 +01:00
Gerard 03e168739b updated icons
gitea/salix/test This commit looks good Details
2019-02-21 10:17:13 +01:00
Juan Ferrer 02569aeea4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
2019-02-21 10:10:48 +01:00
Juan Ferrer e42da544cd Styles fixed 2019-02-21 10:10:38 +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 42cc2bde0d Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-21 07:48:31 +01:00
Gerard 444d531162 summary action now shows ticket id
gitea/salix/test This commit looks good Details
2019-02-21 07:46:27 +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 a3dab9013c Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 17:53:10 +01:00
Gerard 0cca3bb9ce #1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good Details
2019-02-20 17:52:36 +01:00
Gerard 902b654f80 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2019-02-20 16:43:52 +01:00
Gerard c95b2d71d4 tag not closed correctly fixed
gitea/salix/test This commit looks good Details
2019-02-20 16:43:01 +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
Juan Ferrer 8c401b6921 Style fixes
gitea/salix/dev This commit looks good Details
gitea/salix/test This commit looks good Details
2019-02-20 14:38:41 +01:00
Juan Ferrer 752a703cdb Merge
gitea/salix/dev This commit looks good Details
2019-02-20 14:34:56 +01:00
Juan Ferrer 8f1e41e744 Style fixes 2019-02-20 14:34:16 +01:00
Joan Sanchez 646e6c7b46 Disabled delivery-note preview
gitea/salix/dev This commit looks good Details
2019-02-20 13:26:31 +01:00
Joan Sanchez 90092a4f48 fixed treeview order
gitea/salix/dev This commit looks good Details
2019-02-20 12:31:08 +01:00
Gerard 23e08331fc fetched tags not sowing title and displaying wrong fixed
gitea/salix/dev This commit looks good Details
2019-02-20 12:12:16 +01:00
Gerard b97cb52abe changed traduction of email
gitea/salix/dev This commit looks good Details
2019-02-20 11:52:36 +01:00
Gerard 5d6951a610 deleted deprecated component
gitea/salix/dev There was a failure building this commit Details
2019-02-20 11:41:06 +01:00
Gerard efff9d2184 deleted duplicated data
gitea/salix/dev This commit looks good Details
2019-02-20 11:36:55 +01:00
Gerard 0f5d1e55c0 item descriptor not sending the correct warehouse fixed
gitea/salix/dev This commit looks good Details
2019-02-20 11:30:55 +01:00
Joan Sanchez 20843a9068 updated module worker acl, removed fi from summary
gitea/salix/dev This commit looks good Details
2019-02-20 09:59:39 +01:00
Joan Sanchez 40d765adc1 removed fi from worker module
gitea/salix/dev This commit looks good Details
2019-02-20 09:16:19 +01:00