Commit Graph

25080 Commits

Author SHA1 Message Date
Alex Moreno 46af3f9ec7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7119-vehicle_module 2024-11-13 07:45:14 +01:00
Guillermo Bonet ab2e35b64c fix: refs #8153 Version
gitea/salix/pipeline/head This commit looks good Details
2024-11-13 07:12:49 +01:00
Guillermo Bonet 628b67e1e5 fix: refs #8153 Version
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-13 07:10:52 +01:00
Guillermo Bonet a426e9c7c6 Merge pull request 'refactor: refs #8153 Optimized order_getTax' (!3188) from 8153-order_getTaxOptimize into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3188
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-13 06:07:38 +00:00
Guillermo Bonet 127c6fced0 refactor: refs #8153 Optimized order_getTax
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 13:25:51 +01:00
Guillermo Bonet 4891e98109 Merge pull request 'refactor: refs #7242 Deleted select column' (!3189) from 7242-unlocated into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3189
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-11-12 12:18:36 +00:00
Guillermo Bonet 2ece748138 refactor: refs #7242 Deleted select column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 13:13:13 +01:00
Guillermo Bonet a67ea6b15f Merge pull request 'refactor: refs #7715 Deleted hasNewLabelMrwMethod column' (!3184) from 7715-byeMrwOld into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3184
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-12 12:09:54 +00:00
Guillermo Bonet f45460b0e1 Merge branch 'dev' into 8153-order_getTaxOptimize
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-12 12:04:59 +00:00
Guillermo Bonet d52f537f0c refactor: refs #8153 Optimized order_getTax
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-12 13:04:23 +01:00
Pako Natek 2d70e95996 Merge pull request 'fix: more data for fixture.before' (!3181) from fixturesLocal into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3181
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-12 11:29:02 +00:00
Pako Natek a9def89e01 Merge branch 'dev' into fixturesLocal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 11:27:35 +00:00
Sergio De la torre b532691043 Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-12 11:02:58 +00:00
Guillermo Bonet dd3a854ec5 Merge pull request 'feat: refs #8080 Added column comment' (!3185) from 8080-duaComment into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3185
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-11-12 10:48:17 +00:00
Guillermo Bonet aec4d0b1a4 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-12 11:28:32 +01:00
Guillermo Bonet 699675b476 fix: hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-11-12 11:27:23 +01:00
Javier Segarra ec3f852bde Merge pull request 'HOTFIX New order from Customer' (!3186) from hotFix_newOrder_redirect into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3186
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-12 09:54:49 +00:00
Javier Segarra 96301f8a0b fix: hotfix create order from customer
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-12 10:43:05 +01:00
Guillermo Bonet f989b72fab feat: refs #8080 Added column comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 10:18:00 +01:00
Guillermo Bonet a921e51023 refactor: refs #7715 Deleted hasNewLabelMrwMethod column
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 09:51:48 +01:00
Pablo Natek 307179cb9d Merge pull request 'fix: refs #7404 restore stockBuyed old proc' (!3183) from 7404-recoverStockBuyedProcs into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master There was a failure building this commit Details
Reviewed-on: #3183
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-12 08:13:08 +00:00
Pablo Natek 69999125c7 Merge branch 'master' into 7404-recoverStockBuyedProcs
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-12 07:51:59 +00:00
Pablo Natek 63425d31ae fix: refs #7404 restore stockBuyed old proc
gitea/salix/pipeline/pr-master Build queued... Details
2024-11-12 08:51:03 +01:00
Alex Moreno d442593823 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-12 08:49:17 +01:00
Alex Moreno d28f12a0d1 Merge pull request 'build: refs #8179 dump' (!3182) from 8179-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3182
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-11-12 07:49:01 +00:00
Alex Moreno 07e59ccdbf build: refs #8179 dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-12 08:45:40 +01:00
Pako Natek eb3d0e837f Merge branch 'dev' into fixturesLocal
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 07:29:08 +00:00
Pako Natek 76d072e00f fix: more data for fixture.before
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-12 08:28:26 +01:00
Guillermo Bonet 5bbcf5005f Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-12 08:04:30 +01:00
Guillermo Bonet 3158644032 fix: refs #7994 commented alter
gitea/salix/pipeline/head There was a failure building this commit Details
2024-11-12 07:59:07 +01:00
Alex Moreno 732dd02a19 Merge pull request '8179-testToMaster' (!3176) from 8179-testToMaster into master
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #3176
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-12 06:41:51 +00:00
Pablo Natek 82bcb48101 Merge pull request 'test' (!3179) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3179
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-11-12 06:37:16 +00:00
Pablo Natek ffe947c73d Merge pull request 'fix: refs #7404 remove volume from ticket sold on holland' (!3169) from 7404-fix-remove-tickets-volume 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: #3169
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-12 06:31:32 +00:00
Pablo Natek 3d3bc0dbaa Merge branch 'test' into 7404-fix-remove-tickets-volume
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-12 06:24:06 +00:00
Pablo Natek 395e6997dd Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-12 07:23:47 +01:00
Pablo Natek 2dd3ae1c75 fix: refs #7404 empty commit 2024-11-12 07:23:46 +01:00
Alex Moreno 180b0b5b3f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-11 14:09:21 +01:00
Alex Moreno c8d9cfd623 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-11 14:09:03 +01:00
Javi Gallego eaad989b3a fix: clean deletes also zoneEvent range records
gitea/salix/pipeline/head This commit looks good Details
2024-11-11 13:57:49 +01:00
Alex Moreno a79905f7c2 Merge pull request 'feat(Supplier): refs #6828 add companySize' (!3174) from 6828-supplier_companySize into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3174
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-11-11 12:48:08 +00:00
Alex Moreno 7704c5d2c6 feat: refs #7119 add vehicle -dms and -invoiceIn 2024-11-11 13:47:26 +01:00
Alex Moreno 9f763ebae7 Merge branch 'dev' into 6828-supplier_companySize
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-11 12:41:43 +00:00
Guillermo Bonet 0dc77851c0 fix: refs #4948 Tests
gitea/salix/pipeline/head This commit looks good Details
2024-11-11 11:34:37 +01:00
Pako Natek b62b33d175 Merge pull request 'fix(collection_new): remove agency condition for suitable tickets' (!3171) from hotFix-remove-notOwn-agency-collection-advantage into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3171
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-11 10:02:42 +00:00
Alex Moreno f7a29cd9c7 feat(Supplier): refs #6828 add companySize
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-11 10:32:17 +01:00
Pako Natek 35f4f161ab fix(collection_new): remove agency condition for suitable tickets
gitea/salix/pipeline/pr-master This commit looks good Details
Refs: #0000
2024-11-11 09:02:04 +01:00
Guillermo Bonet a254cb19cd feat: refs #4948 Added ticket_selfConsumptionPackaging
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-11 07:40:17 +01:00
Pablo Natek 82e62e8ee7 Merge branch 'test' into 7404-fix-remove-tickets-volume 2024-11-11 05:53:30 +00:00
Pablo Natek f8c3d69c5d fix: refs #7404 remove volume from ticket sold on holland
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-08 13:44:20 +01:00
Sergio De la torre fd36f7ecc3 feat: refs #8150 movExpeditions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-08 10:44:01 +01:00