6594 Commits

Author	SHA1	Message	Date
Sergio De la torre	2335ef754a	Merge branch 'master' into 6861-itemShelvingSetQuantity	2024-11-19 05:55:45 +00:00
Ivan Mas	21693cfd71	feat: refs #7994 new version script fix	2024-11-13 14:33:52 +01:00
Pablo Natek	5f3b1ff601	Merge pull request 'fix: refs #7404 filter an rounding issues' (!3196) from 7404-fix-stockBoughtDetailFilter into master ... Reviewed-on: #3196 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-11-13 11:24:18 +00:00
Guillermo Bonet	aa1c017f22	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 12:17:58 +01:00
Robert Ferrús	9b079a8bb2	Merge branch 'master' into 8169-itemTextureTag	2024-11-13 09:45:23 +00:00
Guillermo Bonet	1086981b53	fix: refs #7779 ticket_splitItemPackingType	2024-11-13 09:35:06 +01:00
Pablo Natek	b025a8b804	fix: refs #7404 filter an rounding issues	2024-11-13 09:10:18 +01:00
Pako Natek	ebc0420531	fix: problem calculation updated	2024-11-13 06:50:21 +01:00
Ivan Mas	4add10f3dd	feat: refs #7994 remove comment script	2024-11-12 17:52:51 +01:00
Robert Ferrús	d925a5d7fa	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 11:55:50 +00:00
Pablo Natek	69999125c7	Merge branch 'master' into 7404-recoverStockBuyedProcs	2024-11-12 07:51:59 +00:00
Pablo Natek	63425d31ae	fix: refs #7404 restore stockBuyed old proc	2024-11-12 08:51:03 +01:00
Alex Moreno	07e59ccdbf	build: refs #8179 dump	2024-11-12 08:45:40 +01:00
Robert Ferrús	55fced363e	Merge branch 'master' into 8169-itemTextureTag	2024-11-12 07:42:58 +00:00
Guillermo Bonet	3158644032	fix: refs #7994 commented alter	2024-11-12 07:59:07 +01:00
Pablo Natek	3d3bc0dbaa	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-12 06:24:06 +00:00
Pablo Natek	395e6997dd	Merge branch '7404-fix-remove-tickets-volume' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fix-remove-tickets-volume	2024-11-12 07:23:47 +01:00
Pablo Natek	2dd3ae1c75	fix: refs #7404 empty commit	2024-11-12 07:23:46 +01:00
Alex Moreno	c8d9cfd623	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-11-11 14:09:03 +01:00
Pako Natek	35f4f161ab	fix(collection_new): remove agency condition for suitable tickets ... Refs: #0000	2024-11-11 09:02:04 +01:00
Robert Ferrús	94ed23ca07	feat: refs #8169 modifica role	2024-11-11 07:51:26 +01:00
Pablo Natek	82e62e8ee7	Merge branch 'test' into 7404-fix-remove-tickets-volume	2024-11-11 05:53:30 +00:00
Pablo Natek	f8c3d69c5d	fix: refs #7404 remove volume from ticket sold on holland	2024-11-08 13:44:20 +01:00
Javi Gallego	d95e455ccf	fix: refs #7935 sin modificar autonomy	2024-11-07 14:48:31 +01:00
Robert Ferrús	6031b1fe3f	feat: refs #8169 create table itemTextureTag	2024-10-28 12:17:56 +01:00
Guillermo Bonet	fc56dbc5fb	Merge branch 'master' into test	2024-10-23 12:44:35 +02:00
Guillermo Bonet	9eaa5a7585	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-23 10:38:00 +00:00
Guillermo Bonet	3cde6b6bc6	feat: refs #8119 Requested changes	2024-10-23 08:30:21 +02:00
Guillermo Bonet	31c89538bc	feat: refs #8119 Requested changes	2024-10-23 08:27:07 +02:00
Guillermo Bonet	37050361c2	feat: refs #8119 Requested changes	2024-10-23 08:26:36 +02:00
Guillermo Bonet	baec188ff5	feat: refs #8119 Requested changes	2024-10-23 08:23:28 +02:00
Guillermo Bonet	fe3e7342bc	fix: refs #7935 version	2024-10-23 07:14:07 +02:00
Alex Moreno	f47043cae4	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-10-22 15:07:24 +02:00
Guillermo Bonet	6227ef0821	Merge branch '8119-itemCampaignQuantity' of https://gitea.verdnatura.es/verdnatura/salix into 8119-itemCampaignQuantity	2024-10-22 15:00:17 +02:00
Guillermo Bonet	1afb33c306	feat: refs #8119 Requested changes	2024-10-22 15:00:16 +02:00
Jorge Penadés	e2b57d695e	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 7524-hotfix-myTeamFilter	2024-10-22 12:25:43 +02:00
Jorge Penadés	ee0c0996f6	feat: refs #7524 add e2e	2024-10-22 12:16:26 +02:00
Sergio De la torre	29745d0af4	Merge pull request 'fix: refs #6861 fixTransactionCommit' (!3139) from 6861-Reservas into master ... Reviewed-on: #3139 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2024-10-22 08:13:00 +00:00
Sergio De la torre	6ef7760498	fix: refs #6861 fixTransactionCommit	2024-10-22 10:06:59 +02:00
Guillermo Bonet	b4d2c69b37	Merge branch 'master' into 8119-itemCampaignQuantity	2024-10-22 06:42:02 +00:00
Guillermo Bonet	5162c2037b	feat: refs #8119 Requested changes	2024-10-22 08:41:46 +02:00
Jorge Penadés	1efe258ea0	fix: refs #7524 filter by department	2024-10-21 14:30:45 +02:00
Pablo Natek	e479873547	fix: restore cursor	2024-10-21 12:19:20 +02:00
Pablo Natek	e38c061deb	fix: add date format on insert data	2024-10-21 11:36:44 +02:00
Guillermo Bonet	5d55fb287d	Merge branch 'test' into dev	2024-10-21 09:25:39 +02:00
Guillermo Bonet	dead904c19	Merge branch 'master' into test	2024-10-21 09:25:29 +02:00
Guillermo Bonet	bbc17d1ff8	fix: refs #230926 item_getSimilar	2024-10-21 08:33:16 +02:00
Javi Gallego	be9f711cc1	Merge pull request 'feat: refs #7348 hasDailyInvoice from client' (!3110) from 7348-autonomyDailyInvoice into dev ... Reviewed-on: #3110 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:31:17 +00:00
Javi Gallego	da772cf504	Merge pull request '7744-closeAllTest' (!3114) from 7744-closeAllTest into dev ... Reviewed-on: #3114 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-10-21 06:29:17 +00:00
Guillermo Bonet	939f083671	Merge pull request 'refactor: refs #8106 Optimized ticket_getTax' (!3122) from 8106-negativeBasesOptimize into dev ... Reviewed-on: #3122 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2024-10-18 08:27:08 +00:00