25318 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	7d7c66de89	Merge branch 'Hotfix-DescriptorRedirectToLilium' of https://gitea.verdnatura.es/verdnatura/salix into Hotfix-DescriptorRedirectToLilium	2024-11-15 14:22:21 +01:00
Jon Elias	4783cc23ac	refactor: deleted negative bases route due to not being used	2024-11-15 14:22:19 +01:00
Jon Elias	af781d4c1a	Merge branch 'master' into Hotfix-DescriptorRedirectToLilium	2024-11-15 12:15:21 +00:00
Jon Elias	6ed521ae5e	fix: redirect to invoice-out summary from salix' descriptor	2024-11-15 13:10:19 +01:00
Pablo Natek	60f989b566	Merge branch 'dev' into 7457-orderFilter	2024-11-15 11:56:54 +00:00
Pablo Natek	55daa2d02b	Merge pull request '7743-simpleTestForSendMail' (!3170) from 7743-simpleTestForSendMail into dev ... Reviewed-on: #3170 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 11:54:23 +00:00
Guillermo Bonet	b529ccfe29	feat: refs #7920 Added ItemShelving in shelvingLog	2024-11-15 12:43:15 +01:00
Robert Ferrús	923296e85e	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:34:34 +00:00
Guillermo Bonet	a3945070f2	refactor: refs #7920 No changes in itemShelvingLog table	2024-11-15 11:34:18 +01:00
Robert Ferrús	c5f1b05671	feat: refs #8127 quitar esquemas	2024-11-15 11:32:20 +01:00
Robert Ferrús	f7a5fc7e31	Merge branch 'dev' into 8127-entry_updateComission	2024-11-15 10:06:45 +00:00
Pablo Natek	86e4e3e981	Merge branch 'dev' into 7743-simpleTestForSendMail	2024-11-15 09:26:42 +00:00
Sergio De la torre	07318656b7	feat: refs #8135 refs#8135 updateTicketACL	2024-11-15 08:47:30 +01:00
Guillermo Bonet	e1a091535e	refactor: refs #7920 Fix version	2024-11-15 08:45:28 +01:00
Sergio De la torre	7a4455d6d0	feat: refs #6869 refs#6869 itemShelving_get	2024-11-15 08:12:16 +01:00
Guillermo Bonet	b5463e5560	refactor: refs #7920 Fix version	2024-11-15 07:54:33 +01:00
Guillermo Bonet	e49285ace8	refactor: refs #7920 Fix version	2024-11-15 07:51:37 +01:00
Guillermo Bonet	e344ae3bf2	refactor: refs #7920 Fix version	2024-11-15 07:48:17 +01:00
Guillermo Bonet	216b81adda	Merge pull request 'refactor: refs #7920 Main change' (!3194) from 7920-itemShelving into dev ... Reviewed-on: #3194 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:44:16 +00:00
Guillermo Bonet	48ffb80094	Merge branch 'dev' into 7920-itemShelving	2024-11-15 06:40:41 +00:00
Pablo Natek	d8e728e823	Merge branch 'dev' into 7457-orderFilter	2024-11-15 06:17:04 +00:00
Guillermo Bonet	96b85701d8	Merge pull request 'refactor: refs #7950 Created cmr model' (!3180) from 7950-cmrModelUnify into dev ... Reviewed-on: #3180 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:07:16 +00:00
Guillermo Bonet	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +00:00
Guillermo Bonet	0fbef4c88a	Merge pull request 'fix: refs #7244 Added collection ACL' (!3198) from 7244-collectionAcl into dev ... Reviewed-on: #3198 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 06:01:48 +00:00
Guillermo Bonet	3b48cf3d5d	Merge pull request 'feat: refs #8151 moveExpeditions' (!3200) from 8151-moveExpeditions into dev ... Reviewed-on: #3200 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-15 05:59:19 +00:00
Jorge Penadés	7e2194df41	Merge pull request 'fix: refs #6818 add defaultChannel' (!3205) from 6818-addDefaultChannel into dev ... Reviewed-on: #3205 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:41:10 +00:00
Jorge Penadés	4b659c0b48	fix: refs #6818 use right col type	2024-11-14 16:39:35 +01:00
Jorge Penadés	f96b914649	fix: refs #6818 use right col type	2024-11-14 16:39:26 +01:00
Jorge Penadés	86c95e185c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-addDefaultChannel	2024-11-14 16:32:40 +01:00
Jorge Penadés	f3e640e4a0	Merge pull request 'refactor: refs #7641 entry report style' (!3178) from 7641-refactorEntryReport into dev ... Reviewed-on: #3178 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:29:14 +00:00
Jorge Penadés	1ca737fd13	Merge branch 'dev' into 7641-refactorEntryReport	2024-11-14 15:22:00 +00:00
Jorge Penadés	e242320eed	Merge pull request '#7874 setDefaultTypeNote' (!3209) from 7874-setDefaultTypeNote into dev ... Reviewed-on: #3209 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-14 15:21:19 +00:00
Jorge Penadés	4766d25dda	feat: refs #7874 use name	2024-11-14 15:54:53 +01:00
Pablo Natek	9ac54f463a	fix: refs #7457 add with on select to reduce	2024-11-14 15:48:11 +01:00
Jorge Penadés	eff251fbb5	feat: refs #7874 add default type	2024-11-14 15:46:51 +01:00
Jorge Penadés	ab2e88806e	fix: refs #7641 drop boilerplate code	2024-11-14 15:29:54 +01:00
Jorge Penadés	c4375b2505	feat: refs #7641 fine tunning	2024-11-14 15:29:18 +01:00
Jorge Penadés	47ae1b59c1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7641-refactorEntryReport	2024-11-14 15:22:22 +01:00
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