Commit Graph

522 Commits

Author SHA1 Message Date
Alex Moreno 2165ca0f34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-11-07 09:34:24 +01:00
Joan Sanchez 2f22753a65 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 13:06:55 +01:00
Joan Sanchez 785e7aa9fa Enabled puppeteer cluster
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 12:52:25 +01:00
Joan Sanchez 4d2003c714 Cluster rollback
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 11:27:20 +01:00
Joan Sanchez f5d24b9a9e Changed param
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 11:21:35 +01:00
Alex Moreno 36894c31de Merge branch 'dev' into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:04 +00: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
Alex Moreno 9c671ed3a4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:47:00 +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 755a1667dc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 07:35:04 +01: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
Joan Sanchez ea5c081a73 Merge pull request 'refs #4716 tipos actualizados' (!1115) from 4716-tipos-aceptados into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1115
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-02 06:26:03 +00:00
Joan Sanchez 67f2c00663 Merge branch 'dev' into 4497-services-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:24:03 +00: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 9170c22d6f fix send email
gitea/salix/pipeline/head This commit looks good Details
2022-10-28 09:21:28 +02:00
Alex Moreno 9225e8f176 fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-10-27 15:11:57 +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 cf24301bfe feat(account): email-verify refs #4077
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 13:28:26 +02:00
Alex Moreno a07a45c1b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-26 08:40:49 +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
Joan Sanchez 4520443734 fix: Intl polyfill for spanish locale
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 08:16: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 41d2d14d39 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 13:46:53 +02:00
Alex Moreno bcfbeb7032 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-21 12:41:39 +02:00
Joan Sanchez 04be661b68 Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1094
2022-10-21 10:38:11 +00: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
Joan Sanchez dcd858c7d5 feat(print): 4690 - Puppeteer cluster
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 14:30:36 +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
Alex Moreno 2e36164a98 fix(recover-password): use pint/Email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-11 10:06:25 +02:00
Alex Moreno ce2ad32ac9 add email template
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-10 15:16:56 +02:00
Joan Sanchez 143f713f2d Package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-06 12:56:48 +02:00
Joan Sanchez 9764b79f81 Restored engine versions
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 12:52:50 +02:00
Joan Sanchez 123810c866 Removed strict
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 12:45:44 +02:00
Joan Sanchez 137ee568df Removed node requirements
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 12:43:19 +02:00
Joan Sanchez bfc67ed79b Engine requirements
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 12:40:28 +02:00
Joan Sanchez 22187c1450 Enforce npm node version
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-06 11:32:13 +02:00
Joan Sanchez 11da463972 Renamed puppeteer method
gitea/salix/pipeline/head This commit looks good Details
2022-10-06 10:38:44 +02:00
Joan Sanchez b8615fef46 Upgraded puppeteer
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-05 14:30:13 +02:00
Joan Sanchez 377a0f7228 Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-04 13:41:37 +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
Pau 3f9ba6b853 Refactor to verdnatura.es and shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 14:22:52 +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 e4b61f81a9 Merge pull request '#4226-remove-density' (#1066) from #4226-remove-density into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1066
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-03 07:41:58 +00:00
Joan Sanchez 21bb95fc88 CSV refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 08:28:47 +02:00
Joan Sanchez 7fd4728c33 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 14:13:16 +02:00
Joan Sanchez 4005d6f82a Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 13:55:53 +02:00
Joan Sanchez 12f4ef0850 fix(print): log sent mails
gitea/salix/pipeline/head This commit looks good Details
2022-09-30 13:55:41 +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 3601881026 Client consumption queue
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:43:27 +02:00
Joan Sanchez d7b563c5ec Debug logs
gitea/salix/pipeline/head This commit looks good Details
2022-09-29 10:09:01 +02:00
Joan Sanchez 4172229051 Closure hotfix
gitea/salix/pipeline/head This commit looks good Details
2022-09-29 09:35:57 +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
Joan Sanchez d7ab95fcc8 closure
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 15:00:12 +02:00
Joan Sanchez 660842ca31 Osticket & waste refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 14:20:57 +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 410e651edd Buyer waste
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 07:24:45 +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 09bdee8b34 View & send PDF from loopback endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-19 12:59:32 +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
Joan 90229112e9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-09-15 06:35:03 +00:00
Joan Sanchez f3fe19360a Closure refactor
gitea/salix/pipeline/head This commit looks good Details
2022-09-13 13:20:18 +02:00
Joan Sanchez 27ecff685e fix(report): debtor letter with portuguese IBAN
gitea/salix/pipeline/head This commit looks good Details
2022-09-12 12:45:52 +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