23763 Commits

All Branches

Search

Author	SHA1	Message	Date
Robert Ferrús	3c6920a094	Merge pull request 'feat: refs #7929 create table material' (!2920) from 7929-createTableMaterial into master ... Reviewed-on: #2920 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-09-06 04:30:07 +00:00
Robert Ferrús	75146f930a	Merge branch 'master' into 7929-createTableMaterial	2024-09-06 04:28:11 +00:00
Jorge Penadés	ca882dbac9	Merge pull request 'master to test' (!2928) from master into test ... Reviewed-on: #2928 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 14:35:21 +00:00
Jorge Penadés	de591864d1	Merge pull request 'fix: refs #7524 add fixture orm config' (!2927) from 7524-hotfix-addFixture into master ... Reviewed-on: #2927 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 13:57:58 +00:00
Jorge Penadés	cff5bef54b	fix: refs #7524 add fixture orm config	2024-09-05 15:47:45 +02:00
Jorge Penadés	c7be8f0b27	Merge pull request 'fix: refs #7524 load after get client' (!2926) from 7524-hotfix-loadAfterGetClient into master ... Reviewed-on: #2926 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-05 13:31:13 +00:00
Jorge Penadés	c1e086072b	fix: refs #7524 load after get client	2024-09-05 14:50:36 +02:00
Juan Ferrer	a7bc58a5bc	fix: refs #7931 Immediately discount order lines from available	2024-09-05 14:45:17 +02:00
Robert Ferrús	5e456a32fb	Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial	2024-09-05 14:38:58 +02:00
Robert Ferrús	3e4caa8edf	feat: refs #7929 autoincrement 1	2024-09-05 14:38:55 +02:00
Robert Ferrús	fa34c4328e	Merge branch 'master' into 7929-createTableMaterial	2024-09-05 12:27:41 +00:00
Robert Ferrús	0cdf2af807	Merge branch '7929-createTableMaterial' of https://gitea.verdnatura.es/verdnatura/salix into 7929-createTableMaterial	2024-09-05 14:26:19 +02:00
Robert Ferrús	684658bb96	feat: refs #7929 quitar codigo	2024-09-05 14:25:50 +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
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
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	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
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
Javier Segarra	32815bad51	revert(salix): rollback limit query	2024-09-04 09:24:07 +02:00
Jorge Penadés	ec63bf35c2	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning	2024-09-04 09:15:15 +02:00
Guillermo Bonet	a8cc3f496f	build: refs #7897 dump 24.36	2024-09-04 09:02:38 +02:00
Guillermo Bonet	3cc19549e4	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 15:03:09 +02:00
Guillermo Bonet	bd06bed570	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix	2024-09-03 13:29:03 +02:00
Guillermo Bonet	790a44c62a	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 13:29:01 +02:00
Jorge Penadés	623794c3dd	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6900-hotfix-fineTunning	2024-09-03 12:52:13 +02:00