 Juan Ferrer
|
e7f26e8502
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-11 00:56:20 +01:00 |
|
Juan Ferrer
|
ad741ba738
|
Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-10 20:37:11 +01:00 |
 Alex Moreno
|
4c216c4556
|
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-10 14:40:55 +01:00 |
 Joan Sanchez
|
303020a731
|
Attachment fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 11:51:14 +01:00 |
|
Joan Sanchez
|
133897c29f
|
Updated templates
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 10:38:54 +01:00 |
|
Joan Sanchez
|
83798dfadb
|
Email template slots
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-10 09:51:28 +01:00 |
|
Alex Moreno
|
cace29f75c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-09 14:20:17 +01:00 |
 Alexandre Riera
|
ff2ee4401e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-09 13:26:54 +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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
41d2d14d39
|
try
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-21 13:46:53 +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
|
377a0f7228
|
Attachments refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-10-04 13:41:37 +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
|
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
|
fe5eb3e13d
|
Changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-09-29 07:35:20 +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 |
|
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
|
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
|
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 |
|
Joan Sanchez
|
768e4d5e77
|
Resolved conflicts
gitea/salix/pipeline/head This commit looks good
Details
|
2022-08-10 12:13:31 +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 |
|
Joan Sanchez
|
099189fdfb
|
Added translation
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-06-22 14:17:41 +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
|
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 |
|
Joan Sanchez
|
558585fd15
|
Updated redmine link
gitea/salix/pipeline/head This commit looks good
Details
|
2022-05-12 12:08:12 +02: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 |
|
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
|
3f73084c7d
|
Changed report translations
gitea/salix/pipeline/head This commit looks good
Details
|
2021-10-29 11:42:03 +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
|
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
|
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
|
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
|
9a2fe0260e
|
last steps to preview credit request
gitea/salix/pipeline/head This commit looks good
Details
|
2021-07-19 10:16:15 +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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
5f28d39bbf
|
dynamic header & footer texts by company #1336
|
2019-11-21 09:33:08 +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
|
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
|
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 |