590 Commits

Author	SHA1	Message	Date
Guillermo Bonet	d6ec84e1fe	hotfix	2024-04-18 12:07:00 +02:00
Alex Moreno	7a021c9ac6	fix(payrollCenter): refs #6738	2024-04-18 09:13:15 +02:00
Pablo Natek	07f95f3f6c	Merge pull request 'master' (!2318) from master into test ... Reviewed-on: #2318 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-04-17 13:25:56 +00:00
Pablo Natek	d93dc28728	fix(view): refs #6372 fix	2024-04-17 12:32:33 +02:00
Guillermo Bonet	0d50f5b405	Merge pull request 'master' (!2315) from master into test ... Reviewed-on: #2315 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-04-17 10:20:20 +00:00
Robert Ferrús	0a4cd4d4d0	feat: company_getSuppliersDebtHotFix	2024-04-17 09:58:27 +02:00
Robert Ferrús	a0f3c6183b	Merge branch 'test' into 7219-sale_replaceItem	2024-04-17 06:42:18 +00:00
Guillermo Bonet	7d50907676	Merge branch 'master' into test	2024-04-17 08:41:10 +02:00
Guillermo Bonet	786a5a68b9	hotfix: EKT	2024-04-17 08:40:25 +02:00
Guillermo Bonet	62596de1dd	Merge branch 'master' into test	2024-04-16 17:25:28 +02:00
Guillermo Bonet	db5b0d7967	hotfix: ticket#174761 Greatest fix null possibility	2024-04-16 17:19:25 +02:00
Robert Ferrús	01d959f6f4	feat: refs #7219	2024-04-16 12:46:50 +02:00
Guillermo Bonet	9ea1ac2a56	Merge branch 'master' into test	2024-04-16 12:32:27 +02:00
Guillermo Bonet	7fda58d4a4	hotfix: ticket#174308 Ekt load packing	2024-04-16 12:29:44 +02:00
Juan Ferrer	42fe7fb1e2	feat(binlog): refs #4409 Disable order recalc from triggers	2024-04-15 11:32:44 +02:00
Juan Ferrer	ccf77ed356	fix(util): refs #7205 util.slowLog_prune code clean	2024-04-12 09:24:48 +02:00
Juan Ferrer	622075a9aa	fix(util): refs #7205 fix util.slowLog_prune	2024-04-12 09:21:34 +02:00
Guillermo Bonet	2226922366	Merge branch 'master' into test	2024-04-11 14:52:16 +02:00
Guillermo Bonet	c190d2bef1	Merge branch 'master' into ticket168996-hotfix	2024-04-11 07:31:31 +00:00
Alex Moreno	3635a4b6d0	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-04-11 07:46:16 +02:00
Pablo Natek	b2c3442c12	Merge branch 'master' into 7024-fixInventorryError	2024-04-11 05:33:44 +00:00
Pablo Natek	68ca5d369c	fix: refs #7024 fix error on setting local variable	2024-04-11 07:33:31 +02:00
Ivan Mas	83befbd120	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-10 15:21:42 +00:00
Pablo Natek	2c5c2ca5a7	fix: refs #7024 fix condition sintax	2024-04-10 14:17:08 +02:00
Ivan Mas	08948ad360	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-10 12:05:04 +00:00
Pablo Natek	2e15b35fd1	fix: refs #7024 create exception for inventory	2024-04-10 14:01:03 +02:00
Ivan Mas	0b7042d597	refs #6732 change Proveedores isReal	2024-04-10 13:55:25 +02:00
Guillermo Bonet	1fe783cf0e	hotfix: ticket168996 Now ticket_doCmr ignore deliveryMethod	2024-04-10 12:00:52 +02:00
Jorge Penadés	099fb70582	Merge branch 'dev' into 6492-refactorProceduresVn2008	2024-04-10 09:29:15 +00:00
Robert Ferrús	2c91385e62	Merge branch '7150-greuge_dif_porte_add' of https://gitea.verdnatura.es/verdnatura/salix into 7150-greuge_dif_porte_add	2024-04-10 08:09:57 +02:00
Robert Ferrús	c30c0de92c	feat: refs #7150	2024-04-10 08:09:54 +02:00
Robert Ferrús	3420667ae5	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-10 06:05:03 +00:00
Ivan Mas	eedf30a2dd	refs #6732 salix dependencies and undo changes Proveedores	2024-04-09 17:31:34 +02:00
Jorge Penadés	a3c1bceb7e	refactor: refs #6492 use enum	2024-04-09 15:57:34 +02:00
Jorge Penadés	dca75437f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 15:20:30 +02:00
Ivan Mas	f02c4354ba	Merge branch 'dev' into 6827-check-usernames-special-characters	2024-04-09 14:45:29 +02:00
Ivan Mas	521033edd2	Merge branch 'dev' into 6732-Change-name-vn.supplier.isSerious-to-vn.supplier.isReal	2024-04-09 11:54:41 +00:00
Guillermo Bonet	0e2e68488d	Merge branch 'test' into dev	2024-04-09 13:08:54 +02:00
Jorge Penadés	9a28a59d00	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008	2024-04-09 11:11:30 +02:00
Robert Ferrús	4a31fe29b8	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-09 05:40:01 +00:00
Sergio De la torre	75293fbb9a	refs #6276 hotFix:itemShelving_add	2024-04-09 07:38:28 +02:00
Pablo Natek	1c064c7bfc	Merge branch 'dev' into 6021-floranet_RedMoon	2024-04-09 05:23:34 +00:00
Pako Natek	2eb229adf7	catalogue fixed	2024-04-08 14:30:46 +02:00
Robert Ferrús	6ba43a3c6d	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 11:29:09 +00:00
Carlos Andrés	5558e92b1e	Merge pull request 'fix: closeTicket idem salix refs #6549' (!2163) from 6549-ticket_close into dev ... Reviewed-on: #2163 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-04-08 10:36:21 +00:00
Robert Ferrús	0c5b9e3544	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 10:28:02 +00:00
Guillermo Bonet	0b96471c7d	feat: refs #6714 Added businessType zone_getAddresses	2024-04-08 09:27:07 +02:00
Robert Ferrús	657150a9a7	feat: refs #7150 greuge_dif_porte_add	2024-04-08 08:57:56 +02:00
Robert Ferrús	1e8e6a67a3	Merge branch 'dev' into 7150-greuge_dif_porte_add	2024-04-08 06:39:22 +00:00
Robert Ferrús	5517c29c1c	fet: refs #7150 greuge_dif_porte_add	2024-04-08 08:37:37 +02:00