 Joan Sanchez
|
ebee9144b4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 09:16:30 +01:00 |
|
Joan Sanchez
|
461799f137
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-09 08:56:30 +01:00 |
 Alexandre Riera
|
21281e09db
|
hotfix removed supplier
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-02-02 15:13:53 +01:00 |
 Alex Moreno
|
6c772643a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-02-02 11:55:11 +01:00 |
|
Alexandre Riera
|
17bb4b6072
|
refs #5088 added receiptId
gitea/salix/pipeline/head This commit looks good
Details
|
2023-02-01 07:17:16 +01:00 |
|
Alex Moreno
|
d2b21d401a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-30 14:27:22 +01:00 |
|
Alexandre Riera
|
46ee12de6d
|
refs #5088 text deleted
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-30 09:45:10 +01:00 |
|
Alex Moreno
|
4e65e88621
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-30 07:56:12 +01:00 |
|
Alex Moreno
|
fe656aa125
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 14:10:20 +01:00 |
|
Alexandre Riera
|
765e4ed332
|
refs #4564 all reports refactored
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 13:15:30 +01:00 |
|
Alexandre Riera
|
96becec9d3
|
refs #4564 mixin vn-report created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 10:12:34 +01:00 |
|
Alexandre Riera
|
6e5728eead
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 10:11:07 +01:00 |
|
Alex Moreno
|
ce06274d0a
|
Merge branch 'dev' into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 07:12:26 +00:00 |
|
Alex Moreno
|
8a844917ce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
|
2023-01-23 08:07:14 +01:00 |
|
Joan Sanchez
|
052e7b3c4a
|
Merge branch 'dev' into #5110-qlabel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 06:47:02 +00:00 |
|
Alexandre Riera
|
ab7989911a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-23 07:44:09 +01:00 |
 Javi Gallego
|
30885a499e
|
link
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-21 07:29:27 +01:00 |
|
Alex Moreno
|
a674169ddb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 08:30:30 +01:00 |
|
Joan Sanchez
|
781c751229
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-20 07:42:36 +01:00 |
|
Alexandre Riera
|
a8a564431a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-19 11:38:34 +01:00 |
|
Alexandre Riera
|
c6f805bbe3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4564-report_eror-handler
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 15:11:22 +01:00 |
 Pau
|
51b2e5a3bc
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 10:37:07 +01:00 |
|
Pau
|
ffad1a6d79
|
eliminadas las comillas de template
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 10:35:19 +01:00 |
|
Pau
|
f7a25c64b5
|
format sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-17 10:13:41 +01:00 |
|
Alex Moreno
|
e27a559416
|
refactor: replace all Date
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-16 15:18:24 +01:00 |
 Guillermo Bonet
|
40109639ab
|
Merge branch 'dev' into 4965-collection-label-add-routeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-16 06:28:58 +00:00 |
|
Alex Moreno
|
2cc89d9ae7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-13 13:54:16 +01:00 |
|
Alex Moreno
|
d7e8c4fafd
|
fix(print_invoiceIn): translation invoice to receipt
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-13 09:28:44 +01:00 |
|
Guillermo Bonet
|
85dd7adcd8
|
refs #4965 Minor change
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-13 08:48:33 +01:00 |
|
Guillermo Bonet
|
52026376a6
|
refs #4965 Added routeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-13 08:44:58 +01:00 |
|
Pau
|
176005fcdc
|
requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-01-12 13:54:22 +01:00 |
|
Joan Sanchez
|
882cf6b9c1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
|
2023-01-12 08:36:24 +01:00 |
|
Pau
|
7cc4a2e635
|
cambiar report body y estilos para centrar mas la label
|
2023-01-05 14:39:53 +01:00 |
|
Alex Moreno
|
aa5cfde1ae
|
test(worker_new): add back tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-01-02 14:52:03 +01:00 |
|
Alex Moreno
|
2c5e42d408
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-28 11:49:16 +01:00 |
|
Pau
|
7a5993b4fe
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-26 07:12:13 +01:00 |
 Vicent Llopis
