26439 Commits

All Branches

Search

Author	SHA1	Message	Date
Pablo Natek	26faaad5b4	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-05 08:03:48 +01:00
Jon Elias	502b48718c	Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev ... Reviewed-on: #2990 Reviewed-by: Javi Gallego <jgallego@verdnatura.es> Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-02-05 06:51:54 +00:00
Pablo Natek	e4cd30bc27	feat: refs #6897 add groupingMode and hasMinPrice parameters to getBuyList method	2025-02-05 07:34:47 +01:00
Jon Elias	55063e488c	Merge pull request '#7127 modify days when adding lines to a claim' (!3195) from 7127-ModifyDaysToAddSales into dev ... Reviewed-on: #3195 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 13:45:20 +00:00
Alex Moreno	da36016f5b	build: init version	2025-02-04 14:43:31 +01:00
Alex Moreno	4b903c5bad	Merge pull request '8524-devToTest' (!3415) from 8524-devToTest into test ... Reviewed-on: #3415 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>	2025-02-04 13:42:14 +00:00
Jon Elias	b3aaac2f52	Merge branch 'dev' into 7127-ModifyDaysToAddSales	2025-02-04 13:00:07 +00:00
Jon Elias	5258e5ba2a	refactor: refs #7127 modified checkAccessAcl instead of using VnRole	2025-02-04 13:55:01 +01:00
Alex Moreno	fe7a1c60cc	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2025-02-04 13:03:17 +01:00
Guillermo Bonet	3bb0d52dde	Merge pull request 'fix: refs #8515 Fix test optimizePriority' (!3414) from 8515-fixTestOptimizePriority into dev ... Reviewed-on: #3414 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 11:39:41 +00:00
Guillermo Bonet	ee5a93ba81	Merge branch 'dev' into 8515-fixTestOptimizePriority	2025-02-04 10:54:06 +00:00
Guillermo Bonet	879d18dd73	Merge pull request 'feat: refs #8227 Roadmap changes' (!3372) from 8227-roadmap into dev ... Reviewed-on: #3372 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-04 07:59:23 +00:00
Guillermo Bonet	eb9d3a7b21	refactor: refs #8227 Requested changes	2025-02-04 08:27:21 +01:00
Guillermo Bonet	49e5da5547	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:48:56 +01:00
Guillermo Bonet	fb8973a358	fix: refs #8515 Fix test optimizePriority	2025-02-04 07:47:28 +01:00
Guillermo Bonet	d6bd60f181	Merge branch 'dev' into 8227-roadmap	2025-02-04 06:18:34 +00:00
Guillermo Bonet	9cecdab5a8	refactor: refs #8227 Fix tests	2025-02-04 07:17:11 +01:00
Sergio De la torre	8240dd655d	Merge pull request 'feat: refs #7412 notificationMisAllocation' (!3412) from 7412_misallocationNotification into dev ... Reviewed-on: #3412 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-02-03 15:23:37 +00:00
Sergio De la torre	9adb160f2d	feat: refs #7412 refs#7569 sendEmailNotificationChangeText	2025-02-03 16:14:48 +01:00
Sergio De la torre	ef5fb111b9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification	2025-02-03 16:13:55 +01:00
Pablo Natek	13d9cac340	test: refs #6897 update expected results in item and tag filter tests	2025-02-03 14:19:39 +01:00
Pablo Natek	8f3bf46165	Merge branch 'dev' of https: refs #6897//gitea.verdnatura.es/verdnatura/salix into 6897-refactorEntryBuyList	2025-02-03 13:36:20 +01:00
Guillermo Bonet	f0e50943d2	Merge branch '8227-roadmap' of https://gitea.verdnatura.es/verdnatura/salix into 8227-roadmap	2025-02-03 13:23:24 +01:00
Guillermo Bonet	a408af2467	Merge branch 'dev' into 8227-roadmap	2025-02-03 13:23:18 +01:00
Pablo Natek	e7dd1f6a58	feat: refs #6897 add recalcEntryPrices method and enhance ACL permissions for entry operations	2025-02-03 13:16:48 +01:00
Sergio De la torre	6b9c8300fb	feat: refs #7412 notificationMisAllocation	2025-02-03 12:41:56 +01:00
Guillermo Bonet	247bdc7295	Merge branch 'dev' into 8227-roadmap	2025-02-03 09:59:03 +00:00
Guillermo Bonet	c1dd0eeb32	refactor: refs #8512 Add 'master' branch check in description condition	2025-02-03 10:54:17 +01:00
Javi Gallego	55ec4aaba1	Merge pull request 'feat: refs #7686 Added new alertLevel ON_PREVIOUS and changes in vn.state.alertLevel' (!2890) from 7686-onPrevious into dev ... Reviewed-on: #2890 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-02-03 08:12:36 +00:00
Javi Gallego	adba4765ed	refactor: refs #7686 update alert level conditions to only check for 'FREE'	2025-02-03 09:07:08 +01:00
Jose Antonio Tubau	ae2a68423a	Merge pull request 'refactor: refs #7414 update Spanish translation for 'total' to 'importe'' (!3397) from 7414-ticketLogChanges into dev ... Reviewed-on: #3397 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 06:05:34 +00:00
Jose Antonio Tubau	b2e5ba14c6	Merge pull request 'refactor: refs #7537 address display all digits in black in driver route report' (!3408) from 7537-modifyDriverRoutePdf into dev ... Reviewed-on: #3408 Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>	2025-02-03 05:59:22 +00:00
Jose Antonio Tubau	ca5668f941	Merge branch 'dev' into 7414-ticketLogChanges	2025-02-03 05:57:16 +00:00
Jose Antonio Tubau	9f8da1d64e	Merge branch 'dev' into 7537-modifyDriverRoutePdf	2025-02-03 05:52:58 +00:00
Guillermo Bonet	12604d0f67	Merge branch 'dev' into 8227-roadmap	2025-01-31 14:27:18 +01:00
Guillermo Bonet	8dc803b5df	feat: refs #8227 Roadmap changes	2025-01-31 14:25:23 +01:00
Ivan Mas	074fe5b0ac	Merge pull request 'feat: refs #8477 add costPerKg to awb view' (!3409) from 8477-addColumnToAwbView into dev ... Reviewed-on: #3409 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-01-31 11:45:36 +00:00
Sergio De la torre	04a65bc1e0	Merge pull request 'fix: refs #6964 visibleGreaterThanZero' (!3405) from 6964_itemsOLder into master ... Reviewed-on: #3405 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-31 11:43:41 +00:00
Ivan Mas	2e4c5fe401	feat: refs #8477 add costPerKg to awb view	2025-01-31 12:10:19 +01:00
Ivan Mas	83228d481d	Merge pull request 'feat: refs #8477 add fee column to awb table' (!3400) from 8477-AddFeeToAWB into dev ... Reviewed-on: #3400 Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es> Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-31 10:42:43 +00:00
Ivan Mas	3fa74a18de	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-31 10:39:55 +00:00
Ivan Mas	45ccf8da28	Merge pull request 'feat: refs #8312 add flippingCost column to Cubos view' (!3407) from 8312-addColumnCubosView into dev ... Reviewed-on: #3407 Reviewed-by: Robert Ferrús <robert@verdnatura.es>	2025-01-31 10:10:12 +00:00
Ivan Mas	fa9b9cc5a3	feat: refs #8312 modify fixtures.before	2025-01-31 11:06:24 +01:00
Guillermo Bonet	b40f145613	feat: refs #8227 Roadmap changes	2025-01-31 10:57:44 +01:00
Ivan Mas	66a08f7641	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:51:33 +00:00
Carlos Andrés	0a9e3d5d54	Merge pull request 'fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger' (!3403) from 8511-Error-traslado-compras into master ... Reviewed-on: #3403 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2025-01-31 09:36:46 +00:00
Carlos Andrés	f437b3285a	Actualizar print/templates/reports/invoice-incoterms/sql/incoterms.sql	2025-01-31 09:34:44 +00:00
Jon Elias	923fef444c	Merge pull request 'Fix[CustomerList]: fixed country field' (!3406) from CustomerListCountryField into dev ... Reviewed-on: #3406 Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>	2025-01-31 09:33:17 +00:00
Jose Antonio Tubau	5c4f31e6af	refactor: refs #7537 address display all digits in black in driver route report	2025-01-31 10:25:43 +01:00
Ivan Mas	a2258a005a	Merge branch 'dev' into 8312-addColumnCubosView	2025-01-31 09:23:32 +00:00