Commit Graph

16753 Commits

Author SHA1 Message Date
Alexandre Riera a6bf61033f refactor tests
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 12:04:16 +01:00
Vicent Llopis 9e9807c4b5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4856-worker.time-control
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 11:55:30 +01:00
Vicent Llopis e39690c2c9 merge with dev
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 10:21:10 +01: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
Alexandre Riera b828d40464 Merge branch 'dev' into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 09:13:05 +00:00
Vicent Llopis 0f021c5183 Merge pull request '5035-intermittent_backTest2' (!1365) from 5035-intermittent_backTest2 into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1365
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-03-06 08:32:14 +00:00
Alexandre Riera 4e800a7a45 .
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:30:14 +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
Alexandre Riera f2bd0253e2 refs #5092 added unbilled tickets section
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:27:53 +01:00
Juan Ferrer e83b518470 refs #3723 Set docker memory limit
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 09:23:24 +01:00
Javi Gallego 780572a9f2 test fixed
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-06 08:14:26 +01:00
Juan Ferrer 99f8bc6bac refs #5174 TpvTransaction.confirm code refator to improve debugging
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 18:55:58 +01:00
Vicent Llopis 497d756af6 fix: autocompletar el switf/bic
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 13:46:18 +01:00
Vicent Llopis 727ae1d4e0 Merge branch 'dev' into 5035-intermittent_backTest2
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 12:11:28 +00:00
Joan Sanchez 5984d6820b Merge pull request '5349-hotfix_report_invoice' (!1364) from 5349-hotfix_report_invoice into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1364
2023-03-03 11:43:28 +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
Juan Ferrer 73c988b18e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 10:57:59 +01:00
Juan Ferrer 6eaf4bdd1b refs #5174 tpvTransaction: Añadidas columnas para depuración 2023-03-03 10:57:57 +01:00
Alexandre Riera f9f58c28d5 Merge pull request 'hotfix itemWaste' (!1363) from hotfix-itemWaste-openOtherTab into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1363
2023-03-03 09:01:30 +00:00
Alexandre Riera de0e7334df Merge branch 'master' into hotfix-itemWaste-openOtherTab
gitea/salix/pipeline/head This commit looks good Details
2023-03-03 07:55:28 +00:00
Alexandre Riera d58a5eb1ff hotfix itemWaste
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 08:54:55 +01:00
Joan Sanchez 37043beb68 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-03 07:44:31 +01:00
Alexandre Riera 8679aefb48 refs #4713 procs deprecated, originalQuantity deleted 2023-03-03 07:36:04 +01:00
Alexandre Riera ed5208c9e4 refs #5206 implemented general search, missing tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 15:10:17 +01:00
Vicent Llopis 7c24b940b3 feat: colorea los numeros de la semana al inicio y cada vez que canvias de mes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 14:55:18 +01:00
Alexandre Riera dbe42e3bf4 refs #5206 version with plane added, needs to implement general search
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 13:55:47 +01:00
Javi Gallego e01fa40531 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:51:41 +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
Alexandre Riera be1993cf8b refs #5206 version with top-searcher and two fields for reference and id
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-02 11:33:55 +01: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
Alexandre Riera d836874b7c Merge pull request 'fix(field): prevent input size changes when showing clear icon' (!1361) from 5338-clear_displacement into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1361
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
2023-03-02 09:45:29 +00: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 57e36cebde fix(field): prevent input size changes when showing clear icon
gitea/salix/pipeline/head This commit looks good Details
Refs: #5338
2023-03-02 09:44:45 +01:00
Joan Sanchez e785c34d90 Added next version
gitea/salix/pipeline/head This commit looks good Details
2023-03-02 07:52:07 +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
Joan Sanchez a1a95aa4e9 Merge pull request 'master → test (Wait to pr 1352)' (!1351) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1351
2023-03-02 06:37:49 +00:00
Joan Sanchez 7a03029168 Merge pull request 'refs #4975 Traduction no branch' (!1352) from 4975-noBranchTraduction into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1352
2023-03-02 06:35:27 +00:00
Joan Sanchez ee6d292d6a Merge pull request 'fixes #5063 Añadir campo doPhoto en la ficha de Item' (!1264) from 5063-item-module-doPhoto into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
Reviewed-on: #1264
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:34:45 +00:00
Joan Sanchez 8834d4d0a4 Merge pull request 'fixes #5070 route-tickets city is now a link to buscaman' (!1282) from 5070-route-tickets-link-maps into dev
Reviewed-on: #1282
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:33:03 +00:00
Joan Sanchez baedb5b6ca Merge pull request 'fixes #5202 item waste abrir en otra pestaña' (!1354) from 5202-itemWaste-openOtherTab into dev
Reviewed-on: #1354
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:31:39 +00:00
Joan Sanchez 32b3284e40 Merge pull request 'refs #5115 transfer_sales' (!1344) from 5115-transfer_sales into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1344
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:31:20 +00:00
Joan Sanchez 84dc95621d Merge pull request 'fixes #5149 ticket.descriptor-menu Eliminar ticket, debe comprobar que no existe un abono' (!1348) from 5149-check-ticket.refund into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1348
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:30:17 +00:00
Joan Sanchez d819a13597 Merge pull request '5240-ticket.sale-tracking' (!1353) from 5240-ticket.sale-tracking into dev
gitea/salix/pipeline/head Build queued... Details
Reviewed-on: #1353
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-03-02 06:28:01 +00:00