Commit Graph

19392 Commits

Author SHA1 Message Date
Alex Moreno 0d7a03f655 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-06 07:37:12 +01:00
Alex Moreno 7ac4617f48 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-06 07:34:39 +01:00
Alex Moreno b80f2e305f fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-06 07:31:03 +01:00
Alex Moreno e248f5d0e8 Merge branch 'rutasAnalyzeHotFix' of https://gitea.verdnatura.es/verdnatura/salix into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 14:38:19 +01:00
Alex Moreno 03b7628eba fix: try to fix puppeteer 2024-03-05 14:38:18 +01:00
Robert Ferrús 9992a8b4ff Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 12:23:38 +00:00
Guillermo Bonet d2f451c613 ticket #162561 hotfix
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:33:28 +01:00
Alex Moreno 6db24580be fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 07:42:44 +01:00
Alex Moreno 40d91aeb28 fix: try to fix puppeteer
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 07:32:06 +01:00
Robert Ferrús c9b6cbf67b fix: vDatedFrom y vDatedTo
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-05 07:15:38 +01:00
Robert Ferrús 5175c91b2d fix: quitar delete
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-04 11:51:55 +01:00
Robert Ferrús 31bd88e856 Merge branch 'master' into rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-03-04 06:56:58 +00:00
Alex Moreno 24c54c618a Merge pull request 'refs #6925 hotFix(invoice) parenthesis & handle incoterms error' (!2122) from hotFix_invoice_incoterms into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2122
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-03-04 06:14:34 +00:00
Alex Moreno a3052c1cf9 refs #6925 hotFix(invoice) parenthesis & handle incoterms error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 15:05:12 +01:00
Robert Ferrús 5e2f9dd3d0 fix: poner nombres correcto
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:58:48 +01:00
Robert Ferrús 19f8d1bb81 fix: poner nombres en camelCase
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:57:34 +01:00
Robert Ferrús 87799fbc64 fix: rutasAnalyzeHotFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-03-01 12:30:37 +01:00
Guillermo Bonet 625d19e88c hotfix: Autoincrement warehouse
gitea/salix/pipeline/head This commit looks good Details
2024-02-29 13:44:58 +01:00
Pablo Natek 4fc413cafb Merge pull request 'fix(style): refs #6684 add wordBreak' (!2114) from 6684-fixOverFlowOnDeliveryReport into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2114
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-29 11:39:58 +00:00
Pablo Natek 6f916c9669 Merge branch 'master' into 6684-fixOverFlowOnDeliveryReport
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 11:21:48 +00:00
Pablo Natek 6e4b4537d3 fix(style): refs #6684 add wordBreak
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 12:22:04 +01:00
Robert Ferrús de8a5175cd Merge pull request 'fix: refs #6501 entry_getTransferFix' (!2106) from 6501-entry_getTransferFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2106
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-29 08:18:55 +00:00
Robert Ferrús 2af7748bcf Merge branch 'master' into 6501-entry_getTransferFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 08:17:19 +00:00
Javier Segarra 7f11930154 Merge pull request 'Hotfix_DownloadCSV' (!2110) from Hotfix_DownloadCSV into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2110
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-29 07:18:39 +00:00
Javier Segarra 599e8761c1 hotfix fix: replace pdf with csv
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-29 06:26:21 +00:00
Javier Segarra 6b7dc67c3e hotfix fix: replace pdf with csv 2024-02-29 06:25:41 +00:00
Robert Ferrús 8ce71a06d1 Merge branch 'master' into 6501-entry_getTransferFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-28 10:53:25 +00:00
Robert Ferrús 8d96bb0a18 Merge pull request 'fix: refs #6371 restore tables dock y Tramos' (!2103) from 6371-restoreTablesFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2103
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-02-28 10:51:39 +00:00
Robert Ferrús 82445683a7 fix: refs #6501 entry_getTransferFix
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-28 09:19:57 +01:00
Robert Ferrús 99805a8edd Merge branch 'master' into 6371-restoreTablesFix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-27 12:02:42 +00:00
Robert Ferrús 2fe0d5f5dd fix: refs #6371 restore tables dock y Tramos
gitea/salix/pipeline/pr-master Build queued... Details
2024-02-27 13:02:15 +01:00
Sergio De la torre f0924298bd Merge pull request 'refs #6531_hotFix_lastTickets' (!2101) from 6531_hotFixLastTickets into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2101
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-27 11:35:01 +00:00
Sergio De la torre 699af5b9b7 refs #6531_hotFix_lastTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-27 11:53:55 +01:00
Guillermo Bonet a8065ab1a4 fix: refs #6184 hasFile false in saveSign and saveCmr
gitea/salix/pipeline/head This commit looks good Details
2024-02-27 09:43:53 +01:00
Guillermo Bonet b561364259 Merge pull request 'fix: refs #6184 saveSign' (!2098) from 6184-saveSignFix into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2098
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
2024-02-26 13:21:30 +00:00
Guillermo Bonet 3579c94268 fix: refs #6184 saveSign
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 14:09:53 +01:00
Guillermo Bonet e3fc9167a3 Merge pull request 'fix: ticket #158883' (!2095) from hotfix158883-entryObservationClean into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2095
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-02-26 10:06:22 +00:00
Guillermo Bonet 89a9cc26d3 fix: ticket #158883
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-26 09:50:03 +01:00
Juan Ferrer 13aca51f2d build: refs #6915 dump & rocket shows Jenkins URL
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details
2024-02-23 18:57:32 +01:00
Pablo Natek 35339e430e Merge pull request 'fix(commit): refs #6403 hotFix add commit' (!2088) from 6403-hotFix-master into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2088
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-23 13:45:28 +00:00
Pablo Natek c8e0195510 fix throw error
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 14:44:59 +01:00
Pablo Natek 44668b2445 remove(focus). refs #6403 remove f
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 14:41:35 +01:00
Pablo Natek 94b49efb1f feat(fix): refs #6403 add transaction to createShipment
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-23 14:38:44 +01:00
Pablo Natek 277bcafd89 fix(commit): refs #6403 hotFix add commit
gitea/salix/pipeline/pr-master There was a failure building this commit Details
2024-02-23 14:11:11 +01:00
Pablo Natek 03550573b0 Merge pull request '#6403 - mrwIntegration' (!2005) from 6403-mrwIntegration into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2005
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-23 08:54:43 +00:00
Pablo Natek 18da27179d merge(dev): refs #6005 traduction conflict
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 09:40:58 +01:00
Jorge Penadés 775764c2a9 Merge pull request '#6878 hotfix fix add manual entries' (!2074) from 6878-hotfix-addManualTimeEntries into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2074
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-02-23 07:37:11 +00:00
Alex Moreno f51df43d17 Merge branch 'master' into 6878-hotfix-addManualTimeEntries
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-23 07:32:18 +00:00
Guillermo Bonet 6345d1ae42 fix refs #6780 XDiario
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build started... Details
2024-02-23 08:14:58 +01:00
Robert Ferrús 2d084b04a4 Merge pull request 'fix: refs #6371 bankPolicy_notifyExpired accountingFk' (!2076) from 6371-bankPolicy_notifyExpired into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2076
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-02-23 06:38:35 +00:00