25330 Commits

All Branches

Search

Author	SHA1	Message	Date
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +01:00
Jorge Penadés	a37332f7be	fix: refs #6818 add defaultChannel	2024-11-14 11:18:38 +01:00
Jorge Penadés	25b05637a6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 11:17:11 +01:00
Ivan Mas	0a11997250	Merge pull request 'feat: refs #8143 deprecate recoverPass and sync from account.user' (!3203) from 8143-deprecateColumnsFromUser into dev ... Reviewed-on: #3203 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-14 10:16:55 +00:00
Jorge Penadés	c8ab5d4344	fix: refs #6818 add defaultChannel	2024-11-14 11:16:45 +01:00
Ivan Mas	96a13af02c	Merge branch 'dev' into 8143-deprecateColumnsFromUser	2024-11-14 10:11:37 +00:00
Guillermo Bonet	54da1a713a	Merge branch '8151-moveExpeditions' of https://gitea.verdnatura.es/verdnatura/salix into 8151-moveExpeditions	2024-11-14 10:53:15 +01:00
Guillermo Bonet	b3dcaf4cf5	feat: refs #8151 Requested changes	2024-11-14 10:53:13 +01:00
Guillermo Bonet	b7cb420c72	Merge branch 'dev' into 8151-moveExpeditions	2024-11-14 09:46:00 +00:00
Guillermo Bonet	534b50f51a	feat: refs #8151 Requested changes	2024-11-14 10:45:28 +01:00
Pablo Natek	b4406a69d8	Merge pull request 'feat: refs #6403 add debug on cancel shipment' (!3197) from 6403-add-debug-on-cancelShipment into master ... Reviewed-on: #3197 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 09:16:08 +00:00
Guillermo Bonet	d387486ea8	refactor: refs #7920 Requested changes	2024-11-14 09:59:01 +01:00
Guillermo Bonet	2f7de633bd	Merge branch 'dev' into 7244-collectionAcl	2024-11-14 08:43:25 +00:00
Guillermo Bonet	8449a6c6d3	feat: refs #7244 Requested changes	2024-11-14 09:42:59 +01:00
Guillermo Bonet	5f50d84213	feat: refs #7244 Requested changes	2024-11-14 09:42:49 +01:00
Carlos Satorres	cd7ed6987a	Merge pull request 'fix: refs #7283 remove' (!2907) from 7283-itemsMigration3 into dev ... Reviewed-on: #2907 Reviewed-by: Alex Moreno <alexm@verdnatura.es> Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-11-14 08:40:50 +00:00
Guillermo Bonet	b9397c527d	feat: refs #8057 Added data updates	2024-11-14 09:32:02 +01:00
Guillermo Bonet	bde192966e	feat: refs #8057 Added data updates	2024-11-14 09:30:36 +01:00
Guillermo Bonet	cba1abad68	feat: refs #8057 Added data updates	2024-11-14 09:27:38 +01:00
Carlos Satorres	b0812139cb	Merge branch '7283-itemsMigration3' of https://gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-11-14 09:26:16 +01:00
Carlos Satorres	155616e622	Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix into 7283-itemsMigration3	2024-11-14 09:26:13 +01:00
Guillermo Bonet	d4b0da50d0	feat: refs #8057 Added data updates	2024-11-14 09:00:19 +01:00
Guillermo Bonet	b7655b4f92	feat: refs #8057 Added geoFk columns	2024-11-14 08:24:42 +01:00
Guillermo Bonet	97e53b2ef8	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-14 06:57:26 +00:00
Guillermo Bonet	9c0af7f7c6	refactor: refs #7950 Requested changes	2024-11-14 07:57:13 +01:00
Ivan Mas	e1b0fc298c	feat: refs #8143 deprecate recoverPass and sync from account.user	2024-11-13 20:26:54 +01:00
Ivan Mas	26be6c6920	Merge pull request 'feat: refs #7994 new version script fix' (!3202) from 7994-newVersionScriptFix into master ... Reviewed-on: #3202 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-11-13 16:34:59 +00:00
Ivan Mas	21693cfd71	feat: refs #7994 new version script fix	2024-11-13 14:33:52 +01:00
Guillermo Bonet	d4a60f63c9	feat: refs #8151 Added test	2024-11-13 14:05:03 +01:00
Guillermo Bonet	018393fa93	feat: refs #8151 Added test	2024-11-13 14:04:02 +01:00
Guillermo Bonet	344427da45	feat: refs #8151 moveExpeditions	2024-11-13 13:46:40 +01:00
Guillermo Bonet	72e067ff81	fix: refs #7244 Added collection ACL	2024-11-13 12:53:18 +01:00
Pablo Natek	5f3b1ff601	Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master ... Reviewed-on: #3196 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:24:18 +00:00
Guillermo Bonet	782563f67d	Merge branch 'test' into dev	2024-11-13 12:19:42 +01:00
Guillermo Bonet	aa1c017f22	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 12:17:58 +01:00
Guillermo Bonet	5a134668da	refactor: refs #7920 itemShelvingLog	2024-11-13 12:04:47 +01:00
Guillermo Bonet	755312b981	refactor: refs #7920 Fix tests	2024-11-13 11:51:23 +01:00
Guillermo Bonet	9d5ef3eeb0	Merge branch 'dev' into 7920-itemShelving	2024-11-13 10:16:57 +00:00
Guillermo Bonet	b3bf0024e3	refactor: refs #7920 Major changes	2024-11-13 11:15:31 +01:00
Pablo Natek	274a365ec0	feat: refs #6403 add debug on cancel shipment	2024-11-13 11:03:57 +01:00
Robert Ferrús	021bc03ecf	Merge pull request 'feat: refs #8169 create table itemTextureTag' (!3155) from 8169-itemTextureTag into master ... Reviewed-on: #3155 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-13 09:48:46 +00:00
Robert Ferrús	9b079a8bb2	Merge branch 'master' into 8169-itemTextureTag	2024-11-13 09:45:23 +00:00
Guillermo Bonet	2273dc636e	refactor: refs #7920 Major changes	2024-11-13 09:56:38 +01:00
Jorge Penadés	0a92fbbdbc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport	2024-11-13 09:53:35 +01:00
Guillermo Bonet	172b4d8e05	Merge branch 'test' into dev	2024-11-13 09:40:30 +01:00
Guillermo Bonet	1086981b53	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 09:35:06 +01:00
Jorge Penadés	5d908fd5f9	feat: refs #7641 improve style	2024-11-13 09:33:28 +01:00
Jorge Penadés	a91f952778	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport	2024-11-13 09:32:43 +01:00
Jorge Penadés	968e308ab6	Merge pull request 'feat: refs #6818 saysimple integration' (!3168) from 6818-saySimpleIntegration into dev ... Reviewed-on: #3168 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-13 08:25:20 +00:00
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00