24144 Commits

All Branches

Search

Author	SHA1	Message	Date
Jon Elias	dc236dbf82	Merge pull request 'Redirect invoice out to Lilium' (!2807) from InvoiceOut_Migration into dev ... Reviewed-on: #2807 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-05 08:32:56 +00:00
Guillermo Bonet	97f409183e	Merge pull request 'feat: refs #7759 Changed definer root to vn' (!2769) from 7759-newDefiner into dev ... Reviewed-on: #2769 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2024-09-05 07:43:20 +00:00
Guillermo Bonet	8ca491b8de	Merge branch 'dev' into 7759-newDefiner	2024-09-05 09:40:42 +02:00
Jorge Penadés	e98313a1a5	Merge branch 'dev' into 7524-addFixture	2024-09-05 07:37:56 +00:00
Guillermo Bonet	d0eab064b7	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:26:27 +00:00
Guillermo Bonet	6df817ea5d	Merge branch 'test' into dev	2024-09-05 09:25:00 +02:00
Guillermo Bonet	a2a5630d17	Merge branch 'master' into test	2024-09-05 09:24:39 +02:00
Guillermo Bonet	95d4c706d4	fix: refs #7346 multiple to quick in closure.js	2024-09-05 09:23:58 +02:00
Guillermo Bonet	f6e585433a	Merge branch '7905-getBuysCsv' of https://gitea.verdnatura.es/verdnatura/salix into 7905-getBuysCsv	2024-09-05 09:21:02 +02:00
Guillermo Bonet	2aeff19578	fix: refs #7905 added comments to flatten.js	2024-09-05 09:21:00 +02:00
Guillermo Bonet	2b465d0d23	Merge branch 'dev' into 7905-getBuysCsv	2024-09-05 07:18:37 +00:00
Javier Segarra	d49707828b	fix(salix): refs #7905 #7905 use right fn to flatten data	2024-09-05 09:13:33 +02:00
Jorge Penadés	03d711b694	chore: refs #7524 add select limit	2024-09-05 09:12:52 +02:00
Jorge Penadés	998d3865a3	chore: refs #7663 fix test	2024-09-05 08:56:15 +02:00
Robert Ferrús	34d0cb76e8	Merge pull request 'feat: refs #7615 setDeleted' (!2719) from 7615-ticketRefundSetDeleted into dev ... Reviewed-on: #2719 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-05 06:14:42 +00:00
Robert Ferrús	4c96d57491	Merge branch 'dev' into 7615-ticketRefundSetDeleted	2024-09-05 06:06:22 +00:00
Robert Ferrús	44adb9cde0	Merge pull request 'fix: ticket #216260 buy_recalcPrices' (!2916) from ticket216260-buy_recalcPrices into master ... Reviewed-on: #2916 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-05 05:39:24 +00:00
Robert Ferrús	777eba8c53	Merge branch 'master' into ticket216260-buy_recalcPrices	2024-09-05 05:22:02 +00:00
Robert Ferrús	f68892f783	Merge branch 'master' into 7929-createTableMaterial	2024-09-05 04:59:54 +00:00
Jorge Penadés	4ec1c8301e	Merge pull request '#7897 - Merge master into test' (!2869) from master into test ... Reviewed-on: #2869 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-04 14:28:42 +00:00
Jorge Penadés	7e2150e434	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit	2024-09-04 16:04:27 +02:00
Jorge Penadés	2ef289bf3a	Merge pull request 'fix: refs #6900 fine tunning' (!2905) from 6900-hotfix-fineTunning into master ... Reviewed-on: #2905 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-04 13:57:26 +00:00
Jorge Penadés	ac5ff9e807	Merge branch 'master' into 6900-hotfix-fineTunning	2024-09-04 13:55:24 +00:00
Carlos Satorres	b66386fdb1	Merge pull request 'refs #7407 create models' (!2603) from 7407-workerMedical into dev ... Reviewed-on: #2603 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 13:07:50 +00:00
Jorge Penadés	d82f9b2cd6	chore: refs #7524 fix test	2024-09-04 14:55:59 +02:00
Jorge Penadés	842f88b8c3	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-addNoLimit	2024-09-04 14:53:38 +02:00
Jorge Penadés	e3015a6559	feat: refs #7524 no apply limit	2024-09-04 14:52:53 +02:00
Robert Ferrús	75be124e1f	feat: refs #7929 create table material	2024-09-04 14:14:12 +02:00
Guillermo Bonet	2bb73af47d	Merge branch 'test' into dev	2024-09-04 14:12:50 +02:00
Guillermo Bonet	80839100c7	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-04 14:10:33 +02:00
Guillermo Bonet	212e8d1a03	fix: refs #7346 invoiceSerial	2024-09-04 14:09:31 +02:00
Pako Natek	9294927931	Merge pull request 'hotfix' (!2919) from hotFix-Miriam into master ... Reviewed-on: #2919 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-04 11:53:48 +00:00
Pako Natek	ad123e61ca	Merge branch 'master' into hotFix-Miriam	2024-09-04 11:49:19 +00:00
Carlos Satorres	9503e5134d	Merge pull request 'fix: hotfix' (!2918) from hotfix-fixSepaCore into master ... Reviewed-on: #2918 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-04 11:45:55 +00:00
Carlos Satorres	461b8d1f81	Merge branch 'master' into hotfix-fixSepaCore	2024-09-04 11:44:24 +00:00
Pako Natek	e574f0060a	hotfix	2024-09-04 13:37:13 +02:00
Carlos Satorres	cb24ca9f82	fix: hotfix	2024-09-04 13:36:57 +02:00
Robert Ferrús	435f2ce8e0	Merge branch 'master' into ticket216260-buy_recalcPrices	2024-09-04 10:58:07 +00:00
Jorge Penadés	93796ef18d	Merge pull request 'refactor: refs #7524 dynamic fetch' (!2914) from 7524-hotfix-addLimit into master ... Reviewed-on: #2914 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2024-09-04 10:54:15 +00:00
Guillermo Bonet	afcb590a9e	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:45:33 +02:00
Guillermo Bonet	d52dc788c8	Merge branch 'ticket216260-buy_recalcPrices' of https://gitea.verdnatura.es/verdnatura/salix into ticket216260-buy_recalcPrices	2024-09-04 12:41:46 +02:00
Guillermo Bonet	297eb30395	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:41:44 +02:00
Robert Ferrús	d3fba4cd32	Merge branch 'master' into ticket216260-buy_recalcPrices	2024-09-04 10:26:00 +00:00
Guillermo Bonet	74a5d1f217	fix: ticket #216260 buy_recalcPrices	2024-09-04 12:23:01 +02:00
Jorge Penadés	8311795fd8	refactor: refs #7524 dynamic fetch	2024-09-04 12:16:42 +02:00
Jorge Penadés	df5961a2a2	feat: refs #7663 wip test	2024-09-04 11:41:47 +02:00
Javier Segarra	5f714df73b	Merge pull request 'revert(salix): rollback limit query' (!2913) from undo_rollback_limit into master ... Reviewed-on: #2913 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-04 08:55:46 +00:00
Jorge Penadés	544ddb0f15	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7663-setWeight	2024-09-04 10:39:46 +02:00
Javi Gallego	c1e76e4c43	Merge branch '7277-RefundInvoices' of https://gitea.verdnatura.es/verdnatura/salix into 7277-RefundInvoices	2024-09-04 10:24:56 +02:00
Javier Segarra	32815bad51	revert(salix): rollback limit query	2024-09-04 09:24:07 +02:00