verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 72 Releases Wiki Activity
26,147 Commits 300 Branches 0 Tags 130 MiB
Commit Graph

7120 Commits

Author SHA1 Message Date
Ivan Mas 148ab57b1a feat: refs #8073 change names and primary key 2024-12-18 15:06:49 +01:00
Ivan Mas 5620242d7e Merge branch 'dev' into 8073-newTableProductionCountryVolume 2024-12-18 12:30:16 +00:00
Ivan Mas 1ba23ad450 feat: refs #8073 #refs 8073 create vn.productionCountryVolume 2024-12-18 13:27:43 +01:00
Carlos Andrés 94136d35ff Actualizar db/routines/vn/triggers/route_afterUpdate.sql 2024-12-18 12:22:59 +00:00
Ivan Mas ab5cf0f497 Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations 2024-12-18 11:17:14 +00:00
Alex Moreno 116ec5b107 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8315-devToTest 2024-12-18 11:22:28 +01:00
Jorge Penadés 7a3339b623 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-18 10:18:43 +01:00
Guillermo Bonet f6d845cca9 refactor: refs #6765 Added fixtures 2024-12-18 09:30:12 +01:00
Alex Moreno 1a8b05c46b fix: refs #8315 fixture claimDevelopment 2024-12-18 07:08:23 +01:00
Ivan Mas af86bb24c4 Merge branch 'dev' into 7880-hedera.order_confirmWithUserTranslations 2024-12-17 15:06:00 +00:00
Jorge Penadés b4c8e16019 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6583-addOnlyDestination 2024-12-17 12:31:27 +01:00
Jorge Penadés 6476eb28e6 Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-17 10:51:52 +01:00
Guillermo Bonet db2a102a88 Merge pull request 'refactor: refs #8262 Deprecated inventoryFailure' (!3311) from 8262-byeInventoryFailure into dev 
Reviewed-on: #3311
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-12-17 06:17:19 +00:00
Guillermo Bonet 4f4eb389c9 Merge pull request 'feat: refs #8218 Added time and code in mistakeType' (!3310) from 8218-workerMistake into dev 
Reviewed-on: #3310
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-12-17 06:15:29 +00:00
Robert Ferrús 68715a8c36 Merge branch 'dev' into 7584-workerTimeControl_afterDelete 2024-12-16 13:25:38 +00:00
Juanjo Breso 6a3cbed3dd fix: refs #8174 fix 2024-12-16 13:47:36 +01:00
Juanjo Breso 5a7ac8dcb3 fix: refs #8174 fix 2024-12-16 13:44:58 +01:00
Juanjo Breso 48064d6393 fix: refs #8174 fix 2024-12-16 13:35:50 +01:00
Juanjo Breso de69a8db1d fix: refs#8174 fix 2024-12-16 13:01:00 +01:00
Juanjo Breso 11db90c67c fix: refs#8174 fix 2024-12-16 12:48:43 +01:00
Juanjo Breso deb1b68c49 fix: refs#8174 fix 2024-12-16 12:47:47 +01:00
Juanjo Breso 7232bfb7a6 fix: 8174 pasar PIN a CHAR 2024-12-16 12:42:08 +01:00
Juanjo Breso d03a2ced04 fix: refs8174 pasar a char el PIN 2024-12-16 12:30:35 +01:00
Guillermo Bonet fda2c5725a refactor: refs #8262 Deprecated inventoryFailure 2024-12-16 12:23:02 +01:00
Guillermo Bonet 5346dd845e feat: refs #8218 Added time and code in mistakeType 2024-12-16 11:40:57 +01:00
Robert Ferrús e7e6c88ec5 Merge branch 'dev' into 8190-entry_getCommission 2024-12-16 10:18:53 +00:00
Guillermo Bonet 71fb3996cd refactor: refs #7882 Added ACL's 2024-12-16 09:40:55 +01:00
Jorge Penadés d9eab36160 fix: refs #7936 conflicts 2024-12-16 09:35:41 +01:00
Jorge Penadés 4612bf2e9b Merge branch 'dev' of https: refs #7936//gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-16 09:35:23 +01:00
Guillermo Bonet d9a6e8a1c9 refactor: refs #7882 Added ACL's 2024-12-16 09:34:45 +01:00
Guillermo Bonet d42ff07547 feat: refs #8174 Changed datatype incompatibility access 2024-12-16 09:20:27 +01:00
Guillermo Bonet 57c3cc8546 feat: refs #8174 Created table sim 2024-12-16 09:01:10 +01:00
Robert Ferrús 1d7e69cb25 feat: refs #7584 workerTimeControl_afterDelete 2024-12-16 07:40:49 +01:00
Guillermo Bonet e1db7a86f6 Merge branch 'dev' into 7882-locationiq 2024-12-16 06:16:03 +00:00
Carlos Andrés ec2b6dd0c2 Actualizar db/versions/11327-maroonOak/00-firstScript.sql 2024-12-13 14:55:03 +00:00
Carlos Andrés 11827207ba Merge pull request 'feat: refs#8174 simSupplier' (!3158) from 8174-crearTablaSim into dev 
Reviewed-on: #3158
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
 2024-12-13 13:43:46 +00:00
