Commit Graph

757 Commits

Author SHA1 Message Date
Alex Moreno ba763abc26 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 232001_test_to_dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-18 07:17:31 +02:00
Alex Moreno 058f828b92 refs #4548 fix(invoiceIn): report use invoiceIn.issued
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-17 11:54:59 +02:00
Carlos Satorres 43ab07d954 refs move reports views
gitea/salix/pipeline/head This commit looks good Details
2023-05-11 11:57:13 +02:00
Alexandre Riera 3166a9e420 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5137-aviso-impresora 2023-05-10 13:23:10 +02:00
Alexandre Riera ded8e0e141 refs #5137 added trigger, template and test
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 13:22:53 +02:00
Carlos Satorres eb3003e0f5 Merge branch 'dev' into 5580-buttonLink
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 06:46:39 +00:00
Alex Moreno 8ae67799a1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-05-09 07:11:09 +02:00
Carlos Satorres 49233eefcd refs #5580 add button, yml
gitea/salix/pipeline/head This commit looks good Details
2023-05-04 10:18:37 +02:00
Carlos Satorres 2467534d1f refs #5090 mod golabel
gitea/salix/pipeline/head This commit looks good Details
2023-05-03 09:23:16 +02:00
Carlos Satorres 66986d3c21 Merge branch 'dev' into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-27 12:08:28 +00:00
Alex Moreno c1ea1acc8c refs #4614 fear(ticket): add 'set weight' funcionality
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 13:49:08 +02:00
Guillermo Bonet fd36592c70 Merge branch 'dev' into 5237-greugeAlarmNotification
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:18:53 +00:00
Carlos Satorres a524d7837d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 11:45:20 +02:00
Carlos Satorres af875dd67e Merge
gitea/salix/pipeline/head This commit looks good Details
2023-04-26 10:26:54 +02:00
Guillermo Bonet 43bb762129 Merge branch 'dev' into 5237-greugeAlarmNotification
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-26 07:46:15 +00:00
Carlos Satorres 57ec0f8587 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-04-26 09:03:37 +02:00
Pablo Natek 3e15728db4 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-24 15:33:28 +00:00
Alex Moreno f738d1659b Merge branch 'dev' into 5456-client-welcome_email_añadirTraducciones
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 11:31:00 +00:00
Alex Moreno 7a79dfd4d1 deploy: 231401 test to dev 2023-04-21 12:49:03 +02:00
Pablo Natek de3b4f37c2 Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good Details
2023-04-21 05:54:00 +00:00
Vicent Llopis 89cca5ee9d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5456-client-welcome_email_añadirTraducciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 15:12:23 +02:00
Vicent Llopis 681b027098 refs #5456 añadida traducción al francés y corregida la de portugués
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-20 15:11:01 +02:00
Alexandre Riera d8fff8f3c4 refs #5527
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:51:21 +02:00
Alexandre Riera 5a4fcc2728 refs #5527 header fixed
gitea/salix/pipeline/head This commit looks good Details
2023-04-20 10:43:35 +02:00
Guillermo Bonet 6f96820168 refs #5237 Ahora lee un conjunto de arrays
gitea/salix/pipeline/head This commit looks good Details
2023-04-19 10:16:37 +02:00
Joan Sanchez cdf092a989 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5475-email_2fa 2023-04-18 11:52:17 +02:00
Carlos Satorres 3c639b9a2b refs # cambios entrantes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-18 10:48:41 +02:00
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 7a02a3213a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2023-04-13 13:47:34 +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
Carlos Satorres 1e71f7487a refs #084200 I18n footer
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-05 11:16:07 +02:00
Joan Sanchez ca30aaa18a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-04-05 08:39:43 +02:00
Carlos Andrés 0372d44415 fixes #5529 Fixes: missing awaits, buffer-to-file
gitea/salix/pipeline/head There was a failure building this commit Details
2023-04-04 15:00:28 +02:00
Carlos Satorres 9be06c6f4b refs #084200 arreglo lang 2023-03-29 12:07:45 +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
Carlos Satorres 14f8f98fe9 refs #084200 findOne
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 15:15:15 +02:00
Carlos Satorres aad8fb0a66 refs #084200 i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 13:11:38 +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
Carlos Satorres ceee1ec79b Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 14:55:03 +01:00
Carlos Satorres d05ddef5fa refs #084200 primer commit companyI18n 2023-03-22 14:54:59 +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
Carlos Satorres 08bda1b05b refs #084200 ultimos cambios footnotes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 08:09:28 +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 9e8150dde3 refs #084200 footnotes dinamico
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 15:59:46 +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 79d15d930e Updated package-lock
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 11:50:36 +01:00
Carlos Satorres a1d4dff7d8 Merge branch '5090-renameGoLabel' of https://gitea.verdnatura.es/verdnatura/salix into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 11:48:50 +01:00
Carlos Satorres 6509a79b02 Deleted package-lock 2023-03-02 11:48:45 +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