Commit Graph

6014 Commits

Author SHA1 Message Date
Alex Moreno def41c011c feat(docuware_upload): send to trash last file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 13:33:59 +01:00
Alexandre Riera 7720c32bc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 09:58:03 +01:00
Alex Moreno d7e8c4fafd fix(print_invoiceIn): translation invoice to receipt
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 09:28:44 +01:00
Joan Sanchez c489c4c6a9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-13 08:55:01 +01:00
Alexandre Riera 41671e8a3a refs #4927 modified hook to check name & country
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 08:38:29 +01:00
Guillermo Bonet 868c2aaaef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4975-mdbVersion-last-method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:25:51 +01:00
Alex Moreno 5bb66fec3f test(docuware): back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:16:38 +01:00
Alexandre Riera f01b729a61 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-12 14:09:39 +01:00
Joan Sanchez 54356ece7d fix(monitor): refresh monitor when using ng-for track
gitea/salix/pipeline/head This commit looks good Details
Refs: #5083
2023-01-12 13:53:38 +01:00
Pau e05fa7c747 Merge branch 'master' into #5081-hotfix-sms-faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:00:01 +01:00
Pau d5a7691b9c add controller function
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 12:56:51 +01:00
Pau 2678d59191 front test expected old value
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:57:20 +01:00
Vicent Llopis da8b6b7f2d fix: comprueba que hay registros
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:52:27 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Vicent Llopis e4603a06f2 refacotor: borrados los await para que devuelva la promesa
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:59:24 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Vicent Llopis 352fba9acf Merge branch 'dev' into 5035-intermittent_backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:32:44 +00:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Joan Sanchez 3f7dee63ac Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 06:17:58 +00:00
Guillermo Bonet d448f41ac1 refs #4975 Changed description of last method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-11 15:39:33 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Pau c908a71ebf Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:22:40 +00:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:23:40 +00:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Vicent Llopis ae3b26b202 Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:14:12 +00:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Pau e0cf45546e Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 12:57:39 +00:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable Details
2023-01-10 13:52:30 +01:00
Vicent Llopis 484b8d42e1 fix: corregido sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:31:20 +01:00
Vicent Llopis 984a3294f9 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 11:58:00 +00:00
Alexandre Riera 9f1c6e6d1d Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:48:10 +00:00
Alexandre Riera 6bdbd77640 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone 2023-01-10 10:15:41 +01:00
Vicent Llopis ac3e68d846 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 10:14:46 +01:00
Vicent Llopis ff653ad834 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 09:18:02 +01:00
Alexandre Riera 28ac2677a3 Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 08:02:51 +00:00
Joan Sanchez 4cfa63918f Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 07:41:26 +00:00
Vicent Llopis eb3ed95b22 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-10 08:32:44 +01:00
Alexandre Riera 07fc5b69ad Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 07:32:03 +00:00
Vicent Llopis cdee85e1e8 refacotor: change description
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 08:31:32 +01:00
Guillermo Bonet f23eb9f4ad refs #4975 Added call to last method in upload
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-09 18:28:09 +01:00
Alex Moreno 382aad2622 feat(docuware): upload and send pdf
gitea/salix/pipeline/head This commit looks good Details
2023-01-09 15:11:53 +01:00
Guillermo Bonet 2803de9445 refs #4975 Return JSON {version:xxx}
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-05 14:20:47 +01:00
Robert Ferrús 6891da4863 refactor(invoiceOut): updated translation
gitea/salix/pipeline/head This commit looks good Details
Refs #4857
2023-01-05 11:43:08 +01:00
Vicent Llopis 1aa21c16b5 refactor: borrado join a worker
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 11:42:21 +01:00
Vicent Llopis 810a1afcd9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2023-01-05 11:40:25 +01:00
Vicent Llopis 3abbfc4fa7 refacotr
gitea/salix/pipeline/head This commit looks good Details
2023-01-05 10:35:55 +01:00
Vicent Llopis fd9ca3a4c1 add test 2023-01-05 10:35:49 +01:00
Pau f0761a92a2 reactivate working tests 2023-01-05 09:26:11 +01:00
Alex Moreno 46f36e1de1 try
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 15:03:45 +01:00
Alex Moreno 021c475de7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2023-01-04 09:39:26 +01:00
Alex Moreno 9c044dc95b fix: phone
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:38:43 +01:00
Alex Moreno 9b98249398 test: front test and e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:23:18 +01:00
Alexandre Riera 6ff17f0af0 Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:51:28 +00:00
Alex Moreno ef437f2fee test: e2e and backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 14:50:29 +01:00
Vicent Llopis 21a62a0fab refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:29:44 +01:00
Vicent Llopis fec965a8dd refs 4925 refactor: borrados console.log y actualizada descripción 2023-01-03 13:29:27 +01:00
Pau 56354ba771 reactivate test 2023-01-03 13:24:44 +01:00
Vicent Llopis 22d0da273e refs #4925 fix: coge únicamente los últimos cambios aplicados
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:21:51 +01:00
Alexandre Riera ac56744244 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:15:26 +00:00
Vicent Llopis ddfee57470 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 13:09:02 +01:00
Vicent Llopis 415fa04e3b refs #2952 feat: add chips
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 13:06:30 +01:00
Vicent Llopis 25dad4b358 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked 2023-01-03 13:03:36 +01:00
Alexandre Riera c6ad9a6aff Merge branch 'dev' into 4937-marcar-verRecibo
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:00:39 +00:00
Pau 4dee2313f4 Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 12:53:03 +01:00
Alexandre Riera 2eea1e68e8 Merge branch 'dev' into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2023-01-03 11:45:35 +00:00
Alex Moreno 29483bcc1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2023-01-03 12:28:55 +01:00
Vicent Llopis fa58ac2462 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 09:13:47 +01:00
Vicent Llopis fe7f388f3d Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:07:31 +00:00
Alexandre Riera 9887f87dd3 refs #5051 pending added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:34:46 +01:00
Alex Moreno 46c3d87dab feat(worker_create): add vn-acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:09:46 +01:00
Alex Moreno aa5cfde1ae test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 14:52:03 +01:00
Alexandre Riera 96f2e4b542 refs #5051 skipped tests and changed fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-02 13:35:33 +01:00
Alexandre Riera 7fcc787a69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:14:59 +01:00
Alexandre Riera f027a7b07f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4937-marcar-verRecibo 2023-01-02 07:12:10 +01:00
Alexandre Riera 7d61933a3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-02 07:07:09 +01:00
Vicent Llopis 3792a80ad5 refs #4925 feat: añadido back para editar tags
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 14:24:32 +01:00
Pau edcc55df26 refs #4875 @3h disable random to be able to test with some kind of reliability
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 10:01:38 +01:00
Alexandre Riera 502461fde5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4926-add-itemPackingOut
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 13:25:10 +01:00
Vicent Llopis d5b626434b refactor: add translations, change css...
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:42:51 +01:00
Vicent Llopis ab0af27f8b refactor: delete changes in ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:23:41 +01:00
Vicent Llopis d0ae97e41b refactor: move changes from ticket.sale-checked to ticket.sale-tracking
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 12:16:23 +01:00
Vicent Llopis ba7e5d6a91 refator: se usa loopback cuando se puede
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 11:56:34 +01:00
Alex Moreno 2c5e42d408 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-28 11:49:16 +01:00
Alexandre Riera 9971611a0b Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:31:33 +00:00
Alexandre Riera b6e17d3489 Merge branch 'dev' into 4971-filtrar-articulo
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:16:14 +00:00
Alexandre Riera 30197e9e15 Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 09:07:26 +00:00
Vicent Llopis eed6d05e23 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:51:39 +01:00
Vicent Llopis eb4cb318ed refactor: evitar join innecesarios en el filter general
gitea/salix/pipeline/head This commit looks good Details
2022-12-28 08:43:02 +01:00
Alex Moreno bee65f9c69 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-28 07:24:08 +01:00
Vicent Llopis 3dd0c79629 feat: add ItemShelvingSales/filter
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 15:00:49 +01:00
Alexandre Riera c06c3dc6a7 refs #4957 saleChecked deleted
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 11:50:58 +01:00
Alexandre Riera 5eda1388ef refs #4927 unique key added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 10:26:56 +01:00
Alexandre Riera 96a6f0b9d9 refs #4926 packingOut added
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:48:09 +01:00
Pau 1c1cc93ef4 Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-26 06:18:47 +00:00
Alexandre Riera d827795441 refs #4930 agency changed for zone
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:38:05 +01:00
Vicent Llopis fb325d5e65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 12:34:51 +01:00
Vicent Llopis 29e66157ea fix: se excluyen los test de back que fallan intermitente
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:29:28 +01:00
Vicent Llopis d3a9e9ac89 delete: columnas que ya no existen en la tabla
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:17:24 +01:00
Alexandre Riera 7d1b8c8c56 refs #4971 itemSearchFunc added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:11:24 +01:00
Vicent Llopis 16c20e4700 feat: add itemShelvingSale popup
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 12:08:16 +01:00
Alexandre Riera 53b5ef6d78 refs #4937 viewReceipt added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 11:48:59 +01:00
Vicent Llopis 682b6d8961 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-23 09:59:21 +01:00
Alexandre Riera cf527dd8be refs #4588 hook added
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 09:37:19 +01:00
Joan Sanchez 93c98e05fc fix(discount): handle error for a worker without business contract
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:27:03 +01:00
Alexandre Riera aec22fad9d Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:16:36 +01:00
Joan Sanchez 606bacbad7 Merge branch 'dev' into 4531-monitor_duplicates
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:37:48 +00:00
Vicent Llopis 7f80c7ed2c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 09:30:35 +01:00
Pau 314bd69d6e Merge branch 'master' into Hotfix-crear-report-Factura-Electronica
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 06:13:01 +00:00
Guillermo Bonet 5a25b0ef4c refs #4975 Added model MdbVersionTree
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:12:44 +01:00
Guillermo Bonet d97a2738a4 refs #4975 Upload method modified and addedd model
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:12:09 +01:00
Vicent Llopis 8880a83b89 feat: añadido saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 15:03:41 +01:00
Alex Moreno 7e6cdc9152 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 13:47:54 +01:00
Alex Moreno 502a692521 test(item_fixedPrice_rate2): backTest and e2e
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:55:11 +01:00
Vicent Llopis 630890cd04 fix: colum name in model
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 12:23:16 +01:00
Vicent Llopis 06075aa17b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4804-ticket.descriptor_sms 2022-12-21 12:15:21 +01:00
Vicent Llopis 3a33750890 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 10:11:37 +01:00
Vicent Llopis a1134879e6 Merge branch 'master' into hotfix_4961-travel.extra-community
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:57:59 +00:00
Vicent Llopis 7261415e16 fix: añadido length
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 09:36:31 +01:00
Alex Moreno b4b7b8e204 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4523-item_fixed-price_rate2 2022-12-21 09:08:39 +01:00
Alexandre Riera 081ef7fc99 Merge branch 'dev' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:30:17 +00:00
Vicent Llopis 1d7145d74b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:05:19 +01:00
Vicent Llopis 5a4a78d045 Merge branch 'dev' into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:12 +00:00
Pau c9b4e1ab9a Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 06:38:20 +00:00
Vicent Llopis 799c26796e feat: añadidos chips
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 15:19:05 +01:00
Pau 90b36bf1ab Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 14:21:01 +01:00
Alexandre Riera 62152d1668 Merge branch '3302-logFormat' of https://gitea.verdnatura.es/verdnatura/salix into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:16:40 +01:00
Alexandre Riera 721123381c Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:54:22 +01:00
Alexandre Riera 4c6a735235 refs #4962 moved sql and methods to ticket
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:53:54 +01:00
Alexandre Riera 8403af7db5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:37:40 +01:00
Alexandre Riera 342eec1e41 refs #3963 autoload fixed
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 11:36:58 +01:00
Alexandre Riera b356839148 refs #3963 autoload fixed 2022-12-20 11:36:37 +01:00
Vicent Llopis 8b5f5d928e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:39 +01:00
Vicent Llopis b7100873a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:11:52 +01:00
Alexandre Riera 284f9f418b Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:54:47 +01:00
Alexandre Riera 6ef282feda refs #4962 updated merge, changed autoload, changed tf->Future
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:54:28 +01:00
Vicent Llopis 63343998d8 refactor: cambiada la forma en que se descarga el zip
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 09:48:58 +01:00
Joan Sanchez c063c0e72f fix(pagination): duplicated rows on paginate
gitea/salix/pipeline/head This commit looks good Details
Refs: #4531
2022-12-20 09:48:41 +01:00
Vicent Llopis 1a616fa1d4 refactor: delete transaction
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 09:09:21 +01:00
Pau d8cae400a8 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:11:59 +00:00
Alexandre Riera cd71a59dfe Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 07:01:45 +00:00
Alex Moreno 5d2b69d063 test(item_fixedPrice): front recalculateRate2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 15:06:59 +01:00
Alex Moreno f82870bec6 feat(item_fixed-price): recalculate rate2 and when change item keep minPrice of item
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 14:39:38 +01:00
Pau 5a01e49f27 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-19 12:25:58 +00:00
Guillermo Bonet dc82e610b7 refs #4975 Minor changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 11:24:18 +01:00
Alex Moreno 17a3896c1c Merge branch 'dev' into 4548-invoiceIn-pdf-2
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:32:52 +00:00
Guillermo Bonet a46c2ced7c refs #4975: Added last mdbVersion/last method
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:26:07 +01:00
Pau 28e0d0566c Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 06:13:45 +00:00
Alexandre Riera 45b02c3bc6 Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:45:25 +01:00
Alexandre Riera 98c9e0ac50 refs #4962 autoload added and second header
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 13:42:23 +01:00
Alexandre Riera fb4432b088 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-16 13:06:06 +01:00
Alexandre Riera b72cb64bf8 refs #4928 findById 2022-12-16 12:50:09 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Alexandre Riera 855f00b1c9 Merge branch '4700-split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 09:51:40 +01:00
Alexandre Riera 45317c0850 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:26:10 +01:00
Alexandre Riera 522000cd04 refs #4928 fix fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:52:34 +01:00
Alexandre Riera 5a975d0b05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 09:22:36 +01:00
Alexandre Riera 33196acac6 refs #4928 fixture notification, fix test supplier
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 08:31:47 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez 3b9cd5be09 Merge pull request 'fixes #4859 export_db' (!1200) from 4859-export_db into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1200
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-12-15 07:21:01 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Vicent Llopis 4e8896202a delete: transacción innecesaria
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:17:26 +01:00
Vicent Llopis 6793b8e9a0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-12-15 07:13:09 +01:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +01:00
Alex Moreno 156f2b9129 feat: handle errors and autogenerate user and code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 15:03:55 +01:00
Vicent Llopis e616835600 delete: hasDateRange()
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:40:28 +01:00
Vicent Llopis f7a97a8139 fix: siempre muestra el botón si hay datos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:31:56 +01:00
Alexandre Riera f80f851e8d refs #4962 model TicketFuture deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:10:33 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alex Moreno b378598113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-14 10:15:11 +01:00
Alex Moreno c14059df75 fix(supplier_consumption): fix JOIN
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 10:12:51 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Alexandre Riera 050010c09f refs #4700 success translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:03:37 +01:00
Alexandre Riera dce48a8a93 refs #4700 corrections
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 14:00:46 +01:00
Alex Moreno 1e0b0028f2 fix: only edit structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 13:37:25 +01:00
Alexandre Riera 72c27f7176 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 12:37:56 +01:00
Alex Moreno 8900656b14 Merge branch 'dev' into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 08:29:32 +00:00
Alexandre Riera 86a58a26ea Merge branch 'dev' into 4893-formato-correo
gitea/salix/pipeline/head This commit looks good Details
2022-12-13 08:07:48 +00:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 18:27:45 +01:00
Alex Moreno bb944f9fee feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 15:05:49 +01:00
Alex Moreno 09edb99a1b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-12-12 13:48:06 +01:00
Alex Moreno 4cb8d8c763 test: enable one test and skip another
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:11:45 +01:00
Vicent Llopis 2e14e04ed0 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 11:17:15 +00:00
Vicent Llopis 9bcef08397 feat: buscar por responsibleFk sin afectar a la consulta principal
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 12:08:30 +01:00
Alex Moreno b2dcb84a7b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db 2022-12-12 11:57:27 +01:00
Joan Sanchez f93398c783 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 10:27:28 +01:00
Alexandre Riera 704cb71b61 refs #4866 instance log added and e2e done
gitea/salix/pipeline/head Build queued... Details
2022-12-07 13:53:59 +01:00
Alex Moreno 995fb6a5c3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head This commit is unstable Details
2022-12-02 13:13:53 +01:00
Vicent Llopis 14a3a815da fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:05:25 +01:00
Joan Sanchez 6128414685 m3 decimal
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:26:21 +01:00
Joan Sanchez 0c4ab815fd decimal
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-12-02 11:24:08 +01:00
Joan Sanchez 6562b68341 fix(agencyTerm): permitir decimales en m3 minimos
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 11:16:49 +01:00
Alexandre Riera 48a7635449 refs #4893 regex changed
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 09:18:52 +01:00
Pau 691d157da8 Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 13:33:52 +00:00
Pau c54844f7ff removed pending from working test
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 14:32:05 +01:00
Joan Sanchez e815292d6b fix(componentUpdate): updated filter where sintax
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 09:24:56 +01:00
Joan Sanchez 6cb0e518d4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:33:38 +01:00
Vicent Llopis 4c0effc48a refacor: description actualizada
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-01 07:25:18 +01:00
Vicent Llopis 6c59a3098d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-12-01 07:24:40 +01:00
Vicent Llopis 444d495b7f refactor: codigo reducido
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:22:13 +01:00
Vicent Llopis ba8fe7dfa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head This commit looks good Details
2022-12-01 07:11:00 +01:00
Alex Moreno 8df7b91127 fix: entry ref
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 15:24:33 +01:00
Alex Moreno 43bd583d6f Merge branch 'dev' into 4875-skip-tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 13:49:59 +00:00
Pau 79f8e30ded add pending to the tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:49:00 +01:00
Pau 67384b724d refs #4875 skipped failing test
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 14:41:03 +01:00
Alex Moreno b769845a28 hotFix: not transfer all sales if all sales is negatives
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 14:29:44 +01:00
Vicent Llopis c1089c637a fix: backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:43:29 +01:00
Vicent Llopis 1588492f9a feat: solo añade los logs de salix con el model 'Sale'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 13:29:39 +01:00
Vicent Llopis 68855add59 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:53:54 +01:00
Pau 97baa89a71 Merge branch 'dev' into hotfix(#4914)-Bug-Client-Phone
gitea/salix/pipeline/head This commit looks good Details
2022-11-30 09:52:19 +01:00
Alexandre Riera 492b852be8 delete orderBy
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:53 +01:00
Pau bef1071316 refs #4914 @1h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 09:22:03 +01:00
Alexandre Riera 27078595ce fix balances
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:39:04 +01:00
Pau 02598ced92 solve merge conficts 2022-11-30 07:12:26 +01:00
Pau 2d7b3cc3a2 Merge branch 'dev' into 4871-socialName-on-client-filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 13:13:57 +00:00
Joan Sanchez 990dd88e2c Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1186
2022-11-29 13:08:38 +00:00
Joan Sanchez 5f3e7c3384 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:49:06 +00:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01:00
Pau ddc543ad63 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 08:22:05 +00:00
Alexandre Riera acbd0474a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 08:50:48 +01:00
Vicent Llopis e3e337c02e fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 14:28:47 +01:00
Vicent Llopis 4b54cf954b refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 13:56:21 +01:00
Carlos Andrés 2a4e8cdde9 Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio
gitea/salix/pipeline/head This commit looks good Details
2022-11-28 12:19:58 +00:00
Pau 0d6e424a3e allow client search by socialname 2022-11-28 10:21:01 +01:00
Alex Moreno da2d1df522 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio 2022-11-28 10:14:16 +01:00
Alex Moreno 804db15ece Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-28 07:53:51 +01:00
Vicent Llopis 7f3265be55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4846-claim.search-panel 2022-11-25 12:24:00 +01:00
Vicent Llopis d15e2551a2 feat: add frontTest
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:16:01 +01:00
Vicent Llopis af87fc2d53 fix: modelo incorrecto
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:51:07 +01:00
Vicent Llopis bca79e1240 feat: add backTest 2022-11-25 11:50:54 +01:00
Alexandre Riera 8fec0670ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance 2022-11-25 10:25:46 +01:00
Pau 8f98082910 refs #4791 @2h
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:59:02 +01:00
Vicent Llopis e540bf7b31 feat: inserta en la nueva tabla ticketSms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:38:34 +01:00
Carlos Andrés 8d2e532167 #4613 eliminar uso de portfolio
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 09:32:54 +01:00
Vicent Llopis dbbce77cc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:43 +01:00
Pau 65f82c8fc1 Merge branch 'dev' into 4557-duplicate-tickets-in-routes
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:05:05 +00:00
Vicent Llopis 84c6604dd9 feat: enviar sms con cambios en el pedido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 15:04:15 +01:00
Pau 7c71e40cc5 Merge branch 'dev' into 4791-refactor-sendsms
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:15:54 +00:00
Joan Sanchez 0f40aa3e27 Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1175
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2022-11-24 12:49:53 +00:00
Pau 001c3ec2ac requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:06:13 +01:00
Vicent Llopis 20d0d053ac Merge branch 'dev' into 4682-searchbar_filter
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:03:23 +00:00
Vicent Llopis 74e8789439 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 10:54:40 +00:00
Pau 37a7a12f87 requested change
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 11:47:32 +01:00
Vicent Llopis b8c6734798 Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:40:43 +00:00
Pau f74b257d75 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:27:49 +00:00
Pau 6a30074a6a Merge branch 'dev' into 4789-search-ticket-without-invoice
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:23:00 +00:00
Vicent Llopis 927b5a63ec Merge branch 'dev' into 4793-models_translation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 09:14:01 +00:00
Alexandre Riera 32e4a7273c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 09:59:59 +01:00