Guillermo Bonet 781a8a4d10 refactor: refs #8205 Added geoFk Fk 2024-12-13 13:49:35 +01:00
Guillermo Bonet 3cdb6c438b Merge branch 'test' into dev 2024-12-13 13:06:26 +01:00
Robert Ferrús ab1eed66df feat: refs #6822 changes required 2024-12-13 12:29:03 +01:00
Guillermo Bonet 452ec3d731 fix: refs #247552 ticket 247552 claimRatio_add 2024-12-13 08:29:14 +01:00
Guillermo Bonet 00b5333ab7 feat: refs #7882 Added tests 2024-12-13 08:07:13 +01:00
Guillermo Bonet bfad016ec4 Merge branch 'dev' into 7882-osrm 2024-12-13 07:01:42 +01:00
Carlos Andrés 20cf3e0d19 Merge pull request 'fix: refs #8087 refs#8087 errores travel_moveRaids' (!3264) from 8087-erroresTravel_moveRaid into master 
Reviewed-on: #3264
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-12 18:21:42 +00:00
Guillermo Bonet 05ba85219b feat: refs #7882 Osrm service 2024-12-12 14:35:58 +01:00
Pablo Natek 8e61160aeb Merge pull request 'feat: refs #7301 add inventory-config and acl' (!3230) from 7301-itemLastEntries into dev 
Reviewed-on: #3230
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-12 13:12:33 +00:00
Guillermo Bonet 95d7c7f227 Merge branch 'dev' into 7882-osrm 2024-12-12 14:06:44 +01:00
Jorge Penadés 8b37d99287 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-12 09:58:42 +01:00
Jon Elias 7fe3369c35 Merge pull request '#8219: Modified data to be equal as the updated back' (!3274) from Invoice-Out-TransferInvoice into dev 
Reviewed-on: #3274
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-12 08:37:50 +00:00
Pablo Natek 33287938ec Merge branch 'dev' into 7301-itemLastEntries 2024-12-12 08:34:54 +00:00
Carlos Satorres 2885facc01 Merge branch 'dev' into 7031-zonePrice 2024-12-12 08:32:07 +00:00
Pablo Natek b5d4d31abb fix: refs #7301 update ACL insertion to use INSERT IGNORE and refine property value 2024-12-12 09:25:51 +01:00
Jon Elias 956673cf56 Merge branch 'dev' into Invoice-Out-TransferInvoice 2024-12-12 07:02:28 +00:00
Carlos Andrés fbd6178c06 fix: refs #8149 taxableBase invoiceIn 2024-12-11 13:16:39 +01:00
Robert Ferrús 4f370dbaea Merge branch '6822-entryTransfer' of https://gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer 2024-12-11 11:54:44 +01:00
Robert Ferrús 43bbdfd421 feat: refs #6822 2024-12-11 11:54:40 +01:00
Guillermo Bonet bc072208d7 Merge branch 'dev' into 7882-osrm 2024-12-11 11:44:23 +01:00
Juanjo Breso 0d26c52d5d Merge branch 'dev' into 8174-crearTablaSim 2024-12-11 10:23:44 +00:00
Robert Ferrús b681585ad5 Merge branch 'dev' into 6822-entryTransfer 2024-12-11 10:21:00 +00:00
Robert Ferrús 7886adb8f5 Merge branch 'dev' into 8190-entry_getCommission 2024-12-11 10:20:31 +00:00
Juanjo Breso 193e628118 Merge branch '8174-crearTablaSim' of https://gitea.verdnatura.es/verdnatura/salix into 8174-crearTablaSim 2024-12-11 11:20:19 +01:00
Juanjo Breso 28ab6b2266 feat: refs #8174 fix 2024-12-11 11:20:15 +01:00
Jorge Penadés 2a2b4b139b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-11 09:13:50 +01:00
Guillermo Bonet c8ec94bed9 feat: refs #7882 Osrm service 2024-12-11 09:03:14 +01:00
Alex Moreno bc3afa81e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-12-11 07:18:59 +01:00
Sergio De la torre 31692ddd3b fix: refs #8188 refs#8188 add IfNotExists 2024-12-11 07:15:40 +01:00
Carlos Satorres 83fd11eba8 Merge branch 'dev' into 7031-zonePrice 2024-12-10 18:40:06 +00:00
Juanjo Breso ce58a9ab2c Merge branch 'dev' into 8174-crearTablaSim 2024-12-10 12:49:44 +00:00
Juanjo Breso 8797635101 feat: refs #8174 fix 2024-12-10 13:46:03 +01:00
Juanjo Breso 10558853a2 feat: refs #8174 create table simsupplier 2024-12-10 13:41:45 +01:00
Alex Moreno 4e72b17e18 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-12-10 13:41:09 +01:00
Carlos Satorres 535b04e1df Merge branch 'dev' of https: refs #7031//gitea.verdnatura.es/verdnatura/salix into 7031-zonePrice 2024-12-10 12:44:52 +01:00
Juan Ferrer 06230d6b2a Merge pull request 'refs #8257 test into dev' (!3287) from test into dev 
Reviewed-on: #3287
 2024-12-10 10:22:54 +00:00
