Commit Graph

366 Commits

Author SHA1 Message Date
Carlos Satorres 9f438751d3 Merge branch 'dev' into 6074-KkearisBlocked 2024-03-28 08:13:37 +00:00
Javi Gallego 699883182c Merge pull request '7120-specialPrice' () from 7120-specialPrice into dev
Reviewed-on: 
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-28 08:01:45 +00:00
Alex Moreno 0b764ebc1b Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-03-28 07:12:51 +00:00
Carlos Satorres f4915fbe2e Merge branch 'dev' into 6074-KkearisBlocked 2024-03-27 16:50:03 +00:00
Carlos Satorres 97b2500eea refs #6074 fix comment 2024-03-27 14:24:58 +01:00
Javi Gallego 2881409b1e feat: #7120 con fecha por defecto 2024-03-27 07:19:51 +01:00
Javier Segarra a2a16d227c refs #5858 fix rename file 2024-03-26 12:41:30 +00:00
Javi Gallego 9408b82874 feat: #7120 con esquema 2024-03-26 12:18:53 +01:00
Javi Gallego c99de95b33 feat: #7120 con tabla temporal 2024-03-26 12:07:23 +01:00
Jon Elias 0f4e1acf09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier 2024-03-26 08:37:51 +01:00
Jon Elias 04e42cd3c8 feat: #6514 created supplierDms functionality 2024-03-26 08:29:07 +01:00
Alex Moreno dce0155c00 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-26 08:18:47 +01:00
Guillermo Bonet df115ec58b refactor: refs #6880 vn.professionalCategory changes 2024-03-25 09:41:05 +01:00
Jorge Penadés e8d1967e11 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-22 15:14:12 +01:00
Pablo Natek 531bd9ef80 Merge branch 'dev' into 6021-floranet 2024-03-22 10:17:49 +00:00
Carlos Satorres ca0d269ee2 refs #6074 remove isBlocked 2024-03-21 15:02:09 +01:00
Ivan Mas c33c90aefe Merge branch 'dev' into 6499-procRefactor6 2024-03-21 10:39:05 +00:00
Sergio De la torre 9eee26cbe9 refs #6276 feat:newWarehouse 2024-03-21 10:18:54 +01:00
Alex Moreno b087c35a36 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-03-21 08:01:05 +01:00
Alex Moreno adddcc96aa Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-03-20 15:01:17 +01:00
Guillermo Bonet cdaa7999d1 Merge branch 'dev' into 6395-buyBuyerFk 2024-03-20 07:55:05 +00:00
Guillermo Bonet 397b49db91 fix: refs #6232 Comment conveyorConfig lines 2024-03-20 08:02:11 +01:00
Guillermo Bonet b327120932 fix: refs #6232 Comment queueConfig lines 2024-03-20 07:39:38 +01:00
Guillermo Bonet 8a96327d97 Merge branch 'dev' into 6232-refactorConfigTables 2024-03-20 06:17:06 +00:00
Pako Natek 8f54a7f12d deliveryDate 2024-03-18 14:03:16 +01:00
Alex Moreno 4f90fb06d8 hotFix(debug) varchar to text 2024-03-18 13:25:23 +01:00
Jorge Penadés 07326e502b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6951-ticketCloneAll 2024-03-18 08:23:47 +01:00
Jorge Penadés f044809f30 feat: refs #6951 to create back 2024-03-15 15:45:47 +01:00
Guillermo Bonet 3aa81d27e7 refs #6875 Packing default 1 2024-03-15 14:53:31 +01:00
Javier Segarra bfdbbc0fdf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-03-15 12:22:57 +01:00
Guillermo Bonet 336d5f0fba Merge branch 'dev' into 6232-refactorConfigTables 2024-03-15 10:48:42 +00:00
Guillermo Bonet 158ed9b55c refs #6232 Regularized config tables 2024-03-15 11:49:33 +01:00
Carlos Satorres 1c523d8d22 Merge branch 'dev' into 6842-sageMod 2024-03-15 08:43:41 +00:00
Javier Segarra 6989299593 Merge branch 'dev' into 6930_scopedToken_Multimedia 2024-03-15 08:26:45 +00:00
Guillermo Bonet 166b74c70d Merge branch 'dev' into 6395-buyBuyerFk 2024-03-14 08:59:22 +00:00
Guillermo Bonet ad7b7be661 refs #6875 Fix version 2024-03-14 09:15:19 +01:00
Guillermo Bonet 08359cdfe0 Merge pull request 'refactor: refs #6875 Add restriction on vn.buy.packing field not null and > 0' (!2047) from 6875-packingNotNull into dev
Reviewed-on: #2047
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-03-14 08:05:11 +00:00
Alex Moreno 0ad052c34a refs #7033 deploy(2412): dev to test 2024-03-14 08:36:19 +01:00
Carlos Satorres 7895f12e3d Merge branch 'dev' into 6842-sageMod 2024-03-14 07:28:12 +00:00
Carlos Satorres 2d8f5f5f50 Merge branch '6842-sageMod' of https://gitea.verdnatura.es/verdnatura/salix into 6842-sageMod 2024-03-14 08:26:52 +01:00
Carlos Satorres e24eed16c1 refs #6842 fix companyCode 2024-03-14 08:26:50 +01:00
Javier Segarra 4012b1756d refs #5858 add comment 2024-03-13 15:00:12 +01:00
Guillermo Bonet 11dcb6e79f refactor: refs #6875 packing not null, negative or zero 2024-03-13 13:45:57 +01:00
Javier Segarra 172e7566b5 refs #5858 perf: improve insert 2024-03-13 11:58:25 +01:00
Guillermo Bonet cbaa48a933 Merge branch 'dev' into 6875-packingNotNull 2024-03-13 10:56:17 +00:00
Javier Segarra 8276765225 refs #5858 perf: destinationFk to pepe 2024-03-13 11:54:02 +01:00
Carlos Satorres f79d1320d8 Merge branch 'dev' into 6842-sageMod 2024-03-13 10:29:07 +00:00
Javier Segarra ff6a1a9111 refs #6930 perf: remove logoutMultimedia acl 2024-03-12 13:39:01 +01:00
Javier Segarra 486b51bcfa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6930_scopedToken_Multimedia 2024-03-12 12:46:46 +01:00
Sergio De la torre 9d94259d67 refs #6078 feat: workerActivity 2024-03-12 12:21:46 +01:00