23671 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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	d781a8ab8c	Merge pull request 'feat: rollback limit' (!2910) from hotfix-rollbackLimit into master ... Reviewed-on: #2910 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2024-09-03 10:16:12 +00:00
Jorge Penadés	90b8187a4f	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-rollbackLimit	2024-09-03 12:08:14 +02:00
Guillermo Bonet	0c3349dc03	fix: refs #7844 salesFilter and tmp.ticket_problems.totalProblems	2024-09-03 12:06:31 +02:00
Jorge Penadés	04c8f87c00	feat: rollback limit	2024-09-03 12:02:55 +02:00
Guillermo Bonet	6f97d1b83a	fix: refs #7844 salesFilter and isTooLittle condition	2024-09-03 09:57:18 +02:00
Guillermo Bonet	7632f33322	fix: refs #7712 sizeLimit	2024-09-03 09:22:55 +02:00
Javier Segarra	adf6708682	Merge pull request '#7897 - masterTest_24_36' (!2909) from 7897_masterTest_24_36 into master ... Reviewed-on: #2909 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-03 06:37:52 +00:00
Javier Segarra	e0a0b987b2	feat(salix): refs #7897 #7897 update changelog.md	2024-09-03 08:05:02 +02:00
Javier Segarra	7d5cb45b3a	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-03 07:57:43 +02:00
Guillermo Bonet	b436ac0518	fix: refs #7916 itemShelving_transfer	2024-09-03 07:45:25 +02:00
Javier Segarra	5e26eccd53	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 7897_masterTest_24_36	2024-09-02 19:29:23 +02:00
Carlos Andrés	41f0c8dc7f	Merge pull request 'fix: refs #7213 problem rounding' (!2903) from 7213-Sale_setProblemRoundingByBuy into master ... Reviewed-on: #2903 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-09-02 15:48:25 +00:00
Guillermo Bonet	89f8e987dc	feat: refs #7562 Requested changes	2024-09-02 14:27:04 +02:00
Guillermo Bonet	586f3334fe	Merge pull request 'feat: refs #7860 Update new packagings' (!2902) from 7860-newPackaging into test ... Reviewed-on: #2902 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-02 05:05:21 +00:00
Carlos Andrés	c88b069ac3	fix: refs #7213 problem rounding	2024-08-30 14:16:03 +02:00
Carlos Andrés	4ed5811042	fix: refs #7213 problem rounding	2024-08-30 14:14:06 +02:00
Carlos Andrés	beb54aedf8	fix: refs #7213 problem rounding	2024-08-30 13:14:45 +02:00
Carlos Andrés	3da6a700ae	fix: refs #7213 problem rounding	2024-08-30 13:08:15 +02:00
Guillermo Bonet	7b1a34e249	feat: refs #7860 Update new packagings	2024-08-30 12:47:05 +02:00
Guillermo Bonet	6093f2001b	Merge branch 'master' into test	2024-08-29 07:51:14 +02:00
Carlos Andrés	88246174dc	Merge pull request 'fix: refs #7213 Hotfix-ticket_isTooLittle-group-by-addressFk' (!2895) from Hotfix-ticket_isTooLittle-group-by-addressFk into master ... Reviewed-on: #2895 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 14:41:48 +00:00
Carlos Andrés	423ba8c218	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-28 11:59:46 +02:00
Carlos Satorres	35009fdd6f	Merge pull request 'fix(salix): rollback updateClaim' (!2897) from hotfix_claimLink into master ... Reviewed-on: #2897 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 09:35:22 +00:00
Carlos Satorres	49394b9b16	fix: change claim	2024-08-28 09:42:59 +02:00
Javier Segarra	27e30c0051	fix(salix): redirect with params	2024-08-28 09:22:31 +02:00
Jorge Penadés	1c6c6902c4	Merge pull request 'chore: refs #7524 modify ormConfig table col' (!2894) from 7524-warmfix-modifyColumn into test ... Reviewed-on: #2894 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-28 06:52:21 +00:00
Javier Segarra	5b49e7cf45	fix(salix): rollback updateClaim	2024-08-28 06:51:32 +00:00
Jorge Penadés	80844acc61	Merge branch 'test' into 7524-warmfix-modifyColumn	2024-08-28 06:50:28 +00:00
Guillermo Bonet	f9c59a9e4c	Merge branch 'master' into test	2024-08-28 08:40:24 +02:00
Guillermo Bonet	3dda49b3c5	fix: refs #pako Deleted duplicated version	2024-08-28 08:40:03 +02:00
Carlos Andrés	1ec9e5bf09	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:39:54 +02:00
Carlos Andrés	9a2351b958	Hotfix: refs #7213 ticket_isTooLittle group by addressFk	2024-08-27 17:12:41 +02:00
Jorge Penadés	b833fd5081	chore: refs #7524 modify ormConfig table col	2024-08-27 14:45:11 +02:00
Pako Natek	4a3f884173	Merge pull request 'version' (!2889) from saleGroup_State into master ... Reviewed-on: #2889 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 11:03:06 +00:00
Javier Segarra	e98d64f526	Merge pull request '#7896 - 24.36 Dev To Test' (!2884) from dev into test ... Reviewed-on: #2884 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-08-27 10:32:52 +00:00
Pako Natek	a4cc36eed1	version	2024-08-27 11:41:34 +02:00
Guillermo Bonet	4d820f1003	Merge branch 'test' into dev	2024-08-27 10:08:04 +02:00
Guillermo Bonet	724a9b5dc1	Merge pull request 'refs #7844 Change in problems calc' (!2842) from 7844-changeProblemsCalc into dev ... Reviewed-on: #2842 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-08-27 08:07:25 +00:00
Guillermo Bonet	2dc095e828	fix: refs #7811 Renew token crash	2024-08-27 10:07:09 +02:00
Guillermo Bonet	79e2424a41	Merge branch 'dev' into 7844-changeProblemsCalc	2024-08-27 08:04:21 +00:00