Commit Graph

499 Commits

Author SHA1 Message Date
Alex Moreno 30d118f9df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 14:32:43 +02:00
Carlos Satorres 06ae86d78f refs #5525 fix adt
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 13:45:16 +02:00
Carlos Satorres 03b95eb9f6 refs #5525 fix accountDetailValue
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-08 13:43:08 +02:00
Carlos Satorres d0e4decf1e refs #6952 add producer sql trad
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-08 11:05:11 +02:00
Guillermo Bonet fb07cdccc3 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:51:09 +02:00
Guillermo Bonet 5712fbd782 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:50:43 +02:00
Guillermo Bonet 1d59883d19 feat: refs #7644 Minor change
gitea/salix/pipeline/head This commit looks good Details
2024-07-05 13:14:16 +02:00
Carlos Satorres 64f5ad0e19 refs #5525 remove AS
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-04 16:54:57 +02:00
Carlos Satorres cf621071d0 refs #5525 fixear sql, fixtures, js 2024-07-04 16:50:54 +02:00
Carlos Satorres fcec3bc0ae refs #5525 fix sql accountDetail
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-04 09:54:09 +02:00
Carlos Satorres dbc3bdbc97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF 2024-07-03 12:52:37 +02:00
Carlos Satorres 7f213a7435 refs #6952 fix producer 2024-07-02 12:02:44 +02:00
Carlos Satorres 2fe995d3ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6952-productorItemPDF 2024-07-02 11:42:44 +02:00
Guillermo Bonet a23f485296 refactor: refs #7424 Component type refactor
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:11:16 +02:00
Guillermo Bonet ac54994760 Merge pull request 'feat: refs #7644 First commit' (!2651) from 7644-entryLabel into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2651
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-01 07:56:14 +00:00
Guillermo Bonet 5c8d8ba280 refs #7644 Added locales and changed name of method
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 09:07:36 +02:00
Guillermo Bonet 7bf55c6815 refs #7644 Added control source
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 08:00:27 +02:00
Guillermo Bonet 85c7336d92 refs #7644 Minor changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 14:52:19 +02:00
Guillermo Bonet 19bf606330 refs #7644 First commit
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-28 12:57:27 +02:00
Jorge Penadés 0da6d633fd fix: refs 197934 add alias
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-26 17:21:22 +02:00
Carlos Satorres 2797a731c5 refs #6952 subName
gitea/salix/pipeline/pr-dev Build queued... Details
2024-06-25 12:00:49 +02:00
Alex Moreno 3f327866ca Merge branch 'master' into 7631_testToMaster_2426
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-25 06:35:33 +00:00
Robert Ferrús c42a21bc6f fix: refs #19537 changes required
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-21 11:47:34 +02:00
Robert Ferrús 8fc231da2f feat: refs #195937 2024-06-20 14:03:31 +02:00
Robert Ferrús 852785b4c1 fix: refs #195937 refactor incoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 13:45:38 +02:00
Robert Ferrús 46792ba30e fix: refs #195937 changes requerid
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 11:04:42 +02:00
Robert Ferrús 5a40952547 fix: refs #195937 icoterms
gitea/salix/pipeline/pr-master This commit looks good Details
2024-06-20 09:34:13 +02:00
Jorge Penadés faf450e075 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-07 11:45:51 +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
Robert Ferrús eb503238d7 feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-27 09:07:23 +02:00
Robert Ferrús 1ee29036f4 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-15 08:22:00 +00:00
Robert Ferrús 1eb75599d8 Merge branch 'dev' into 7296-expeditionTruck
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 09:38:14 +00:00
Robert Ferrús 87e85e4a4e Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-06 05:08:07 +00: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
Pablo Natek 95aba9e7b3 Merge pull request 'feat(collection-label): refs #6602 add qr to the report' (!2292) from 6602-barcode-to-qr into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2292
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-03 11:52:22 +00:00
Pablo Natek 6868863e54 fix: refs #6602 refactor code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 10:32:20 +02:00
Pablo Natek d45d53d665 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6602-barcode-to-qr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-02 10:26:46 +02:00
Pablo Natek bd1499a6f7 feat(collection-label): new option barcode-qr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-02 10:25:46 +02:00
Jorge Penadés cc4081d25f fix: refs #7165 css
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-30 16:17:29 +02:00
Robert Ferrús e7be1e2efe feat: refs #7296 expeditionTruck to roadmapStop
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-30 11:48:18 +02:00
Robert Ferrús d2c3034ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 12:07:53 +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
Carlos Satorres bc94850cc8 refs #6976 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:59:00 +02:00
Carlos Satorres e78b23a849 refs #6976 remove css
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-26 08:31:33 +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
Carlos Satorres b7b9035f72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6976-supplierConsumption 2024-04-24 12:45:22 +02:00
Carlos Satorres 34bb0e9052 refs #6976 fix pdf
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 10:07:40 +02:00
Carlos Andrés d249645c37 Hot fix informe facturas recibidas Ticket #176640
gitea/salix/pipeline/pr-master This commit looks good Details
2024-04-22 17:51:21 +02:00
Carlos Satorres 0537a3eca3 refs #6976 entity quantity price 2024-04-22 12:54:48 +02:00
Carlos Satorres b706d1c1c6 refs #6976 changes back supplier consumption 2024-04-12 14:26:28 +02:00
Pablo Natek aaef10b8d8 feat(collection-label): refs #6602 add qr to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-12 08:48:29 +02:00
Carlos Satorres db8d48ccee refs #6976 changes sql 2024-04-11 14:13:25 +02:00
Javier Casado bf3eb51bad Merge pull request '#7123 - creditRequestChange' (!2238) from 7123-creditRequestChange into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2238
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-04-05 07:29:43 +00:00
Pablo Natek 2a7807a4ab remove: refs #7145 dev code
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-04 08:49:47 +02:00
Pablo Natek de5e954ce2 fix: refs #7145 fix overFlow on driver-route 2024-04-04 08:48:58 +02:00
jcasado 09e1e4de19 refactor: #7123 change credit document
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-03 07:23:36 +02:00
jcasado f6ba5224e6 refs #7123 first edit pdf 2024-03-22 15:00:30 +01:00
Guillermo Bonet 00d5d06c6a Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:38:15 +01:00
Guillermo Bonet 85d3508848 Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-03-05 12:37:06 +01: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
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
Guillermo Bonet 3736d0708b feat: refs #6401 Minor change
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 08:16:07 +01:00
Guillermo Bonet feeb9eece7 feat: refs #6401 Added QR and CIF in the CMR report
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-29 08:12:17 +01:00
Carlos Satorres b6086e74c1 refs #6922 change order
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-22 10:39:34 +01:00
Alex Moreno 4d7bc482ec refs #6742 fix(invoice_pdf): incotermsFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-02-12 10:10:30 +01:00
Pablo Natek 550e3991cd fix(warning): refs #6684 fix vue warning 2024-01-31 12:50:32 +01:00
Pablo Natek 4ba76291c1 remove(console.log): refs #6684 driverRouteFix 2024-01-31 12:33:52 +01:00
Pablo Natek 7d4b6132ec fix(css): refs #6684 driverRouteReport 2024-01-31 12:30:57 +01:00
Pablo Natek 4fc71b9798 fix(driverRoute): refs #6684 driverRouteHotFix 2024-01-29 08:04:52 +01:00
Pablo Natek e43210af9c fix(driver-route): refs #6684 manage word overflow with wordBreak
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-26 09:23:43 +01:00
Guillermo Bonet 0c5225e3d0 fix: #6634 Line count previa collection-label
gitea/salix/pipeline/head This commit looks good Details
2024-01-26 07:42:53 +01:00
Carlos Satorres 7b9480f006 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE 2024-01-16 12:48:13 +01:00
Carlos Satorres 84134d671f refs #5525 remove as
gitea/salix/pipeline/head Build queued... Details
2024-01-16 12:47:58 +01:00
Guillermo Bonet 4ead2345c4 Merge branch '6634-collectionLabelPrevia' of https://gitea.verdnatura.es/verdnatura/salix into 6634-collectionLabelPrevia
gitea/salix/pipeline/head Build queued... Details
2024-01-15 10:03:06 +01:00
Guillermo Bonet a900e0fff6 feat: refs #6634 Minor change 2024-01-15 10:03:05 +01:00
Guillermo Bonet 1cd9b85ddf Merge branch 'dev' into 6634-collectionLabelPrevia
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:00:08 +00:00
Guillermo Bonet be1a94c283 feat: refs #6634 Modified collection-label
gitea/salix/pipeline/head There was a failure building this commit Details
2024-01-15 09:59:32 +01:00
Guillermo Bonet 4673145c58 fix: ticket 147437: Fix packages in incoterms
gitea/salix/pipeline/head This commit looks good Details
2024-01-11 10:09:35 +01:00
Carlos Satorres bbf1bb50e9 refs #5525 fix sql supplier for sepacore
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 13:27:38 +01:00
Carlos Satorres bfb31ad7c3 refs #5525 supplier
gitea/salix/pipeline/head This commit looks good Details
2023-12-28 11:46:34 +01:00
Carlos Satorres df1c9e3d9f refs #5525 suppliercif
gitea/salix/pipeline/head This commit looks good Details
2023-12-27 17:46:46 +01:00
Carlos Satorres 18e87a05c4 refs #5525 st and nd
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 10:07:17 +01:00
Carlos Satorres 9165995ee5 Merge branch 'dev' into 5971-addressInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 07:07:45 +00:00
Sergio De la torre 64ecf2e229 Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-12-11 05:48:21 +00:00
Carlos Satorres 7e9134ecc3 refs #5971 change sql address
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 13:47:07 +01:00
Carlos Satorres 102ea1ee65 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE
gitea/salix/pipeline/head This commit looks good Details
2023-12-07 07:35:18 +01:00
Pablo Natek fc653746f0 remove(barcode): refs #5228 remove barcode from report
gitea/salix/pipeline/head This commit looks good Details
2023-11-21 07:54:25 +01:00
Javi Gallego 9d54618620 fix: refs: #6207 impide facturar si no tienes incoterm
gitea/salix/pipeline/head This commit looks good Details
2023-11-08 10:01:02 +01:00
Sergio De la torre 60ffc21d5a Merge branch 'dev' into 5867-Driver-Route-Pdf
gitea/salix/pipeline/head This commit looks good Details
2023-10-27 04:49:16 +00:00
Jorge Penadés 1231d6dd1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-24 08:34:42 +02:00
Guillermo Bonet 5c51d7fb04 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-10-19 13:22:33 +02:00
Sergio De la torre fa08ebf416 refs #5867 fix: tickets sql
gitea/salix/pipeline/head There was a failure building this commit Details
2023-10-17 08:57:45 +02:00
Jorge Penadés 737eca2771 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut 2023-10-13 13:13:52 +02:00
Pablo Natek f52a6cb0c7 refs #4764 fixReport
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 15:04:39 +02:00
Carlos Satorres 5b6eb0a2a6 refs #5768 add address, nickname, pdf, email
gitea/salix/pipeline/head This commit looks good Details
2023-10-05 14:01:07 +02:00
Carlos Satorres f2adbc1716 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5768-incoterms 2023-10-04 13:54:18 +02:00
Jorge Penadés c35899542d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-04 08:40:44 +02:00
Carlos Satorres ed3871f75c refs #5861 edit css
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 14:03:59 +02:00
Carlos Satorres bd46a77cb7 refs #5768 incoterms addressFk
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 10:15:16 +02:00
Jorge Penadés f64f7a975d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-09-22 14:51:20 +02:00