Commit Graph

722 Commits

Author SHA1 Message Date
Carlos Satorres b5394d3925 refs #084200 footer finalizado, web personalizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:52:41 +01:00
Vicent Llopis 1ef454681c fix: faltaba this delante de formateDate
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-10 12:51:25 +01:00
Vicent Llopis 19fcf5d536 feat: add column 'description'
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 07:46:36 +01:00
Vicent Llopis b24b6d4121 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback 2023-03-10 07:46:16 +01:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Guillermo Bonet 0c22c1b0de refs #5368 Fix expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 17:30:28 +01:00
Joan Sanchez 63694f4478 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:47:47 +00:00
Vicent Llopis 5248fd7fcf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing 2023-03-06 10:20:57 +01:00
Juan Ferrer 47f1ad9a0c Merge pull request 'master' (!1367) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1367
2023-03-06 08:28:29 +00:00
Vicent Llopis 8ac575419a fix: no mostraba la factura rectificada correcta
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 12:31:20 +01:00
Carlos Satorres ea9a15ece1 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 10:44:24 +00:00
Carlos Satorres 1ef78ce8be refs #5090 ultimo commit
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 10:58:01 +01:00
Carlos Satorres ab14cfde21 refs #5090 solucion final yml tab
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 10:26:52 +01:00
Carlos Satorres 3df45c77e5 refs #5090 error linea26 solve
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 10:04:14 +01:00
Carlos Satorres 9843b06e6e refs #5090 correction error multiline
gitea/salix/pipeline/head Build queued... Details
2023-03-02 10:01:15 +01:00
Carlos Satorres 892e3319b0 refs #5090 solucion error yml2
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 09:57:09 +01:00
Carlos Satorres 7b7dcddce0 refs #5090 solucion de error yml 2023-03-02 09:51:15 +01:00
Joan Sanchez b8881a050c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 07:41:16 +01:00
Guillermo Bonet a5d236257b refs #4965 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 14:03:47 +01:00
Guillermo Bonet fdf97b1fc7 refs #4965 Hotfix collection-label
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 12:59:46 +01:00
Carlos Satorres 1c3aa29642 refs #5090 model.ezp nuevo
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 11:56:41 +01:00
Carlos Satorres 968f422054 refs #5090 Renamed QLabel to GoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-01 11:43:07 +01:00
Guillermo Bonet e231b0e12b refs #5237 Added greuge notify
gitea/salix/pipeline/head This commit looks good Details
2023-03-01 10:11:22 +01:00
Carlos Andrés 01ade6eb03 refs #5000 Merge with dev 2023-02-23 09:23:06 +01:00
Carlos Andrés eaa5b4530a getMinClientId 2023-02-23 09:22:17 +01:00
Joan Sanchez 86dd299292 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:52 +01:00
Joan Sanchez ceab11cc41 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 13:33:34 +01:00
Joan Sanchez 527caf9ca0 refactor(zerofill): deprecated zerofill and removed function
gitea/salix/pipeline/head This commit looks good Details
Refs: #5207
2023-02-17 11:19:35 +01:00
Vicent Llopis 885a98457e feat: sustido sql por loopback del report 'balance-compensation'
gitea/salix/pipeline/head This commit looks good Details
2023-02-17 09:11:20 +01:00
Joan Sanchez d4cecb9c25 Merge pull request 'refs #4965 Added routeFk' (!1251) from 4965-collection-label-add-routeFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1251
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-15 07:53:28 +00:00
Alexandre Riera 7876d4611c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5223-cliente-compensado
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:44:03 +01:00
Alexandre Riera ea2fd59cdc refs #5223 changed ref and email text
gitea/salix/pipeline/head This commit looks good Details
2023-02-14 12:41:36 +01:00
Vicent Llopis ac3faddac1 fix: actulizada sql intrastat y se muestra solamente cuando toca
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 12:09:51 +01:00
Vicent Llopis e61af5286b fix: actualizada sql intrastat
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:10:48 +01:00
Alex Moreno d8acf45e0d fix(client-debt-statment): typo
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 09:34:42 +01:00
Alex Moreno 0529d56d4e fix(delivery-note_report): fix taxes
gitea/salix/pipeline/head This commit looks good Details
2023-02-09 13:30:52 +01:00
Vicent Llopis 4754dc7bda feat: actualizada sql intrastat
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 11:03:22 +01:00
Alex Moreno bbf68a88a7 feat: sendEmail checkBox and docuware open clientBalanceCreate with default data
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-09 10:26:55 +01:00
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 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
Robert Ferrús d5daa172d5 refs #5112 feat(print): create entry-update-comission template
gitea/salix/pipeline/head This commit looks good Details
2023-01-17 11:53:29 +01:00
Robert Ferrús 31d23f7dd1 feat(print): create entry-update-comission template
gitea/salix/pipeline/head This commit looks good Details
refs #5112
2023-01-17 11:50:27 +01:00
Robert Ferrús 759a140e61 feat(print): create entry-update-comission template
gitea/salix/pipeline/head This commit looks good Details
refs #4586
2023-01-17 11:45:50 +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
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
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
Pau 6eaee8faca Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 06:06:20 +00:00
Alex Moreno 6113ea398d feat: worker-welcome
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-14 15:19:38 +01:00
Alex Moreno db3a6df23d feat(worker): new worker 2022-11-14 15:19:16 +01:00
Vicent Llopis a30f50ffe5 refactor: borrado console.log
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 12:20:27 +01:00
Pau 3c771fc771 refactor missing URL's refs #4609
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:53:00 +01:00
Alex Moreno d1dce73a33 feat: creat email/vehicle-event-expired
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 08:50:38 +01:00
Vicent Llopis 7e50f23563 refacor code
gitea/salix/pipeline/head This commit looks good Details
2022-11-11 08:55:56 +01:00
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
Joan Sanchez 1f05e6fb3b Label without header & footer
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:50:08 +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 55b90d8a80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:43:04 +01:00
Joan Sanchez 800d98a5b5 Removed unused components
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 13:34:23 +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
Joan Sanchez b8add5b0bc Report template
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:57:42 +01:00
Joan Sanchez 89e49c3843 Template component
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 07:48:24 +01:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +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
Joan Sanchez f9eee431b4 fix(driver-route): routes with empty lines
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 10:27:00 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +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 d1636376d8 Merge branch 'dev' into 4650-observaciones-albaranes
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 08:03:59 +00:00
Joan Sanchez 009e9e3bb7 Merge branch 'dev' into 4548-invoiceIn-pdf
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 07:35:02 +00:00
Alexandre Riera b73fe06043 Merge branch 'dev' into 4497-services-intrastat
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 07:22:57 +00:00
Alexandre Riera 84eb87e02a refs #4547 cambios sql
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-03 08:08:24 +01: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 59e66e1f49 typo
gitea/salix/pipeline/head This commit is unstable Details
2022-11-02 13:55:06 +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 5cefc82113 Merge branch 'dev' into 4650-observaciones-albaranes
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:57:40 +00:00
Guillermo Bonet af6acbd066 Merge branch 'dev' into 4550-printServer 2022-11-02 11:50:53 +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 b5889d2f40 refs #4497 servicios añadidos
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-31 10:35:43 +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 926ab0e35c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order 2022-10-27 09:05:05 +02:00
Alex Moreno 3a2fc984dd refs #4564
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 15:18:14 +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
Alexandre Riera 7948523685 refs #4650 cambios en la query
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:03:09 +02:00
Alexandre Riera 67402dfe5e refs #4650 observaciones añadidas
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 13:27:04 +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 6c38835e8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4548-invoiceIn-pdf 2022-10-24 08:20:25 +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 bcfbeb7032 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password 2022-10-21 12:41:39 +02:00
Alex Moreno c23d58da69 fix if not ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-20 14:21:36 +02:00
Alex Moreno 4b12405586 feat: report invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 15:15:54 +02:00
Alex Moreno 192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-19 14:54:13 +02:00
Guillermo Bonet bd10c01550 Merge branch 'test' into 4550-printServer 2022-10-18 16:25:49 +02:00
Alex Moreno c9073641aa feat(invoiceInPdf): content
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-18 14:58:38 +02:00
Alex Moreno eb58839839 feat(invoiceIn): invoiceInPdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 15:13:27 +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
Guillermo Bonet 2c7cce4b36 second commit 2022-10-04 13:06:59 +02:00
Guillermo Bonet 23726b6e60 first commit 2022-10-04 10:55:13 +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 a065d77929 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:37:59 +02:00
Joan Sanchez c177c0366d Item PDF
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-03 13:35:49 +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 1ac35c0b68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4481-print_library2
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 14:52:31 +02:00
Joan Sanchez 5aec280adb Closure migration
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-29 09:07:18 +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
Javi Gallego 426ff5f753 selector con weightByPieceCheckbox
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 11:26:36 +02:00
Javi Gallego a662bb90a2 Merge branch 'dev' into #4226-remove-density
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-27 09:32:48 +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 5a43bdb6c9 Delivery note 2022-09-21 13:18:32 +02:00
Vicent Llopis 888f70abcc fix: required is true
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 08:12:08 +02:00
Vicent Llopis c17e0fd38b feat: add new report
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-21 08:11:04 +02:00
Vicent Llopis 9f1c90387b feat: add new report vehicleExpired
gitea/salix/pipeline/head This commit looks good Details
2022-09-20 08:18:44 +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 18ac0a0b61 Export Email and Report classes
gitea/salix/pipeline/head This commit looks good Details
2022-09-16 23:13:37 +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
Javi Gallego 5cf102c7fd sustituido density por weightByPiece
gitea/salix/pipeline/head This commit is unstable Details
2022-08-24 14:13:26 +02:00
Javi Gallego 5e54e27718 quito left en taxes
gitea/salix/pipeline/head This commit looks good Details
2022-08-17 12:19:54 +02:00
Joan Sanchez 768e4d5e77 Resolved conflicts
gitea/salix/pipeline/head This commit looks good Details
2022-08-10 12:13:31 +02:00
Joan Sanchez 398df267a7 Item-label locale
gitea/salix/pipeline/head This commit looks good Details
2022-08-09 11:58:42 +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
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 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 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 caa9a63c4c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2022-05-24 08:45:37 +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
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 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 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 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