Commit Graph

1089 Commits

Author SHA1 Message Date
Alexandre Riera 5cdec35ed4 refs #5513 addFromPackaging.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 14:30:10 +02:00
Alex Moreno a1521f5220 Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:39:39 +00:00
Alex Moreno 4a7902ae4d Merge branch 'dev' into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head This commit looks good Details
2023-05-02 08:41:18 +00:00
Alex Moreno ac55dc4cc7 refs #5297 feat(worker_new): add payMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 14:17:19 +02:00
Pablo Natek 8651898a1f Merge branch 'dev' into 5153-worker-sin-tr
gitea/salix/pipeline/head This commit looks good Details
2023-04-28 08:36:47 +00:00
Alex Moreno 42e3c8f29d refs #5488 fix(): use hasWriteRole
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-28 09:35:15 +02:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Carlos Satorres 57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-04-26 09:03:37 +02:00
Alex Moreno 73153071d6 Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 05:56:46 +00:00
Pablo Natek e8ce8e42fd refs #5153
gitea/salix/pipeline/head This commit looks good Details
2023-04-25 14:25:22 +02:00
Alex Moreno 294bf2b8a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-04-21 13:30:34 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alexandre Riera aecde484f4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 07:52:05 +02:00
Alex Moreno 39333a9119 refs #5488 replace hasRole for checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-19 15:23:32 +02:00
Alex Moreno c1d4281b1b refs #5488 replace hasWriteRole, hasReadRole
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 13:59:26 +02:00
Carlos Satorres f76727903a update insert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 15:17:05 +02:00
Alexandre Riera 0dcbc9fc8b refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 10:46:26 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Alex Moreno 0bfdbcb750 refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good Details
2023-04-17 08:44:24 +02:00
Juan Ferrer add3a8b1fa merge with dev 2023-04-15 01:49:23 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02: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 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 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
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
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
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 cbe79a964c refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 10:31:02 +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
Alexandre Riera 3fcfc3d640 refs #5056 adding fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 07:53:26 +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
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
Vicent Llopis 46a6a5fc63 refs #5203 refactor: se le pasan los argumentos directamente y se corrige la transaccion
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 08:51:30 +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
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
Alexandre Riera 387576d63a Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head This commit looks good Details
2023-03-16 06:42:39 +00: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
Alexandre Riera 53bca1e8a3 refs #5056 added fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:36:10 +01:00
Vicent Llopis c51e542235 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 13:43:59 +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 67f9cae2f2 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-14 09:04:45 +01:00
Joan Sanchez 6cc7017475 Merge branch 'dev' into 4856-worker.time-control
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:22:36 +00:00
Alexandre Riera 0cac62da76 Merge branch 'dev' into 5036-regularizar-historicos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 09:02:54 +00:00
Carlos Satorres a48c67aab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-03-09 14:09:37 +01:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Vicent Llopis b85624085a fix backTest: add columns to table tpvTransaction
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:24:21 +01:00
Vicent Llopis 165dc73b33 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 12:22:29 +01:00
Alexandre Riera 9dd242908e .
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 11:43:47 +01:00
Vicent Llopis 78721e7ffa feat: add fixtures 2023-03-08 09:50:47 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1370
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-03-07 08:28:13 +00: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
Vicent Llopis 4830f8489a remove unnecessary fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:12:08 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
gitea/salix/pipeline/head This commit looks good Details
Refs: #5340
2023-03-06 12:37:37 +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
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
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
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
Alexandre Riera 915c598c0c fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 09:04:53 +01:00
Alexandre Riera 2e09845dbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5149-check-ticket.refund
gitea/salix/pipeline/head Build queued... Details
2023-03-01 08:29:58 +01:00
Alexandre Riera 6eab4bbe94 refs #5149 fixing tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 08:15:58 +01:00
Alexandre Riera b2bf7f2727 refs #5149 fixing e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-28 14:29:31 +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
Carlos Andrés ffdfd1a7e5 refs #5000 Invoicing change structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-23 14:48:21 +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 f88c9b904c Updated fixtures 2023-02-21 10:38:23 +01:00
Joan Sanchez c9840f6985 Updated entry structure 2023-02-21 08:32:46 +01:00
Joan Sanchez a04c8ed8d8 Updated structure
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-21 08:17:52 +01:00
Joan Sanchez 0a7b3647b8 Updated fixtures 2023-02-21 07:57:35 +01:00
Joan Sanchez 39527cbc50 Updated structure & data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-20 14:46:38 +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
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
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 7194e62cae refs #4588 faked observationEditorFk in structure
gitea/salix/pipeline/head Build queued... Details
2023-02-14 13:28:21 +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 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +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
Javi Gallego 4a562c3110 unificado todo a claimState isEditable 2023-02-07 15:40:03 +01:00
Vicent Llopis cec7602e1b 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-07 13:44:53 +01:00
Vicent Llopis 4f76465246 fix: no recarga cada vez
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:24:26 +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
Alex Moreno 03d7a2908b refactor: only mock vn.time from 2000 to 2002
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 11:25:14 +01:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:52:40 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +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
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 a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Joan Sanchez 0a0cca0585 Set client bcrypt password
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 09:06:23 +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
Alex Moreno 0a096bc96f fix: updateWorkCenter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-25 15:29:01 +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
Alex Moreno 4a06b8e8a9 fix: import date.js and fix e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 15:16:42 +01:00
Alex Moreno fe656aa125 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 14:10:20 +01:00