Commit Graph

402 Commits

Author SHA1 Message Date
Joan Sanchez caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +02:00
Joan Sanchez 558585fd15 Updated redmine link
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 12:08:12 +02:00
Carlos Jimenez Ruiz a7b56b3b89 Merge branch 'dev' into 3327-global_invoicing
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 12:19:31 +00: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
Joan Sanchez d156cb1c30 Queue transaction
gitea/salix/pipeline/head This commit looks good Details
2022-05-02 13:52:57 +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
Joan Sanchez ea6b1abdd8 Invoice queue 2022-05-02 09:51:49 +02:00
Joan Sanchez fea7df269c Added invoice schedule method
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 14:59:29 +02:00
Joan Sanchez c923526342 refactor(invoicing): send invoice to print queue
gitea/salix/pipeline/head This commit looks good Details
2022-04-28 08:14:33 +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 b4c4c6dfff Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-02-18 08:50:50 +01:00
Joan Sanchez c260917e20 fix(closure): removed transaction
gitea/salix/pipeline/head This commit looks good Details
2022-02-18 08:49:31 +01:00
Joan Sanchez 2bdb1075fb fix(invoice): prevent report empty pages
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 11:25:20 +01: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
Joan Sanchez 8b60dbacfa fix(report): Check ticket property first
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 09:27:11 +01:00
Joan Sanchez 3e33436bf6 fix(report): Check ticket property first
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 09:53:38 +01:00
Joan Sanchez 5518fac357 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-14 08:44:22 +01:00
Joan Sanchez f4ff854a1f feat(notification): notify client metrics
gitea/salix/pipeline/head This commit looks good Details
Refs: 3315
2022-02-09 14:06:06 +01:00
Joan Sanchez 2fa284cd4b Updated report anchor
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 12:02:20 +01:00
Joan Sanchez e618423ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 12:27:42 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-24 15:40:37 +01:00
Joan Sanchez f657299229 Merge branch 'dev' into 3519-hide_logo
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 12:45:10 +00:00
Joan Sanchez f5217c3ebc Removed package-lock files
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 10:43:47 +01:00
Joan Sanchez 5ff950d078 refactor(invoice): hide report logo for non group companies #3519
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 10:33:40 +01:00
Joan Sanchez cb8b0e9657 Removed comments
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 11:56:04 +01:00
Joan Sanchez e3795ea072 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 11:05:25 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 14:19:29 +01:00
Joan Sanchez 071d15b79d puppeter not longer launch instances at service boot
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 12:29:00 +01:00
Joan Sanchez 38965ba50e Removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 09:16:02 +01:00
Joan Sanchez 4db6ddba54 Updated closure queries
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-19 09:12:10 +01:00
Joan Sanchez d626a69175 Read routes from file
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-19 08:40:13 +01:00
Joan Sanchez 0b2d62b2bf Added axios as http package
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 17:08:58 +01:00
Joan Sanchez 41b92bdc21 Added report file names
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:45:29 +01:00
Joan Sanchez 47c7b36936 CSV method refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:15:42 +01:00
Joan Sanchez a8f56dce58 Updated prop types 2022-01-17 12:44:43 +01:00
Joan Sanchez 7d16d7aaf2 Closure refactor 2022-01-17 12:33:11 +01:00
Carlos Jimenez Ruiz f20f2ecf03 package-locks due to loopback vn-mysql error 2022-01-14 16:14:48 +01:00
Joan Sanchez 63ea0902d1 refactor(print): print service refactor with better router handler
gitea/salix/pipeline/head There was a failure building this commit Details
Refs: 3245, 3477, 2800
2022-01-05 14:48:21 +01:00
Alex Moreno 5d3fedcbed feat(print_claim-pickup-order): add client.phone
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 12:52:14 +01:00
Joan Sanchez 805cdd6418 3112 - addd cmr-authorization report
gitea/salix/pipeline/head This commit looks good Details
2021-12-13 08:23:44 +01:00
Javi Gallego c8e9416448 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 07:33:54 +01:00
Joan Sanchez 03c7b3f743 fix(smtp): exclude png files on attachments
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 11:13:10 +01:00
Javi Gallego dc42c18ead after gulp
gitea/salix/pipeline/head This commit looks good Details
2021-11-18 07:38:49 +01:00
Joan Sanchez b7e58aa9cd fix(smtp): log attachment files sent through email
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 11:00:48 +01:00
Joan Sanchez 02e651eac8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:45:05 +01:00
Joan Sanchez f32db33ed9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:43:50 +01:00
Joan Sanchez bcaa11a3c4 fix(invoice): order by shipped
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 08:45:02 +01:00
Joan Sanchez cae69a2ce4 fix(invoice): order tickets by id on invoice report
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 08:35:00 +01:00
Joan Sanchez 06b72ae708 fix(pickup-order): changed sql query from pickup order
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 07:41:10 +01:00
Joan Sanchez 026e5d706f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-10-29 11:43:05 +02:00
Joan Sanchez 3f73084c7d Changed report translations
gitea/salix/pipeline/head This commit looks good Details
2021-10-29 11:42:03 +02:00
Joan Sanchez 6578a498ca feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 12:13:33 +02:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 11:58:23 +02:00
Joan Sanchez 2cdc22bc4d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 11:46:16 +02:00
Joan Sanchez 8a679b2c8b fix(invoice): fixed error for invoice with incoterms
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 10:26:40 +02:00
Joan Sanchez 9986d4eb03 feat(closure): should mail the PDF invoice invoiceable clients
gitea/salix/pipeline/head This commit looks good Details
Refs: 3211
2021-10-19 15:11:20 +02:00
Joan Sanchez 5209414613 feat(closure): should mail the PDF invoice invoiceable clients
gitea/salix/pipeline/head This commit looks good Details
Refs: 3211
2021-10-19 13:46:17 +02:00
Joan Sanchez ee1a7952ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 09:44:27 +02:00
Joan Sanchez b970214a85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 09:31:50 +02:00
Joan Sanchez da5be333d9 fix(osticket): don't show resolved tickets by other deparments
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 08:22:14 +02:00
Carlos Jimenez Ruiz 1ba2a924e6 refactor(print): chrimoum is now a single process on each instance with no child processes
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:15:00 +02:00
Joan Sanchez e641a947b3 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 09:51:42 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:28:06 +02:00
Joan Sanchez 33754b7d67 Updated osticket report sql
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 09:07:47 +02:00
Joan Sanchez 8d9a6b7f44 Changed invalid alias for osticket report
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 08:53:35 +02:00
Joan Sanchez 8828247b0d fix(invoice): prevented error for invoiced tickets without sales
gitea/salix/pipeline/head This commit looks good Details
2021-10-04 08:41:34 +02:00
Joan Sanchez 1ec20e250c feat(invoice): Send invoice and delivery-note on CSV format
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-01 12:41:31 +02:00
Joan Sanchez 39ff9d0ddb Removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2021-09-24 08:19:12 +02:00
Joan Sanchez 8c3a3d83e0 Removed vn-mysql package
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-23 07:59:56 +02:00
Javi Gallego 3365eadf5e Merge branch 'dev' into 2995-supplierAccount-modificaciones 2021-09-21 14:02:07 +02:00
Joan Sanchez 32d492efd3 refactor(deliveryNote): updated report translations
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-21 13:03:07 +02:00
Joan Sanchez c9cda92fbf refactor(smtp): replaced field "sender" with "receiver"
gitea/salix/pipeline/head This commit looks good Details
2021-09-20 14:32:15 +02:00
Joan Sanchez f90eb4c39d refactor(deliveryNote): added warning text for non returned packagings
gitea/salix/pipeline/head This commit looks good Details
Refs: 3097
2021-09-20 08:57:51 +02:00
Joan Sanchez 560993cc8c Removed unused translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 11:34:26 +02:00
Joan Sanchez f5b1eb3ccd feat(closure): send to driver the route report on route closure
gitea/salix/pipeline/head This commit looks good Details
2021-09-10 10:38:19 +02:00
Javi Gallego 8160912fe7 Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head This commit looks good Details
2021-09-08 10:41:26 +02:00
Joan Sanchez 2bf55f04bc fix(osticket): Filter by non-merged tickets 2021-09-07 12:12:58 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego bb764e206a test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:36:18 +02:00
Joan Sanchez 7ebabfdc24 Removed empty translations
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:34:54 +02:00
Joan Sanchez 6143992238 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-22 08:39:47 +02:00
Joan Sanchez 50629804cb HOTFIX: Changed param order on insert email into queue
gitea/salix/pipeline/head This commit looks good Details
2021-07-22 08:39:15 +02:00
Joan Sanchez dbe680a58c 3004 - Deprecated ticket_closeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 13:06:31 +02:00
Joan Sanchez f24e7cafce Merge branch 'dev' into 2989-client_debt_sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:07:36 +00:00
Carlos Jimenez Ruiz af321be095 Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 07:52:42 +00:00