Commit Graph

544 Commits

Author SHA1 Message Date
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 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 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
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 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 560993cc8c Removed unused translation
gitea/salix/pipeline/head This commit looks good Details
2021-09-17 11:34:26 +02:00
Joan Sanchez 2bf55f04bc fix(osticket): Filter by non-merged tickets 2021-09-07 12:12:58 +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 f6c4ef8150 HOTFIX: Compatible SQL with MySQL
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 07:32:07 +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 3ed6e65f33 Style fixes to osticket report
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 07:31:06 +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 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +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 dfbf114161 Merge branch 'dev' into 2708-travel_extracommunity
gitea/salix/pipeline/head There was a failure building this commit Details
2021-01-19 12:10:06 +00: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
Joan Sanchez 946d0e8209 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-01-13 11:05:48 +01:00
Joan Sanchez 0e9160f61b Letter debtor hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-01-13 11:05:30 +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
Joan Sanchez cf2c8ca0c8 Updated translation
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:16:13 +02:00
Joan Sanchez 27a1a45d71 Añadido CIF/NIF
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 14:46:37 +02:00
Joan Sanchez 559a2e9721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:56:58 +02:00
Joan Sanchez 7043b833d0 Pdf optimization
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:44:10 +02:00
Joan Sanchez 7b9205ee1e Actualizados títulos de albarán
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 15:06:00 +02:00
Joan Sanchez 9ef58cabd4 Removed console log
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 14:10:38 +02:00
Joan Sanchez cd74e9684a Download route PDF on route index
gitea/salix/pipeline/head This commit looks good Details
2020-08-25 10:00:21 +02:00
Joan Sanchez 11ae95daba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2162-print_pdf_puppeteer
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 13:06:46 +02:00
Joan Sanchez c6dc1b6b23 Label report fixes & report options are not longer shared
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-06 08:27:05 +02:00
Carlos Jimenez Ruiz f2e1f00ae3 using csss variables plus a traduction
gitea/salix/pipeline/head This commit looks good Details
2020-07-03 16:43:45 +02:00
Joan Sanchez 6fe50dc040 Switch to puppeteer 2020-07-02 16:07:26 +02:00
Joan Sanchez 279677bda9 Removed report from descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-06-15 09:07:13 +02:00
Joan Sanchez b3db5681fe 2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 09:18:19 +02:00
Joan Sanchez 9615fb063d Fixed translation
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 16:43:51 +02:00
Joan Sanchez e606f95b65 Fixed translations
gitea/salix/pipeline/head This commit looks good Details
2020-06-03 16:14:18 +02:00
Carlos Jimenez Ruiz 98157fc45a Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-27 07:10:27 +00:00
Joan Sanchez 23ec99d0f8 2274 - Added english translation
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 08:24:38 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Joan Sanchez f6efa7160e 2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-20 16:23:53 +02:00
Joan Sanchez 87f0a7e417 delivery-note get ticket address fix
gitea/salix/pipeline/head This commit looks good Details
2020-04-09 20:03:45 +02:00
Bernat Exposito Domenech 6aa1a5137b fix report
gitea/salix/pipeline/head This commit looks good Details
2020-03-06 13:00:03 +01:00
Joan Sanchez 1f714718bb 1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-05 13:56:45 +01:00
Joan Sanchez b736303610 2144 - Prevent page break on data tables
gitea/salix/pipeline/head This commit looks good Details
2020-03-03 13:22:36 +01:00
Bernat Exposito Domenech c48da59314 report entry-order
gitea/salix/2038-entry_descriptor_vista_impresion This commit looks good Details
2020-02-24 08:44:43 +01:00
Bernat Exposito Domenech aecfe2b8a9 report entry-order 2020-02-20 09:31:09 +01:00
Bernat Exposito Domenech 2be5e04a39 changed title in report driver-route
gitea/salix/2060-report_route_driver This commit looks good Details
2020-02-12 13:20:08 +01:00
Bernat Exposito Domenech 1d73d9f89d refactor campaing report
gitea/salix/1910-informe_consumo This commit looks good Details
2020-02-11 13:25:41 +01:00
Joan Sanchez 0355d9bc27 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-20 07:58:34 +01:00
Joan Sanchez 40172e5c8c corrección de formato
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-20 07:39:11 +01:00
Joan Sanchez 1fcd54e8d7 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-17 13:33:57 +01:00
Joan Sanchez 6b314d8dbe fixed date bug
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-17 13:22:32 +01:00
Joan Sanchez 826dfe8092 changes to percentage filter
gitea/salix/master This commit looks good Details
2020-01-17 11:46:45 +01:00
Carlos Jimenez Ruiz 8807f64e09 Merge branch '1972-buyer_week_waste' of verdnatura/salix into dev 2020-01-17 11:42:53 +01:00
Joan Sanchez 2b2e6532f6 changes to percentage filter
gitea/salix/2008-item_buyer_waste_detail This commit looks good Details
2020-01-16 13:39:32 +01:00
Bernat Exposito Domenech bc40473e9b modificar plantilla
gitea/salix/1994-plantilla_instalacio_impresora This commit looks good Details
2020-01-15 08:48:17 +01:00
Joan Sanchez 0999c7e2ca renamed field
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-09 07:54:34 +01:00
Joan Sanchez a702d14fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1972-buyer_week_waste 2020-01-09 07:52:35 +01:00
Juan Ferrer a979a17482 Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details
2020-01-08 13:53:10 +01:00
Joan Sanchez 4f32333894 Updated report phone extension
gitea/salix/master This commit looks good Details
gitea/salix/test This commit looks good Details
2020-01-08 12:29:52 +01:00
Joan Sanchez 6c9def9c6c changed translation
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-08 09:06:19 +01:00
Joan Sanchez e7433fab24 some fixes
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-08 08:53:07 +01:00
Joan Sanchez d815948795 Added buyer week-waste email #1972
gitea/salix/1972-buyer_week_waste This commit looks good Details
2020-01-03 13:52:42 +01:00
Joan Sanchez b4e7a1e3e0 Changed sepa-core title
gitea/salix/dev This commit looks good Details
2019-12-27 10:29:20 +01:00
Joan Sanchez ec1750476e Fixed tags
gitea/salix/master This commit looks good Details
2019-12-20 12:56:56 +01:00
Joan Sanchez 10fcb10787 added translations & fixed null locale value
gitea/salix/1931-delivery_note_translations This commit looks good Details
2019-12-16 08:01:19 +01:00
Carlos Jimenez Ruiz 909fef5e86 #1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-28 08:30:36 +01:00
Carlos Jimenez Ruiz f4e0d04b64 #1903 informe consumo campaña
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-27 16:16:22 +01:00
Carlos Jimenez Ruiz 8624a3db68 #1903 informe consumo campaña removed comented code 2019-11-27 16:02:07 +01:00
Carlos Jimenez Ruiz 0c0ae14263 #1903 informe consumo campaña 2019-11-27 16:00:42 +01:00
Carlos Jimenez Ruiz 474e42c9bd #1772 informe consumo campaña email template
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-22 16:01:11 +01:00
Carlos Jimenez Ruiz 8202a6f419 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests
gitea/salix/1891-worker_time_control_tests This commit looks good Details
2019-11-21 11:17:17 +01:00
Joan Sanchez 56a73f152e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-11-21 09:33:10 +01:00
Joan Sanchez 5f28d39bbf dynamic header & footer texts by company #1336 2019-11-21 09:33:08 +01:00
Carlos Jimenez Ruiz c04640bd62 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1891-worker_time_control_tests 2019-11-21 09:19:15 +01:00
Bernat a1784470cc update scheme db 2019-11-20 12:42:10 +01:00
Carlos Jimenez Ruiz 19371fbb41 1772-campaign_metrics refactor
gitea/salix/1772-campaign_metrics This commit looks good Details
2019-11-19 14:52:38 +01:00
Joan Sanchez e499d44018 dont use payMethodId on view #1854
gitea/salix/dev This commit looks good Details
2019-11-19 12:53:25 +01:00
Joan Sanchez f9deb9f52d send closure error by email 2019-11-19 11:53:01 +01:00
Joan Sanchez ed5458a264 error handling fixes
gitea/salix/dev This commit looks good Details
2019-11-19 10:32:09 +01:00
Joan Sanchez 8643030bf0 restructure router methods, added closure method
gitea/salix/1391-ticket_closure This commit looks good Details
2019-11-18 15:04:51 +01:00
Joan Sanchez 6b4d7f0aeb Added delivery-note french translation
gitea/salix/dev This commit looks good Details
2019-11-14 11:51:46 +01:00
Joan Sanchez 5b2367bfc9 updated delivery-note translations
gitea/salix/dev This commit looks good Details
2019-11-14 11:19:01 +01:00
Joan Sanchez f8c90832fd Deprecated LCR
gitea/salix/dev This commit looks good Details
2019-11-14 09:59:11 +01:00
Joan Sanchez e0ed9072c9 unified LCR and CORE #1868
gitea/salix/dev This commit looks good Details
2019-11-14 08:16:52 +01:00
Joan Sanchez c166067888 updated tests & email compatibility with phone
gitea/salix/dev This commit looks good Details
2019-11-13 12:18:30 +01:00
Joan Sanchez 0838540789 template mso compatibility
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-11 11:04:49 +01:00
Joan Sanchez 1a15ed7d50 removed attachment link
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-08 07:21:14 +01:00
Joan Sanchez 5705c37f92 show attachments on email templates attachment component
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-07 11:19:05 +01:00
Joan Sanchez 23f6c8843d #1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-06 08:20:45 +01:00
Joan Sanchez 14cb32d1c8 updated reports
gitea/salix/1466-print_refactor There was a failure building this commit Details
2019-11-04 13:55:20 +01:00
Joan Sanchez d063bb4568 refactor changes
gitea/salix/1466-print_refactor This commit looks good Details
2019-11-04 08:54:21 +01:00
Joan Sanchez 8bce163099 changes
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-31 14:14:18 +01:00
Joan Sanchez a2ea532fc1 refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-31 12:43:04 +01:00
Joan Sanchez 443aa56fed refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-29 07:46:44 +01:00
Joan Sanchez 0eaba04e52 refactor
gitea/salix/1466-print_refactor This commit looks good Details
2019-10-24 07:41:54 +02:00