Commit Graph

6492 Commits

Author SHA1 Message Date
Alex Moreno 63f062a069 fix(renewToken): refs #8093 test & fix(sql) addClientObservationType 2024-10-15 08:19:35 +02:00
Alex Moreno 5b938a6f78 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-10-15 08:00:39 +02:00
Sergio De la torre f27566ac0f Merge pull request 'master' (!3098) from master into test
Reviewed-on: #3098
Reviewed-by: Robert Ferrús <robert@verdnatura.es>
2024-10-15 05:18:30 +00:00
Sergio De la torre 13c7b34c98 Merge branch 'master' into 6861-ItemShelvingSaleReserve 2024-10-14 14:15:51 +00:00
Jorge Penadés 0549e22720 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType 2024-10-14 15:38:30 +02:00
Alex Moreno e0b252e6bb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-10-14 14:12:16 +02:00
Alex Moreno 0063591089 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-10-14 14:11:57 +02:00
Sergio De la torre 06b7d56837 fix: refs #6861 assignCollection&isOnReservationMode 2024-10-14 13:01:30 +02:00
Jorge Penadés b39a749bee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType 2024-10-14 08:37:58 +02:00
Alex Moreno d8e0c1debe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-10-14 07:27:19 +02:00
Jorge Penadés 295c31a5f0 feat: refs #7874 add finance obs type 2024-10-10 11:01:25 +02:00
Jorge Penadés 2b17e6da4c Merge branch 'dev' into 7874-createObservationType 2024-10-10 08:16:29 +00:00
Jorge Penadés f5a43962fd Merge branch 'dev' into 7207-showPbx 2024-10-10 07:18:06 +00:00
Pako Natek 3347cde109 Merge branch 'master' into 8075-master-itemShelvingMoving 2024-10-10 06:33:13 +00:00
Pako Natek 208869bd30 fix: refs #8069 removed obsolete variables 2024-10-10 08:20:41 +02:00
Pako Natek 4eab12dd04 fix: refs #8069 throw message in spanish 2024-10-09 07:41:43 +02:00
Pako Natek 679773b33e feat: refs #8075 itemShelvingMoving 2024-10-09 07:26:22 +02:00
Pako Natek 5eda0af20f feat: refs #8075 itemShelvingMoving 2024-10-09 07:24:34 +02:00
Pako Natek f0ac12d52e Merge branch 'master' into 8069-hotFix-oversTocking 2024-10-09 05:21:02 +00:00
Alex Moreno 02adc6473a fix: duplicate variable 2024-10-08 12:22:47 +02:00
Alex Moreno 5cdb0b7eb6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-10-08 12:19:10 +02:00
Alex Moreno f8a3527680 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-10-08 12:17:02 +02:00
Guillermo Bonet 023842ac33 feat: refs #7994 comment changes 2024-10-08 08:33:04 +02:00
Sergio De la torre 4894cb140e Merge pull request 'fix: refs #6861 duplicatedTicketsInReserve' (!3053) from 6861-itemShelvingSaleDelete into master
Reviewed-on: #3053
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-10-08 05:41:54 +00:00
Pako Natek ff43533b5a Merge branch 'dev' into 8075-itemShelvingMoving 2024-10-08 05:33:14 +00:00
Jorge Penadés 330c1f3de6 chore: refs #7207 drop transaction 2024-10-07 17:50:36 +02:00
Jorge Penadés ebe763dc9b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx 2024-10-07 17:45:07 +02:00
Ivan Mas 0358157b2c Merge branch 'dev' into 7994-UpdateSale.OriginalQuantity 2024-10-07 14:48:20 +00:00
Jorge Penadés 3755c5a15b Merge branch 'dev' into 7207-showPbx 2024-10-07 14:27:09 +00:00
Sergio De la torre d164cccee5 fix: refs #6861 assignCollection 2024-10-07 16:14:16 +02:00
Pako Natek 20836d734c fix: refs #8069 order_confirmWithUser 2024-10-07 14:25:46 +02:00
Pako Natek 33a4061058 feat: refs #8069 8069-overStocking 2024-10-07 14:24:55 +02:00
Pako Natek 22719820fd feat: refs #8069 overStocking protocol 2024-10-07 14:21:18 +02:00
Pako Natek e105fba227 feat: refs #8075 itemShelving
new field movingState
2024-10-07 13:46:56 +02:00
Pako Natek de769efc0f feat: refs #8075 autoupdating 2024-10-07 09:05:03 +02:00
Pako Natek 3cc31b7779 Merge branch 'dev' into 8075-itemShelvingMoving 2024-10-07 06:41:45 +00:00
Pako Natek 542d0dcbd2 feat(itemShelving): refs #8075 new field
isMoving indicates the record must be transferred to another sector

Refs: #8075
2024-10-07 08:41:07 +02:00
Jorge Penadés 4fb0936399 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-07 06:39:11 +00:00
Jorge Penadés 53f590af61 Merge branch 'dev' into 7207-showPbx 2024-10-07 06:31:14 +00:00
Guillermo Bonet 701b8d3c14 Merge pull request 'refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale' (!3057) from 6824-itemShelvingSaleNoDelete into dev
Reviewed-on: #3057
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-07 05:50:48 +00:00
Guillermo Bonet d6e2200227 Merge branch 'test' into dev 2024-10-07 07:48:23 +02:00
Guillermo Bonet eb5da0f9cc Merge branch 'test' into dev 2024-10-07 07:39:23 +02:00
Guillermo Bonet 4da63900a2 fix: refs #7760 collection_assing added global handler sqlexception 2024-10-07 07:36:50 +02:00
Guillermo Bonet 7b4d15cb23 refactor: refs #6824 Requested changes 2024-10-07 07:30:36 +02:00
Guillermo Bonet 6b7f161d9a fix: refs #7844 sale_problems llena 2024-10-07 06:39:41 +02:00
Guillermo Bonet 9a327a1c39 Merge branch 'dev' into 6824-itemShelvingSaleNoDelete 2024-10-06 08:21:07 +00:00
Guillermo Bonet ba9d0743b5 refactor: refs #6824 Throw for no delete itemShelving with itemShelvingSale 2024-10-06 10:20:34 +02:00
Guillermo Bonet 12bf7f07c5 Merge branch 'test' into dev 2024-10-06 09:13:07 +02:00
Guillermo Bonet 4a17d9ec0e fix: refs #7760 collection_assing 2024-10-06 09:07:48 +02:00
Jorge Penadés e0d0b66963 feat: refs #7207 add transaction 2024-10-04 16:48:38 +02:00