Commit Graph

560 Commits

Author SHA1 Message Date
Carlos Andrés dc897854a4 merge: refs #6802 merge dev fix conflicts 2024-07-11 13:59:55 +02:00
Carlos Andrés 3b5f88fd33 refactor: refs #6802 refactor salesPerson to salesDepartment 2024-07-11 12:30:43 +02:00
Alex Moreno 4535795515 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-03 10:08:15 +02:00
Sergio De la torre 1561e15d5e feat roadmap refs #7195
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-03 09:21:58 +02:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00:00
Sergio De la torre e1b6ba4276 feat roadmap refs #7195
gitea/salix/pipeline/pr-dev Build queued... Details
2024-07-02 12:03:21 +02:00
Sergio De la torre 08cf79b09b feat roadmap refs #7195
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-02 08:39:42 +02:00
Sergio De la torre d9742afc9b feat roadmap refs #7195
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 17:45:45 +02:00
Sergio De la torre 22959db0ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7195_roadmap2
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:28:14 +02:00
Alex Moreno 95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 11:43:42 +00:00
Guillermo Bonet 074d4f4755 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-06-20 13:10:07 +02:00
Guillermo Bonet 9a4ec46073 hotfix: refs #6820 Deleted km validation
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:09:40 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00
Guillermo Bonet 39381a4a7c Merge pull request 'fix: refs #5995 Optimized downloadCmrsZip' (!2596) from 5995-optimizedDownloadCmr into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2596
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-17 11:22:30 +00:00
Guillermo Bonet eaaf83561c fix: refs #5995 Optimized downloadCmrsZip
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 13:03:02 +02:00
Robert Ferrús cfa0b87898 feat: refs #7296 RoutesMonitor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-17 11:50:25 +02:00
Jon Elias 0bf384b2ce Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 07:06:30 +00:00
Jon Elias 61a588b57c refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-14 08:39:57 +02:00
Jon Elias 84a51d3e8d feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-12 12:23:37 +02:00
Jon Elias b3fa869757 refactor: refs #6436 second wave
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-11 10:00:30 +02:00
Jorge Penadés 562e8689e1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-10 15:36:34 +02:00
Javi Gallego 4089c7deb3 feat: refs #4560 minorChanges
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-04 12:23:28 +02:00
Javi Gallego da1b4649bb feat: refs #4560 sin expeditionTruck 2024-06-04 11:58:39 +02:00
Sergio De la torre 882d5bf036 feat: roadMap refs #7195 2024-06-03 18:39:11 +02:00
Jorge Penadés a13581ed97 feat: refs #6243 Add warehouseFk parameter
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-03 16:31:38 +02:00
Jorge Penadés 58053d8286 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6243-generalizeCmrSection
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-03 15:22:08 +02:00
Sergio De la torre 2985e1c9e8 feat: roadMap refs #7195 2024-05-31 13:08:48 +02:00
Javi Gallego 7186686548 Merge branch 'dev' into 4560-GastosReparto 2024-05-30 09:44:06 +02:00
Robert Ferrús df5f4a5a42 feat: refs #7296 fixAPPWarehouse 2024-05-27 14:05:31 +02:00
Javi Gallego 0e5a15dd4e con addressFk 2024-05-24 15:14:20 +02:00
Robert Ferrús 823e8fd7a1 feat: refs #7296 requested changes3
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:27:38 +02:00
Robert Ferrús 34f48e46e7 feat: refs #7296 requested changes2
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 13:19:01 +02:00
Robert Ferrús 62ca4885c4 feat: refs #7296 requested changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-20 12:28:27 +02:00
Robert Ferrús 11a0b98495 feat: refs #7296 roadmapStop
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-16 10:20:08 +02:00
Juan Ferrer e469fb2da4 Merge pull request 'test' (!2456) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2456
2024-05-15 06:57:05 +00:00
Sergio De la torre edb024a1f9 refs #6106 hotFix: getTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 10:14:53 +02:00
Jorge Penadés 40b2c32a00 feat: refs #6243 show all cmr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 17:37:36 +02:00
Robert Ferrús 82ee8d2209 Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 09:25:06 +00:00
Guillermo Bonet c987bb6e66 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-04-30 11:47:35 +02:00
Sergio De la torre a180f54390 refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-29 08:59:12 +02:00
Sergio De la torre f4767728bc refs #6275 hotFix fix:getExpeditionSummary
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-04-29 08:20:57 +02:00
Sergio De la torre f2225b49a7 refs #6275 hotFix fix:getExpeditionSummary 2024-04-29 08:19:18 +02:00
Robert Ferrús fd7dcf2781 fix: refs #7039 fixpr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 10:26:20 +02:00
Robert Ferrús 8153a526ce feat: refs #7039 country-name
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-25 12:35:21 +02:00
Alex Moreno 60d5b9e4aa test: refs #7173 fix sql, adding alias
gitea/salix/pipeline/pr-test This commit looks good Details
2024-04-23 08:47:52 +02:00
Sergio De la torre 23fa74a5ad Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 08:11:37 +00:00
Javier Segarra 322d91d814 feat(salix): refs #6930 Add DEFAULT scope 2024-04-19 10:49:57 +02:00
Sergio De la torre f4afda8cb2 Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 14:52:57 +00:00
Jon Elias 08ca1a302b Merge pull request 'refactor: refs #7139 replace warehouse with ticket' (!2323) from 7139-changeColumnsInRouteSummary into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
Reviewed-on: #2323
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-04-18 12:55:58 +00:00
Sergio De la torre 279c300fbf Merge branch 'dev' into 6921_addFromDelivery
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-18 11:08:15 +00:00