Commit Graph

269 Commits

Author SHA1 Message Date
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
Carlos Jimenez Ruiz d2871ff3a6 Merge branch 'dev' into 3623-reportInvoice_intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:12:36 +00:00
Joan Sanchez 743972e9c3 fix(invoice): prevent report empty pages
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 11:23:27 +01:00
Vicent Llopis 72f4ef70ed recalculate neto in sql
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 10:18:47 +01:00