Alex Moreno 2f47d7d76e build: refs #8282 dump db 2024-12-10 10:30:43 +01:00
Sergio De la torre 699e56a64c Merge pull request 'feat: refs #8188 refs#8188 orderPicking' (!3279) from 8188-orderPicking into test 
Reviewed-on: #3279
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-10 06:05:11 +00:00
Jorge Penadés fcb842d948 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-09 16:44:08 +01:00
Alex Moreno 94bc1241e5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-12-09 14:31:37 +01:00
Alex Moreno 9403588d7b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-12-09 14:30:03 +01:00
Jorge Penadés f69dfbd5aa refactor: refs #7936 remove schema 2024-12-09 14:03:45 +01:00
Jorge Penadés 7c2c56ed9a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-09 13:50:01 +01:00
Carlos Satorres cb516d2022 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-7323workerHoliday 2024-12-09 13:22:10 +01:00
Guillermo Bonet e279cc4b47 feat: refs #7882 Added osrm service 2024-12-09 10:01:59 +01:00
Guillermo Bonet 0bb9282953 feat: refs #7882 Added locationiq service 2024-12-09 09:11:55 +01:00
Guillermo Bonet 8960b54664 feat: refs #7882 Added locationiq service 2024-12-08 14:30:05 +01:00
Guillermo Bonet 04a96e87d6 refactor: refs #7882 Deleted quadminds files 2024-12-08 07:28:29 +01:00
Sergio De la torre f8e5b76a6f feat: refs #8188 refs#8188 orderPicking 2024-12-05 13:56:06 +01:00
Sergio De la torre 5db8ae53ac feat: refs #8188 refs#8188 orderPicking 2024-12-05 12:39:20 +01:00
Jorge Penadés db8ab307ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-05 10:10:40 +01:00
Carlos Satorres 483966501a fix: refs #7031 fix vnPrice 2024-12-05 08:31:09 +01:00
Robert Ferrús 6ac30dcb0c feat: refs #6822 fix conflict 2024-12-04 13:32:10 +01:00
Jorge Penadés ea5bf85b55 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-04 13:31:54 +01:00
Ivan Mas 41a3f9ae94 refactor: refs #8272 delete bi.rotacion 2024-12-04 13:19:14 +01:00
Robert Ferrús 47cb1ff722 Merge branch 'dev' of https: refs #6822//gitea.verdnatura.es/verdnatura/salix into 6822-entryTransfer 2024-12-04 13:18:26 +01:00
Carlos Satorres fad6f33b7c fix: refs #7031 remove check 2024-12-04 12:33:17 +01:00
Jon Elias 123c0db126 feat: modified data to be equal as the updated back 2024-12-04 11:58:17 +01:00
Robert Ferrús b97b61c7dd feat: refs #6822 fix 2024-12-04 09:40:28 +01:00
Robert Ferrús c518352bf7 feat: refs #6822 changes required 2024-12-04 08:12:47 +01:00
Alex Moreno fb13a9ff38 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 8267-devToTest 2024-12-03 13:11:09 +01:00
Guillermo Bonet 6ae2853c4d Merge branch 'test' into dev 2024-12-03 12:09:16 +01:00
Guillermo Bonet c52e03c677 Merge branch 'master' into test 2024-12-03 12:09:05 +01:00
Guillermo Bonet 01d8f15d2f fix: refs #4948 expedition_selfConsumptionPackaging 2024-12-03 12:07:55 +01:00
Carlos Satorres e95b2a4496 Merge branch 'master' into hotfix-8222DeleteZoneSQL 2024-12-03 07:50:08 +00:00
Carlos Satorres 0f0c8250a1 fix: fix sql 2024-12-03 08:44:00 +01:00
Alex Moreno a85d797edc chore: pullinfo 2024-12-03 08:40:26 +01:00
Alex Moreno 14892042bd chore: refs #8267 pullinfo 2024-12-03 08:31:49 +01:00
Alex Moreno 6fcfb0208d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-12-03 08:29:21 +01:00
Alex Moreno 1ee6254976 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-12-03 08:24:49 +01:00
Jorge Penadés 9d26a9df7d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-12-02 17:11:21 +01:00
Ivan Mas 1b2987494a Merge branch 'dev' into 7146-route.createdToDated 2024-12-02 14:04:36 +00:00
Jorge Penadés 9573090318 chore: refs #6818 rollback 2024-12-02 14:49:35 +01:00
Jorge Penadés 33f8ee5e9d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6818-hotfix-addInternationalChannel 2024-12-02 13:34:38 +01:00
Jorge Penadés 66a87f1997 feat: refs #6818 add current country prefix 2024-12-02 13:33:39 +01:00
Guillermo Bonet 947812e9f1 Merge branch 'test' into dev 2024-12-02 13:07:08 +01:00
Guillermo Bonet b67585137a Merge branch 'master' into test 2024-12-02 13:06:47 +01:00
Guillermo Bonet 508908bf85 fix: refs #7266 Minor changes 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 2024-12-02 12:57:34 +01:00
Ivan Mas bf0daf90db Merge branch 'dev' into 7146-route.createdToDated 2024-12-02 11:56:58 +00:00
Guillermo Bonet fb58ab5bd2 fix: refs #7266 Created buy_getLastWihoutInventory proc 2024-12-02 12:54:36 +01:00
Carlos Satorres 4e6b83809b fix: workerHoliday hr 2024-12-02 10:29:12 +01:00
Carlos Satorres cf862202ff fix: hotfix 7323 createAbsence 2024-12-02 10:12:56 +01:00
Carlos Andrés 202ed47963 fix: refs #8087 refs#8087 errores travel_moveRaids 2024-11-29 17:20:14 +01:00
Carlos Andrés b0ee1f3e24 fix: refs #8087 refs#8087 errores travel_moveRaids 2024-11-29 17:18:25 +01:00
Jorge Penadés 163c6ddd20 feat: refs #7936 add currency handling in invoiceIn trigger 2024-11-29 13:44:42 +01:00
Carlos Andrés fc1e0672a4 fix: refs #8087 refs#8087 errores travel_moveRaids 2024-11-29 11:59:36 +01:00
Jorge Penadés c270ec3723 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-11-29 09:41:08 +01:00
Robert Ferrús 7afd14a301 Merge branch 'dev' into 8190-entry_getCommission 2024-11-29 05:42:08 +00:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated 2024-11-28 17:29:39 +01:00
Jorge Penadés 7d5ae9dfbd feat: refs #7936 add reference rates for currency in fixtures 2024-11-28 14:52:41 +01:00
Sergio De la torre 6f1bfd6787 Merge branch 'master' into 8213-itemShelvingSalePicker 2024-11-28 07:50:06 +00:00
Robert Ferrús 3f4aa60cd2 feat: refs #6822 poner esquemas en el with 2024-11-28 08:22:30 +01:00
Robert Ferrús 4b474834cf feat: refs #6822 change request 2024-11-28 08:13:53 +01:00
Robert Ferrús 7b8d4c6a2c Merge branch 'dev' into 6822-entryTransfer 2024-11-28 06:38:36 +00:00
Jorge Penadés ba51052d88 feat: refs #7936 add SiiTypeInvoiceIn model and update invoice correction logic 2024-11-27 17:52:45 +01:00
Carlos Andrés 15c755087c fix: refs #8221 duaInvoiceIn unique 2024-11-27 14:28:50 +01:00
Jorge Penadés 4bb3305704 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-11-27 13:12:31 +01:00
Guillermo Bonet e62553630c Merge branch 'test' into dev 2024-11-27 10:41:31 +01:00
Guillermo Bonet 55bf10435e Merge branch 'master' into test 2024-11-27 10:41:14 +01:00
Jorge Penadés 4234e614fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn 2024-11-27 09:41:19 +01:00
Robert Ferrús e3971848e8 Merge branch 'dev' into 8190-entry_getCommission 2024-11-27 08:40:59 +00:00
Jorge Penadés 60a90bb090 fix: add IF NOT EXISTS to isRaid column in travel table 2024-11-27 09:38:33 +01:00
Robert Ferrús 70042c02aa Merge branch 'dev' into 8190-entry_getCommission 2024-11-27 06:28:51 +00:00
Robert Ferrús d9aa11b3e9 feat: refs #8190 entry_getCommission change request 2024-11-27 07:27:47 +01:00
Guillermo Bonet 05671be60e Merge pull request 'refactor: refs #8204 Deprecated itemShelvingLog' (!3249) from 8204-byeItemShelvingLog into dev 
Reviewed-on: #3249
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-27 05:50:44 +00:00
Carlos Andrés c550f711c6 Actualizar db/routines/vn/triggers/travel_beforeUpdate.sql 2024-11-26 17:55:36 +00:00
Ivan Mas 10d2d4c9c4 fix: hotfix entry_splitByShelving 2024-11-26 18:01:49 +01:00
Jorge Penadés 6ab25c2ff5 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table 2024-11-26 17:06:45 +01:00
Jorge Penadés a68e287b23 refactor: refs #7936 remove old trigger and add isRaid column to travel table 2024-11-26 17:01:50 +01:00
Jorge Penadés 9a645c3288 fix: refs #7936 add IF NOT EXISTS to isRaid column in travel table 2024-11-26 16:56:39 +01:00
Jorge Penadés ad35a354a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4466-facturas-recibidas 2024-11-26 16:35:46 +01:00
Alex Moreno 816a7f23e5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-11-26 14:18:19 +01:00