Commit Graph

294 Commits

Author SHA1 Message Date
Joan Sanchez 9cd6728956 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2847-driver_route
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:35:17 +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
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz 625722e4da package-lock up to date in all services
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:40:22 +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
Joan Sanchez 7e4b540af1 Updated company address
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 14:47:00 +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 868a0dbff7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2811-entry_latest_buys
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 09:43:34 +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
jorgebl 5f95bf4e15 Removed vn-horizontal and styles in the spans 2021-03-22 10:23:52 +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 37c29584af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2843-claim_pickup_order 2021-03-16 11:23:49 +01:00
jorgebl 7da8f21777 Put new email 2021-03-16 11:23:44 +01:00
Joan Sanchez 0ec6d273e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:49:16 +01:00
Carlos Jimenez Ruiz 0aaf7b32ab Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:32:08 +01:00
Joan Sanchez 1acd5dc838 Closure to dayEnd
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 12:03:19 +01:00
Joan Sanchez 893cca52cc Changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 11:49:35 +01:00
Joan Sanchez 060fc2ac21 Closure by date
gitea/salix/pipeline/head This commit looks good Details
2021-03-15 11:07:44 +01:00
Carlos Jimenez Ruiz 2b8286eb28 deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 17:15:26 +01:00
Joan Sanchez 1719f53111 2734 - Recreate invoice
gitea/salix/pipeline/head This commit looks good Details
2021-03-11 08:58:34 +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 7ec1e4272a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-19 20:56:40 +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
Carlos Jimenez Ruiz 464366fdbe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2564-item_priceFixed 2021-01-18 17:17:02 +01:00
Carlos Jimenez Ruiz 8d6dd3e03a minor refactors 2021-01-18 14:17:01 +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
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
Joan Sanchez 1353a0987d 2700 - Closure by multiple agencies
gitea/salix/pipeline/head This commit looks good Details
2021-01-04 09:22:32 +01:00
Joan Sanchez 6416b0ad79 2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good Details
2020-12-22 14:56:21 +01:00
Carlos Jimenez Ruiz ffc9b8dba9 Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2020-12-21 09:55:45 +00:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Joan Sanchez 42cd2356a2 Refactor v2
gitea/salix/pipeline/head There was a failure building this commit Details
2020-12-18 17:23:04 +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 d959dbc058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2425-ticket_descriptor_menu
gitea/salix/pipeline/head This commit looks good Details
2020-11-11 07:34:34 +01:00
Joan Sanchez 637116b17d Added descriptor-menu component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-09 14:52:25 +01:00
Joan Sanchez a30cfd2218 Added unit test
gitea/salix/pipeline/head This commit looks good Details
2020-11-05 09:21:20 +01:00
Juan Ferrer 9b563cb8bf LDAP & Samba synchronization fixes + improvements
gitea/salix/pipeline/head This commit looks good Details
2020-10-31 00:02:27 +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 5680e86363 2437 - Changed to "EN" default locale
gitea/salix/pipeline/head This commit looks good Details
2020-10-07 08:03:21 +02:00
Joan Sanchez 2ab7999816 Removed unused param dirname
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 14:10:13 +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
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +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 652812bca4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-09-14 13:37:20 +02:00
Joan Sanchez 26f0958838 Trigger build
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-09-14 13:25:37 +02:00
Joan Sanchez c077afcfed Changed var 2020-09-14 12:34:13 +02:00
Joan Sanchez 076ee50c0f Config file path fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 12:14:22 +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 ea6aed351a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:56:48 +02:00
Joan Sanchez 279120dd03 Launch puppeteer browser on app start
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:38:48 +02:00
Joan Sanchez 21c4b8db14 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 08:59:59 +02:00
Joan Sanchez edf3f1e96e Removed temporary table on ticket closure
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 08:51:46 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +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 c3e8c0cc58 Changes 2020-09-07 12:51:49 +02:00
Joan Sanchez fa634d2dad 2285 - Added closure paths 2020-09-07 12:51:38 +02:00
Joan Sanchez f3a7fc514a Changes
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 10:54:39 +02:00
Joan Sanchez 66f4674392 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2285-ticket_closure 2020-09-07 10:05:52 +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 55b3e962a4 Merge branch 'dev' into 1361-calendar_date_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 12:03:31 +00:00
Joan Sanchez cacf562954 Audit fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-08-18 14:01:43 +02:00
Carlos Jimenez Ruiz f38701bb43 unit testing filter 2020-08-13 10:03:50 +02:00
Joan Sanchez debd2a8693 Added puppeteer no-sandbox
gitea/salix/pipeline/head This commit looks good Details
2020-08-12 07:52:43 +02:00
Joan Sanchez cff9a64e54 puppeteer 2.0
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 15:07:41 +02:00
Joan Sanchez 91fb2e954c Added puppeteer to package.json
gitea/salix/pipeline/head This commit looks good Details
2020-08-11 13:51:18 +02:00
Joan Sanchez 0335d6c51e Removed commented lines
gitea/salix/pipeline/head This commit looks good Details
2020-07-09 08:45:17 +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 b9cc71aeba There's no way to prevent tbody page-break
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 12:59:16 +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