22173 Commits

All Branches

Search

Author	SHA1	Message	Date
Guillermo Bonet	9b80ef73a8	Merge branch 'test' into dev	2024-06-14 12:48:00 +02:00
Guillermo Bonet	6c2fd2580d	Merge branch 'master' into test	2024-06-14 12:47:51 +02:00
Guillermo Bonet	798bf6d028	hotfix: refs #6281 itemShelving_add buy is required	2024-06-14 12:41:46 +02:00
Carlos Satorres	86617ec35a	Merge pull request 'warmFix change if' (!2587) from warmFix-vacationsWorkCenter into test ... Reviewed-on: #2587 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-14 08:45:51 +00:00
Carlos Satorres	e3e9706fb8	fix fixtures	2024-06-14 09:53:50 +02:00
Carlos Satorres	189c67bd2d	warmFix change if	2024-06-14 09:43:10 +02:00
Ivan Mas	159b69a04c	Merge pull request 'refs #7530 delete trigger deviceProductionConfig_afterUpdate' (!2586) from 7530-Remove_CAU_sending_deviceProductionConfig into dev ... Reviewed-on: #2586 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-14 06:07:18 +00:00
Ivan Mas	615fd3e97b	refs #7530 delete trigger deviceProductionConfig_afterUpdate	2024-06-13 15:10:04 +02:00
Robert Ferrús	5714539d78	Merge pull request 'test' (!2585) from test into dev ... Reviewed-on: #2585 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 07:18:55 +00:00
Robert Ferrús	31c4ace76c	Merge pull request 'master' (!2584) from master into test ... Reviewed-on: #2584 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 06:59:38 +00:00
Robert Ferrús	78fde69c32	Merge pull request 'fix: refs #7039 supplier search-panel country' (!2583) from 7039-supplierFixCountry into master ... Reviewed-on: #2583 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-13 06:50:42 +00:00
Robert Ferrús	b5e139b734	fix: refs #7039 supplier search-panel country	2024-06-13 08:43:11 +02:00
Guillermo Bonet	53c732bcb9	Merge branch 'test' into dev	2024-06-13 07:12:10 +02:00
Guillermo Bonet	d7317e4067	hotfix: refs #7024 Modify booked entries	2024-06-13 07:09:48 +02:00
Javi Gallego	446e180cf0	hotfix claim	2024-06-12 11:58:07 +02:00
Alex Moreno	b5ecf2e3b5	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 10:11:14 +02:00
Alex Moreno	a6d2029dc0	Merge pull request 'fix(updateQuantity): fix rocket translation' (!2581) from 6408-hotFix_updateQuantity into master ... Reviewed-on: #2581 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-12 08:10:10 +00:00
Alex Moreno	de0f0623e1	Merge branch 'master' into 6408-hotFix_updateQuantity	2024-06-12 08:07:25 +00:00
Alex Moreno	d9b0a1a75c	fix(updateQuantity): fix rocket translation	2024-06-12 09:59:58 +02:00
Alex Moreno	b31a38e03b	Merge pull request 'fix(sale): rocket is only sent if it has sales' (!2580) from 6408-hotFix_sales_length into master ... Reviewed-on: #2580 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-12 07:33:53 +00:00
Alex Moreno	789e0e65e3	fix(sale): rocket is only sent if it has sales	2024-06-12 09:12:48 +02:00
Alex Moreno	8dcd04384b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 08:39:59 +02:00
Alex Moreno	4833ba4def	Merge pull request 'feat(jenkinsfile): use build_id' (!2579) from jenkinsFile_useBuildIdInVersion into master ... Reviewed-on: #2579 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-12 06:37:37 +00:00
Alex Moreno	08d6384fd4	Merge branch 'master' into jenkinsFile_useBuildIdInVersion	2024-06-12 06:24:04 +00:00
Alex Moreno	1eee1d0e9b	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-12 07:47:56 +02:00
Alex Moreno	a0146597d5	Merge pull request 'hotfix #6408' (!2578) from hotFix-6408 into master ... Reviewed-on: #2578 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-12 05:46:33 +00:00
Alex Moreno	c4c6df5a78	feat(jenkinsfile): use build_id	2024-06-12 07:41:00 +02:00
Guillermo Bonet	17fa1e10f6	feat: refs #6701 Added claimRatio_afterInsert	2024-06-12 07:33:10 +02:00
Pablo Natek	11a7d890a0	Merge pull request 'feat: refs #7499 add printedStickers' (!2577) from 7499-add-printedStickers into dev ... Reviewed-on: #2577 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 14:32:14 +00:00
Javi Gallego	4744f57269	Merge pull request 'feat: refs #7548 link a grafana' (!2568) from 7548-ticketSummaryCollection into dev ... Reviewed-on: #2568 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 12:54:06 +00:00
Javi Gallego	79c922300b	hotfix #6408	2024-06-11 14:50:47 +02:00
Pablo Natek	13d1d0a61c	feat: refs #7499 add printedStickers	2024-06-11 14:29:16 +02:00
Robert Ferrús	ec7bf13e8c	Merge pull request 'fix: refs #7039 fix item-tax' (!2576) from 7039-fixCountry into master ... Reviewed-on: #2576 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-11 12:20:59 +00:00
Robert Ferrús	8039530ab4	fix: refs #7039 fix item-tax	2024-06-11 14:15:10 +02:00
Jorge Penadés	a6c8b2bebe	Merge pull request 'hotfix buyer editZone acl' (!2572) from hotfix-buyerEditZoneAcl into master ... Reviewed-on: #2572 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 10:47:35 +00:00
Jorge Penadés	1cefe817f5	feat: add editZone ACL for buyer	2024-06-11 12:06:44 +02:00
Guillermo Bonet	deff65918d	Merge pull request 'feat: refs #7568 Added freelancer exception' (!2571) from 7568-ticket_doCmr into dev ... Reviewed-on: #2571 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-06-11 09:22:29 +00:00
Guillermo Bonet	76f76b8304	feat: refs #7568 Added freelancer exception	2024-06-11 10:48:24 +02:00
Alex Moreno	9c2ccc5df4	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-06-11 09:59:09 +02:00
Jorge Penadés	8117b748b3	Merge pull request '#6243 generalize cmr section' (!2406) from 6243-generalizeCmrSection into dev ... Reviewed-on: #2406 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-06-11 07:41:19 +00:00
Alex Moreno	c9885920e7	Merge pull request 'build: dump' (!2569) from 7565-dump into master ... Reviewed-on: #2569 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-06-11 07:37:04 +00:00
Jorge Penadés	6b04b371f2	Merge branch 'dev' into 6243-generalizeCmrSection	2024-06-11 07:36:58 +00:00
Jorge Penadés	6aca0765c0	Merge pull request '#6598 acls back' (!2400) from 6598-getUserAcls into dev ... Reviewed-on: #2400 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-06-11 07:31:03 +00:00
Alex Moreno	a446c278b4	Merge branch 'master' into 7565-dump	2024-06-11 07:17:11 +00:00
Jorge Penadés	d30cd68417	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6598-getUserAcls	2024-06-11 09:11:56 +02:00
Guillermo Bonet	873f36fef6	refactor: refs #7503 Added relations and ACLs	2024-06-11 08:50:32 +02:00
Alex Moreno	2dec51804c	build: dump	2024-06-11 08:38:26 +02:00
Alex Moreno	7adf4a373d	Merge pull request '7565-testToMaster' (!2567) from 7565-testToMaster into master ... Reviewed-on: #2567 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-06-11 06:31:16 +00:00
Alex Moreno	282cf96336	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7565-testToMaster	2024-06-11 08:04:09 +02:00
Guillermo Bonet	bd13ecd464	refactor: refs #7486 engine memory and primary key sales_merge	2024-06-11 07:59:53 +02:00