Commit Graph

7284 Commits

Author SHA1 Message Date
Jon Elias 502b48718c Merge pull request '#7965 - unifyProblems' (!2990) from 7965-unifyProblems into dev
gitea/salix/pipeline/head This commit looks good Details
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
Jon Elias b3aaac2f52 Merge branch 'dev' into 7127-ModifyDaysToAddSales
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 13:00:07 +00:00
Alex Moreno fe7a1c60cc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2025-02-04 13:03:17 +01:00
Guillermo Bonet eb9d3a7b21 refactor: refs #8227 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 08:27:21 +01:00
Guillermo Bonet d6bd60f181 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 06:18:34 +00:00
Guillermo Bonet 9cecdab5a8 refactor: refs #8227 Fix tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-04 07:17:11 +01:00
Sergio De la torre ef5fb111b9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7412_misallocationNotification
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-03 16:13:55 +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
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-03 12:41:56 +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
gitea/salix/pipeline/head There was a failure building this commit Details
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'
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-02-03 09:07:08 +01:00
Guillermo Bonet 12604d0f67 Merge branch 'dev' into 8227-roadmap
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 14:27:18 +01:00
Guillermo Bonet 8dc803b5df feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 14:25:23 +01:00
Ivan Mas 2e4c5fe401 feat: refs #8477 add costPerKg to awb view
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 12:10:19 +01:00
Ivan Mas 3fa74a18de Merge branch 'dev' into 8477-AddFeeToAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 10:39:55 +00:00
Ivan Mas fa9b9cc5a3 feat: refs #8312 modify fixtures.before
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 11:06:24 +01:00
Guillermo Bonet b40f145613 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-31 10:57:44 +01:00
Ivan Mas a2258a005a Merge branch 'dev' into 8312-addColumnCubosView
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 09:23:32 +00:00
Ivan Mas da5e395450 feat: refs #8312 add flippingCost column to Cubos view
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 10:17:01 +01:00
Carlos Satorres e1125dc46d Merge branch 'dev' into 6553-workerBusiness
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-31 09:16:13 +00:00
Carlos Andrés 672ef36501 fix: refs #8511 ref #8511 ensure entry is editable for new entryFk in buy_beforeUpdate trigger
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-30 18:11:30 +01:00
Ivan Mas f68f62543d Merge branch 'dev' into 8477-AddFeeToAWB
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 17:00:14 +00:00
Ivan Mas 148072b39d feat: refs #8477 change column name and add comment
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 17:58:39 +01:00
Ivan Mas 9e95afa190 Merge branch 'dev' into 8312-newPackagingColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 16:37:52 +00:00
Ivan Mas e0e72272a7 feat: refs #8312 change column name
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 17:35:30 +01:00
Javi Gallego 3965441f7f Merge branch 'dev' into 7686-onPrevious
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 15:29:45 +01:00
Guillermo Bonet 855600811e feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 15:00:19 +01:00
Ivan Mas 85c3dc54fa Merge branch 'dev' into 8487-deprecateAppointmentFromTravel
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 13:24:08 +00:00
Guillermo Bonet 123f28055e feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-30 09:28:44 +01:00
Sergio De la torre c96d083467 fix: refs #7920 shelvingFkByCode
gitea/salix/pipeline/pr-master This commit looks good Details
2025-01-30 09:16:54 +01:00
Robert Ferrús 9c467e67e0 Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-30 06:07:59 +00:00
Ivan Mas 2a7795d432 feat: refs #8477 add fee column to awb table
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 19:24:49 +01:00
Javier Segarra efe0aa708f Merge branch 'dev' into 7134-supplierBalance
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 15:13:49 +00:00
Ivan Mas 70d286df80 feat: refs #8487 deprecate travel.appointment
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 14:59:19 +01:00
Guillermo Bonet a14d6227a1 feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2025-01-29 14:15:22 +01:00
Robert Ferrús 35e72c90d3 Merge branch 'dev' into 6822-entryTransferFix
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:46:23 +00:00
Robert Ferrús d536690197 feat: refs #6822 changes request
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 12:43:46 +01:00
Pako Natek af5b4981df Merge branch 'dev' into 8408-Disponible-por-zonas-y-horas
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 11:16:41 +00:00
Pako Natek 597615facb fix(agencyIncomingForeign): refs #8408 version changes rolled back
gitea/salix/pipeline/pr-dev This commit looks good Details
Refs: #8408
2025-01-29 12:15:04 +01:00
Pako Natek 4e2a6d275a fix(travel): refs #8408 trigger restriction for wrong availabled value
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:12:23 +01:00
Pako Natek 0de9c3c172 feat(available): refs #8408 available refreshing now includes time
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Refs: #8408
2025-01-29 12:03:55 +01:00
Carlos Satorres 17a27060c3 Merge branch 'dev' into 7917-freelancerRoute2
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 10:11:50 +00:00
Juan Ferrer 9a6b89793c fix: refs #8494 Fix ZoneIncluded logs
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test There was a failure building this commit Details
gitea/salix/pipeline/pr-master Build started... Details
2025-01-29 10:35:06 +01:00
Javier Segarra f2be71be6c fix: refs #7134 replace value by util.VN_CURDATE() 2025-01-29 09:54:05 +01:00
Guillermo Bonet 56b0baebaa feat: refs #8227 Roadmap changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-29 07:53:41 +01:00
Javier Segarra a63ca1b3c5 Merge branch 'dev' into 7134-supplierBalance 2025-01-28 23:39:03 +01:00
Ivan Mas dfcc155ef9 Merge branch 'dev' into 8312-newPackagingColumn
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 18:14:38 +00:00
Ivan Mas 821e2cbe4d feat: refs #8312 new column packaging.rejectCost
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 19:11:56 +01:00
Carlos Andrés 801629c8db fix: refs #8492 Sage invoiceInTax Check VAT
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 18:04:02 +01:00
Carlos Satorres b383725f9f fix: refs #7917 fix user tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2025-01-28 12:56:30 +01:00