Commit Graph

2057 Commits

Author SHA1 Message Date
Alexandre Riera 245b0e70f4 hotfix rollback delivery.sql
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 14:51:39 +02:00
Alexandre Riera 3ee08e0300 changed folder
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 12:34:26 +02:00
Alexandre Riera c6db5f1a4b hotfix apply changes procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 12:29:09 +02:00
Alexandre Riera d5d18d5376 hotfix apply SQL delivery.sql
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 11:02:08 +02:00
Alexandre Riera 53bd6cd729 Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 07:52:16 +00:00
Alexandre Riera ce28339973 refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 09:48:31 +02:00
Joan Sanchez b9e48f2102 Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:39:43 +02:00
Carlos Satorres 9f4d027014 refs #5316 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 15:36:14 +02:00
Joan Sanchez 2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02:00
Carlos Satorres b3f946e15f Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 08:32:05 +00:00
Alexandre Riera 05912610f8 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:47:06 +00:00
Carlos Satorres f307f79dc2 refs #5250 cambio a ult version de changes 2023-04-06 09:34:46 +02:00
Carlos Satorres 68a24b7335 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker 2023-04-06 09:33:50 +02:00
Joan Sanchez 213766afdf Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-04-06 07:27:13 +00:00
Joan Sanchez 641fdf39d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-06 09:26:55 +02:00
Alexandre Riera 5cbc826281 Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good Details
2023-04-06 07:16:00 +00:00
Joan Sanchez 902709d61b Added authCode table
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 15:22:09 +02:00
Alexandre Riera 8f4de7e7e9 refs #5259 undo delete, update trigger
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:27:10 +02:00
Alexandre Riera 589e996b69 refs #5259 minor fix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:17:19 +02:00
Joan Sanchez 0d6b248f76 feat(2fa): email 2fa
gitea/salix/pipeline/head This commit looks good Details
Refs #5475
2023-04-04 14:59:33 +02:00
Alexandre Riera 81cf35f2d3 refs #5259 drop procedure invoiceOut_afterInsert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:55:37 +02:00
Alexandre Riera eed1ecc208 refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 14:47:13 +02:00
Vicent Llopis c89f95a33e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-04-04 13:40:12 +02:00
Alexandre Riera 32df51ecca refs #5092 moved sql
gitea/salix/pipeline/head Build queued... Details
2023-04-04 08:40:51 +02:00
Alexandre Riera 24f576a4b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 08:40:03 +02:00
Joan Sanchez 8b4c70e8ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-30 14:57:00 +02:00
Joan Sanchez 6ff6004627 Added version 2314.01
gitea/salix/pipeline/head This commit looks good Details
2023-03-30 08:35:04 +02:00
Carlos Satorres 60383eda0c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-30 08:26:45 +02:00
Joan Sanchez 6aca23e466 Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-30 05:23:29 +00:00
Joan Sanchez 3bab90f9e5 Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev
Reviewed-on: #1411
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-30 05:19:07 +00:00
Carlos Satorres 71220c58f7 refs #084200 inserts 2023-03-29 12:00:01 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Alexandre Riera 05caf0c6d8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:26:11 +02:00
Alexandre Riera 87d0dc3cec refs #5092 changed name to negative bases
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 08:25:41 +02:00
Alexandre Riera 6f2de903bc refs #5184 working on search panel
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 14:29:22 +02:00
Carlos Satorres aad8fb0a66 refs #084200 i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 13:11:38 +02:00
Alexandre Riera 39af68c3dc Merge branch 'dev' into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-27 05:39:22 +00:00
Carlos Satorres b199ca4a6e Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 11:48:31 +00:00
Vicent Llopis c65f01b689 refs #5416 delete: supplierAccount triggers
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 12:30:18 +01:00
Vicent Llopis 871618b122 fix: faltaba el esquema 2023-03-24 12:29:58 +01:00
Carlos Satorres c68c78cc5b refs #5250 solucion error WorkerObserv
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 12:11:42 +01:00
Vicent Llopis dca760d4e4 Merge branch 'dev' into 4858-chat_realTime
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 10:02:51 +00:00
Vicent Llopis 6c75853ce6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 09:43:13 +01:00
Alexandre Riera 74312a3cdf refs #5056 changed acl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 07:30:35 +01:00
Vicent Llopis 7e37d7f3f1 refs #5342 actualido el itemType.isFragile para las 'plants'
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 09:25:56 +01:00
Carlos Satorres d05ddef5fa refs #084200 primer commit companyI18n 2023-03-22 14:54:59 +01:00
Vicent Llopis d276c7b611 refs #5342 unificados proc x_getWarnings
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 10:57:18 +01:00
Vicent Llopis 2559be8230 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5342-monitor.tickets_isFragile 2023-03-22 10:29:21 +01:00
Carlos Satorres fde854f5c2 refs #5250 campo de notes
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:21:15 +01:00
Vicent Llopis 1b1bca28bd refs #5410 add frontTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 10:13:59 +01:00
Alexandre Riera ce67132d7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-22 07:21:20 +01:00
Vicent Llopis 4141a97356 refs #4858 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 11:37:26 +01:00
Vicent Llopis 32e2d1c0fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime
gitea/salix/pipeline/head Build queued... Details
2023-03-21 11:26:41 +01:00
Alexandre Riera 1198ad3b01 refs #5056 wagonType backs and test
gitea/salix/pipeline/head This commit looks good Details
2023-03-21 10:44:00 +01:00
Alexandre Riera a94e47e622 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-20 09:54:02 +01:00
Robert Ferrús 1d697e1ac5 refs #4357 add operator model
gitea/salix/pipeline/head This commit looks good Details
2023-03-17 08:46:01 +01:00
Juan Ferrer f61c205a7b Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:53:16 +00:00
Alexandre Riera 1cd768f7b8 refs #5056 moved sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 10:39:02 +01:00
Alexandre Riera a8f92b151d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5056-gestion-vagones
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:38:04 +01:00
Vicent Llopis 2f2d65bfd6 refs #5342 feat: añadido icono en los tickets que tengan sales fragiles
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 10:33:24 +01:00
Alexandre Riera c46e15c8e4 refs #5092 changed section name
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 09:35:00 +01:00
Alexandre Riera 0b4a6874d1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:16:50 +01:00
Joan Sanchez 1a79bb586c Added version 2312.01
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-16 09:07:59 +01:00
Alexandre Riera f037575428 Merge branch 'dev' into 4632-guardarFirmas-salix
gitea/salix/pipeline/head Build queued... Details
2023-03-16 08:06:17 +00:00
Alexandre Riera a99bd2577a refs #4632 changed route from TicketDms to Ticket
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 08:24:34 +01:00
Alexandre Riera 6609cce065 refs #5056 minHeightBetweenTrays
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 12:14:58 +01:00
Alexandre Riera f706b66efc refs #5056 added divisible in wagonType
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-15 11:57:09 +01:00
Carlos Andrés 6b375cbaaa refs #5000 InvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:34:41 +01:00
Carlos Andrés 2a6848c09a refs #5000 invoiceOutGlobal 2023-03-14 09:17:39 +01:00
Carlos Andrés 6d3fa34624 refs #5000 invoiceOutGlobal
gitea/salix/pipeline/head Build queued... Details
2023-03-14 09:14:04 +01:00
Carlos Satorres b5394d3925 refs #084200 footer finalizado, web personalizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:52:41 +01:00
Alexandre Riera 0248c3c9e0 refs #5056 models and tables added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 07:34:49 +01:00
Alexandre Riera c4d6a19666 refs #5092 download as csv button
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:49:20 +01:00
Alexandre Riera 423ae85212 refs #4632 dmsRecover deprecated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:29:09 +01:00
Alexandre Riera 06dd72f30c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4632-guardarFirmas-salix 2023-03-08 12:13:48 +01:00
Alexandre Riera 106f96b9a6 refs #4713 fixed front test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:10:08 +01:00
Alexandre Riera ed6edfed45 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 11:50:29 +01:00
Joan Sanchez 23a15ee15c Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 06:50:16 +00:00
Carlos Satorres 955e55a7f4 refs #5284 new onCreateClaimAccepted y createClaim
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 15:43:48 +01:00
Vicent Llopis 0bda8c0ed6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 09:14:30 +01:00
Javi Gallego 4a32c164a6 template string
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:34:08 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:27:53 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Alexandre Riera 8679aefb48 refs #4713 procs deprecated, originalQuantity deleted 2023-03-03 07:36:04 +01:00
Javi Gallego e01fa40531 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:51:41 +01:00
Joan Sanchez e785c34d90 Added next version
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 07:52:07 +01:00
Carlos Andrés 6f5e25493d invoicing test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 10:36:38 +01:00
Vicent Llopis da6e29056e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 08:08:23 +01:00
Alexandre Riera d5ea59e284 refs #5287 permisos añadidos
gitea/salix/pipeline/head This commit looks good Details
2023-02-28 12:46:48 +01:00
Alexandre Riera 94901d5b1f refs #5287 pda section added, tests added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 07:49:34 +01:00
Alexandre Riera 5d9220c5c0 refs #5287 locker added
gitea/salix/pipeline/head This commit looks good Details
2023-02-27 08:39:46 +01:00
Alexandre Riera 2a4d41cbca refs #4632 saveSign refactored, working on tests, check if dmsRecover is needed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-24 14:41:02 +01:00
Carlos Andrés 4cc6485cbd refs #5000 Invoicing RC
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 09:25:23 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Joan Sanchez 251c7b54ba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5192-db_export
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-20 14:36:47 +01:00
Vicent Llopis 3ef0b3a68b feat: add acl
gitea/salix/pipeline/head This commit looks good Details
2023-02-20 12:42:42 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Joan Sanchez 46fdaab649 Merge pull request 'test -> dev' (!1335) from test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1335
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2023-02-17 12:23:11 +00:00
Vicent Llopis c6304898b4 refactor: borrado insert, se ha hecho directamente sobre produccion
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:00:02 +01:00
Vicent Llopis 7883723b8c move changes sql
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 12:54:59 +01:00
Vicent Llopis 77c454f953 move sql changes and add changelog
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 10:45:08 +01:00
Vicent Llopis 373be40986 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies 2023-02-17 10:42:50 +01:00
Vicent Llopis 5285ad9242 move sql changes
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 10:19:12 +01:00
Joan Sanchez a59dac2b9f Added version 230801
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 10:12:29 +01:00
Vicent Llopis d25ebaec0b Merge branch 'dev' into 5097-item.summary_available
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 08:47:56 +00:00
Alexandre Riera 4cae4448f6 refs #5194 moved invoiceOut to 230402
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:45:11 +01:00
Alexandre Riera 8b088e831a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-16 14:43:51 +01:00
Alexandre Riera ec16a0d66c Merge branch '5194-cambios-ticketFutureAdvance' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:35:33 +01:00
Alexandre Riera 457fd3f5f9 refs #5194 sql moved to 230404 2023-02-16 14:35:03 +01:00
Joan Sanchez 3031ae2511 Updated version
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 14:28:33 +01:00
Vicent Llopis 76f2030125 feat: add update sql
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 09:50:25 +01:00
Vicent Llopis 3dd870f7df fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-16 09:44:20 +01:00
Vicent Llopis dc2ab50f65 fix: test e2e 2023-02-16 09:44:06 +01:00
Vicent Llopis 73ae45c2c0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-15 15:08:58 +01:00
Alexandre Riera e68afa3169 refs #5223 moved sql
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 12:59:19 +01:00
Vicent Llopis fda428d73e refactor: change user
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 09:52:35 +01:00
Vicent Llopis 5ecf55a1e7 movida sql a carpeta changes actual
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 09:51:27 +01:00
Vicent Llopis 7439b12d98 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4849-supplier-isVies
gitea/salix/pipeline/head This commit looks good Details
2023-02-15 09:31:20 +01:00
Alexandre Riera 7194e62cae refs #4588 faked observationEditorFk in structure
gitea/salix/pipeline/head Build queued... Details
2023-02-14 13:28:21 +01:00
Alexandre Riera 7876d4611c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:44:03 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:41:36 +01:00
Alexandre Riera 7d5591462d refs #4588 entry sql
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 09:08:49 +01:00
Alexandre Riera 54ad373c5e Merge branch 'master' into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 09:30:47 +00:00
Alexandre Riera 76ed4d2d4b refs #5194 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-13 10:16:28 +01:00
Alexandre Riera a7e9e52ad4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-13 07:34:13 +01:00
Vicent Llopis ac3faddac1 fix: actulizada sql intrastat y se muestra solamente cuando toca
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 12:09:51 +01:00
Alexandre Riera 6cb815faaf .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:13:41 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Vicent Llopis 4754dc7bda feat: actualizada sql intrastat
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 11:03:22 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:26:55 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Vicent Llopis 222032aae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-02-09 08:38:08 +01:00
Vicent Llopis b70311999d refactor: eliminado codigo innecesario y quitado update que se hará directamente en producción
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-08 09:41:09 +01:00
Alexandre Riera 549d530690 .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-08 07:35:52 +01:00
Javi Gallego 4a562c3110 unificado todo a claimState isEditable 2023-02-07 15:40:03 +01:00
Alexandre Riera c397757762 sql version updated
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:26:54 +01:00
Alexandre Riera 68b4d269ff Merge branch 'dev' into 4588-campo-nota-ultimo-usuario
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 09:18:13 +00:00
Alex Moreno 7ad9e2cb5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4858-chat_realTime 2023-02-06 10:05:17 +01:00
Alexandre Riera 0a9d37ca08 hotfix itemConfig
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 09:01:13 +01:00
Joan Sanchez 8158cb6860 feat(db): export prod structure & data
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: #5192
2023-02-03 15:08:41 +01:00
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:31:50 +01:00
Joan Sanchez eded1ebf20 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 11:42:48 +01:00
Pau 99e6ef5a36 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:35:14 +00:00
Joan Sanchez 4d8af54b1e Added version 23.06.01
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 09:21:12 +01:00
Joan Sanchez d45c0cb99a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:59:39 +01:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Alexandre Riera 780018e4df 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-02-02 08:40:49 +01:00
Joan Sanchez d0e65b9539 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 07:38:12 +00:00
Joan Sanchez 7a700de5c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:23:17 +01:00
Joan Sanchez 644d98ec1c syncUser() and setPassword() changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 07:32:38 +01:00
Alex Moreno 39d4b53872 fix: sql fail in real structure...
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 09:00:49 +01:00
Alex Moreno 56f7794d87 typo
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:47 +01:00
Pau 9ece9d8625 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:42:21 +01:00
Pau 650cc68f4a requested changes 2023-02-01 08:42:20 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Joan Sanchez e34d64361b Account refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 14:57:24 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Vicent Llopis 903a42683d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-01-30 12:45:17 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Pau 29b5c7cc5a Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:03:54 +00:00
Alexandre Riera fbf252b634 refs #5072 template strings
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:31:56 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:30:39 +01:00
Joan Sanchez 9bf4cd5cff Merge branch 'dev' into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 08:20:32 +00:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Alexandre Riera 956b3e05f8 hotfix delete saleChecked from vnClean
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 07:56:51 +01:00
Vicent Llopis f7fa082294 refator: name endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:49:09 +01:00
Pau 3184dcd39d requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 08:41:12 +01:00
Pau c13bffcc57 refs #4797 @1h requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 10:11:16 +01:00
Pau dfa3022949 Merge branch 'dev' into 4797-lilium-worker-notifications 2023-01-24 08:20:45 +01:00
Vicent Llopis 1154179ddf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:11:46 +01:00
Pau 4228c1e49c change c.fi to s.nif
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-24 08:02:42 +01:00
Joan Sanchez ee1ce21bb9 refactor(account): account model refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-23 15:24:00 +01:00
Alexandre Riera 07d3fef8f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:44:19 +01:00
Alex Moreno ce06274d0a Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 07:12:26 +00:00
Alexandre Riera 199fabbb1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-20 10:11:52 +01:00
Alexandre Riera 89700f71f7 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-20 10:05:42 +01:00
Alex Moreno ace7a5939e move to changes 230401
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:33:59 +01:00
Vicent Llopis c77f1b17a6 movida sql a nueva carpeta changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:32:18 +01:00
Alex Moreno a674169ddb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:30:30 +01:00
Vicent Llopis ef7a0508ed Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:29:42 +01:00
Alexandre Riera a3b580e27d refs #4945 item.relevancy comment
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 08:01:19 +01:00
Joan Sanchez fbbca1dc2e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-01-20 07:42:51 +01:00
Joan Sanchez 781c751229 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:36 +01:00
Joan Sanchez a5decd3166 Updated version
gitea/salix/pipeline/head This commit looks good Details
2023-01-20 07:42:15 +01:00
Alexandre Riera 292372395e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-20 07:15:03 +01:00
Vicent Llopis dfcacdad71 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4903-workerTimeControl_sendMail
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 08:56:39 +01:00
Alexandre Riera 200a256016 Merge branch 'dev' into 4945-dejar-buscar-tag-nombreTemporal
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-18 12:15:12 +00:00
Alexandre Riera be5f987b0a refs #4945 added defaultTag, validPriorities, defaultPriority in itemConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 13:14:49 +01:00
Pau 5e198b8541 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:15:45 +00:00
Alexandre Riera 4aaa5b2687 refs #5020 isActive Not Null
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 09:08:09 +01:00
Pau 10c70f5388 Merge branch '4797-lilium-worker-notifications' of https://gitea.verdnatura.es/verdnatura/salix into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 09:06:18 +01:00
Pau a5f83021db requested changes 2023-01-18 09:06:17 +01:00
Alexandre Riera 98d6322b0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5020-borradoLogico-IPT
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 08:00:20 +01:00
Pau ec4c628adf Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2023-01-18 06:43:45 +00:00
Vicent Llopis adc2c32ac4 feat: add changes sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 12:51:04 +01:00
Vicent Llopis b7004e6a76 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 12:50:34 +01:00
Pau f0cc28d698 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:46:55 +00:00
Alex Moreno bc9510a317 Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:46:16 +00:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Vicent Llopis 76fe32924c fix: update url
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 09:25:20 +01:00
Alexandre Riera c47cac7d55 refs #5020 isActive column added, filter in front
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 08:54:26 +01:00
Alexandre Riera ba3335b9a2 Merge branch 'dev' into 4951-longitud-cuentaContables
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 06:59:33 +00:00
Alex Moreno ff39a81b8c Merge branch 'dev' into 4523-item_fixed-price_rate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 06:07:14 +00:00
Alex Moreno ecfad94057 refactor(worker_new): remove roleFk and profileType
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 12:19:03 +01:00
Alexandre Riera b3c6443277 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 10:33:35 +01:00
Alex Moreno 2cc89d9ae7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 13:54:16 +01:00
Alex Moreno 9a3fea99ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send 2023-01-13 13:45:10 +01:00
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
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
Vicent Llopis 6a8e7873fa fix: sólo cierra caus que el último mensaje sea una respuesta. Cierra caus con el estado 'Abierto' y 'En espera'º
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 15:07:48 +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
Pau dfd264ff82 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 13:29:45 +01:00
Vicent Llopis ed90957ab5 fix: corregida primaryKey de mdbApp
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:45:11 +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 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
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
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
Vicent Llopis b801ac676c feat: updated production db
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:41:02 +01:00
Alexandre Riera a42723210f refs #4951 delete function
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:13:18 +01:00
Alexandre Riera 14ca5cc599 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4951-longitud-cuentaContables
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 08:48:46 +01: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
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
Joan Sanchez 030c474e06 Fixed update module
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 13:18:55 +01:00
Alexandre Riera e82035606f refs #4984 autoincrement added
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 11:31:09 +01:00
Alex Moreno d85717ca04 feat: chat in real time
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 11:23:06 +01:00
Alexandre Riera a4e591c5f5 refs #4951 triggers modified
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 10:37:59 +01:00
Alex Moreno 8184749626 change db version folder
gitea/salix/pipeline/head This commit looks good Details
2023-01-04 09:40:27 +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 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 f499311a16 refs #4951 changed triggers and added checkLength
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-04 08:36:55 +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 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
Pau a55d007655 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-03 08:12:46 +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 21cd2e2a63 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-29 09:03:05 +00:00
Pau 45d4ab80d5 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head This commit looks good Details
2022-12-29 06:37:21 +00: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
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
Pau ee0cd2174f requested changes refs #4797 @2h
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 14:32:19 +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
Pau ada3e6f175 update sql folder
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 10:10:37 +01:00
Pau c9468990b7 Merge branch 'dev' into 4797-lilium-worker-notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-27 10:08:39 +01:00
Pau 7aeeddcf18 removed the sql
gitea/salix/pipeline/head This commit looks good Details
2022-12-27 07:23:15 +01:00
Pau 8696d554d6 Change SQL folder
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-26 07:22:59 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +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
Joan Sanchez c13b49c7cd Added next version & changelog
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 10:07:19 +01:00
Vicent Llopis 9468f604ff move sql changes
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 10:02:21 +01:00
Vicent Llopis 906d8c5df7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat 2022-12-23 10:01:44 +01:00
Joan Sanchez ff0243db8f Fixed SQL files 2022-12-23 09:55:15 +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
Vicent Llopis c98b5a969d feat: actualizada consulta intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 09:16:26 +01:00
Pau fc86e913c4 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 08:09:38 +00:00
Joan Sanchez e15d724db5 Merge pull request 'closes #3681 move-sign_save-to-salix' (!1151) from 3681-move-sign_save-to-salix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1151
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 12:44:01 +00:00
Joan Sanchez 7c33cd2691 Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-22 10:43:20 +00:00
Pau a8ca163321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 10:49:41 +01: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 aa716634db Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:30:36 +01:00
Pau ea6d399cf1 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 07:25:38 +00:00
Pau c0d285856b move sql files
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:24:54 +01:00
Pau f57201c8c3 add requested changes 2022-12-22 08:20:59 +01:00
Pau fed4cc8534 Merge branch 'dev' into #288-traducir-state-i18n 2022-12-22 08:07:25 +01:00
Pau a713cf92cf Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:00:33 +01:00
Pau f6f6d0866d requested changes refs #4732 @1h 2022-12-22 08:00:18 +01:00
Pau 05f4db7924 Add requested changes to the fixtures 2022-12-22 07:16:22 +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 a45ef27e3f move changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 12:15:33 +01:00
Vicent Llopis e4f4e70cc6 Merge branch 'dev' into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 08:26:53 +00: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
Vicent Llopis b0595dd0da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-21 08:12:59 +01: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
Pau 1430749892 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-21 07:02:02 +00:00
Alexandre Riera 9291f4a380 refs #3963 sql moved
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 12:10:02 +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 d178800c14 movidos change sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-20 10:53:13 +01:00
Vicent Llopis 1ddaf7ff08 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-20 10:52:23 +01:00
Joan Sanchez 73ea928b33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:40:23 +01:00
Joan Sanchez 47e1c05e47 Renamed version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:39:39 +01:00
Joan Sanchez 70b1854cc5 Added version
gitea/salix/pipeline/head This commit looks good Details
2022-12-20 10:20:31 +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
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 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 6b3876b200 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 12:26:52 +00:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Pau d356e5352b delete old files
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:41:15 +01:00
Pau 055a479aba Merge branch 'dev' into #288-traducir-state-i18n 2022-12-19 07:40:56 +01: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 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
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
Vicent Llopis 85148ab929 refactor: movidos changes sql
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 08:59:06 +01:00
Vicent Llopis 3642b295b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-16 08:50:51 +01:00
Alex Moreno b8a0d179f1 Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 07:08:39 +00:00
Vicent Llopis 1b30ee9d2d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-15 14:32:51 +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
Alex Moreno 279456b377 Merge branch 'dev' into 4919-module_code
gitea/salix/pipeline/head This commit looks good Details
2022-12-15 07:58:18 +00: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
Vicent Llopis 859c084430 refactor: movidos changes sql 2022-12-15 07:17:13 +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
Joan Sanchez a86636bee4 Use proper module codes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 13:49:49 +01:00
Alexandre Riera 2baa4a1954 refs #4962 ticket tour future refactor 2022-12-14 12:26:18 +01:00
Alexandre Riera f00fdcff7c refactor sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 08:06:02 +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
Alexandre Riera 95967a29db refs #4928 email template added and proc modified
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 11:50:17 +01:00
Vicent Llopis 91f955ccf5 refactor: move sql changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-13 09:56:05 +01:00
Vicent Llopis e4dbeb0b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification 2022-12-13 09:54:56 +01:00
Joan Sanchez dc777ea69f Added version after merging to test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 14:23:40 +01:00
Joan Sanchez e000103ca4 Deleted version
gitea/salix/pipeline/head This commit looks good Details
2022-12-12 14:22:32 +01:00
Vicent Llopis 3d47ee1cd9 feat: inseet in notificationSubscription
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:53:21 +01:00
Alex Moreno 7822a6cac8 change folder
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:48:20 +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 158a71a326 restrictions
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 13:37:14 +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
Joan Sanchez ac447d4981 Updated SQL version nomenclature
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:48:12 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00: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
Vicent Llopis 89e9722027 refactor: cambiados varchar por text, para q no falle en local
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:14:38 +01:00
Pau a676351e5b Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 07:24:26 +01:00
Vicent Llopis c258587e02 feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 15:06:21 +01:00
Pau cc87565190 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 14:16:15 +01:00
Alexandre Riera cd8d5efa88 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 10:29:18 +01: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
Alex Moreno 7f1478f2e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:48:37 +01:00
Pau aee7cd113e add template strings to sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 09:33:14 +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
Alex Moreno 6db1a9e8ae refs #4859 fix: fixtures db exportation
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 07:19:30 +01:00
Vicent Llopis 5415338f55 refactor: movidos changes sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 12:17:16 +01:00
Vicent Llopis 4ef2e3dfcd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-25 12:16:40 +01:00
Pau 074763f633 rename files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 11:47:23 +01:00
Alexandre Riera 9f10129152 sql moved to 10510
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 10:27:45 +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
Joan Sanchez 92557ea22d Added version 10510
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:43:34 +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
Joan Sanchez 4e7ef47b88 SQL fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:41:08 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:35:15 +00:00
Pau 9252fc896f Merge branch '#288-traducir-state-i18n' of https://gitea.verdnatura.es/verdnatura/salix into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 07:08:57 +01:00
Pau 724c1e6e8a remove unnecessary index 2022-11-25 07:08:54 +01:00
Pau 3e08650b6f acls for the notifications
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-25 07:06:04 +01:00
Pau 0b15236129 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 13:18:40 +00:00
Pau 15f14062ca Requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-24 14:06:52 +01:00
Vicent Llopis d233286a3f Merge branch 'dev' into DEV_fix_closeTicket
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 12:44:37 +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
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
Alexandre Riera 5124b3b681 Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-24 08:42:09 +00:00
Alex Moreno cbdffc98a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-23 14:16:42 +01:00
Vicent Llopis 7f89899d6c fix: closeTicket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 12:54:52 +01:00
Vicent Llopis f313a53cde refactor: cambiadas fixtures, backTest y traducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 10:56:55 +01:00
Vicent Llopis 9cfab2b3f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4794-mdb_block 2022-11-23 10:23:17 +01:00
Pau a8520f851c Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-23 08:28:07 +00:00
Pau ad38f50ae3 Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-23 08:55:46 +01:00
Pau ade2e777d6 refs #4457 @30min requested changes 2022-11-23 08:55:44 +01:00
Pau 51d3091a40 Merge branch 'dev' into 4511-kkear-expedition.itemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 13:45:03 +00:00
Alex Moreno 660648e01f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-22 14:35:25 +01:00
Vicent Llopis 32f28e91b5 feat: sistema de bloque para ficheros mdb
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-22 14:29:42 +01:00
Alexandre Riera 5552cd654e Merge branch 'dev' into 4547-fix-compensation
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:48:11 +00:00
Alexandre Riera 6656ea4f54 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-11-22 10:20:42 +01:00
Alexandre Riera 2651081838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4700-split-tour
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 10:15:31 +01:00
Alexandre Riera 8e1505d5ee Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 07:02:56 +00:00
Pau cb6ae41c13 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:45:28 +00:00
Pau 3003290e61 refs #4551 @20min requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 14:38:51 +01:00
Pau 52630f0a25 add collections with sectorFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 13:38:53 +01:00
Alex Moreno 26be27c2ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:13:25 +01:00
Alexandre Riera 6ddd2d95a5 insert acl
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:48:18 +01:00
Alexandre Riera 4c21ffac3b 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-11-21 11:44:53 +01:00
Alexandre Riera 463e56b631 corrections
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 11:41:17 +01:00
Alexandre Riera 40ea9805cf fixes #4547 check compensation and tests
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 10:49:19 +01:00
Pau cb0735d136 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-21 08:34:18 +00:00
Pau 7475aa8389 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:33:51 +00:00
Alex Moreno 7e98a255b8 refs #4849 SQL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 08:11:01 +01:00
Alexandre Riera fd58eaf838 drop procedure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:36:38 +01:00
Alex Moreno ef6af87d89 feat: add supplier.isVies funcionality
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-18 09:21:21 +01:00
Pau 8059e54a26 Merge branch 'dev' into #288-traducir-state-i18n
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:54:47 +00:00
Alexandre Riera 566d384483 Merge branch '3557-back-missingTrash' of https://gitea.verdnatura.es/verdnatura/salix into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 13:46:20 +01:00
Alexandre Riera e4a6585b6a fix test back 2022-11-16 13:46:16 +01:00
Pau 5b4c1ad4e6 Merge branch 'dev' into 3681-move-sign_save-to-salix
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 12:26:59 +01:00
Pau 6ab28678c5 Removed unused require and insert statement
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 11:56:03 +01:00
Pau 0f0c4c0554 feat(save-sign implemented in salix back, refs 3681 @2h
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 10:28:13 +01:00
Alexandre Riera 294f806bd9 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-11-16 09:52:13 +01:00
Alexandre Riera 78dc7db7a7 correcciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 09:46:35 +01:00
Pau 7b3a1bfb22 requested changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 08:28:12 +01:00
Pau 8e7e7901af Implement needed functions refs #3681 @1h 2022-11-16 08:11:29 +01:00
Alexandre Riera 7c8178b423 Merge branch 'dev' into 3557-back-missingTrash
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-16 07:07:20 +00:00
Pau d7dc7c4329 Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-16 06:08:01 +00:00
Alexandre Riera b7c9d6ea50 refs #3963 front and back tests fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:30:00 +01:00
Vicent Llopis c200e1af32 refactor: optimizado select
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 15:09:41 +01:00
Pau 6e58b1de8b refs #4511 Changed fixtures to fix broken test @30min
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 14:17:24 +01:00
Pau 56893ea58b Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-15 13:42:06 +01:00
Alex Moreno 8dcd567a68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 13:20:52 +01:00
Alex Moreno cba3c38ba6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 12:55:07 +01:00
Pau 2b3b2086d9 Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:39:03 +00:00
Pau 6339634756 refs #4457 move sql, remove await on front @2h 2022-11-15 10:37:12 +01:00
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Alex Moreno 8f4ac8fcc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker 2022-11-15 10:12:29 +01:00
Alex Moreno 72400ebf02 change folder db
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:37:14 +01:00
Alexandre Riera 5acbaf036a refs #3557 back and test done
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 09:30:36 +01:00
Pau 9d0cd36afe Merge branch 'dev' into 4457'
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:49:21 +01:00
Alex Moreno bcab493f37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-15 07:33:53 +01:00
Pau 29b299f36a Merge branch 'dev' into 4507-greuge-add-userFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:10:31 +00:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Alexandre Riera 23ed6c6031 refs #3963 test front done
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 14:30:35 +01:00
Alexandre Riera 05f0eba741 Merge branch 'split-tour' into 3963-ticket-advance
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 09:06:51 +01:00
Alexandre Riera c16210dd8a refs #4700 working on e2e
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 15:58:11 +01:00
Pau 58c90b3bbc refs #288
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 13:41:22 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
Vicent Llopis a5b20bfb03 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing 2022-11-11 08:53:10 +01:00
Joan Sanchez 163f7fd284 Added version 10503
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:31:45 +01:00
Joan Sanchez 5e0a31f244 Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1129
2022-11-11 07:30:01 +00:00
Vicent Llopis 9d06f5c0f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 07:47:29 +01:00
Alexandre Riera 117e2c03f5 refs #4700 tests back y empezando e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 15:54:00 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Joan Sanchez 6a2977a2cf Fixed SQL changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:19:20 +01:00
Pau 56201f4c1a Start implementing method refs #3681 @3h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:37:16 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Alex Moreno 517422be8c refactor: not use axios
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:32:07 +01:00
Pau 1327f0ae9d Added requested changes, refs #4507 @1:20h
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:18:05 +01:00
Vicent Llopis 79e9edcee9 delete: old code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-09 09:26:28 +01:00
Vicent Llopis 9bcfebcae6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 07:26:56 +01:00
Pau 2fc12dff52 #4457 @1h notifications working, need refactor ACL
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 13:59:00 +01:00
Pau e85505ee8e #4457 implement notification system, @1h 30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-08 12:26:01 +01:00
Pau f45eaa07f9 refs #4511 fixed test, changed drop to rename @1h
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 09:45:56 +01:00
Pau d1be14605b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk 2022-11-08 09:32:09 +01:00
Pau 78e6c8da15 Merge branch 'dev' into 4511-kkear-expedition.itemFk 2022-11-08 09:08:06 +01:00
Vicent Llopis 11459bbd56 refactor: change column name 2022-11-08 08:46:36 +01:00
Alexandre Riera 896a7eb6f0 refs #4700 arreglar filtro y traducciones
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 15:55:17 +01:00
Joan Sanchez 92a2367db2 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:52:53 +01:00
Joan be1fbc4d68 Added version 10502
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:49:17 +01:00
Joan 17d6308126 Already on prod 2022-11-07 10:48:38 +01:00
Alex Moreno c3ee9da6c6 hotFix: force apply changes
gitea/salix/pipeline/head This commit looks good Details
2022-11-07 10:18:32 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Alex Moreno 5051f8b590 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-07 07:24:44 +01:00
Joan Sanchez 1bcde47ab1 Merge pull request '3951-invoiceOut.index_downloadPdfs' (!1110) from 3951-invoiceOut.index_downloadPdfs into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1110
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-04 10:42:32 +00:00
Joan Sanchez 2afb47fe14 Added version 10501 - November
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 10:01:23 +01:00
Vicent Llopis ae513fb2b3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 09:12:16 +01:00
Vicent Llopis b6d3a08871 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 10:17:46 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Alex Moreno 67697784cd Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 06:48:38 +00:00
Vicent Llopis 35c50cb314 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3951-invoiceOut.index_downloadPdfs 2022-11-03 07:11:54 +01:00
Vicent Llopis f96fc0f91e Merge branch 'dev' into 3852-client.search-panel2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:13:41 +00:00
Vicent Llopis 8c4e70c11d Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:06:06 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Alex Moreno 943103c254 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:33:45 +00:00
Alex Moreno c1ed0f2226 Merge branch 'dev' into changesInCorrectFolder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:58:32 +00:00
Alex Moreno 2c3b735650 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-11-02 13:49:09 +01:00
Alex Moreno 6a9134d8f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:48:36 +01:00
Alex Moreno 2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 12:01:11 +00:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Joan Sanchez e2101db706 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:53:47 +00:00
Joan Sanchez 2fba17ab15 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 09:33:27 +00:00
Joan Sanchez fe3ebe8e0c Merge branch 'dev' into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:43:43 +00:00
Joan Sanchez 33c92a0f24 Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1076
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:34:49 +00:00
Alex Moreno a7b1ee85fe fix changes folder
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:27:57 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +01:00
Pau 0739608de3 Merge branch 'dev' into 4457-hasInvoiceElectronic
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 07:57:50 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Alex Moreno e9731c4ac0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-28 09:11:40 +02:00
Vicent Llopis 264b56378a Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 06:31:12 +00:00
Alex Moreno 9eb3b09be1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 08:26:45 +02:00
Alex Moreno 80617dd578 Merge branch 'dev' into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 05:33:45 +00:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +02:00
Vicent Llopis fa89d1f944 fix: comentario corregido
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:10:50 +02:00
Vicent Llopis 65e32f5e7f feat: client search panel add find by zone
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 12:40:13 +02:00
Vicent Llopis 350c516bb1 feat: cancelar petición cuando esta calculando el packaging
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 10:36:41 +02:00
Vicent Llopis 3110172c54 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3811-ticket.sale_updatePrice 2022-10-26 08:39:58 +02:00
Vicent Llopis 5e0f976ad2 Merge branch 'dev' into 4155-close_tickets_fix2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 06:25:18 +00:00
Vicent Llopis 07a18dc736 delete sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:05:11 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno 607e9010e6 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 12:36:35 +00:00
Joan Sanchez 4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 14:09:21 +02:00
Alex Moreno ac8c4b8ef0 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:39:50 +00:00
Pau 7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:00:13 +00:00
Joan Sanchez 1196125350 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-10-25 11:58:47 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau 76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:25 +00:00
Pau 9089ba7346 requested changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 10:42:16 +02:00
Pau 23598c993b Change ACL from employee to hr
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:25:15 +02:00
Vicent Llopis 7f1dd801a5 refactor: change ACLs
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:56:17 +02:00
Alex Moreno 7cb8175b73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-25 07:36:21 +02:00
Vicent Llopis d18b22bb05 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 07:05:26 +02:00
Joan Sanchez e80754f280 Added new SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 18:37:38 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 15:15:23 +02:00
Vicent Llopis c77999871e refs #3951
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 14:34:17 +02:00
Alex Moreno a66c5e6798 acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-24 11:30:17 +02:00
Vicent Llopis 888f612dbb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 11:41:53 +02:00
Vicent Llopis 18c119c62a change acl
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:20:27 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00
Vicent Llopis 6891190c72 refactor: create endpoint to unify code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 15:05:46 +02:00
Vicent Llopis 39f4445172 refator: endpoint name
gitea/salix/pipeline/head This commit looks good Details
2022-10-20 07:23:57 +02:00
Vicent Llopis 6f7ec12cb2 feat: response as 'reply' and not as 'internNote'
gitea/salix/pipeline/head This commit looks good Details
2022-10-19 10:35:41 +02:00
Pau 470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:58:44 +02:00
Pau a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 12:29:04 +02:00
Alex Moreno a5ceee07e9 use loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 11:50:16 +02:00
Pau 81088bc495 Fixed ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:46:14 +02:00
Pau f481cc3c97 Capitalizar
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:38:40 +02:00
Pau c9e9e3545d Added ACL
gitea/salix/pipeline/head This commit looks good Details
2022-10-18 10:33:48 +02:00
Alex Moreno 0bc018ec02 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:06:31 +02:00
Pau 9290cd6fb6 Finished back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 14:02:18 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +02:00
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +02:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 13:22:53 +02:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Alex Moreno 24cb8e00bb creates notification sql in changes
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 13:20:25 +02:00
Alex Moreno c78e222ee0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
gitea/salix/pipeline/head This commit looks good Details
2022-10-11 10:09:57 +02:00
Vicent Llopis 9c52508a88 feat: add total labels
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 08:40:22 +02:00
Vicent Llopis 7b7e01f49e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3095-item.shelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 07:09:20 +02:00
Alex Moreno 376d46b67e feat(canEdit): integrate isWeekly and adapt back tests and e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 13:06:49 +02:00
Vicent Llopis 8130cf9e6a feat: separate globalInvoicing in 2 parts
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 12:40:10 +02:00
Pau 51d3063849 Drop expedition itemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 10:53:15 +02:00
Alex Moreno e7bafb1386 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-07 07:47:46 +02:00
Alex Moreno c29625f079 fix: funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-06 15:04:27 +02:00
Joan Sanchez 4fadc7e2a4 Added subversion
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 13:56:10 +02:00
Joan Sanchez 8ccb47d741 Merge pull request '4073-feat(user): add section privileges and remove changeRole in descriptor' (#1073) from 4073-user_privileges into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1073
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-06 11:54:16 +00:00
Pau dde5eed9e2 DB fixtures 2022-10-06 13:34:06 +02:00
Vicent Llopis ddbe1057ad feat: add new section
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 09:47:53 +02:00
Alex Moreno 9d482f7dfd test(ticket): fix tests and add funcionalityAcl
gitea/salix/pipeline/head This commit is unstable Details
2022-10-05 15:13:36 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +02:00
Alex Moreno 7a690dd880 feat(user): add section privileges and remove changeRole in descriptor
gitea/salix/pipeline/head This commit looks good Details
test(user):back and e2e
2022-10-03 15:11:29 +02:00
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Alex Moreno e931414bb7 unnecessary code
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 08:59:49 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez 7a7ad6ac5f InvoiceOut_sendQueued
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 13:09:44 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +02:00
Alex Moreno 2c691eb796 feat(vnApp): getUrl and create salix.url. test(boxing): getVideoList
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 14:49:11 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Alex Moreno f698a22fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 09:25:43 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Pau 26a16bf846 ACL para sector,añadido sector al model-config
gitea/salix/pipeline/head This commit looks good Details
2022-09-23 13:53:33 +02:00
Joan Sanchez 664fd444cc Sample refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-22 15:44:35 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Vicent Llopis a330e9d64a refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 12:02:04 +02:00
Vicent Llopis 6367f1ef05 refator: delete sensitive info
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 11:46:55 +02:00
Vicent Llopis afeed9757c refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 10:39:59 +02:00
Vicent Llopis a695468bb7 refator: deleted sensitive information
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 10:32:37 +02:00
Vicent Llopis cfe5c66fe4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4155-close_tickets
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 09:23:56 +02:00
Vicent Llopis 28bf7bd747 feat: check general status 'open' to close ticket
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 08:34:42 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Vicent Llopis 1fd97f167c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 11:35:15 +02:00
Alex Moreno 43df1e7e10 refactor(boxing): refactor getVideo
gitea/salix/pipeline/head This commit looks good Details
2022-09-05 12:06:14 +02:00
Alex Moreno 4a058faaf8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing 2022-09-05 08:12:07 +02:00
Javi Gallego 9fe32788fc regularizado
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Joan Sanchez 6b6d00cf95 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:23:28 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Alex Moreno 062806b3f0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 13:19:43 +02:00
Joan Sanchez 69ca28ae14 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-08-05 11:42:36 +02:00
Joan Sanchez cabc30ef87 Merge pull request '3069-client.shelving' (#1029) from 3069-client.shelving into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1029
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-08-05 09:18:53 +00:00
Vicent Llopis a82bc7a8e8 delete: old versions of db changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-08-04 13:55:30 +02:00
Joan Sanchez 1b9de5cc95 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-08-03 08:44:43 +02:00
Joan Sanchez 185ce60bef Merge pull request '1781-zoneHoliday' (#994) from 1781-zoneHoliday into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #994
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2022-08-03 06:41:22 +00:00
Alex Moreno 8a08b6f399 feat(ticket_boxing): return video stream
gitea/salix/pipeline/head This commit looks good Details
2022-08-02 15:15:05 +02:00
Alex Moreno 7d4dd7bb52 feat(boxing): return stream video
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 15:03:17 +02:00
Alex Moreno d040ecb743 feat(ticket): getVideo from shinobi
gitea/salix/pipeline/head This commit looks good Details
2022-08-01 07:59:04 +02:00
Vicent Llopis 537c383cd2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4291-delete_it.warehouseFk
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 13:38:23 +02:00
Vicent Llopis cd78afb539 fix: db changes
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 12:03:59 +02:00
Vicent Llopis 538c04e8c5 feat: db connection and query
gitea/salix/pipeline/head This commit looks good Details
2022-07-29 11:59:03 +02:00
Joan Sanchez 468da0c5a9 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-07-27 08:12:06 +02:00
Joan Sanchez 882c4cc3d7 fix(insurance): force script execution
gitea/salix/pipeline/head This commit looks good Details
2022-07-26 13:19:57 +02:00
Vicent Llopis 3fd289ff51 update chat
gitea/salix/pipeline/head Build queued... Details
2022-07-26 13:03:03 +02:00
Alex Moreno 8048d4ce90 feat(notification): basic functionality and test 2022-07-25 08:25:10 +02:00
Alex Moreno f432d64f56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-07-25 07:45:26 +02:00
Carlos Jimenez Ruiz b8183748ce Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head This commit looks good Details
2022-07-22 13:58:52 +00:00
Carlos Jimenez Ruiz f3766edbb7 Merge branch 'dev' into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:56:19 +00:00
Vicent Llopis 7809d9dd7e fix: typo
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-22 13:41:18 +02:00
Vicent Llopis 465a5e4d73 refactor: mo ve folder of sql chagues 2022-07-22 13:12:54 +02:00
Vicent Llopis eccbd942f7 feat: can close a ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 13:11:24 +02:00
Alex Moreno 9b48cbb078 feat(notification): send
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:54:50 +02:00
Vicent Llopis 26f8996936 refactor: set vn-focus and move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-07-20 14:02:15 +02:00
Vicent Llopis 771c86ba4b fix: shelving log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-20 12:40:30 +02:00
Vicent Llopis a0ea3b4c03 delete unnecessary sql
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 14:47:05 +02:00
Vicent Llopis c56ac1c192 feat: add log
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-19 13:35:17 +02:00
Vicent Llopis 2a41c1bb93 update foreign key
gitea/salix/pipeline/head This commit looks good Details
2022-07-19 12:44:55 +02:00
Carlos Jimenez Ruiz bbfab8d0bd Merge branch 'dev' into 4270-route.create
gitea/salix/pipeline/head This commit looks good Details
2022-07-15 12:22:15 +00:00
Carlos Jimenez Ruiz 333828c583 Moved invoiceOut, Ticket and Sales refund loginc to backend + tests
gitea/salix/pipeline/head This commit looks good Details
2022-07-14 13:40:50 +02:00
Vicent Llopis ac344d6edd refactor: add column id PK and updated column code UQ
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-14 09:54:28 +02:00
Vicent Llopis 762ec3045f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3069-client.shelving 2022-07-14 09:11:43 +02:00
Vicent Llopis 7bf9a8c100 delete itemType.warehouseFk
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 11:52:47 +02:00
Vicent Llopis 1eb6ee69cc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-07-12 08:09:02 +02:00
Vicent Llopis d9a12fd203 feat: update commissionWorkCenterFk where is not calculated
gitea/salix/pipeline/head This commit is unstable Details
2022-07-07 07:39:46 +02:00
Vicent Llopis 189d0a27bc refactor: delete unnecessary sql
gitea/salix/pipeline/head This commit is unstable Details
2022-07-05 11:44:03 +02:00
Vicent Llopis 5f2f5b9b25 feat: add sql changes 2022-07-05 10:18:26 +02:00
Vicent Llopis e441c658fd feat: set daysInFuture value
gitea/salix/pipeline/head This commit looks good Details
2022-07-04 08:31:53 +02:00
Vicent Llopis 24159cd3e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4213-item.summary
gitea/salix/pipeline/head Build queued... Details
2022-06-29 14:28:54 +02:00
Vicent Llopis d49a2666f1 refactor: don´t show 'description' if it is empty
gitea/salix/pipeline/head This commit is unstable Details
2022-06-29 14:28:23 +02:00
Carlos Jimenez Ruiz a52748348b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4098-rename_procedures
gitea/salix/pipeline/head This commit is unstable Details
2022-06-28 11:09:24 +02:00
Carlos Jimenez Ruiz 6370471bd5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4223-claim_observations
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 11:01:42 +02:00
Carlos Jimenez Ruiz f1cb5a958c data migration from claim.observation to claimObservations 2022-06-27 11:01:29 +02:00
Vicent Llopis fcf79a507c Merge branch 'dev' into 4213-item.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 05:32:21 +00:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable Details
2022-06-25 15:22:47 +02:00
Joan Sanchez e3cb89b0a6 Moved SQL files from version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-23 15:19:02 +02:00
Vicent Llopis 2c721867fc feat(item.summary): add description
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 14:30:25 +02:00
Joan Sanchez 2a758fd12a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization 2022-06-22 11:38:01 +02:00
Joan Sanchez f7d64e89ab 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-06-22 08:59:06 +02:00
Carlos Jimenez Ruiz e4883afc7c removed deprecated procedures and functions from Account 2022-06-20 13:28:49 +02:00
Alex Moreno e775c67b1b rename
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 09:44:59 +02:00
Alex Moreno fd6b688382 fix(changes): prevent sql errors when test to master
gitea/salix/pipeline/head This commit looks good Details
2022-06-17 09:40:33 +02:00
Carlos Jimenez Ruiz 0f44f072ee refactor(client): added updateUser and setPassword methods to client module 2022-06-16 11:32:42 +02:00
Joan Sanchez 0e89616089 incoterms report refactor
gitea/salix/pipeline/head This commit is unstable Details
2022-06-13 11:03:11 +02:00
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 13:16:27 +02:00
Joan Sanchez 2f082ece34 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 10:18:56 +02:00
Alex Moreno de0f7c98fa Merge branch 'dev' into 3653-clientInsurance
gitea/salix/pipeline/head This commit looks good Details
2022-06-10 05:32:58 +00:00
Vicent Llopis a9badfc1ba feat: add backTest
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 14:59:17 +02:00
Alex Moreno 417c798afd add schema
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 14:52:01 +02:00
Juan Ferrer 86605c3d67 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:18:03 +00:00
Carlos Jimenez Ruiz cd5dba6fcb Merge branch 'dev' into 4040-chat_sendQueued
gitea/salix/pipeline/head This commit is unstable Details
2022-06-09 08:44:22 +00:00
Joan Sanchez 7fe7fb2e8f Replaced fs sync functions
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 10:13:45 +02:00
Alex Moreno 61cc3c19f3 refactor(client): creditInsuarnce change creditClassification for creditClassificationFk
gitea/salix/pipeline/head This commit looks good Details
2022-06-09 07:13:54 +02:00
Carlos Jimenez Ruiz a824da3908 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head This commit looks good Details
2022-06-08 09:17:24 +00:00
Alex Moreno 81f42985e4 sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 15:15:25 +02:00
Joan Sanchez c92f444776 Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 14:59:18 +02:00
Carlos Jimenez Ruiz 27e8c99604 Merge branch 'dev' into 4067-client_detail
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:50:37 +00:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:27:12 +00:00
Joan Sanchez 33e9dacf60 Merge branch 'dev' into 4164-edi_updateData
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 11:07:19 +00:00
Joan Sanchez f77f5cee58 4164 - Endpoint refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-07 13:06:42 +02:00
Vicent Llopis aab484ad41 refactor code
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 10:28:39 +02:00
Vicent Llopis f6028316f4 feat: endpoint sendQueued addded
gitea/salix/pipeline/head This commit looks good Details
2022-06-02 14:55:39 +02:00
Vicent Llopis e9c98a98e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head This commit is unstable Details
2022-06-02 13:38:27 +02:00
Vicent Llopis f7be419bbe refator: updated fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-02 11:52:53 +02:00
Vicent Llopis 7de0fd6634 feat: create table chat
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 13:49:45 +02:00
Joan Sanchez c369453bfc Added model fields
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 13:36:27 +02:00
Joan Sanchez a5e833af2c feat(client): detail section with smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-31 07:56:17 +02:00
Alex Moreno 863977915e fix 2022-05-27 13:27:05 +02:00
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +02:00
Vicent Llopis 456f167513 feat: fix editExclusion mode
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 11:09:03 +02:00
Vicent Llopis 47ef3d0b46 Merge branch '1781-zoneHoliday' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 08:33:47 +02:00
Vicent Llopis bbdaa7de39 feat: add editExclusion mode 2022-05-26 08:33:45 +02:00
Vicent Llopis dbb44e228d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-26 07:47:49 +02:00
Vicent Llopis b5db025106 refactor: move sql to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 07:41:00 +02:00
Alex Moreno 79c42d04f9 feat(mdb): start section
gitea/salix/pipeline/head This commit is unstable Details
2022-05-25 14:59:28 +02:00
Carlos Jimenez Ruiz 402aa567dd Merge branch 'dev' into 4109-duplicated_folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:39:42 +00:00
Vicent Llopis a907354cc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1781-zoneHoliday
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-25 09:03:52 +02:00
Joan Sanchez 0cf8ee3edf Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 15:06:32 +02:00
Alex Moreno 47ab4fc2c1 intro
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:52:26 +02:00
Alex Moreno 7a69d53642 fix(changes): add reference table
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-05-24 14:50:33 +02:00
Vicent Llopis 880f3ce647 refactor: move acl to new folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 14:44:18 +02:00
Carlos Jimenez Ruiz c721d9ae82 Merge branch 'dev' into 4022-client.balance.create
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:43:00 +00:00
Vicent Llopis 9bbdeb2840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-23 12:41:01 +02:00
Vicent Llopis 3c9800a7a3 refactor: pull request changes
gitea/salix/pipeline/head This commit looks good Details
2022-05-20 12:33:12 +02:00
Vicent Llopis 0425b17b4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3905-invoice-out_refund 2022-05-20 11:57:20 +02:00
Vicent Llopis c5683ab880 feat: added itemShelving
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-20 09:17:18 +02:00
Joan Sanchez 6586595976 feat(closure): send incoterms authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-05-19 07:31:00 +02:00
Vicent Llopis eeede417eb feat: update date depending of accountingType
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 12:24:35 +02:00
Vicent Llopis 3335cb8a01 feat(item.itemType): add fields
gitea/salix/pipeline/head This commit looks good Details
2022-05-17 08:32:45 +02:00
Vicent Llopis 7ad56327a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4002-item.itemType 2022-05-17 08:21:49 +02:00
Joan Sanchez bf8e7eed57 Added SQL version 10470
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 11:37:43 +02:00
Joan Sanchez 576cad16ad SQL fixes
gitea/salix/pipeline/head This commit is unstable Details
2022-05-16 11:34:29 +02:00
Carlos Jimenez Ruiz b5ccd32800 Merge branch 'dev' into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:23:08 +00:00
Joan Sanchez c88fe629cd Removed duplicated version
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 08:21:12 +02:00
Vicent Llopis 10cd9c5b87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3893-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:16 +02:00
Vicent Llopis 40bcc56758 refactor: change acl
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 07:22:01 +02:00
Vicent Llopis ab13c16948 feat: add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-16 07:17:29 +02:00
Joan Sanchez 9cbee7a38a Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 13:05:08 +00:00
Joan Sanchez 913b76880a Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head This commit looks good Details
2022-05-13 12:59:30 +00:00
Vicent Llopis b96d9ea4c2 feat(zone.events): add dialog
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-12 13:53:13 +02:00
Javi Gallego 0d63f3c3af Merge branch 'dev' into 3851-dms_delete
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 11:13:34 +02:00
Alex Moreno 7f46d4e50a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3409-clientCredit_maxRows
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 08:06:39 +02:00
Vicent Llopis 13a6f1f8c1 feat(item): add section itemType
gitea/salix/pipeline/head This commit looks good Details
2022-05-11 14:47:54 +02:00
Joan Sanchez d39147689d Merge branch 'dev' into 3771-ticket.expedition
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:47:33 +00:00
Joan Sanchez afe4f0ba94 Merge branch 'dev' into 3977-invoiceIn.tax
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-11 12:46:39 +00:00
Carlos Jimenez Ruiz 86ee110b78 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:55:00 +00:00
Joan Sanchez e0c0663e41 Renamed folder
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 14:21:41 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00:00
Joan Sanchez d9c8ed96e4 Added SQL version
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 09:46:56 +02:00
Vicent Llopis a6b8674302 feat(invoiceIn.tax): add button for create an expence
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-09 14:34:20 +02:00
Alex Moreno 55574919d2 rename 2022-05-09 13:19:34 +02:00
Vicent Llopis 66685e7541 feat(ticket.expedition): add popover
gitea/salix/pipeline/head There was a failure building this commit Details
2022-05-04 10:35:31 +02:00
Javi Gallego 6584a29ce5 create deleteTrashFiles
gitea/salix/pipeline/head This commit looks good Details
2022-05-03 11:16:56 +02:00
Alex Moreno b40b8d931d feat(client_credit): remove de old rows
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 11:18:39 +02:00
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Joan Sanchez fea7df269c Added invoice schedule method
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 14:59:29 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:14:33 +02:00
Vicent Llopis 39f4c4a6e8 feat: updated backTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:36:05 +02:00
Vicent Llopis 76ff6330f9 feat(supllier.summary): add two fields
gitea/salix/pipeline/head This commit looks good Details
2022-04-25 12:23:03 +02:00
Vicent Llopis 4ffb61b75c refactor: refund 2022-04-22 11:45:14 +02:00
Vicent Llopis d1bd2f9c77 refactor: refund
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 14:59:41 +02:00
Carlos Jimenez Ruiz 8efcb6233f feat(user): added userConfig.darkMode relation towards account.user
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 10:25:01 +02:00
Carlos Jimenez Ruiz 9085098a04 Merge branch 'dev' into 3830-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:19:50 +00:00
Vicent Llopis a47349646f change versions db
gitea/salix/pipeline/head This commit looks good Details
2022-04-13 09:50:29 +02:00