Commit Graph

199 Commits

Author SHA1 Message Date
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
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 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 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
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
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 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 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 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 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 7ebabfdc24 Removed empty translations
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:34:54 +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
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:09:46 +02:00
Joan Sanchez e9b6c6b63e 3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz 724da74204 removed footer unused bindings and added date
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:57:08 +02:00
Carlos Jimenez Ruiz 4ed31f5172 added footerr to report
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:42:12 +02:00
Carlos Jimenez Ruiz 9a2fe0260e last steps to preview credit request
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 10:16:15 +02:00
Carlos Jimenez Ruiz 347c1ae197 Merge branch 'dev' into 2974-receipt_amountUnpaid
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:20:36 +00:00
Joan Sanchez d09ab13ba1 Replaced customer_risk with clientRisk 2021-07-01 09:56:22 +02:00
Joan Sanchez 2643d79781 Reformat rollback
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:41:04 +02:00
Joan Sanchez c8bfc911c2 2974 - Get amount unpaid from customer_risk
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:33:56 +02:00
Joan Sanchez 3ae520d247 2847 - Driver route now shows item packaging type
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 09:10:47 +00:00
Joan Sanchez 325afe2245 2906 - Number of packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:42:55 +02:00
Joan Sanchez 9c09d60775 Updated var name
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 13:14:13 +02:00
Joan Sanchez e7c62d2e71 2956 - Fix for extra community report
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 13:04:54 +02:00
Joan Sanchez 83071d163f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 10:50:22 +02:00
Joan Sanchez c533973398 HOTFIX: Invoice regeneration error
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 10:49:19 +02:00
Joan Sanchez a376ca32df Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 14:23:50 +02:00
Joan Sanchez 95073183e9 Email rollback
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 14:19:39 +02:00
Joan Sanchez dcebe94294 Show supplier name on route-driver report
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:21:49 +02:00
Carlos Jimenez Ruiz c12a2ceec9 instructions added to sepa core report
gitea/salix/pipeline/head This commit looks good Details
2021-05-04 11:53:47 +02:00
Joan Sanchez 38af26aca2 Mysql pool refactor
gitea/salix/pipeline/head This commit looks good Details
2021-04-27 10:29:09 +02:00
Joan Sanchez 302dedef0f Missing translations & attachment fix
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 14:25:57 +01:00
jorgebl fb5af479e3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:58:13 +01:00
Joan Sanchez 41ce834264 Removed unused require
gitea/salix/pipeline/head This commit looks good Details
2021-03-16 14:00:15 +01:00
Joan Sanchez db9d1c84e0 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-16 13:37:59 +01:00
jorgebl 7da8f21777 Put new email 2021-03-16 11:23:44 +01:00
Joan Sanchez 1e36b460a1 Added invoice incoterms report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-01 11:25:37 +01:00
Joan Sanchez cc00587b66 Small refactor
gitea/salix/pipeline/head This commit looks good Details
2021-02-25 09:00:49 +01:00
Joan Sanchez bb45d78062 Changes made 2021-02-24 07:51:05 +01:00
Joan Sanchez 20d9a99f6b Changes 2021-02-18 13:01:01 +01:00
Joan Sanchez af5f0db7f8 2734 - Added invoice report 2021-02-17 13:00:06 +01:00
Carlos Jimenez Ruiz b28b9be3d8 Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 13:51:58 +00:00
Joan Sanchez 3625ea2c36 Updated delivery note with botanical field
gitea/salix/pipeline/head This commit looks good Details
2021-01-19 14:43:40 +01:00
Joan Sanchez ddf5993277 2708 - Added report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-18 08:33:20 +01:00
Bernat Exposito ac6d97c026 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good Details
2020-12-18 10:10:09 +01:00
Bernat Exposito b9344832d6 cr changes 2020-12-18 10:08:51 +01:00
Bernat Exposito a13b554a26 supplier consumption email and fix report
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 14:42:57 +01:00
Joan Sanchez 8ee68d9fae Added unit test & updated translation
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 12:21:15 +01:00
Joan Sanchez 56ec7714ed Updated reports
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 11:40:51 +01:00
Joan Sanchez 5ecd589106 Updated delivery note
gitea/salix/pipeline/head This commit looks good Details
2020-12-16 09:24:11 +01:00
Bernat Exposito e1ac64a8d9 supplier consumption 2020-12-16 08:05:41 +01:00
Joan Sanchez 2842b66cbd Delivery note signature hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-10-19 08:10:32 +02:00
Joan Sanchez f17e9058b3 Refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-28 13:54:02 +02:00
Joan Sanchez 4d25fe88cf Added functions to call sql from def
gitea/salix/pipeline/head This commit looks good Details
2020-09-25 14:45:00 +02:00