7489-testToMaster #2515

Merged
alexm merged 329 commits from 7489-testToMaster into master 2024-05-28 05:30:19 +00:00

329 Commits

Author SHA1 Message Date
Robert Ferrús 1a96b96dd0 Merge pull request 'feat: refs #7296 fixAPPWarehouse' (!2513) from 7296-restoreExpeditionTruck into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2513
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-05-27 12:07:13 +00:00
Robert Ferrús f4426f5863 Merge branch 'test' into 7296-restoreExpeditionTruck
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-27 12:05:49 +00:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Guillermo Bonet d384c5624f refactor: refs #7486 Deleted unused debugAll
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:57:27 +02:00
Guillermo Bonet 086c2291d1 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 13:50:59 +02:00
Juan Ferrer ab879df00f fix(Jenkinsfile): refs #7442 Remove unused variable
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 12:55:36 +02:00
Juan Ferrer 52e9c66271 fix: refs #7442 Fix kubernetes deploy
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 09:39:51 +02:00
Juan Ferrer a18df86abd fix: refs #7442 Fix kubernetes deploy
gitea/salix/pipeline/head This commit looks good Details
2024-05-27 09:37:17 +02:00
Juan Ferrer 5d83409892 feat: refs #7442 Kubernetes deploy
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-27 09:31:42 +02:00
Carlos Andrés 14f243f251 Merge pull request 'fix: refs #7400 ledger_next' (!2495) from 7400-warmfix-ledger into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2495
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-23 14:03:22 +00:00
Carlos Andrés 8b967ee927 Merge pull request 'fix: problems in colums ticket and sale refs #7213' (!2497) from 7213-Problems-in-colums-ticket-and-sale into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2497
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-23 10:53:15 +00:00
Pablo Natek a919c71369 Merge pull request 'feat: refs #7187 Add support for multiple PDAs per user' (!2496) from 7187-add-traducctions into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2496
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-23 10:24:53 +00:00
Pablo Natek 86a6211cd8 fix: refs #7187 fix duplicate
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-23 12:23:31 +02:00
Carlos Andrés bc6af32962 fix: problems in colums ticket and sale refs #7213
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-22 14:50:45 +02:00
Pablo Natek 2142b78deb feat: refs #7187 Add support for multiple PDAs per user
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 19:25:18 +02:00
Jorge Penadés 365e5a3ba3 fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 17:31:29 +02:00
Guillermo Bonet 6e06891937 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:26 +02:00
Alex Moreno 5dd1d1f1b6 Merge pull request '7430_devToTest' (!2490) from 7430_devToTest into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2490
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-21 09:15:02 +00:00
Pablo Natek 9a762d2fd4 Merge pull request '7187-redirect' (!2476) from 7187-redirect into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2476
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-21 08:23:03 +00:00
Pablo Natek b39f953898 Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 08:21:40 +00:00
Guillermo Bonet 35e892a90c refs #7422 Fix
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 10:07:51 +02:00
Alex Moreno e1ab0d3051 Merge pull request 'refs #7431 feat: itemPlacementSupplyStockGetTargetList' (!2488) from 7431_itemPlacements into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2488
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-21 07:53:05 +00:00
Alex Moreno f803f5a57d Merge branch 'dev' into 7431_itemPlacements
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 07:49:00 +00:00
Guillermo Bonet 6f9826421d refactor: refs #7422 Fix e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 09:39:09 +02:00
Sergio De la torre 6dad3d8af4 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 09:37:29 +02:00
Pablo Natek 8e5d12a6cb Merge branch 'dev' into 7187-redirect
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 07:18:06 +00:00
Sergio De la torre cb866b4ab7 refs #7431 feat: itemPlacementSupplyStockGetTargetList
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 09:16:47 +02:00
Pablo Natek 6438ce3a16 fix: refs #7187 e2e
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 09:13:31 +02:00
Pablo Natek 1fef00789f fix: refs #7187 remove bindings
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-21 08:54:53 +02:00
Guillermo Bonet c4b8cef4f8 refactor: refs #7422 Deleted column of Compres
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:17:37 +02:00
Guillermo Bonet 030106f06d refactor: refs #7422 Deprecated column
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:13:06 +02:00
Guillermo Bonet b33d4ce319 Merge pull request 'refactor: refs #7375 Refactor clientsDisable' (!2471) from 7375-clientsDisable into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2471
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-21 06:11:24 +00:00
Guillermo Bonet ac2ed0956b refs #7422 Fixed all problems
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 08:04:28 +02:00
Guillermo Bonet 81c220d130 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:58:53 +02:00
Guillermo Bonet cbf9a4c4e9 refs #7422 Fixed all problems 2024-05-21 07:58:51 +02:00
Pako Natek 0496c90d86 Merge pull request 'casting values' (!2479) from 7420-supplierPackaging_ReportSource into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2479
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-21 05:52:34 +00:00
Pako Natek f947b44da1 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 05:51:15 +00:00
Guillermo Bonet 93314d67b6 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:31:24 +02:00
Guillermo Bonet cc2b5764e9 refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:26:54 +02:00
Guillermo Bonet 82d985ff3a refs #7422 Fix
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-21 07:19:04 +02:00
Guillermo Bonet 8563116091 Merge pull request 'refactor: refs #7422 Deleted tables' (!2478) from 7422-byeVn2008Tables into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2478
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-21 05:06:12 +00:00
Pablo Natek 335b9caaa4 fix: refs #7187 got summary before lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-21 01:10:53 +02:00
Pablo Natek 38b1e48959 Merge pull request 'feat: refs #6021 add new column' (!2485) from 6021-createObservations into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2485
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-20 12:27:48 +00:00
Alex Moreno 6212974154 Merge pull request 'feat: refs #7296 roadmapStop' (!2461) from 7296-expeditionTruckToRoadmapStop into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2461
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-20 12:24:21 +00:00
Pablo Natek dab8ae92ef Merge pull request 'fix: refs #6404 fix cancel shipment' (!2486) from 6404-mrwIntegrationWebService into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2486
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 12:02:48 +00:00
Pablo Natek 3fa557f90d fix: refs #6404 create shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:58:32 +02:00
Robert Ferrús 823e8fd7a1 feat: refs #7296 requested changes3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:27:38 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:19:01 +02:00
Robert Ferrús 996f14341d Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:31:13 +00:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:28:27 +02:00
Pablo Natek 143f9cf0bb fix: refs #6404 fix return
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:17:10 +02:00
Pablo Natek d51c9fc120 fix: refs #6404 fix cancel shipment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:14:59 +02:00
Pablo Natek b203d94b27 feat: refs #6021 add new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 11:37:40 +02:00
Alex Moreno 9cba2be00d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:31:24 +02:00
Alex Moreno f361a07dd5 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:31:03 +02:00
Carlos Satorres 2291c3ca86 Merge pull request 'master' (!2483) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2483
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 09:24:14 +00:00
Pako Natek abdacb3627 casting values
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 10:33:01 +02:00
Pako Natek 44ce998604 Merge pull request 'improved proc' (!2477) from 7420-supplierPackaging_ReportSource into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2477
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-20 08:22:39 +00:00
Pako Natek f1ae4d9f29 Merge branch 'dev' into 7420-supplierPackaging_ReportSource
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:21:25 +00:00
Guillermo Bonet 7f0f1b9547 refactor: refs #7422 Deleted tables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 09:54:30 +02:00
Robert Ferrús e67981b382 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 06:44:31 +00:00
Carlos Satorres cbbd488674 Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 06:27:33 +00:00
Pako Natek 9a5acedd38 improved proc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 08:21:54 +02:00
Guillermo Bonet 9d98ae4a03 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 07:02:00 +02:00
Guillermo Bonet 18ce388944 Merge branch 'test' into dev 2024-05-20 06:59:42 +02:00
Guillermo Bonet 329299d4d9 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 06:58:22 +02:00
Sergio De la torre a24c289f63 Merge pull request 'feat: conversion art. A1 a A2 refs #4979' (!2171) from 4979-Conversión-automática-de-producto-A1-a-A2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2171
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-17 15:24:26 +00:00
Sergio De la torre df08f7a8de Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 15:10:26 +00:00
Sergio De la torre c822a64dc7 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 16:38:11 +02:00
Carlos Satorres 05f09d0b87 refs #7187 fix workerPda
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:56:40 +02:00
Pablo Natek 7fb6ecd617 feat: refs #7187 redirect to lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:46:49 +02:00
Carlos Satorres dd7ee27e9b refs #7396 fix worker model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:28:28 +02:00
Pablo Natek 2b0ab1816f Merge pull request '#7187 add pda freelancers' (!2298) from 7187-addPdaFreelancers into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev Build started... Details
Reviewed-on: #2298
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-17 11:35:18 +00:00
Pablo Natek 4790ae94d1 Merge branch 'dev' into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:33:57 +00:00
Alex Moreno 44c4432c67 Merge pull request 'feat: refs #6428 auto-changelog with bash' (!2338) from 6428-auto-changeLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2338
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-17 11:13:54 +00:00
Carlos Andrés 6a576e69e1 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:50:51 +02:00
Carlos Andrés c8db0a3aa8 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-17 12:48:16 +02:00
Guillermo Bonet 0b5f05cbed refactor: refs #7375 Refactor clientsDisable
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 12:36:54 +02:00
Sergio De la torre 135526e513 refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 11:20:26 +02:00
Robert Ferrús 958f91ca93 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 08:39:43 +00:00
Guillermo Bonet 1154e484e5 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 09:57:35 +02:00
Guillermo Bonet 91784f2253 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 09:57:19 +02:00
Carlos Satorres 481ecfa079 Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 07:01:45 +00:00
Guillermo Bonet bddc9a8386 Deleted insert into util.debug (deletedState)
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 07:51:51 +02:00
Sergio De la torre 27110c2abe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 06:27:09 +02:00
Carlos Andrés 08ea0d2693 Merge pull request 'refs #7400 feat: book ledger with counters' (!2467) from 7400-Contador-para-los-asientos-contables into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2467
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 18:13:39 +00:00
Carlos Andrés dab90633db Merge pull request 'test' (!2466) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2466
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 17:21:54 +00:00
Carlos Andrés 8d8cfa24de refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 19:16:25 +02:00
Carlos Andrés 38c505fb7a refs #7400 feat: book ledger with counters
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 19:07:48 +02:00
Carlos Andrés 01d1a2391d refs #7400 feat: book ledger with counters 2024-05-16 18:48:59 +02:00
Carlos Andrés 402506467b Merge pull request 'master' (!2464) from master into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2464
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 14:56:56 +00:00
Pablo Natek 1372f817bd fix: refs #7187 model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:05:22 +02:00
Pablo Natek b299e842b9 fix: refs #7187 model foreignKey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:04:21 +02:00
Pablo Natek 4cf5457690 fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:01:41 +02:00
Pablo Natek 1abacdc42b fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 14:00:42 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Ivan Mas 9b5b269fe6 Merge pull request 'refs #6965 Add Fk vehicleFk firstEditorFk' (!2433) from 6965-AddFkRoute-vehicleFk-firstEditorFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2433
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-16 11:41:31 +00:00
Ivan Mas 10d812ae3d Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 11:34:18 +00:00
Ivan Mas 993dd0d8bd refs #6965 Modify firstEditorFk NULL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 13:15:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-16 10:20:08 +02:00
Guillermo Bonet 115d1aaf85 Fix version
gitea/salix/pipeline/head This commit looks good Details
2024-05-16 08:10:53 +02:00
Sergio De la torre 9b73cdfa6f refs #4979 feat:getInfoDetails && item_devalueA2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 17:03:33 +02:00
Guillermo Bonet 7e3861a02f Merge branch 'test' into dev
gitea/salix/pipeline/head Build queued... Details
2024-05-15 14:32:48 +02:00
Guillermo Bonet c443872d1f Merge pull request 'feat: refs #7264 Refactor proc itemShelvingRadar and added columns' (!2460) from 7264-itemShelvingRadar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2460
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-05-15 12:18:10 +00:00
Guillermo Bonet dfe317e78a Merge branch '7264-itemShelvingRadar' of https://gitea.verdnatura.es/verdnatura/salix into 7264-itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 14:05:36 +02:00
Guillermo Bonet 9134e0ff65 feat: refs #7264 Minor change 2024-05-15 14:05:35 +02:00
Guillermo Bonet ac2a0c5151 Merge branch 'dev' into 7264-itemShelvingRadar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:54:55 +00:00
Guillermo Bonet 53fa78894c feat: refs #7264 Refactor proc itemShelvingRadar and added columns
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:54:22 +02:00
Alex Moreno 8260016da5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:53:07 +02:00
Ivan Mas c15f9b13f2 Merge branch 'dev' into 6965-AddFkRoute-vehicleFk-firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:17:11 +00:00
Ivan Mas 9ed90412de refs #6965 Points to user instead of worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 13:15:27 +02:00
Sergio De la torre 9288f08b91 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 11:30:05 +02:00
Robert Ferrús 23eea27268 Merge pull request 'feat: refs #7296 expeditionTruck to roadmapStop' (!2386) from 7296-expeditionTruck into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2386
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-15 09:06:47 +00:00
Robert Ferrús 1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 08:22:00 +00:00
Guillermo Bonet 778f368300 Merge pull request 'refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk' (!2429) from 7252-deliveryNoteFarmingFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2429
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-15 08:19:34 +00:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Javi Gallego 0894cbd38c Merge pull request 'feat: #7333 ticket with refund' (!2422) from 7333-ClaimRefund into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2422
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-14 13:45:11 +00:00
Pako Natek 5fd2ef3cff Merge pull request 'done' (!2432) from 7362-VIP into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2432
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-14 10:52:11 +00:00
Pako Natek 0adf6bfc45 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 10:50:59 +00:00
Carlos Andrés 4254fac6c2 Merge pull request '7213-Pasar-problemas-a-columnas-calculadas' (!2396) from 7213-Pasar-problemas-a-columnas-calculadas into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2396
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-14 09:35:51 +00:00
Alex Moreno d487d13cdb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 11:26:11 +02:00
Robert Ferrús 6ae48790f3 Merge pull request 'feat: refs #7039 country' (!2361) from 7039-country-country into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2361
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-14 08:12:13 +00:00
Pako Natek 53f49531b7 VIP now is Vip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 09:07:43 +02:00
Robert Ferrús eeb36a6810 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 06:32:45 +00:00
Carlos Satorres ebcf8e2927 refs #6428 change file
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 08:30:22 +02:00
Alex Moreno 3798509206 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-14 07:51:04 +02:00
Robert Ferrús c6f7a0768a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 05:49:39 +00:00
Robert Ferrús b0da193b4a feat: refs #7039 añadir colum virtual country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-14 07:48:03 +02:00
Carlos Satorres a8299383b9 refs #6428 remove sh
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 16:28:29 +02:00
Jorge Penadés b13c7c0db6 Merge pull request '#5919 createLocker' (!2446) from 5919-createLocker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2446
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-13 13:10:39 +00:00
Jorge Penadés 45082f532f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-createLocker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 15:05:27 +02:00
Carlos Andrés 3ce43909e2 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 14:21:01 +02:00
Guillermo Bonet bd6ddd681d Merge pull request 'refactor: refs #7373 Deleted proc packageInvoicing' (!2444) from 7373-packageInvoicing_bye into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2444
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 12:16:51 +00:00
Jorge Penadés b902a1a7f7 Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:02:17 +00:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Carlos Satorres 585a0c68a8 Merge pull request 'refs #7360 fix error weekly' (!2431) from 7360-errorWeeklyHourEmail into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2431
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-13 12:00:18 +00:00
Guillermo Bonet 6c325fccef refactor: refs #7373 Deleted proc packageInvoicing
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:41:47 +02:00
Carlos Andrés f89ca786df eat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 13:31:58 +02:00
Jorge Penadés 5d5f1ef7c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 13:20:32 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Robert Ferrús 5e3fa1be8b Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:33:37 +00:00
Carlos Andrés b1af625937 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:32:46 +02:00
Carlos Satorres ac4cc1506b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7360-errorWeeklyHourEmail
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 12:18:03 +02:00
Guillermo Bonet 799108f041 fix: refs #7345 Fixed e2e
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 11:23:29 +02:00
Carlos Andrés 057121582e feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 10:06:00 +02:00
Carlos Andrés 6d3f00ec95 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 09:54:27 +02:00
Jorge Penadés 29e3f934af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 09:35:08 +02:00
Alex Moreno 6ac664a139 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-05-13 09:06:57 +02:00
Jorge Penadés 562aefecdd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-13 08:56:54 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02:00
Robert Ferrús c706f1cc2b Merge pull request 'feat: refs #7363 item_getBalance saleTracking no mostrar duplicados' (!2438) from 7363-item_getBalance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2438
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 05:05:37 +00:00
Robert Ferrús 56906963de Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-13 05:03:45 +00:00
Jorge Penadés cbb7cb18eb fix: refs #5919 delete locker field 2024-05-10 16:02:50 +02:00
Ivan Mas dfa2d67642 Merge pull request 'refs #7342 Modify decimal item plastic' (!2440) from 7342-IntToDec-Item-Plastic into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2440
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-10 13:50:51 +00:00
Ivan Mas 473f261cf1 refs #7342 Modify decimal item plastic
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 14:11:29 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés 1996a00af1 feat: refs #5919 drop version 2024-05-10 13:31:21 +02:00
Robert Ferrús 32b339ffdf Merge branch 'dev' into 7363-item_getBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:13:09 +00:00
Robert Ferrús e7df3fefc6 feat: refs #7363
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 13:11:41 +02:00
Robert Ferrús 9163d3db74 feat: refs #7363 changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 13:05:44 +02:00
Jorge Penadés 8876a7ea8f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 13:05:22 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Guillermo Bonet ba72408e84 refactor: refs #7345 Deprecated isFarmer__
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 12:45:53 +02:00
Guillermo Bonet 365c3fe588 Merge pull request 'refactor: refs #7345 Renamed column of invoiceInConfig' (!2437) from 7345-byeIsFarmer into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2437
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-10 10:04:25 +00:00
Robert Ferrús cb9cacc1ea feat: refs #7363 item_getBalance saleTracking no mostrar duplicados
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-10 11:51:54 +02:00
Guillermo Bonet 6b7a529b55 refactor: refs #7345 Renamed column of invoiceInConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 11:39:14 +02:00
Robert Ferrús 35f69b8692 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 07:21:05 +00:00
Jorge Penadés 4e7d0e6469 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-10 08:28:06 +02:00
Robert Ferrús b03fe4e6d3 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:23:07 +00:00
Pako Natek c048389412 Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-10 05:13:35 +00:00
Jon Elias 6207d79244 Merge pull request 'feat: refs #6739 transferInvoice new functionality' (!2412) from 6739-transferInvoiceOut into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2412
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-10 04:51:41 +00:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Guillermo Bonet f4229284fa Merge branch 'dev' into 7252-deliveryNoteFarmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:56:05 +00:00
Carlos Andrés cc941de606 feat: conversion art. A1 a A2 refs #4979
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 14:24:20 +02:00
Ivan Mas b060048d5d Merge pull request 'refs #7161 feat:setVisibleDiscard by itemTrash' (!2424) from 7161-deleteItemTrash into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2424
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-09 11:43:18 +00:00
Ivan Mas 9d1dc6b483 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 11:41:04 +00:00
Guillermo Bonet 9c5b46b3e2 Merge pull request 'feat: refs #7247 clientSupplier_add' (!2346) from 7247-monacoVies into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2346
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 11:30:28 +00:00
Carlos Satorres fcd1b5e351 Merge pull request 'refs #6877 add attenderFk' (!2427) from 6877-modPeticionesCompra into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2427
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-09 10:53:10 +00:00
Robert Ferrús 0498b425b3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 10:51:18 +00:00
Jorge Penadés 03a8dafe47 Merge pull request '#6202 myt watcher' (!2377) from 6202-mytWatcher into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2377
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-09 10:50:57 +00:00
Jorge Penadés 035782414f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:47:25 +02:00
Jorge Penadés 1450a680ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:45:33 +02:00
Ivan Mas 9d7184ed7b refs #6965 Add Fk vehicleFk firstEditorFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:35:26 +02:00
Jorge Penadés 2c826ed838 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 12:14:43 +02:00
Jorge Penadés bf0db89286 refactor: refs #6202 remove blanks
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 12:02:44 +02:00
Jorge Penadés 74399d5ab6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6202-mytWatcher 2024-05-09 11:56:48 +02:00
Pako Natek 2203ac478b Merge branch 'dev' into 7362-VIP
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:56:41 +00:00
Pako Natek 42d17aa7f5 done
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 11:52:25 +02:00
Guillermo Bonet faf2d51a43 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-09 11:36:15 +02:00
Carlos Satorres 0f52fe65d3 refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 09:46:40 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Jon Elias b9e53df218 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 06:06:40 +00:00
Jon Elias 620dd3d836 Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 08:05:24 +02:00
Jon Elias 58aedf160b refactor: refs #6739 changed translations' keys 2024-05-09 08:05:23 +02:00
Javi Gallego abd692cbd3 Merge pull request 'fix: #7344 getSupplierDebt agrupa por pago' (!2426) from 7344-getSupplierDebt into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2426
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 05:49:28 +00:00
Robert Ferrús 7ccd219629 Merge pull request 'feat: refs #7291 sale_getProblems' (!2382) from 7291-sale_getProblems into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2382
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-09 05:35:37 +00:00
Robert Ferrús 833994bd27 Merge branch 'dev' into 7291-sale_getProblems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 05:23:33 +00:00
Robert Ferrús ec89e93adc Merge pull request 'feat: refs #182001 packaging' (!2420) from 182001-packaging into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2420
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 05:20:12 +00:00
Robert Ferrús e02dfc0456 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-09 05:18:08 +00:00
Carlos Andrés d6451a94e3 feat: conversion art. A1 a A2 refs #4979
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 17:38:52 +02:00
Carlos Andrés 710841ba4a Merge branch 'dev' into 4979-Conversión-automática-de-producto-A1-a-A2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 16:31:25 +02:00
Guillermo Bonet c4a66b42bb feat: refs #7247 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:56:51 +02:00
Guillermo Bonet 3a7d93759c Merge branch 'dev' into 7247-monacoVies
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:52:32 +00:00
Guillermo Bonet 1a375c0e88 refactor: refs #7252 Deprecated vn.deliveryNote.farmingFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:45:37 +02:00
Jon Elias 0f973baa65 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:31:32 +00:00
Jon Elias 77c2f61f47 refs #6739 move petitions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 14:30:20 +02:00
Jon Elias 72da046ead Merge branch '6739-transferInvoiceOut' of https://gitea.verdnatura.es/verdnatura/salix into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 14:12:11 +02:00
Jon Elias 9d75ba0bc5 refactor: refs #6739 default params 2024-05-08 14:12:10 +02:00
Guillermo Bonet feb36eb911 Merge pull request 'refactor: refs #6230 Revoke item: `size`, longName, name' (!2428) from 6230-revoke into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2428
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
2024-05-08 12:00:25 +00:00
Guillermo Bonet 162c78e392 Merge branch '6230-revoke' of https://gitea.verdnatura.es/verdnatura/salix into 6230-revoke
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:59:38 +02:00
Guillermo Bonet 7d92b514c5 refactor: refs #6230 Revoke item: `size`, longName, name 2024-05-08 13:59:37 +02:00
Guillermo Bonet a90e83e9e0 Merge branch 'dev' into 6230-revoke
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 11:56:31 +00:00
Guillermo Bonet f86d1ded72 Merge pull request 'feat: refs #7335 Added call ticket_afterUpdate' (!2415) from 7335-modifyCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2415
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-08 11:54:02 +00:00
Guillermo Bonet 53b58104c7 refactor: refs #6230 Revoke item: `size`, longName, name
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 13:52:52 +02:00
Sergio De la torre f7e6901ef6 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 11:32:00 +00:00
Carlos Satorres 0d43d9a982 refs #6877 remove restriction
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 13:20:45 +02:00
Guillermo Bonet 4df13d900a Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:55:47 +00:00
Guillermo Bonet 82ac54f0b3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 12:52:02 +02:00
Sergio De la torre 0d42b32611 Merge branch 'dev' into 7161-deleteItemTrash
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 10:47:22 +00:00
Robert Ferrús 50157c932e Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:42:54 +00:00
Carlos Satorres f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:27:20 +00:00
Robert Ferrús cc89100d08 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:26:53 +00:00
Carlos Satorres 7b298c1baf refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:24:05 +02:00
Carlos Satorres fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:21:19 +00:00
Carlos Satorres 8a7d124066 refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-08 12:17:44 +02:00
Carlos Satorres 0709a64dca refs #6882 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 12:05:47 +02:00
Carlos Satorres 269c42e5c9 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 11:47:06 +02:00
Carlos Satorres c355595384 refs #6882 fix back, tback te2e 2024-05-08 11:47:04 +02:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Javi Gallego 393d57f078 fix: #7344 getSupplierDebt agrupa por pago
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 10:51:35 +02:00
Robert Ferrús 2866f231b8 Merge branch 'dev' into 182001-packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:41:38 +00:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Guillermo Bonet 16e7fb9662 Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:29:00 +00:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Guillermo Bonet 71f66085f6 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-08 09:50:52 +02:00
Sergio De la torre 9a235838d8 refs #7161 feat:setVisibleDiscard by itemTrash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 09:04:08 +02:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Guillermo Bonet 6cde2e8170 fix: refs #6585 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:08 +02:00
Javi Gallego 8e1c84ec4b feat: #7333 ticket with refund
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 15:33:18 +02:00
Carlos Satorres 371df19194 Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-07 14:59:25 +02:00
Carlos Satorres 3eba4a1f69 refs #6882 fix sql 2024-05-07 14:59:23 +02:00
Robert Ferrús e5ba6a8673 Merge pull request 'feat: refs #179881' (!2421) from 179881-deleteProcedureFv_pca into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2421
Reviewed-by: Juanjo Breso <jbreso@verdnatura.es>
2024-05-07 12:39:51 +00:00
Robert Ferrús 43c742938c feat: refs #179881
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:37:24 +02:00
Robert Ferrús f70f2949ec feat: refs #182001
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:30:38 +02:00
Robert Ferrús f529a7f5b4 feat : refs #182001
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:25:26 +02:00
Robert Ferrús 6c6ae412bd feat: refs #182001 packaging
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 14:19:11 +02:00
Carlos Satorres 5e8e09cbae refs #6877 add attenderFk
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:42:58 +02:00
Guillermo Bonet 0e8d2af741 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 13:19:18 +02:00
Guillermo Bonet 832db8901e Merge branch '7335-modifyCmr' of https://gitea.verdnatura.es/verdnatura/salix into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 13:03:51 +02:00
Guillermo Bonet 2adf96cb37 refactor: #6585 Deleted transaction ticket_doCmr 2024-05-07 13:03:50 +02:00
Guillermo Bonet 45f7412b35 Merge branch 'dev' into 7335-modifyCmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 10:36:28 +00:00
Jon Elias 5e96049e65 Merge branch 'dev' into 6739-transferInvoiceOut
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 09:36:26 +00:00
Jon Elias d4f734455d refactor: refs #6739 transferInvoice() refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 11:35:05 +02:00
Carlos Satorres 19c729d5fd Merge branch 'dev' into 6842-errorCalendar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 06:55:05 +00:00
Alex Moreno 545f90c8b6 deploy: init version 2422
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 08:36:29 +02:00
Guillermo Bonet e44568ff4b feat: refs #6585 Added call ticket_afterUpdate
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 08:00:26 +02:00
Robert Ferrús 1610b9bd0a Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 05:11:02 +00:00
Jon Elias 4e78307a8d feat: refs #6739 transferInvoice new functionality
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 14:51:53 +02:00
Robert Ferrús 1eb75599d8 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 09:38:14 +00:00
Robert Ferrús b57be129e3 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:27:21 +00:00
Carlos Satorres bc5f78827c Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 08:09:21 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00:00
Carlos Satorres e15b8eee30 refs #6842 worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:54:12 +02:00
Pablo Natek 699684bd65 feat: refs #7187 add sim column to the model and id 2024-05-03 14:22:48 +02:00
Pablo Natek 133b862dc0 fix: refs #7187 move column sim to deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:20:16 +02:00
Carlos Andrés 2659e3b259 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:03:26 +02:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Carlos Andrés 7659a39b42 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 10:19:05 +02:00
Robert Ferrús 523735e4fc Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 04:59:01 +00:00
Carlos Andrés 9905d7254d Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 18:17:31 +02:00
Carlos Andrés e28a5eb478 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 18:13:12 +02:00
Carlos Andrés 27e3ae897a feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 17:05:10 +02:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Carlos Andrés a67f603990 Merge branch 'dev' into 7213-Pasar-problemas-a-columnas-calculadas
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 15:50:13 +02:00
Robert Ferrús 5ea57ce728 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 10:04:40 +00:00
Robert Ferrús 83e9756692 fear: refs #7296 expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 12:02:19 +02:00
Robert Ferrús e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:48:18 +02:00
Jorge Penadés 9802f0066c fix: refs #5919 unique key & unassigned locker 2024-04-29 16:05:36 +02:00
Jorge Penadés be69b5e2c4 fix: refs #5919 rollback 2024-04-29 12:04:31 +02:00
Jorge Penadés f6e89c9049 fix: refs #5919 rollback 2024-04-29 11:46:58 +02:00
Jorge Penadés 7240269f5b fix: refs #5919 rollback 2024-04-29 11:45:54 +02:00
Jorge Penadés 50ea41f99a fix: refs #5919 rollback 2024-04-29 11:43:56 +02:00
Jorge Penadés 0003779681 fix: refs 5919 apply version 2024-04-29 11:35:08 +02:00
Robert Ferrús c18c77ab93 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 08:08:52 +00:00
Robert Ferrús 9af3c17a1f feat: refs #7291 sale_getProblems
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-29 09:58:58 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Jorge Penadés 30e927d722 feat: refs #6202 dbWatcher script
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:10:05 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 2d0d4b5643 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 06:48:01 +00:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Pablo Natek f2d4283304 fix: refs #7187 number on de code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:29:57 +02:00
Pablo Natek e8a32d8e13 fix: refs #7187 db version
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:09:42 +02:00
Pablo Natek 008b6f6f41 fix: refs #7187 unify versions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:08:26 +02:00
Pablo Natek 88ef12032b feat: refs #7187 serialNumber new column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 14:05:18 +02:00
Robert Ferrús 5efe286382 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 10:14:49 +00:00
Pablo Natek a15970c95f fix: refs #7187 sql for pdaFreelancer
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-24 11:08:57 +02:00
Robert Ferrús ffe56edc9c feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:24:42 +02:00
Robert Ferrús a27e06e8ff feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:08:19 +02:00
Robert Ferrús 7899cf230e feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-24 09:05:29 +02:00
Pablo Natek fbc1614132 fix: refs #7187 sql creation for deviceProductionUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 18:50:28 +02:00
Pablo Natek 71a9aed1bb fix: refs #7187 check for multiple device on freelancer 2024-04-22 18:03:17 +02:00
Robert Ferrús 44f2cd4efc feat: refs #7247 clientSupplier_add
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 14:04:07 +02:00
Alex Moreno bab2ee78c4 feat: refs #6428 auto-changelog with bash
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-19 13:13:57 +02:00
Carlos Andrés 9ca1b9f104 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-17 15:02:58 +02:00
Carlos Andrés c262805d33 feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 18:29:14 +02:00
Carlos Andrés 7bbf113ffa feat: Turn issues into calculated columns refs#7213
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 18:26:57 +02:00
Carlos Andrés d53f19b47d feat: Turn problems into calculated columns
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-16 17:01:14 +02:00
Jorge Penadés 976b18203e feat: refs #7187 check if is freelancer on insert & update
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-16 10:49:17 +02:00
Carlos Satorres de75d811c3 refs #6682 absence
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 12:30:25 +02:00
Carlos Andrés bafd4456ef feat: conversion art. A1 a A2 refs #4979
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-15 14:46:43 +01:00
Carlos Satorres bf796c445d refs #5919 fix section
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-01-17 13:20:28 +01:00
Carlos Satorres c0c3d913b7 refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-12 09:03:54 +01:00
Carlos Satorres 69739fca9c refs #5919 locker relation
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-03 08:17:37 +01:00
Carlos Satorres e2eebf96f7 refs #5919 locker insert prod
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 11:29:48 +01:00
Carlos Satorres 3a429a31da refs #5919 locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-29 08:44:42 +01:00
Carlos Satorres 6ceee45b13 refs #5919 fix locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-28 16:40:13 +01:00
Carlos Satorres f35b2a4905 refs #5919 back chooseLocker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-26 13:44:52 +01:00
Carlos Satorres aa33c28468 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head This commit looks good Details
2023-12-26 12:15:43 +01:00
Carlos Satorres c5c314eb43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-10 11:59:01 +01:00
Carlos Satorres fd64cb7e80 refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-17 13:08:00 +02:00
Carlos Satorres 5a375ebfda refs #5919 front back
gitea/salix/pipeline/head This commit looks good Details
2023-10-16 13:22:36 +02:00
Carlos Satorres 38bf90da66 refs #5919 sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-11 13:26:27 +02:00
Carlos Satorres c061841cac refs #5919 locker and back
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:58:33 +02:00
Carlos Satorres 3c58f86c2a refs #5919 locker back y front
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 13:44:22 +02:00