Commit Graph

21384 Commits

Author SHA1 Message Date
Alex Moreno d884192066 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:52:50 +02:00
Alex Moreno 18bb8a4ea5 fix: checking process.env.NODE_ENV
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-21 13:50:45 +02:00
Guillermo Bonet d672385776 hotfix: Rectificación Pepe
gitea/salix/pipeline/head This commit looks good Details
2024-05-21 11:44:11 +02:00
Alex Moreno f82b105430 fix: TicketLog res.data
gitea/salix/pipeline/head This commit looks good Details
2024-05-20 11:30:43 +02:00
Carlos Satorres f9ecc687dd Merge pull request 'hotfix TicketLog filter' (!2481) from hotfix-TicketLogs into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2481
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 09:21:16 +00:00
Carlos Satorres 6d66c0f71f hotfix TicketLog filter
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-20 11:14:30 +02:00
Guillermo Bonet ac49daf0f3 Merge pull request 'hotfix: ticket 135539 Unroute tickets' (!2469) from 135539-hotfixCloseAll into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2469
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-20 04:53:49 +00:00
Alex Moreno 96b013bbbf Merge pull request 'fix: refs #7033 add es locale' (!2472) from 7033-hotfix-addLocale into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2472
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-17 11:24:37 +00:00
Jorge Penadés 2694f277d2 fix: refs #6744 add es locale
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-17 13:03:24 +02:00
Guillermo Bonet 968effc936 hotfix: ticket 135539 Unroute tickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-17 11:56:04 +02:00
Guillermo Bonet a99554c773 fix: Occasionally saleVolume bad index
gitea/salix/pipeline/head This commit looks good Details
2024-05-17 09:50:53 +02:00
Carlos Andrés c5f2b3a384 Merge pull request 'fix: invoiceInTax_getFromEntries (referenceRate)' (!2462) from Hotfix-referenceRate-en-invoiceInTax_getFromEntries into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
Reviewed-on: #2462
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-05-16 12:53:27 +00:00
Carlos Andrés 2f4f199fad fix: invoiceInTax_getFromEntries (referenceRate)
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-16 14:40:02 +02:00
Guillermo Bonet 049e8931ab hotfix: Tmp fix item_getSimilar
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 14:30:04 +02:00
Carlos Satorres 4b8cad9aef hotfix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 13:23:36 +02:00
Carlos Satorres 6387075413 Merge pull request 'hotfix accessScopes' (!2458) from hotfix-accesScopesPdf into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2458
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-15 10:53:15 +00:00
Carlos Satorres a4e1b1931c hotfix accessScopes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-15 12:38:30 +02:00
Alex Moreno 53057863e1 Merge pull request 'testToMaster hotFix' (!2457) from test into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2457
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-15 10:26:13 +00:00
Alex Moreno dcc943e82d hotFix(env): refs #7388 disable webpack nodeEnv
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-15 12:19:01 +02:00
Alex Moreno f442f0dafb hotFix(env): refs #7388 install gettext-base
gitea/salix/pipeline/head This commit looks good Details
2024-05-15 11:52:50 +02:00
Alex Moreno 1c3c5e1423 Merge pull request 'hotFix: fix env' (!2454) from 7388_fix_front_env into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2454
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2024-05-15 08:18:12 +00:00
Alex Moreno a64d41fedb Merge branch 'test' into 7388_fix_front_env
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-15 07:02:48 +00:00
Alex Moreno f368e00677 hotFix: fix env
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-15 09:02:23 +02:00
Juan Ferrer af198e2832 Merge pull request 'master' (!2455) from master into test
gitea/salix/pipeline/pr-dev Build queued... Details
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2455
2024-05-15 06:56:48 +00:00
Alex Moreno 022d78e76c hotFix: fix env
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-15 07:53:42 +02:00
Carlos Andrés df15e44442 Merge pull request '6974-sale_add' (!2452) from 6974-sale_add into master
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test Build queued... Details
Reviewed-on: #2452
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-05-14 15:06:35 +00:00
Carlos Andrés adaba6ecfb refs #6974 refactor: optimize sale_add
gitea/salix/pipeline/pr-test This commit looks good Details
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 15:39:28 +02:00
Carlos Andrés d0d710f023 refs #6974 refactorLoop 2024-05-14 15:36:09 +02:00
David Domenech 33ce0f2291 Merge pull request 'fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit' (!2450) from 7389-sipConf_callLimit into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2450
Reviewed-by: David Domenech <davidd@verdnatura.es>
2024-05-14 12:29:59 +00:00
Juan Ferrer b6f788a8db fix: refs #7389 pbx.sipConfig: rename incomingLimit to call-limit
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 14:21:16 +02:00
Juan Ferrer eadf13b663 fix: Jenkinsfile display BRANCH_NAME
gitea/salix/pipeline/head This commit looks good Details
2024-05-14 12:20:39 +02:00
Sergio De la torre b3170245d1 Merge pull request 'refs #6106 hotFix: getTickets' (!2449) from 6106_getTickets into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2449
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-14 09:25:54 +00:00
Sergio De la torre edb024a1f9 refs #6106 hotFix: getTickets
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 10:14:53 +02:00
Alex Moreno 43cd0c2ff2 Merge pull request 'deploy: dump' (!2448) from 7383-dump into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2448
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
2024-05-14 07:44:39 +00:00
Alex Moreno 2ddadcd8a4 deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-14 09:38:03 +02:00
Alex Moreno 12f36dc825 hotFix: refs #6731 remove CodCOMPRADOR
gitea/salix/pipeline/head This commit looks good Details
2024-05-14 08:24:40 +02:00
Alex Moreno 7b1d931747 Merge pull request '7383-testToMaster' (!2445) from 7383-testToMaster into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2445
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-05-14 05:44:12 +00:00
Alex Moreno 6251493adb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/pr-master This commit looks good Details
gitea/salix/pipeline/head This commit looks good Details
2024-05-13 14:24:31 +02:00
Pablo Natek db9c20fb22 Merge pull request 'fix: refs #4988 insert into agencyWorkCenter' (!2442) from 4988-fixInsert-into-agencyWorkCenter into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2442
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-13 10:31:55 +00:00
Pablo Natek bde7fc9972 fix: refs #4988 no task id on table comment
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 12:30:17 +02:00
Pablo Natek c7eeaf238a fix: refs #4988 add schema
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 11:04:50 +02:00
Pablo Natek 48392879cb fix: refs #4988 insert into agencyWorkCenter
gitea/salix/pipeline/pr-test There was a failure building this commit Details
2024-05-13 10:59:22 +02:00
Pablo Natek 7301657a3a Merge pull request 'fix: duplicate version' (!2441) from fixTestDeploy into test
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #2441
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-13 07:03:30 +00:00
Pablo Natek 1e956bb0f8 fix: duplicate version
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-13 08:53:25 +02:00
Alex Moreno a7910d9894 hotFix(invoiceInPdf): fix accessScopes
gitea/salix/pipeline/head This commit looks good Details
2024-05-10 14:58:52 +02:00
Carlos Andrés 85aa4fae08 Merge pull request 'Ticket 180571 No se ven las ubicaciones' (!2439) from Hotfix-productionConfig-defaultSectorFk-adelantamos-cambio into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2439
Reviewed-by: Pako Natek <pako@verdnatura.es>
2024-05-10 12:52:17 +00:00
Carlos Andrés 349c3d71dd Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:14:23 +02:00
Carlos Andrés 56815e4b1a Ticket 180571 No se ven las ubicaciones
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-10 13:10:54 +02:00
Pako Natek 6b10f81add Merge pull request 'done' (!2435) from hotFix-collection_assign into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2435
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2024-05-09 17:06:25 +00:00
Pako Natek ec060209aa done
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-09 18:53:32 +02:00