|
906d8c5df7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test_4825-intrastat
|
2022-12-23 10:01:44 +01:00 |
|
Vicent Llopis
|
c98b5a969d
|
feat: actualizada consulta intrastat
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-23 09:16:26 +01:00 |
|
Joan Sanchez
|
7c33cd2691
|
Merge pull request '4649-bookEntriesIncorrectly_notification' (!1188) from 4649-bookEntriesIncorrectly_notification into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1188
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-22 10:43:20 +00:00 |
|
Guillermo Bonet
|
d391946f57
|
refs #4898 Added barcode and changes in structure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-22 08:04:03 +01:00 |
|
Pau
|
a713cf92cf
|
Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-22 08:00:33 +01:00 |
|
Pau
|
f6f6d0866d
|
requested changes refs #4732 @1h
|
2022-12-22 08:00:18 +01:00 |
|
Pau
|
1430749892
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-21 07:02:02 +00:00 |
|
Pau
|
90b36bf1ab
|
Fix missing report for the invoice electronic notification
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 14:21:01 +01:00 |
|
Vicent Llopis
|
1ddaf7ff08
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-12-20 10:52:23 +01:00 |
|
Alexandre Riera
|
cd71a59dfe
|
Merge branch 'dev' into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-20 07:01:45 +00:00 |
|
Pau
|
6b3876b200
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 12:26:52 +00:00 |
|
Pau
|
f652e86c78
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-19 07:47:08 +01:00 |
|
Pau
|
cc6e2a8d01
|
remove package locks to avoid merge conflicts
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-19 07:30:47 +01:00 |
|
Alex Moreno
|
2a8a928ac5
|
feat: create invoiceIn
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-16 10:36:18 +01:00 |
|
Vicent Llopis
|
1b30ee9d2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 14:32:51 +01:00 |
|
Alexandre Riera
|
5a975d0b05
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-15 09:22:36 +01:00 |
|
Joan Sanchez
|
c004a2917d
|
Merge pull request 'refs #4204 Added param URL labelCount and' (!1204) from 4204-collection-label-labelCount into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1204
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-15 07:24:34 +00:00 |
|
Joan Sanchez
|
e6867f6004
|
Merge pull request '4898-expedition-pallet-label' (!1203) from 4898-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1203
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2022-12-15 07:20:00 +00:00 |
|
Guillermo Bonet
|
76001ec022
|
refs #4204 labelCount argument not required
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 16:15:41 +01:00 |
|
Alexandre Riera
|
f4ed7781b5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4928-supplier-payMethod-notify
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-14 08:30:36 +01:00 |
|
Guillermo Bonet
|
b7a369a41c
|
refs #4204 Added param URL labelCount and
gitea/salix/pipeline/head There was a failure building this commit
Details
changes in the css
|
2022-12-13 18:05:29 +01:00 |
|
Alexandre Riera
|
95967a29db
|
refs #4928 email template added and proc modified
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-13 11:50:17 +01:00 |
|
Vicent Llopis
|
e4dbeb0b33
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-12-13 09:54:56 +01:00 |
|
Guillermo Bonet
|
6ca8b646c2
|
refs #4898 Added userFk in QR
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 19:36:11 +01:00 |
|
Guillermo Bonet
|
d7a6350995
|
refs #4898 Created report expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 18:27:45 +01:00 |
|
Alex Moreno
|
bb944f9fee
|
feat(newWorker): use worker-welcome
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-12 15:05:49 +01:00 |
|
Alex Moreno
|
09edb99a1b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-12-12 13:48:06 +01:00 |
|
Joan Sanchez
|
f93398c783
|
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-12-12 10:27:28 +01:00 |
|
Vicent Llopis
|
14a3a815da
|
fix(invoiceOut): pdf adjunto correcto. Corregido valor NaN en intrastat. Sólo muestra intrstar en fact CEE
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 12:05:25 +01:00 |
|
Pau
|
5235ed5499
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-12-02 08:05:04 +00:00 |
|
Joan Sanchez
|
12cfa05696
|
fix(invoicePdf): invoice correction
gitea/salix/pipeline/head This commit looks good
Details
|
2022-12-02 08:33:56 +01:00 |
|
Joan Sanchez
|
6cb0e518d4
|
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-12-01 07:33:38 +01:00 |
|
Guillermo Bonet
|
23f429d94a
|
refs #4550 fixed no ellipsize in agencyDescription
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 12:44:33 +01:00 |
|
Guillermo Bonet
|
497e3e54a2
|
refs #4550 changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 10:52:52 +01:00 |
|
Guillermo Bonet
|
d0acd3e4c0
|
refs #4550 collection-label changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-30 08:18:37 +01:00 |
|
Vicent Llopis
|
f056c26b0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4649-bookEntriesIncorrectly_notification
|
2022-11-30 08:03:16 +01:00 |
|
Vicent Llopis
|
c258587e02
|
feat: plantilla email para asientos contables importados incorrectamente
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 15:06:21 +01:00 |
|
Guillermo Bonet
|
b7fa4dca4c
|
refs #4550 changed font-family of collection-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 14:16:44 +01:00 |
|
Joan Sanchez
|
990dd88e2c
|
Merge pull request 'test → dev (Hacer despues)' (!1186) from test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1186
|
2022-11-29 13:08:38 +00:00 |
|
Pau
|
18a23cf8b5
|
add some right padding to prevent the printer from cutting the label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-29 13:47:53 +01:00 |
|
Joan Sanchez
|
5f3e7c3384
|
Merge branch 'test' into master
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:49:06 +00:00 |
|
Guillermo Bonet
|
2faacb169a
|
refs #4550 collection-label more fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 11:56:05 +01:00 |
|
Guillermo Bonet
|
b262b29627
|
refs #4550 collection-label fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-29 08:22:32 +01:00 |
|
Pau
|
97cdbc4118
|
Merge branch '4732-previa-label' of https://gitea.verdnatura.es/verdnatura/salix into 4732-previa-label
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 14:34:15 +01:00 |
|
Pau
|
884286015f
|
fix labels not working on test data refs #4732 @2h
|
2022-11-28 14:01:38 +01:00 |
|
Vicent Llopis
|
4b54cf954b
|
refactor: envia el email con formato Verdnatura
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-28 13:56:21 +01:00 |
|
Pau
|
02f2724f2b
|
Merge branch 'dev' into 4732-previa-label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-25 06:35:15 +00:00 |
|
Alex Moreno
|
42adba3538
|
mail content
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-23 15:11:46 +01:00 |
|
Alex Moreno
|
cbdffc98a4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-23 14:16:42 +01:00 |
|
Alex Moreno
|
660648e01f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
|
2022-11-22 14:35:25 +01:00 |
|
Joan Sanchez
|
7e12938de3
|
Merge branch 'dev' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:53:03 +00:00 |
|
Guillermo Bonet
|
3c6ed672f5
|
refs #4550 added xmldom module and bugs fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 12:33:12 +01:00 |
|
Guillermo Bonet
|
6247ebc65c
|
refs #4550 HOTFIX added jsbarcode module in print
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-22 10:42:39 +01:00 |
|
Alex Moreno
|
7c75eaadce
|
feat: worker-welcome
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 15:15:25 +01:00 |
|
Pau
|
b1e12d7128
|
Merge branch '4732-new-label' into 4732-previa-label
|
2022-11-21 13:33:52 +01:00 |
|
Pau
|
2567a1fab3
|
refs #4732 @4h30m
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:31:55 +01:00 |
|
Alex Moreno
|
26be27c2ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-21 13:13:25 +01:00 |
|
Pau
|
d41269bbbe
|
Change fixtures so the provider is present in the label
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-18 11:58:46 +01:00 |
|
Pau
|
bc5940b036
|
Label show provider
|
2022-11-18 11:46:13 +01:00 |
|
Joan Sanchez
|
d7729654ee
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-17 16:48:31 +01:00 |
|
Joan Sanchez
|
f501707adf
|
fix(ordersFilter): wrong table schema
gitea/salix/pipeline/head This commit looks good
Details
|
2022-11-17 16:47:01 +01:00 |
|
Alex Moreno
|
8dcd567a68
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 13:20:52 +01:00 |
|
Alex Moreno
|
7a7da9508f
|
feat: workerWelcomeEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2022-11-15 12:56:30 +01:00 |
|
Alex Moreno
|
8f4ac8fcc9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4658-createWorker
|
2022-11-15 10:12:29 +01:00 |