25592 Commits

All Branches

Search

Author	SHA1	Message	Date
Pako Natek	785778e58a	fix: refs #8030 database selected for grant	2024-09-24 13:56:41 +02:00
Pako Natek	e33429f474	fix: refs #8030 grant actions to buyer	2024-09-24 13:53:24 +02:00
Pako Natek	142ee2b96f	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 11:04:54 +00:00
Pako Natek	7a343d60e6	feat: refs #8030 new fields for vn.priceDelta	2024-09-24 13:04:03 +02:00
Jon Elias	ae039d6ce2	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 10:51:25 +00:00
Pako Natek	0822996f20	Merge pull request '8030-newPriceComponent' (!3012) from 8030-newPriceComponent into dev ... Reviewed-on: #3012 Reviewed-by: Pablo Natek <pablone@verdnatura.es>	2024-09-24 10:39:04 +00:00
Pako Natek	403637dd8c	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:37:44 +00:00
Alex Moreno	63a4cb1847	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2024-09-24 12:25:41 +02:00
Alex Moreno	4ed6f35912	build: init version 24.42	2024-09-24 12:24:56 +02:00
Alex Moreno	45a016065d	Merge pull request 'feat(travelFilter): add daysOnward' (!3008) from hotFix_travelList_daysOnward into test ... Reviewed-on: #3008 Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>	2024-09-24 10:21:54 +00:00
Pako Natek	ed656836b1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 10:06:38 +00:00
Pako Natek	f6e1880634	fix: refs #8030 test change	2024-09-24 12:06:08 +02:00
Pako Natek	7e449c5716	fix: refs #8030 bugs	2024-09-24 11:54:12 +02:00
Alex Moreno	9106171b92	Merge branch 'test' into hotFix_travelList_daysOnward	2024-09-24 09:39:21 +00:00
Alex Moreno	7dae387b7f	Merge pull request '8032-devToTest_2440' (!3009) from 8032-devToTest_2440 into test ... Reviewed-on: #3009 Reviewed-by: Jon Elias <jon@verdnatura.es>	2024-09-24 09:34:47 +00:00
Jon Elias	d221611382	Merge branch 'dev' into 7356-FixTicketWeekly	2024-09-24 09:33:47 +00:00
Pablo Natek	d608b3b9c8	Merge pull request '7404-fixStockBought' (!3004) from 7404-fixStockBought into dev ... Reviewed-on: #3004 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:32:49 +00:00
Alex Moreno	afbf084535	Merge branch 'test' into 8032-devToTest_2440	2024-09-24 09:29:38 +00:00
Alex Moreno	ae97c8a035	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2024-09-24 11:29:09 +02:00
Pako Natek	47f4b2f3d4	Merge pull request 'fix: refs #8030 little bugs' (!3011) from 8030-newPriceComponent into dev ... Reviewed-on: #3011 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 09:08:33 +00:00
Pako Natek	1dbf29ccd1	Merge branch 'dev' into 8030-newPriceComponent	2024-09-24 09:00:57 +00:00
Pako Natek	1be5fced3c	fix: refs #8030 little bugs	2024-09-24 10:59:15 +02:00
Jon Elias	1e07a2fc59	Merge branch 'dev' into 7884-AddLabelerField	2024-09-24 08:44:36 +00:00
Pako Natek	5c4849b60d	Merge pull request '8030-newPriceComponent' (!3010) from 8030-newPriceComponent into dev ... Reviewed-on: #3010 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 08:43:58 +00:00
Pako Natek	a39b28f1a8	Merge branch '8030-newPriceComponent' of https://gitea.verdnatura.es/verdnatura/salix into 8030-newPriceComponent	2024-09-24 10:39:28 +02:00
Pako Natek	5c8f42a3ae	fix: refs #8030 redmine revision updates ... Changes recomended by the reviewer Refs: #8030	2024-09-24 10:38:56 +02:00
Jorge Penadés	11b54666d0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7874-createObservationType	2024-09-24 10:34:16 +02:00
Pako Natek	91801b1979	fix: refs #8030 redmine revision updates ... Changes recomended by the reviewer Refs: #8030	2024-09-24 10:27:27 +02:00
Jorge Penadés	78b500e452	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker	2024-09-24 10:15:25 +02:00
Jorge Penadés	c6a3004d12	feat: refs #7207 allocate new queue on dept change	2024-09-24 10:15:01 +02:00
Pako Natek	fb7208d898	fix: refs #8030 warehouse filter ... Warehouse is also needed to make the filter Refs: #8030	2024-09-24 09:05:30 +02:00
Pablo Natek	f9b37541eb	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 08:55:47 +02:00
Pablo Natek	a5f3dbc15a	fix: refs #7404 last entries spec	2024-09-24 08:55:24 +02:00
Pako Natek	acabd3e154	feat(catalog_componentCalculate): refs #8030 new component improved ... The procedure has now the component "bonus", a special price increasing for a group of items Refs: #8030	2024-09-24 08:50:34 +02:00
Alex Moreno	76e545d488	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into hotFix_travelList_daysOnward	2024-09-24 08:35:30 +02:00
Pablo Natek	bfd52b8773	Merge branch 'dev' into 7404-fixStockBought	2024-09-24 05:31:34 +00:00
Pablo Natek	166ca42e32	Merge branch '7404-fixStockBought' of https://gitea.verdnatura.es/verdnatura/salix into 7404-fixStockBought	2024-09-24 07:31:24 +02:00
Pablo Natek	3988eb0d97	fix: refs #7404 back and e2e	2024-09-24 07:31:22 +02:00
Sergio De la torre	ea06afb361	Merge pull request 'fix: hotFix backLimit refs #6964' (!3003) from 6964-ListItemNewer into master ... Reviewed-on: #3003 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-24 05:17:02 +00:00
Alex Moreno	882f1eb7c2	feat(travelFilter): add daysOnward	2024-09-23 15:30:10 +02:00
Jorge Penadés	6ff76fd74b	feat: refs #7207 show queue in worker summary	2024-09-23 14:40:38 +02:00
Robert Ferrús	2a3dcbe71a	Merge pull request 'feat: refs #8000 add column' (!3005) from 8000-zoneAddColumn into master ... Reviewed-on: #3005 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 11:23:03 +00:00
Pako Natek	9a0b487d20	feat: refs #8030 new table	2024-09-23 13:12:53 +02:00
Ivan Mas	f4de066d16	Merge pull request 'refactor: refs #7725 deprecate worker.isF11Allowed' (!3002) from 7725-refactorIsF11Allowed into dev ... Reviewed-on: #3002 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 10:26:41 +00:00
Robert Ferrús	a61d2ceb56	Merge branch 'master' into 8000-zoneAddColumn	2024-09-23 10:26:19 +00:00
Javier Segarra	21cc899e99	Merge pull request 'HOTFIX: Administrative role ACL' (!3006) from hotfix_administrativeACL into master ... Reviewed-on: #3006 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2024-09-23 10:17:18 +00:00
Javier Segarra	4689681618	fix(salix): add administrative ACLs	2024-09-23 12:07:06 +02:00
Robert Ferrús	31d5a7a635	feat: refs #8000 add column	2024-09-23 11:53:27 +02:00
Robert Ferrús	c0cc25219f	Merge pull request 'feat: refs #8000 refs #8000 catalog_calculate itemMaxLength' (!2992) from 8000-catalog_calculate into master ... Reviewed-on: #2992 Reviewed-by: Pako Natek <pako@verdnatura.es> Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2024-09-23 09:11:10 +00:00
Robert Ferrús	b34e8a7b7e	Merge branch 'master' into 8000-catalog_calculate	2024-09-23 08:18:49 +00:00