27129 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	4310d6d3e6	Merge branch 'dev' into 8370-WorkerTimeControl	2025-03-04 12:44:21 +00:00
Guillermo Bonet	55e2bebff8	Merge branch 'test' into dev	2025-03-04 12:51:06 +01:00
Guillermo Bonet	c401167a6e	Merge branch 'master' into test	2025-03-04 12:50:21 +01:00
Guillermo Bonet	d14937fd64	fix: refs #7956 item_getSimilar	2025-03-04 12:50:07 +01:00
Pako Natek	539a7f375f	Merge pull request 'fix(priceDelta): removes not null restriction for itemTypeFk' (!3529) from hotfix-master-priceDelta into master ... Reviewed-on: #3529 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-03-04 11:11:15 +00:00
Alex Moreno	692d355574	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-04 12:05:13 +01:00
Alex Moreno	8bc54d0d64	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-04 12:05:07 +01:00
Pako Natek	8eefcf53d0	fix(priceDelta): removes not null restriction for itemTypeFk ... refs#8674	2025-03-04 11:51:15 +01:00
Jon Elias	ff977de929	Merge pull request 'Hotfix[MonitorSalesFilter]: Fix filtering' (!3525) from Hotfix-MonitorFilter into master ... Reviewed-on: #3525 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-04 10:41:56 +00:00
PAU ROVIRA ROSALENY	c0d8e6fa51	Merge pull request 'feat: #8048 update DB' (!3526) from 8408-updateDB into dev ... Reviewed-on: #3526 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-04 10:28:11 +00:00
Jon Elias	d40d45206d	Merge branch 'dev' into 8370-WorkerTimeControl	2025-03-04 10:26:45 +00:00
Jon Elias	8d89aed38a	refactor: refs #8370 fixed calendar not showing the correct color	2025-03-04 11:20:41 +01:00
Jon Elias	d7f06b7df9	fix: fixed salesFilter test	2025-03-04 10:33:48 +01:00
Jon Elias	729185f921	fix: fix salesFilter excluding ticket filtered	2025-03-04 10:25:19 +01:00
PAU ROVIRA ROSALENY	139e7d064d	feat: refs #8408 town, province, autonomy and country update to remove uppercase names	2025-03-04 10:23:51 +01:00
PAU ROVIRA ROSALENY	9958c0509d	feat: refs #8408 town and province update to remove uppercase names	2025-03-04 10:09:52 +01:00
Carlos Andrés	c4c606018d	Merge pull request 'fixlostTestMaster' (!3524) from fixlostTestMaster into master ... Reviewed-on: #3524 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-03-04 08:55:34 +00:00
Carlos Andrés	10a2dc484b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into fixlostTestMaster	2025-03-04 09:50:04 +01:00
Carlos Andrés	dd0bcd66cf	fix: comment out time adjustment logic in beforeInsert and beforeUpdate triggers	2025-03-04 09:45:24 +01:00
Carlos Andrés	06068c41c9	Actualizar db/routines/vn/procedures/item_getMinacum.sql	2025-03-04 08:38:44 +00:00
Carlos Andrés	b7d972593a	Actualizar db/routines/vn/procedures/item_getBalance.sql	2025-03-04 08:36:35 +00:00
Carlos Andrés	3b1e906a87	Actualizar db/routines/vn/procedures/item_getStock.sql	2025-03-04 08:20:30 +00:00
Juan Ferrer	1d592d336a	fix: refs #4409 Grant CDC stock privileges	2025-03-04 09:04:50 +01:00
Carlos Andrés	8e82a6d0f1	Actualizar db/routines/cache/procedures/available_refresh.sql	2025-03-04 08:03:59 +00:00
Juan Ferrer	4e701aaef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-04 08:58:09 +01:00
Juan Ferrer	68326fedd1	fix: refs #4409 Grant CDC stock privileges	2025-03-04 08:58:05 +01:00
Alex Moreno	4712547711	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-04 08:52:43 +01:00
Alex Moreno	fc9344d486	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-04 08:52:36 +01:00
Alex Moreno	2037c3d1fb	build: dump db	2025-03-04 08:51:41 +01:00
Juan Ferrer	6ff366cf02	fix: refs #4409 Grant CDC stock privileges	2025-03-04 08:43:25 +01:00
Alex Moreno	9a1669441f	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-04 08:04:19 +01:00
Alex Moreno	959c6f25e1	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-04 08:02:22 +01:00
Alex Moreno	80a27e44d9	Merge pull request '8713-testToMaster' (!3523) from 8713-testToMaster into master ... Reviewed-on: #3523 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-03-04 06:52:13 +00:00
Carlos Andrés	b63f2e5539	Merge pull request 'hotfix-catalog_calculate-bonus-en-test' (!3521) from hotfix-catalog_calculate-bonus-en-test into test ... Reviewed-on: #3521 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-03-04 06:43:32 +00:00
Carlos Andrés	4605a26b1f	fix: comment out shipping time adjustments in beforeInsert and beforeUpdate triggers	2025-03-04 07:41:04 +01:00
Alex Moreno	b77961fb14	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-03-03 14:44:28 +01:00
Alex Moreno	75f5888741	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2025-03-03 14:44:21 +01:00
Jose Antonio Tubau	3fbc13d468	Merge pull request 'feat: refs #7587 add ACL entry for TicketRefund model to allow employee read access' (!3515) from 7587-addClaimedTicketRefToRefundTicket into dev ... Reviewed-on: #3515 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:15:22 +00:00
Carlos Andrés	6861f2d4a0	Merge pull request '8700_invoiceOut' (!3513) from 8700_invoiceOut into master ... Reviewed-on: #3513 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-03-03 13:12:14 +00:00
Pako Natek	892c95f5f0	feat(availabled): refs #8048	2025-03-03 14:01:30 +01:00
Jose Antonio Tubau	5d61587153	Merge pull request '8664-refactorCmrList' (!3498) from 8664-refactorCmrList into dev ... Reviewed-on: #3498	2025-03-03 12:56:05 +00:00
Jose Antonio Tubau	c071d2a593	Merge branch 'dev' into 7587-addClaimedTicketRefToRefundTicket	2025-03-03 12:51:03 +00:00
Jose Antonio Tubau	e6d56cf2d6	Merge branch 'dev' into 8664-refactorCmrList	2025-03-03 12:40:47 +00:00
Pako Natek	8cc88453c4	fix(travel): new trigger for travel and new version to update it ... stockRefresh and entryIn also updated Refs: #8048	2025-03-03 13:29:20 +01:00
Javier Segarra	b65b884ca9	Merge pull request 'fix: #6321 - replace arg id by itemFk' (!3455) from fix_ticketNegative into dev ... Reviewed-on: #3455 Reviewed-by: Jon Elias <jon@verdnatura.es>	2025-03-03 11:52:53 +00:00
Javier Segarra	3adcdeae82	Merge pull request 'fix: hotfix back' (!3517) from hotfix-7830AddresType into master ... Reviewed-on: #3517 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 11:39:59 +00:00
Pako Natek	99bc9b4698	fix(catalog_calculate): improves new option for not itemtype selected ... Refs: #8674	2025-03-03 11:50:34 +01:00
Javier Segarra	7aae9be750	Merge branch 'dev' into fix_ticketNegative	2025-03-03 10:49:51 +00:00
Jon Elias	e059417d10	Merge pull request '#8081 recovered supplier decriptor and summary' (!3516) from 8081-RecoverSupplierDescriptor into dev ... Reviewed-on: #3516 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-03-03 10:43:11 +00:00
Javier Segarra	6804cdd5a3	Merge branch 'dev' into fix_ticketNegative	2025-03-03 10:41:21 +00:00