26495 Commits

All Branches

Search

Author	SHA1	Message	Date
Javier Segarra	550b0871f0	feat: refs #6321 changes	2025-02-04 13:45:59 +01:00
Javier Segarra	410f3e73dc	Merge branch 'dev' of https: refs #6321//gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets	2025-02-04 09:54:41 +01: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	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
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
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
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
Javier Segarra	49c6df42a7	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 10:20:42 +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
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
Carlos Satorres	3fede6d586	Merge pull request 'refs #6553 changes models' (!2522) from 6553-workerBusiness into dev ... Reviewed-on: #2522 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2025-01-31 09:19:14 +00:00
Ivan Mas	da5e395450	feat: refs #8312 add flippingCost column to Cubos view	2025-01-31 10:17:01 +01:00
Carlos Satorres	e1125dc46d	Merge branch 'dev' into 6553-workerBusiness	2025-01-31 09:16:13 +00:00
Jon Elias	53ee0c1617	fix: fixed country field	2025-01-31 09:17:15 +01:00
Javier Segarra	767c891317	perf: refs #6321 remove comments	2025-01-31 01:17:23 +01:00
Javier Segarra	2574e59c71	Merge branch 'dev' into 6321_negative_tickets	2025-01-31 01:07:53 +01:00
Javier Segarra	cd7add3497	feat: refs #6321 debug	2025-01-31 01:07:39 +01:00
Javier Segarra	7fdd3d1eb8	feat: refs #6321 fix methods	2025-01-31 01:07:28 +01:00
Javier Segarra	9791f3b935	fix: refs #6321 fixtures	2025-01-31 01:06:57 +01:00
Javier Segarra	b8894ca67d	feat: refs #6321 i18n replaceItem	2025-01-31 01:04:34 +01:00
Javier Segarra	75b4202a7b	feat: refs #6321 remove origin	2025-01-31 01:04:14 +01:00
Ivan Mas	4d210b34c7	Merge pull request 'feat: refs #8312 new column packaging.rejectCost' (!3391) from 8312-newPackagingColumn into dev ... Reviewed-on: #3391 Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>	2025-01-30 17:03:58 +00:00
Ivan Mas	f68f62543d	Merge branch 'dev' into 8477-AddFeeToAWB	2025-01-30 17:00:14 +00:00
Ivan Mas	148072b39d	feat: refs #8477 change column name and add comment	2025-01-30 17:58:39 +01:00
Ivan Mas	9e95afa190	Merge branch 'dev' into 8312-newPackagingColumn	2025-01-30 16:37:52 +00:00
Ivan Mas	e0e72272a7	feat: refs #8312 change column name	2025-01-30 17:35:30 +01:00