Commit Graph

23725 Commits

Author SHA1 Message Date
Juan Ferrer d2ead9d936 Merge pull request 'fix: refs #7931 Merge available fix into master' (!2936) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2936
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-09-09 10:20:42 +00:00
Guillermo Bonet 3c6b7cd224 Merge branch 'master' into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:35:08 +02:00
Guillermo Bonet 723ec2b453 fix: refs #7844 Filter monitor
gitea/salix/pipeline/head This commit looks good Details
2024-09-09 11:34:42 +02:00
Juan Ferrer b0f1cc69af Merge pull request 'fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added' (!2932) from 7931-availableFix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
Reviewed-on: #2932
2024-09-06 13:02:22 +00:00
Juan Ferrer 37fabc38bd fix(hedera): refs #7931 PROC order_addItem NULL available fix, translations added
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 14:56:14 +02:00
Guillermo Bonet 5a82ce4aae Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:51:13 +02:00
Guillermo Bonet 0ad4d3a959 feat: refs #7905 getBuysCsv
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 13:50:49 +02:00
Juan Ferrer 5700b95e22 Merge pull request 'fix: refs #7931 Immediately discount order lines from available' (!2925) from 7931-availableFix into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2925
Reviewed-by: Pako Natek <pako@verdnatura.es>
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-06 11:11:35 +00:00
Juan Ferrer e2c6a45756 fix: refs #7931 Available back test fix
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-06 12:57:57 +02:00
Carlos Andrés d10db686e5 fix: refs #7346 ticket_close serial
gitea/salix/pipeline/head This commit looks good Details
2024-09-06 12:52:24 +02:00
Juan Ferrer 382e54b572 fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 11:30:43 +02:00
Juan Ferrer d44dec3703 fix: refs #7931 Back test fix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 11:25:49 +02:00
Juan Ferrer a06e9a98ca Merge branch '7931-availableFix' of https://gitea.verdnatura.es/verdnatura/salix into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 09:16:23 +02:00
Juan Ferrer 48f94140e2 fix: refs #7931 Back test fix 2024-09-06 09:16:22 +02:00
Juan Ferrer 93330db88f Merge branch 'test' into 7931-availableFix
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 07:14:08 +00:00
Juan Ferrer 640b45ed99 fix: refs #7931 Apply PR change requests
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-09-06 09:06:00 +02:00
Robert Ferrús 3c6920a094 Merge pull request 'feat: refs #7929 create table material' (!2920) from 7929-createTableMaterial into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2920
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-09-06 04:30:07 +00:00
Robert Ferrús 75146f930a Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-06 04:28:11 +00:00
Jorge Penadés ca882dbac9 Merge pull request 'master to test' (!2928) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2928
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 14:35:21 +00:00
Jorge Penadés de591864d1 Merge pull request 'fix: refs #7524 add fixture orm config' (!2927) from 7524-hotfix-addFixture into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2927
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 13:57:58 +00:00
Jorge Penadés cff5bef54b fix: refs #7524 add fixture orm config
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 15:47:45 +02:00
Jorge Penadés c7be8f0b27 Merge pull request 'fix: refs #7524 load after get client' (!2926) from 7524-hotfix-loadAfterGetClient into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2926
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-05 13:31:13 +00:00
Jorge Penadés c1e086072b fix: refs #7524 load after get client
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 14:50:36 +02:00
Juan Ferrer a7bc58a5bc fix: refs #7931 Immediately discount order lines from available
gitea/salix/pipeline/pr-test This commit looks good Details
2024-09-05 14:45:17 +02:00
Robert Ferrús 5e456a32fb Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 14:38:58 +02:00
Robert Ferrús 3e4caa8edf feat: refs #7929 autoincrement 1 2024-09-05 14:38:55 +02:00
Robert Ferrús fa34c4328e Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 12:27:41 +00:00
Robert Ferrús 0cdf2af807 Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 14:26:19 +02:00
Robert Ferrús 684658bb96 feat: refs #7929 quitar codigo 2024-09-05 14:25:50 +02:00
Guillermo Bonet a2a5630d17 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:24:39 +02:00
Guillermo Bonet 95d4c706d4 fix: refs #7346 multiple to quick in closure.js
gitea/salix/pipeline/head This commit looks good Details
2024-09-05 09:23:58 +02:00
Robert Ferrús 44adb9cde0 Merge pull request 'fix: ticket #216260 buy_recalcPrices' (!2916) from ticket216260-buy_recalcPrices into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2916
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-05 05:39:24 +00:00
Robert Ferrús 777eba8c53 Merge branch 'master' into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 05:22:02 +00:00
Robert Ferrús f68892f783 Merge branch 'master' into 7929-createTableMaterial
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-05 04:59:54 +00:00
Jorge Penadés 4ec1c8301e Merge pull request '#7897 - Merge master into test' (!2869) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2869
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-04 14:28:42 +00:00
Jorge Penadés 2ef289bf3a Merge pull request 'fix: refs #6900 fine tunning' (!2905) from 6900-hotfix-fineTunning into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2905
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-04 13:57:26 +00:00
Jorge Penadés ac5ff9e807 Merge branch 'master' into 6900-hotfix-fineTunning
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:55:24 +00:00
Robert Ferrús 75be124e1f feat: refs #7929 create table material
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 14:14:12 +02:00
Guillermo Bonet 80839100c7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-09-04 14:10:33 +02:00
Guillermo Bonet 212e8d1a03 fix: refs #7346 invoiceSerial 2024-09-04 14:09:31 +02:00
Pako Natek 9294927931 Merge pull request 'hotfix' (!2919) from hotFix-Miriam into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #2919
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-09-04 11:53:48 +00:00
Pako Natek ad123e61ca Merge branch 'master' into hotFix-Miriam
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 11:49:19 +00:00
Carlos Satorres 9503e5134d Merge pull request 'fix: hotfix' (!2918) from hotfix-fixSepaCore into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2918
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-09-04 11:45:55 +00:00
Carlos Satorres 461b8d1f81 Merge branch 'master' into hotfix-fixSepaCore
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 11:44:24 +00:00
Pako Natek e574f0060a hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:37:13 +02:00
Carlos Satorres cb24ca9f82 fix: hotfix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 13:36:57 +02:00
Robert Ferrús 435f2ce8e0 Merge branch 'master' into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 10:58:07 +00:00
Jorge Penadés 93796ef18d Merge pull request 'refactor: refs #7524 dynamic fetch' (!2914) from 7524-hotfix-addLimit into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
Reviewed-on: #2914
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-09-04 10:54:15 +00:00
Guillermo Bonet afcb590a9e fix: ticket #216260 buy_recalcPrices
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-04 12:45:33 +02:00
Guillermo Bonet d52dc788c8 Merge branch 'ticket216260-buy_recalcPrices' of https://gitea.verdnatura.es/verdnatura/salix into ticket216260-buy_recalcPrices
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-09-04 12:41:46 +02:00