Commit Graph

25515 Commits

Author SHA1 Message Date
Alex Moreno a8c7dea77f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 14:32:50 +01:00
Alex Moreno 87136f1aba Merge pull request '8267-devToTest' (!3270) from 8267-devToTest into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3270
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-12-03 12:18:19 +00:00
Alex Moreno fb13a9ff38 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest
gitea/salix/pipeline/pr-test This commit looks good Details
2024-12-03 13:11:09 +01:00
Guillermo Bonet 6ae2853c4d Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 12:09:16 +01:00
Guillermo Bonet c52e03c677 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 12:09:05 +01:00
Guillermo Bonet 01d8f15d2f fix: refs #4948 expedition_selfConsumptionPackaging
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 12:07:55 +01:00
Carlos Satorres 65a4578e15 Merge pull request 'fix: fix sql' (!3271) from hotfix-8222DeleteZoneSQL into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-03 07:54:46 +00:00
Carlos Satorres e95b2a4496 Merge branch 'master' into hotfix-8222DeleteZoneSQL
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-03 07:50:08 +00:00
Carlos Satorres 0f0c8250a1 fix: fix sql
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-03 08:44:00 +01:00
Alex Moreno a85d797edc chore: pullinfo
gitea/salix/pipeline/head There was a failure building this commit Details
2024-12-03 08:40:26 +01:00
Alex Moreno 14892042bd chore: refs #8267 pullinfo
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-12-03 08:31:49 +01:00
Alex Moreno 6fcfb0208d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 08:29:21 +01:00
Alex Moreno 1ee6254976 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 08:24:49 +01:00
Carlos Satorres 9e691ee2be Merge pull request 'fix: refs #8222 fix prDeleteZone' (!3269) from 8222-refactorDeleteZone2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3269
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-12-03 07:24:07 +00:00
Carlos Satorres 32d3b2939a Merge branch 'master' into 8222-refactorDeleteZone2
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-03 07:19:05 +00:00
Jorge Penadés 14f9d3d22f Merge pull request '#6818 hotfix-addInternationalChannel' (!3268) from 6818-hotfix-addInternationalChannel into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3268
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-02 15:07:57 +00:00
Ivan Mas c1c42de13a Merge pull request 'refactor: refs #7146 route.created to route.dated' (!3260) from 7146-route.createdToDated into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3260
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-12-02 14:16:20 +00:00
Ivan Mas 1b2987494a Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-02 14:04:36 +00:00
Jorge Penadés 9573090318 chore: refs #6818 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 14:49:35 +01:00
Jorge Penadés 13387beed9 feat: refs #6818 add PbxConfig model
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 14:31:06 +01:00
Alex Moreno bf9f7d45bf Merge branch 'master' into 8222-refactorDeleteZone2
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 12:53:00 +00:00
Carlos Satorres fd05ce0915 fix: refs #8222 fix prDeleteZone
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:45:04 +01:00
Jorge Penadés 33f8ee5e9d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-addInternationalChannel
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:34:38 +01:00
Jorge Penadés 66a87f1997 feat: refs #6818 add current country prefix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:33:39 +01:00
Guillermo Bonet 947812e9f1 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 13:07:08 +01:00
Guillermo Bonet b67585137a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 13:06:47 +01:00
Guillermo Bonet ef5522b2b3 Merge pull request 'fix: refs #7266 Created buy_getLastWihoutInventory proc' (!3267) from 7266-buyGetLastWihoutInventory into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3267
Reviewed-by: Sergio De la torre <sergiodt@verdnatura.es>
2024-12-02 12:06:18 +00:00
Guillermo Bonet 508908bf85 fix: refs #7266 Minor changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:01:12 +01:00
Jorge Penadés fc4f5b55f7 fix: refs #6818 update country & channel 2024-12-02 12:59:37 +01:00
Guillermo Bonet 4a74015fc5 fix: refs #7266 Minor changes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 12:57:34 +01:00
Ivan Mas bf0daf90db Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-12-02 11:56:58 +00:00
Guillermo Bonet fb58ab5bd2 fix: refs #7266 Created buy_getLastWihoutInventory proc
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 12:54:36 +01:00
Javier Segarra ecd86b2b5a Merge pull request 'fix: refs #244936 sale redirect catalog to lilium' (!3266) from 244936-hotFixRedirectToCatalog into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3266
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-12-02 11:26:44 +00:00
Robert Ferrús d355b320b4 test: refs #244936 remove window.open called
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 12:25:27 +01:00
Robert Ferrús 30da83a88c fix: refs #244936 sale redirect catalog to lilium
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-12-02 11:52:05 +01:00
Guillermo Bonet 10fd00df80 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 06:59:40 +01:00
Guillermo Bonet a8d378a4be Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 06:59:22 +01:00
Guillermo Bonet a17e434df1 fix: refs #7266 Buy label barcode, minor barcode width
gitea/salix/pipeline/head This commit looks good Details
2024-12-02 06:59:01 +01:00
Guillermo Bonet 3453aa0f8c Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 11:40:22 +01:00
Guillermo Bonet 3b73ffbd8a Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 11:40:05 +01:00
Sergio De la torre 76b12e73b9 Merge pull request 'fix: refs #7920 refs#7920 itemShelvingLogs' (!3263) from 7920-itemShelvingsLog into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3263
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-11-29 10:38:30 +00:00
Sergio De la torre 009b4ab7b9 fix: refs #7920 refs#7920 itemShelvingLogs
gitea/salix/pipeline/pr-master This commit looks good Details
2024-11-29 11:31:31 +01:00
Alex Moreno 20b68b4b41 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 07:28:55 +01:00
Alex Moreno b48beaf4b3 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-11-29 07:28:24 +01:00
Carlos Andrés 97cdadac78 Merge pull request 'fix: refs #8221 duaInvoiceIn unique' (!3256) from 8221-duaInvoiceInUnique into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3256
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-11-28 17:58:39 +00:00
Ivan Mas df51b93e5b Merge branch 'dev' into 7146-route.createdToDated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 16:32:03 +00:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 17:29:39 +01:00
Alex Moreno d6a849727e fix: fix result test
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 13:11:43 +01:00
Alex Moreno 838296e744 fix: add expected message result
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 13:02:58 +01:00
Alex Moreno 6785779fe5 fix: add console log
gitea/salix/pipeline/head This commit looks good Details
2024-11-28 12:26:03 +01:00