Commit Graph

671 Commits

Author SHA1 Message Date
Javier Segarra 753525d0ac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-04 11:57:16 +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
Javier Segarra becd2e6f48 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-29 07:49:24 +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
Pablo Natek 5e97f820a2 feat(spec): refs #6005 add spec
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-21 12:59:42 +01:00
Javier Segarra 811a49275d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions 2024-02-20 13:53:18 +01:00
Pablo Natek 1c40e01fcb refactor: refs #6005 move the logic to the report
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 13:49:42 +01:00
Pablo Natek ab7eb88913 merge(dev): refs #6005 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-20 09:34:08 +01:00
Alex Moreno 625922275c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-02-15 10:14:19 +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
Javier Segarra a756c3bc3a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-12 08:51:58 +01:00
Guillermo Bonet d6ae1fd1f8 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-06 06:39:51 +01:00
Javi Gallego 5c9589ba7b Merge branch 'dev' into 6742-incoterm-error
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-02-05 11:13:37 +00:00
Guillermo Bonet 1d596b63a0 Merge branch 'dev' into 6184-saveCmr
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 12:24:28 +01:00
Alex Moreno 9ac0ffb85a Merge branch 'dev' into 6270-electronicInvoiceBack
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 07:30:59 +00:00
Javi Gallego fd98348a4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6742-incoterm-error
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-02-02 08:06:06 +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
Carlos Satorres 509d5cea14 refs #6270 fix back
gitea/salix/pipeline/head This commit looks good Details
2024-01-30 15:54:03 +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
Guillermo Bonet a676607e29 feat: #6184 Added email cmr 2024-01-23 14:13:40 +01:00
Javi Gallego 540c76005e fix: #6742 calcula hasIncoterm a partir de la serie
gitea/salix/pipeline/head This commit looks good Details
2024-01-23 12:30:04 +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
Pablo Natek 3e2cac5544 Merge branch 'dev' into 6005-backupLabeler 2023-12-19 14:05:45 +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
Javier Segarra 72e9b69d7e Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:04:41 +00:00
Javier Segarra 2d4fb9d2f8 refs #5858 perf: remove unused methods
gitea/salix/pipeline/head Build queued... Details
2023-12-19 08:04:11 +01:00
Javier Segarra dbc3fc8007 refs #5858 perf: remove bad comments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 08:02:38 +01:00
Javier Segarra cc88fcbd9d refs #5858 feat: update notification template 2023-12-19 07:54:12 +01:00
Carlos Satorres ea31d3bebb refs #5525 debtor-nd
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:46:48 +01:00
Carlos Satorres 556b403a5b refs #5525 letter debtor st
gitea/salix/pipeline/head This commit looks good Details
2023-12-13 11:29:50 +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
Javier Segarra c40dc134f8 refs #5858 feat: sql files for new version 2023-11-29 12:15:38 +01:00
Pablo Natek d5fcfdfd79 fix(yml): refs #6005 backUpLabeler yml fix
gitea/salix/pipeline/head This commit looks good Details
2023-11-28 12:24:54 +01:00
Javier Segarra 4383ebd7f1 refs #5858 feat: email notification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-11-24 12:30:44 +01:00
Javier Segarra a2329e1276 refs #5858 feat: update template notification 2023-11-23 15:17:40 +01:00
Pablo Natek 3788d160a6 Merge branch 'dev' into 6005-backupLabeler 2023-11-22 11:30:44 +01:00
Javier Segarra 1b60cd33d5 ref #5858 feat: notification template 2023-11-22 09:25:35 +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
Pablo Natek 9c896c835f refactor(printer-notification): refs #6005 refactor de la notificación 2023-11-09 07:56:35 +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
Carlos Satorres cba8a48d18 Merge branch 'dev' into 5768-incoterms
gitea/salix/pipeline/head This commit looks good Details
2023-10-11 10:05:45 +00:00
Jorge Penadés 179d8ab87d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5914-transferInvoiceOut
gitea/salix/pipeline/head This commit looks good Details
2023-10-10 11:30:53 +02:00
Guillermo Bonet 47747ee236 Merge branch 'dev' into 5662-CollectionVolumetryNotify
gitea/salix/pipeline/head This commit looks good Details
2023-10-06 06:55:14 +00: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
Guillermo Bonet a5103c18eb Merge branch 'dev' into 5662-CollectionVolumetryNotify
gitea/salix/pipeline/head This commit looks good Details
2023-10-03 11:39:53 +00: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
Jorge Penadés 82f14e62ad ref #5914 tests fixed
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 16:08:55 +02:00
Carlos Satorres 7b246b1bac refs #5768 trad choose address
gitea/salix/pipeline/head This commit looks good Details
2023-09-21 13:15:00 +02:00
Carlos Satorres f4ac6f68c0 refs #5525 trad en
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 13:03:49 +02:00
Jorge Penadés 87cee57e56 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-09-20 10:47:53 +02:00
Guillermo Bonet 9112237277 Merge branch 'dev' into 5662-CollectionVolumetryNotify
gitea/salix/pipeline/head This commit looks good Details
2023-09-20 05:57:50 +00:00
Carlos Satorres daf5b343fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2 2023-09-19 13:58:13 +02:00
Javi Gallego e1b03172fb Merge pull request 'test' (!1744) from test into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1744
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-09-14 07:32:24 +00:00
Carlos Satorres d26a73bdd9 refs #5525 sql correct
gitea/salix/pipeline/head This commit looks good Details
2023-09-13 11:02:47 +02:00
Carlos Satorres b5d882ae5d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE
gitea/salix/pipeline/head This commit looks good Details
2023-09-11 10:26:32 +02:00
Carlos Andrés 4784e71350 refs #6176 book entry deleted
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 13:21:03 +02:00
Guillermo Bonet e20a8d215d refs #5662 Add email modified-collection-volumetry
gitea/salix/pipeline/head This commit looks good Details
2023-09-07 11:47:33 +02:00
Carlos Andrés 0d2db7749f refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 21:22:10 +02:00
Carlos Satorres 8678d2b1e0 refs #5525 new sql
gitea/salix/pipeline/head This commit looks good Details
2023-09-06 17:23:31 +02:00
Carlos Satorres 4918e3ccc7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-06 14:02:53 +02:00
Carlos Satorres 8141cd7834 refs #6194 url verdnatura
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 14:08:17 +02:00
Carlos Satorres b81dd1a9e8 refs #6194 new url verdnatura
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 14:01:36 +02:00
Carlos Satorres 2711ed579c refs #6194 generical url
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 13:26:08 +02:00
Carlos Satorres eb6917c10d refs #6194 change link
gitea/salix/pipeline/head This commit looks good Details
2023-09-04 13:08:01 +02:00
Carlos Andrés 40468b70e6 refs #6176 book entry deleted
gitea/salix/pipeline/head There was a failure building this commit Details
2023-09-04 11:59:55 +02:00
Carlos Satorres 3bc26b228e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5525-ibanSEPA-CORE 2023-08-31 13:37:10 +02:00
Jorge Penadés 3d4a99b07e refs 5914 transferInvoice created
gitea/salix/pipeline/head There was a failure building this commit Details
2023-08-24 10:51:34 +02:00
Carlos Satorres b1b6bd13ea refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good Details
2023-08-22 10:45:41 +02:00
Carlos Satorres 6b63072278 refs #6041 hotfix agricola
gitea/salix/pipeline/head This commit looks good Details
2023-08-18 11:52:04 +02:00
Guillermo Bonet 602f57bca9 Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 08:54:32 +00:00
Guillermo Bonet 688a72ddb3 refs #5995 Modify sql
gitea/salix/pipeline/head This commit looks good Details
2023-08-03 08:39:37 +02:00