Commit Graph

239 Commits

Author SHA1 Message Date
Joan Sanchez 52e26eb99d mark manual lines #1449
gitea/salix/dev This commit looks good Details
2019-05-21 12:56:29 +02:00
Bernat bb5c81a3e9 #1409 ticket.weekly add finder
gitea/salix/dev This commit looks good Details
2019-05-21 09:03:57 +02:00
Carlos Jimenez Ruiz c7ad52f7b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-05-16 14:07:42 +02:00
Carlos Jimenez Ruiz 43bf6b45cf #1260 ticket.service textfield por autocomplete 2019-05-16 14:07:16 +02:00
Joan Sanchez 599084a8be parse scopeDays integer on ticket.index #1439 2019-05-16 12:33:41 +02:00
Carlos Jimenez Ruiz 2358c94aae #1402 route.ticket 2019-05-15 13:07:32 +02:00
Joan Sanchez 5cc78ce5ac ticket & order index fixes #1422 & #1423
gitea/salix/test This commit looks good Details
gitea/salix/master This commit looks good Details
2019-05-14 08:14:37 +02:00
Joan Sanchez 790577acaf ticket & order index fixes #1422 & #1423
gitea/salix/dev This commit has test failures Details
2019-05-14 08:13:04 +02:00
Bernat e6d6e63255 1413 ticket.summary refactor checkbox triple state
gitea/salix/dev This commit looks good Details
2019-05-09 14:40:59 +02:00
Bernat 1f128797c3 export production to local, fix test and add fixtures
gitea/salix/dev This commit looks good Details
2019-05-09 09:32:04 +02:00
Bernat 83898c9ba7 1354 refactor item-descriptor-popover
gitea/salix/dev This commit looks good Details
2019-05-07 11:32:35 +02:00
Joan Sanchez 4aff31a165 fixed update discount
gitea/salix/dev This commit looks good Details
2019-05-06 07:40:59 +02:00
Bernat 91e8b1f81b update fixtures, #1388 ticket descript change shiiped hour
gitea/salix/dev This commit looks good Details
2019-05-03 12:23:57 +02:00
Joan Sanchez 2b7287dabb added ticket.dms #1373
gitea/salix/dev This commit looks good Details
2019-05-01 18:49:39 +02:00
Joan Sanchez a572130b6c propagate check value to multicheck component for intermediate value #1305
gitea/salix/dev There was a failure building this commit Details
2019-04-30 08:00:27 +02:00
Carlos Jimenez Ruiz 85dc6e51af #1258 ticket.index sumatorio removed unused code
gitea/salix/dev This commit looks good Details
2019-04-29 10:35:46 +02:00
Carlos Jimenez Ruiz 774d8524cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-04-29 10:21:54 +02:00
Carlos Jimenez Ruiz 10669f01f3 #1258 ticket.index sumatorio unit test fixed 2019-04-29 10:21:36 +02:00
Bernat 5bc6f5107e #1370 ticket.descriptor change shipped hour
gitea/salix/dev This commit looks good Details
2019-04-29 07:48:59 +02:00
Carlos Jimenez Ruiz 2ca85394f3 #1385 excluded tests
gitea/salix/dev This commit looks good Details
2019-04-26 16:10:51 +02:00
Joan Sanchez 16bf0b3448 regenerate invoice #1342
gitea/salix/dev This commit looks good Details
2019-04-26 08:52:43 +02:00
Carlos Jimenez Ruiz 511e33b835 #1350 route.index worker descriptor + filters 2019-04-25 14:24:02 +02:00
Javi Gallego 47e55580ad #1258 ticket.index sumatorio
gitea/salix/dev This commit looks good Details
2019-04-25 07:57:26 +02:00
Bernat 4ac36e6bf2 #1362 ticket.packaging negative quantity 2019-04-24 11:36:13 +02:00
Joan Sanchez 6747a80943 fixed available/visible icon on ticket sales #1363
gitea/salix/dev This commit looks good Details
2019-04-24 09:54:25 +02:00
Carlos Jimenez Ruiz 5501ff8f4f test repairs
gitea/salix/dev This commit has test failures Details
2019-04-23 09:08:28 +02:00
Carlos Jimenez Ruiz 2b04eebe84 #1334 E2E ticket.descriptor - Make invoice 2019-04-23 08:58:49 +02:00
Carlos Jimenez Ruiz 2107b57764 small typo 2019-04-18 11:12:48 +02:00
Carlos Jimenez Ruiz d52f5077b0 #1306 Renombrar controladores, rutas y carpeta 2019-04-16 15:00:21 +02:00
Joan Sanchez 6573e61a7c fixed karma tests
gitea/salix/dev This commit looks good Details
2019-04-16 08:21:20 +02:00
Joan Sanchez f814584f6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-04-16 07:59:15 +02:00
Joan Sanchez 90bbe1bd02 Log sent sms #1324 2019-04-16 07:59:12 +02:00
Carlos Jimenez Ruiz 9c596b06c8 merge
gitea/salix/dev This commit looks good Details
2019-04-15 14:37:12 +02:00
Carlos Jimenez Ruiz 82ed0078d2 #1339 Print - Hoja de rutas 2019-04-15 14:34:33 +02:00
Bernat a68174c456 #1337 refactor checkbox in ticketRequest
gitea/salix/dev This commit looks good Details
2019-04-15 14:21:52 +02:00
Bernat dbe56b2496 #1330 add info in the search panel
gitea/salix/dev This commit has test failures Details
2019-04-12 14:33:08 +02:00
Joan Sanchez ac8a27d2f4 Added ticket invoice #1310
gitea/salix/dev This commit has test failures Details
2019-04-12 13:54:31 +02:00
Javi Gallego 50d70f0f6f Tarea #1259 crear modelo ticketServiceType 2019-04-10 14:44:41 +02:00
Carlos Jimenez Ruiz 98e704adf8 #1326 enlazar en ticket.descriptor tres puntos 2019-04-10 10:43:11 +02:00
Joan Sanchez 4f1a1ae004 Merge branch 'master' into dev 2019-04-09 13:19:34 +02:00
Joan Sanchez a6308c7f1e input-number refactor #1311
gitea/salix/master This commit looks good Details
2019-04-09 13:18:55 +02:00
Joan Sanchez 33e6467c44 fixed zone descriptor
gitea/salix/dev There was a failure building this commit Details
2019-04-08 10:57:01 +02:00
Carlos Jimenez Ruiz 971a2ab891 #1270
ticket.index advanced search mostrar dias en el futuro
2019-04-03 15:16:32 +02:00
Javi Gallego 0b977d3b0b #1293 ticket.components solo muestra base
gitea/salix/dev This commit looks good Details
2019-04-02 08:00:16 +02:00
Carlos Jimenez Ruiz 62acb534e1 #1181 No modificar ticket.basicData en reparto 2019-04-01 14:49:12 +02:00
Joan Sanchez 3f1889daa3 fix open client card from ticket descriptor #1291
gitea/salix/dev This commit looks good Details
2019-04-01 09:48:22 +02:00
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 8db51fdf64 added shrink class to item index #1278
gitea/salix/dev This commit looks good Details
2019-03-29 08:01:15 +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
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 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
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
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
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
Joan Sanchez 6eaf317b5e added worker calendar #1147
gitea/salix/dev This commit looks good Details
2019-03-22 08:28:57 +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 30333a914e #957 ticket.descriptor stowaway singlepage nav e2e 2019-03-20 12:23:38 +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 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 7f0d3279d1 #1189 ticket.index mostrar mas informacion
gitea/salix/dev This commit looks good Details
2019-03-08 08:14:22 +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 8923970e75 e2e fixed
gitea/salix/dev This commit looks good Details
2019-03-06 08:54:04 +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
Carlos Jimenez Ruiz d1d11233ad #1039 ticket.summary 2019-03-04 16:34:41 +01:00
Gerard 7dd08dc6e5 merge test
gitea/salix/dev This commit looks good Details
2019-02-28 10:19:31 +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
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 87e8be0ede time filter changed by dateTime 2019-02-27 17:04:00 +01:00
Gerard 4de73fb2a8 #1152 refactor ticket.sale 2019-02-26 17:32:32 +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
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 9370142731 styles fixed
gitea/salix/test This commit looks good Details
2019-02-22 12:43:08 +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 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 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 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 0cca3bb9ce #1137 ticket.summary, ticket.sale
gitea/salix/test This commit looks good Details
2019-02-20 17:52:36 +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
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 927957aed8 Merge remote-tracking branch 'upstream/dev' into jgallego 2019-02-19 16:12:01 +01:00
Gerard e041cef586 vn-empty-rows deleted as its not longer needed 2019-02-19 16:11:57 +01:00
Gerard b7db5f969b fixed worker descriptor not showing the correct worker
gitea/salix/dev This commit looks good Details
2019-02-19 15:09:50 +01:00