Commit Graph

24013 Commits

Author SHA1 Message Date
Alex Moreno fb15225078 Merge pull request 'build: dump 2432' (!2838) from 7837-dump_2432 into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2838
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-08-06 07:16:43 +00:00
Guillermo Bonet 58677dca56 Merge pull request 'refactor: refs #7820 Deprecated silexACL' (!2833) from 7820-silexAcl into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2833
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-06 07:15:20 +00:00
Alex Moreno 6fb78e1599 test: hotFix saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 08:59:20 +02:00
Jorge Penadés eaea1f3559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-08-06 08:47:23 +02:00
Alex Moreno 70a91da0ff build: dump 2432
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-06 08:27:40 +02:00
Alex Moreno 36dee872d6 Merge pull request '7837-testToMaster_2432' (!2834) from 7837-testToMaster_2432 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2834
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-06 05:52:04 +00:00
Guillermo Bonet 54e6c63b8b fix: refs #7834 SELECT
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:29:32 +02:00
Guillermo Bonet e03a1914d9 fix: refs #7834 Throw
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-06 07:27:36 +02:00
Guillermo Bonet 1e41f5d533 Merge pull request 'feat: refs #7713 Created ACLLog' (!2783) from 7713-AclLog into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2783
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-06 05:05:19 +00:00
Alex Moreno e95d722a7c add changelog
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 14:52:09 +02:00
Pako Natek dcdbb0bf93 Merge branch 'dev' into 7836-futureEntries
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:29:30 +00:00
Pako Natek be5859b8cf prototipo
gitea/salix/pipeline/pr-dev Build queued... Details
2024-08-05 14:28:29 +02:00
Guillermo Bonet ea65a13cfb Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:59:44 +02:00
Guillermo Bonet d6e09fcfc9 Merge branch 'master' 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
2024-08-05 12:59:37 +02:00
Guillermo Bonet 91253cc807 fix: refs #7835 transferSales
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:57:38 +02:00
Guillermo Bonet fa3a7aa931 refactor: refs #7820 Deprecated silexACL
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 12:49:04 +02:00
Guillermo Bonet 967443b427 fix: refs #7834 expeditionScan_Put
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 12:26:16 +02:00
Guillermo Bonet 21423d3b48 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-05 12:00:01 +02:00
Guillermo Bonet d5a8e32b52 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-05 11:59:46 +02:00
Guillermo Bonet df672a22eb Merge pull request 'feat: refs #7644 Optimized entry labels report' (!2831) from 7644-buyLabelChunk into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2831
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-08-05 09:53:33 +00:00
Guillermo Bonet 32b48a7bb6 feat: refs #7644 Fix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-05 11:48:02 +02:00
Guillermo Bonet 760a1debca feat: refs #7644 Requested changes
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:44:20 +02:00
Guillermo Bonet ab446b54ed feat: refs #7644 Optimized entry labels report
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-08-05 11:29:35 +02:00
Jorge Penadés 09783ae576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemSectionsMigration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:38:49 +02:00
Jorge Penadés bf7cd1530c feat: refs #7283 order by desc date
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 15:36:02 +02:00
Carlos Andrés e1dc7a3cb9 Merge pull request 'Hotfix changes whit conficts merged incorrectly' (!2829) from Hotfix-changes-whit-conficts-merged-incorrectly into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2829
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 12:16:03 +00:00
Carlos Andrés f431d6c37f Hotfix changes whit conficts merged incorrectly
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 13:45:58 +02:00
Guillermo Bonet abd8bc9639 fix: refs #6453 order_confirmWithUser
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:20:50 +02:00
Guillermo Bonet ae9472e092 Merge pull request 'refactor: refs #6453 order_confirmWithUser' (!2694) from 6453-orderConfirm into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2694
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-08-02 10:14:58 +00:00
Guillermo Bonet 6acba08a91 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 12:08:40 +02:00
Guillermo Bonet f6db62945d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 12:08:22 +02:00
Guillermo Bonet dead585a1b Merge pull request 'fix: refs #7812 Added orders in item_getMinacum' (!2810) from 7812-radarOrder into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2810
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 10:01:55 +00:00
Guillermo Bonet afb2f8d111 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:26 +02:00
Guillermo Bonet 4c67daedec Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 11:50:16 +02:00
Carlos Andrés 69d4c8bd6e Merge pull request 'fix: refs #7829 Error al calcular problemas de componentes' (!2828) from 7829-Error-calcular-problemas-componentes into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2828
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-08-02 09:45:06 +00:00
Carlos Andrés 29a50caaca fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 11:43:30 +02:00
Carlos Andrés ddd5e4ffa4 fix: refs #7829 Error al calcular problemas de componentes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 10:28:50 +02:00
Guillermo Bonet 879d48eb27 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-08-02 10:00:35 +02:00
Guillermo Bonet 01df29b47c Merge branch 'master' into test
gitea/salix/pipeline/pr-dev This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-08-02 10:00:12 +02:00
Guillermo Bonet 97c1f8b321 Merge pull request 'feat: refs #7382 Changes' (!2826) from 7382-invoiceInBooking into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2826
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-02 07:54:48 +00:00
Guillermo Bonet d852d16ae4 feat: refs #7382 Changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-08-02 08:11:38 +02:00
Guillermo Bonet b56260af36 feat: refs #6453 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-02 07:58:45 +02:00
Alex Moreno 20caa5d9a1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-08-01 14:11:00 +02:00
Jon Elias 6620a1d119 Merge branch 'dev' into Worker_Migration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 11:56:06 +00:00
Jon Elias ed283cac46 feat: deleted worker module code & redirect to Lilium
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-08-01 13:15:11 +02:00
Robert Ferrús 619dd2fbe8 Merge pull request 'master' (!2823) 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: #2823
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-08-01 05:05:14 +00:00
Sergio De la torre b75e54120d Merge pull request 'hotFix itemShelving refs #6861' (!2821) from 6861_triggerItemShelving into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2821
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-08-01 04:52:40 +00:00
Sergio De la torre 94d89f9c99 Merge branch 'master' into 6861_triggerItemShelving
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-31 19:51:36 +00:00
Carlos Andrés 77f6e80066 Actualizar db/routines/vn/procedures/ticket_setRisk.sql
gitea/salix/pipeline/head This commit looks good Details
2024-07-31 17:38:50 +00:00
Carlos Andrés f0598d6cf1 Merge pull request 'hotfix: getBuys add field comment Ticket 207748' (!2822) from Ticket-207748-Hotfix-getBuys-add-field-comment into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2822
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-07-31 16:46:19 +00:00