10156 Commits

Author	SHA1	Message	Date
Alex Moreno	7f39edf014	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-19 07:46:43 +01:00
Pablo Natek	4e7a96442a	Merge branch 'master' into 7404-fixNegativeQuantity	2024-11-19 05:21:26 +00:00
Pablo Natek	33d9ba9b44	fix: refs #7404 negative quantity	2024-11-19 06:21:00 +01:00
Pablo Natek	056b5adddc	Merge branch 'dev' into 7457-orderFilter	2024-11-19 05:12:18 +00:00
Carlos Satorres	6619ec451c	fix: getSales	2024-11-18 13:46:56 +01:00
Javier Segarra	4b64b27ca7	Merge branch 'dev' into 7289_sales_already_moved	2024-11-18 10:39:17 +00:00
Jorge Penadés	dd637b9333	fix: refs #6869 use id as primaryKey	2024-11-18 10:34:23 +01:00
Javier Segarra	9558d030ff	feat: refs #7289 #7289 remove bad translation	2024-11-18 10:10:30 +01:00
Guillermo Bonet	2b97c18412	Merge branch 'dev' into 6869-createGetDetails	2024-11-18 08:34:11 +00:00
Javier Segarra	6c00efae89	feat: refs #7289 #7289 apply option 1	2024-11-17 17:57:54 +01:00
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	86e4e3e981	Merge branch 'dev' into 7743-simpleTestForSendMail	2024-11-15 09:26:42 +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	d1c528c8fd	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-15 06:03:36 +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	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
Alex Moreno	a8cb0b9eb8	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-11-14 12:21:13 +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
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	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
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
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	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
Jorge Penadés	f52041eeff	Merge branch 'dev' into 6818-saySimpleIntegration	2024-11-13 08:22:40 +00:00
Pablo Natek	b025a8b804	fix: refs #7404 filter an rounding issues	2024-11-13 09:10:18 +01:00
Guillermo Bonet	3c8ef7cdba	refactor: refs #7950 Requested changes	2024-11-12 14:54:11 +01:00
Guillermo Bonet	6427a90c44	Merge branch 'dev' into 7950-cmrModelUnify	2024-11-12 12:25:11 +00:00
Sergio De la torre	b532691043	Merge pull request 'feat: refs #8150 movExpeditions' (!3167) from 8150-moveExpeditionsApp into dev ... Reviewed-on: #3167 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-11-12 11:02:58 +00:00
Guillermo Bonet	aec4d0b1a4	Merge branch 'test' into dev	2024-11-12 11:28:32 +01:00
Guillermo Bonet	699675b476	fix: hotfix	2024-11-12 11:27:23 +01:00
Javier Segarra	96301f8a0b	fix: hotfix create order from customer	2024-11-12 10:43:05 +01:00
Guillermo Bonet	90e7ab1ec1	refactor: refs #7950 Created cmr model	2024-11-12 08:25:23 +01:00
Jorge Penadés	186312702d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration	2024-11-11 16:41:37 +01:00
Jorge Penadés	a41fc36f90	feat: refs #6869 define model	2024-11-11 13:02:09 +01:00