Commit Graph

500 Commits

Author SHA1 Message Date
Alex Moreno 560b5b374f Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 05:37:12 +00:00
Carlos Satorres f76727903a update insert
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 15:17:05 +02:00
Carlos Satorres d399cda050 refs #5316 quitar comment
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-17 10:34:08 +02:00
Carlos Satorres 60d3729b4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes 2023-04-17 08:55:22 +02:00
Joan Sanchez f5d26bdb99 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-13 12:00:22 +02:00
Carlos Satorres 1ce2705869 refs #5316 last kkentry
gitea/salix/pipeline/head This commit looks good Details
2023-04-11 15:04:49 +02:00
Carlos Satorres d21ab7a5a7 refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable Details
2023-04-11 10:32:21 +02:00
Joan Sanchez b0f1bae33e Added unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 08:56:50 +02:00
Joan Sanchez b9e48f2102 Added translations & enable through departments
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-11 07:39:43 +02:00
Joan Sanchez 2e0325e567 Validate code
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-06 14:59:25 +02:00
Carlos Satorres 014998952e refs #084200 recipientId
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 14:39:51 +02:00
Alexandre Riera 7e42bd1116 refs #5379 referencia a vn2008 quitada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 12:01:42 +02:00
Pablo Natek 2c01ebf681 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-28 13:26:17 +02:00
Vicent Llopis cbe79a964c refs #5013 eliminado espacio en blanco al final de la cadena y añadidas fixtures
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-24 10:31:02 +01:00
Vicent Llopis dd412606ef Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5013-observaciones_facturas
gitea/salix/pipeline/head This commit looks good Details
2023-03-24 08:26:06 +01:00
Joan Sanchez 4762f3b54f fix(deliveryNote): ticket without delivery address
gitea/salix/pipeline/head This commit looks good Details
2023-03-23 13:33:14 +01:00
Vicent Llopis e1f7ba1343 refs #5456 feat: actualizada traduccion en castellano y añadida en portugues
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-23 10:37:46 +01:00
Vicent Llopis 9ef5c0c560 refs #5013 mostrar las observaciones del ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 09:07:22 +01:00
Vicent Llopis 1d0024c538 refs #5013 feat: añadida observacion para cada ticket
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-21 14:08:34 +01:00
Joan Sanchez d373d80b12 Merge pull request '5120-reports_loopback' (!1389) from 5120-reports_loopback into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1389
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:34:02 +00:00
Joan Sanchez e911f7a127 Merge pull request '4980-travel.extra-community_filterToReport' (!1391) from 4980-travel.extra-community_filterToReport into dev
Reviewed-on: #1391
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-16 06:27:33 +00:00
Vicent Llopis 286bc541b6 refs #5120 delete console.log
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 11:27:01 +01:00
Vicent Llopis da5886243e refs #5120 refactor: no utilizar receipt directamente
gitea/salix/pipeline/head This commit looks good Details
2023-03-15 10:22:34 +01:00
Vicent Llopis 50ccb61728 refactor: el report llama directamente al filtro de extra-community
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:59:29 +01:00
Carlos Andrés 67f9cae2f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head This commit looks good Details
2023-03-14 09:04:45 +01:00
Joan Sanchez 28730f3262 Attachment fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 09:01:05 +01:00
Vicent Llopis 29df1ba894 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5120-reports_loopback
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-14 08:00:02 +01:00
Carlos Satorres 36e18ff28c Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:03:04 +00:00
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