10302 Commits

Author	SHA1	Message	Date
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
Jorge Penadés	addb093b6b	feat: refs #7936 add minimum due date	2024-12-11 17:42:03 +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
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
Jorge Penadés	46448d5fc2	fix: refs #7936 change type	2024-12-10 10:27:35 +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	eaa62909ff	chore: simplify	2024-12-09 14:30:45 +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	7c2c56ed9a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7936-fineTunningInvoiceIn	2024-12-09 13:50:01 +01:00
Jon Elias	87577d0982	Merge pull request '#7283 Items module: added translations and show error in item-type' (!3278) from Fix-ItemsModuleBack into dev ... Reviewed-on: #3278 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-12-09 12:30:53 +00: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
Sergio De la torre	22e9a9104a	feat: refs #8188 refs#8188 orderPicking	2024-12-09 13:20:55 +01:00
Jorge Penadés	f63d850ea3	refactor: refs #7366 rename ref to reference	2024-12-09 11:37:01 +01:00
Sergio De la torre	d17566107e	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:42:17 +01:00
Sergio De la torre	5db8ae53ac	feat: refs #8188 refs#8188 orderPicking	2024-12-05 12:39:20 +01:00
Jon Elias	97f08542be	feat: added translations and show error in item-type	2024-12-05 10:28:57 +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
Guillermo Bonet	127842a705	Merge branch 'test' into dev	2024-12-05 06:57:08 +01:00
Guillermo Bonet	078b559bea	Merge branch 'master' into test	2024-12-05 06:56:48 +01:00
Guillermo Bonet	187cd226c4	feat: refs #7644 Added distinct total label count	2024-12-05 06:56:18 +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
Carlos Satorres	7d1e3b6751	Merge branch 'master' into hotfix-6899invoiceOut	2024-12-04 08:18:27 +00:00
Alex Moreno	91db8817ef	Merge branch 'dev' into 8004-liliumStyleRemake	2024-12-04 07:09:30 +00:00
Carlos Andrés	d7af439787	Actualizar modules/travel/back/methods/travel/extraCommunityFilter.js	2024-12-03 17:49:48 +00:00
Jorge Penadés	104bef43c1	feat: add country id filter to sales monitor	2024-12-03 14:03:08 +01:00
Carlos Satorres	2267942368	fix: fix invoiceOut filter	2024-12-03 10:25:40 +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
Jorge Penadés	5b04debfb1	refactor: refs #7936 add transaction & tests	2024-12-02 17:48:40 +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
Alex Moreno	bf9f7d45bf	Merge branch 'master' into 8222-refactorDeleteZone2	2024-12-02 12:53:00 +00:00
Carlos Satorres	fd05ce0915	fix: refs #8222 fix prDeleteZone	2024-12-02 13:45:04 +01:00
Guillermo Bonet	947812e9f1	Merge branch 'test' into dev	2024-12-02 13:07:08 +01:00
Ivan Mas	bf0daf90db	Merge branch 'dev' into 7146-route.createdToDated	2024-12-02 11:56:58 +00:00
Robert Ferrús	d355b320b4	test: refs #244936 remove window.open called	2024-12-02 12:25:27 +01:00
Robert Ferrús	30da83a88c	fix: refs #244936 sale redirect catalog to lilium	2024-12-02 11:52:05 +01:00
Carlos Satorres	f50c20fb28	Merge branch 'master' into hotfix-7323workerHoliday	2024-12-02 09:49:55 +00:00
Carlos Satorres	fb40e25c7c	fix: remove ctx	2024-12-02 10:47:44 +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
Jorge Penadés	00085f2b99	feat: refs #7936 add tests for invoiceIn filter	2024-11-29 17:05:13 +01:00
Jorge Penadés	59b5dd5a36	feat: refs #7936 add tests for invoiceIn	2024-11-29 16:25:47 +01:00
Jorge Penadés	ac87905351	feat: refs #7936 add back test for updateInvoiceIn	2024-11-29 15:49:14 +01:00
Jorge Penadés	c9cf96676b	fix: refs #7936 check if insert in hook & change test description	2024-11-29 14:32:12 +01:00
Jorge Penadés	163c6ddd20	feat: refs #7936 add currency handling in invoiceIn trigger	2024-11-29 13:44:42 +01:00
Jorge Penadés	9ece52c5ce	feat: refs #7936 add currency check to updateInvoiceIn	2024-11-29 12:42:15 +01:00