Commit Graph

472 Commits

Author SHA1 Message Date
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Carlos Satorres 57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-04-26 09:03:37 +02:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Alexandre Riera d8fff8f3c4 refs #5527
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:51:21 +02:00
Alexandre Riera 5a4fcc2728 refs #5527 header fixed
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:43:35 +02:00
Carlos Satorres 3c639b9a2b refs # cambios entrantes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 10:48:41 +02:00
Carlos Satorres f76727903a update insert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 15:17:05 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 15:04:49 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Carlos Satorres 014998952e refs #084200 recipientId
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:39:51 +02:00
Alexandre Riera 7e42bd1116 refs #5379 referencia a vn2008 quitada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 12:01:42 +02:00
Carlos Satorres b51710fb31 refs #5525 mod yml y sql
gitea/salix/pipeline/head This commit looks good Details
2023-04-03 15:44:12 +02:00
Vicent Llopis cbe79a964c refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 10:31:02 +01:00
Vicent Llopis dd412606ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5013-observaciones_facturas
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:26:06 +01:00
Joan Sanchez 4762f3b54f fix(deliveryNote): ticket without delivery address
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 13:33:14 +01:00
Vicent Llopis 9ef5c0c560 refs #5013 mostrar las observaciones del ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 09:07:22 +01:00
Vicent Llopis 1d0024c538 refs #5013 feat: añadida observacion para cada ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:08:34 +01:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:34:02 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Vicent Llopis 286bc541b6 refs #5120 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:27:01 +01:00
Vicent Llopis da5886243e refs #5120 refactor: no utilizar receipt directamente
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 10:22:34 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Vicent Llopis 29df1ba894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 08:00:02 +01:00
Carlos Satorres 36e18ff28c Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:03:04 +00:00
Carlos Satorres b5394d3925 refs #084200 footer finalizado, web personalizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:52:41 +01:00
Vicent Llopis 1ef454681c fix: faltaba this delante de formateDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:51:25 +01:00
Vicent Llopis 19fcf5d536 feat: add column 'description'
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 07:46:36 +01:00
Vicent Llopis b24b6d4121 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback 2023-03-10 07:46:16 +01:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Guillermo Bonet 0c22c1b0de refs #5368 Fix expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 17:30:28 +01:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Juan Ferrer 47f1ad9a0c Merge pull request 'master' (!1367) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1367
2023-03-06 08:28:29 +00:00
Vicent Llopis 8ac575419a fix: no mostraba la factura rectificada correcta
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 12:31:20 +01:00
Joan Sanchez b8881a050c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 07:41:16 +01:00
Guillermo Bonet a5d236257b refs #4965 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:03:47 +01:00
Guillermo Bonet fdf97b1fc7 refs #4965 Hotfix collection-label
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:59:46 +01:00
Carlos Andrés 01ade6eb03 refs #5000 Merge with dev 2023-02-23 09:23:06 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 885a98457e feat: sustido sql por loopback del report 'balance-compensation'
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 09:11:20 +01:00
Joan Sanchez d4cecb9c25 Merge pull request 'refs #4965 Added routeFk' (!1251) from 4965-collection-label-add-routeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1251
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-15 07:53:28 +00:00
Alexandre Riera 7876d4611c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:44:03 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:41:36 +01:00
Vicent Llopis ac3faddac1 fix: actulizada sql intrastat y se muestra solamente cuando toca
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 12:09:51 +01:00
Vicent Llopis e61af5286b fix: actualizada sql intrastat
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:10:48 +01:00
Alex Moreno d8acf45e0d fix(client-debt-statment): typo
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 09:34:42 +01:00
Alex Moreno 0529d56d4e fix(delivery-note_report): fix taxes
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 13:30:52 +01:00
Vicent Llopis 4754dc7bda feat: actualizada sql intrastat
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 11:03:22 +01:00
Joan Sanchez ebee9144b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 09:16:30 +01:00
Joan Sanchez 461799f137 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 08:56:30 +01:00
Alexandre Riera 21281e09db hotfix removed supplier
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 15:13:53 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Alexandre Riera 17bb4b6072 refs #5088 added receiptId
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:17:16 +01:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Alexandre Riera 46ee12de6d refs #5088 text deleted
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 09:45:10 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Alexandre Riera 765e4ed332 refs #4564 all reports refactored
gitea/salix/pipeline/head This commit looks good Details
2023-01-23 13:15:30 +01:00
Alex Moreno 8a844917ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-23 08:07:14 +01:00
Alexandre Riera a8a564431a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good Details
2023-01-19 11:38:34 +01:00
Alexandre Riera c6f805bbe3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 15:11:22 +01:00
Pau 51b2e5a3bc Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:37:07 +01:00
Pau ffad1a6d79 eliminadas las comillas de template
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:35:19 +01:00
Pau f7a25c64b5 format sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 10:13:41 +01:00
Alex Moreno e27a559416 refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-16 15:18:24 +01:00
Guillermo Bonet 40109639ab Merge branch 'dev' into 4965-collection-label-add-routeFk
gitea/salix/pipeline/head This commit looks good Details
2023-01-16 06:28:58 +00:00
Guillermo Bonet 85dd7adcd8 refs #4965 Minor change
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 08:48:33 +01:00
Guillermo Bonet 52026376a6 refs #4965 Added routeFk
gitea/salix/pipeline/head This commit looks good Details
2023-01-13 08:44:58 +01:00
Pau 176005fcdc requested changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 13:54:22 +01:00
Pau 7cc4a2e635 cambiar report body y estilos para centrar mas la label 2023-01-05 14:39:53 +01:00
Pau 7a5993b4fe Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-26 07:12:13 +01:00
Vicent Llopis 906d8c5df7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat 2022-12-23 10:01:44 +01:00
Vicent Llopis c98b5a969d feat: actualizada consulta intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-12-23 09:16:26 +01:00
Guillermo Bonet d391946f57 refs #4898 Added barcode and changes in structure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-22 08:04:03 +01:00
Pau a713cf92cf Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-22 08:00:33 +01:00
Pau f6f6d0866d requested changes refs #4732 @1h 2022-12-22 08:00:18 +01:00
Pau 6b3876b200 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 12:26:52 +00:00
Pau f652e86c78 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-12-19 07:47:08 +01:00
Alex Moreno 2a8a928ac5 feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good Details
2022-12-16 10:36:18 +01:00
Joan Sanchez c004a2917d Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:24:34 +00:00
Joan Sanchez e6867f6004 Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-12-15 07:20:00 +00:00
Guillermo Bonet 76001ec022 refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-14 16:15:41 +01:00
Guillermo Bonet b7a369a41c refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit Details
changes in the css
2022-12-13 18:05:29 +01:00
Guillermo Bonet 6ca8b646c2 refs #4898 Added userFk in QR
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 19:36:11 +01:00
Guillermo Bonet d7a6350995 refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-12 18:27:45 +01:00
Vicent Llopis 14a3a815da fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 12:05:25 +01:00
Pau 5235ed5499 Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-12-02 08:05:04 +00:00
Joan Sanchez 12cfa05696 fix(invoicePdf): invoice correction
gitea/salix/pipeline/head This commit looks good Details
2022-12-02 08:33:56 +01:00
Guillermo Bonet 23f429d94a refs #4550 fixed no ellipsize in agencyDescription
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 12:44:33 +01:00
Guillermo Bonet 497e3e54a2 refs #4550 changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 10:52:52 +01:00
Guillermo Bonet d0acd3e4c0 refs #4550 collection-label changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-30 08:18:37 +01:00
Guillermo Bonet b7fa4dca4c refs #4550 changed font-family of collection-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 14:16:44 +01:00
Pau 18a23cf8b5 add some right padding to prevent the printer from cutting the label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-29 13:47:53 +01:00
Guillermo Bonet 2faacb169a refs #4550 collection-label more fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 11:56:05 +01:00
Guillermo Bonet b262b29627 refs #4550 collection-label fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-29 08:22:32 +01:00
Pau 97cdbc4118 Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-28 14:34:15 +01:00
Pau 884286015f fix labels not working on test data refs #4732 @2h 2022-11-28 14:01:38 +01:00
Pau 02f2724f2b Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-25 06:35:15 +00:00
Guillermo Bonet 3c6ed672f5 refs #4550 added xmldom module and bugs fixed
gitea/salix/pipeline/head This commit looks good Details
2022-11-22 12:33:12 +01:00
Pau b1e12d7128 Merge branch '4732-new-label' into 4732-previa-label 2022-11-21 13:33:52 +01:00
Pau 2567a1fab3 refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-21 13:31:55 +01:00
Pau d41269bbbe Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good Details
2022-11-18 11:58:46 +01:00
Pau bc5940b036 Label show provider 2022-11-18 11:46:13 +01:00
Alex Moreno d1dce73a33 feat: creat email/vehicle-event-expired
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:50:38 +01:00
Joan Sanchez 1f05e6fb3b Label without header & footer
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:50:08 +01:00
Joan Sanchez 55b90d8a80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:43:04 +01:00
Joan Sanchez 800d98a5b5 Removed unused components
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:34:23 +01:00
Joan Sanchez 303020a731 Attachment fixes
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 11:51:14 +01:00
Joan Sanchez 133897c29f Updated templates
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 10:38:54 +01:00
Joan Sanchez b8add5b0bc Report template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:57:42 +01:00
Joan Sanchez 89e49c3843 Template component
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:48:24 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Alexandre Riera ff2ee4401e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 13:26:54 +01:00
Joan Sanchez f9eee431b4 fix(driver-route): routes with empty lines
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:27:00 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Alexandre Riera d1636376d8 Merge branch 'dev' into 4650-observaciones-albaranes
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 08:03:59 +00:00
Joan Sanchez 009e9e3bb7 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 07:35:02 +00:00
Alexandre Riera b73fe06043 Merge branch 'dev' into 4497-services-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:22:57 +00:00
Alexandre Riera 84eb87e02a refs #4547 cambios sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-03 08:08:24 +01:00
Alexandre Riera 908908a643 refs #4547 correcciones
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-02 15:54:23 +01:00
Alex Moreno 59e66e1f49 typo
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:55:06 +01:00
Alex Moreno 2c3b735650 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-11-02 13:49:09 +01:00
Joan Sanchez 5cefc82113 Merge branch 'dev' into 4650-observaciones-albaranes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:57:40 +00:00
Guillermo Bonet af6acbd066 Merge branch 'dev' into 4550-printServer 2022-11-02 11:50:53 +01:00
Joan Sanchez 2fba17ab15 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 09:33:27 +00:00
Alex Moreno fc7a39e910 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 07:33:07 +01:00
Alexandre Riera b5889d2f40 refs #4497 servicios añadidos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 10:35:43 +01:00
Alexandre Riera 57e74fab38 refs #4716 tipos actualizados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 15:53:57 +02:00
Alexandre Riera 1246a65f32 refs #4547 informe y email generados
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-28 14:49:22 +02:00
Alex Moreno 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Alex Moreno 3a2fc984dd refs #4564
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 15:18:14 +02:00
Alexandre Riera 7948523685 refs #4650 cambios en la query
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:03:09 +02:00
Alexandre Riera 67402dfe5e refs #4650 observaciones añadidas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 13:27:04 +02:00
Alex Moreno e8500f926c feat(invoiceIn): add email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 08:19:56 +02:00
Alex Moreno 9e0eab5a77 feat(invoiceIn): email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-24 15:15:23 +02:00
Alex Moreno 6c38835e8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-24 08:20:25 +02:00
Alex Moreno c23d58da69 fix if not ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 14:21:36 +02:00
Alex Moreno 4b12405586 feat: report invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 15:15:54 +02:00
Alex Moreno 192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 14:54:13 +02:00
Guillermo Bonet bd10c01550 Merge branch 'test' into 4550-printServer 2022-10-18 16:25:49 +02:00
Alex Moreno c9073641aa feat(invoiceInPdf): content
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 14:58:38 +02:00
Alex Moreno eb58839839 feat(invoiceIn): invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 15:13:27 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 11:22:27 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Guillermo Bonet 2c7cce4b36 second commit 2022-10-04 13:06:59 +02:00
Guillermo Bonet 23726b6e60 first commit 2022-10-04 10:55:13 +02:00
Joan Sanchez a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +02:00
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Joan Sanchez 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +02:00
Joan Sanchez fe5eb3e13d Changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 07:35:20 +02:00
Javi Gallego 426ff5f753 selector con weightByPieceCheckbox
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 11:26:36 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +02:00
Joan Sanchez 7f78286d6b Reports refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 13:33:27 +02:00
Joan Sanchez 85698410db Templates refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-26 08:07:45 +02:00
Joan Sanchez 92a476bd05 credit request 2022-09-22 09:42:04 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 8105c12a18 Campaign metrics 2022-09-22 08:48:29 +02:00
Joan Sanchez 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Vicent Llopis 888f70abcc fix: required is true
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 08:12:08 +02:00
Vicent Llopis c17e0fd38b feat: add new report
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 08:11:04 +02:00
Vicent Llopis 9f1c90387b feat: add new report vehicleExpired
gitea/salix/pipeline/head This commit looks good Details
2022-09-20 08:18:44 +02:00
Joan Sanchez 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +02:00
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Javi Gallego 5e54e27718 quito left en taxes
gitea/salix/pipeline/head This commit looks good Details
2022-08-17 12:19:54 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Joan Sanchez 398df267a7 Item-label locale
gitea/salix/pipeline/head This commit looks good Details
2022-08-09 11:58:42 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-25 14:49:39 +02:00
Vicent Llopis 699f19b0d4 refactor: change invoice id by refFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-21 10:05:37 +02:00
Vicent Llopis 2d57b3bd54 Merge branch 'dev' into 4221-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-07-12 06:10:20 +00:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Vicent Llopis 459a1fe518 feat: update instrastat.sql
gitea/salix/pipeline/head This commit looks good Details
2022-06-29 14:15:22 +02:00
Joan Sanchez cffff93cdc Updated translations
gitea/salix/pipeline/head There was a failure building this commit Details
2022-06-22 10:57:28 +02:00
Joan Sanchez b2d57f4022 Added portuguese translation
gitea/salix/pipeline/head This commit is unstable Details
2022-06-22 09:25:21 +02:00
Joan Sanchez 0e89616089 incoterms report refactor
gitea/salix/pipeline/head This commit is unstable Details
2022-06-13 11:03:11 +02:00
Joan Sanchez 9ab8b84290 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4045-incoterms_authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-06-10 13:16:27 +02:00
Joan Sanchez a5f3580b17 derp
gitea/salix/pipeline/head This commit looks good Details
2022-05-26 16:14:10 +02:00
Joan Sanchez 6586595976 feat(closure): send incoterms authorization
gitea/salix/pipeline/head This commit is unstable Details
2022-05-19 07:31:00 +02:00
Alex Moreno dbc5c61050 fix(diver-route): supplierAgencyTerm
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 14:53:03 +02:00
Alex Moreno 3f07400705 fix(delivery-note): type not required
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 12:28:17 +02:00
Carlos Jimenez Ruiz 7209bc52de Merge branch 'dev' into 3791-travel_extra-community
gitea/salix/pipeline/head This commit looks good Details
2022-03-29 08:10:30 +00:00
Vicent Llopis 64ae7ee8ea feat: modify filter
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 13:24:26 +02:00
Vicent Llopis 1e587be2ed (fix): filter repaired
gitea/salix/pipeline/head This commit looks good Details
2022-03-28 11:57:19 +02:00
Alex Moreno aeb1eed421 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3615-print_deliveryNote
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:31:38 +01:00
Joan Sanchez 6e9db8b1cd Merge pull request '3597-feat(print_deliveryNote): add proforma type' (#906) from 3597-ticket_descriptor_proforma into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #906
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-03-23 11:22:57 +00:00
Alex Moreno 2d9163ea1b use computed function
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 09:48:09 +01:00
Alex Moreno ebfd0bdb29 use computed function
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 09:46:44 +01:00
Alex Moreno 1051a9cafb traductions
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 09:42:00 +01:00
Alex Moreno 4a323d2cfb report-footer use function
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 09:27:10 +01:00
Alex Moreno 0dc1848870 feat(print_deliveryNote): add withoutPrices type
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 15:13:34 +01:00
Alex Moreno 4112fe84c0 change footer
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 14:59:57 +01:00
Alex Moreno ca35c88be4 feat(print_deliveryNote): add proforma type
gitea/salix/pipeline/head This commit looks good Details
2022-03-22 07:38:14 +01:00
Alex Moreno a2b06e7248 feat(print_claim-pickup-order): add claimConfig
gitea/salix/pipeline/head This commit looks good Details
2022-03-18 13:22:39 +01:00
Alex Moreno 62aeea04bc refactor(print): report driver-route remove ticket.import 2022-03-08 15:15:59 +01:00