Commit Graph

17797 Commits

Author SHA1 Message Date
Vicent Llopis da8b6b7f2d fix: comprueba que hay registros
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:52:27 +01:00
Pau b6de50848a refs #5081 fix sms faltas
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:48:44 +01:00
Vicent Llopis ed90957ab5 fix: corregida primaryKey de mdbApp
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 11:45:11 +01:00
Joan Sanchez fe6211e965 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 09:56:59 +01:00
Vicent Llopis 2451d00998 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:59:43 +00:00
Vicent Llopis e4603a06f2 refacotor: borrados los await para que devuelva la promesa
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:59:24 +01:00
Vicent Llopis 4b60aacbbe refactor: añadidos valores a piñon a la tabla workerTimeControlConfig
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 08:50:03 +01:00
Joan Sanchez 7f080241f3 Merge pull request 'MASTER_4943-osticket_closeTicket' (!1242) from MASTER_4943-osticket_closeTicket into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1242
2023-01-12 07:41:04 +00:00
Vicent Llopis bca8a324d8 Merge pull request 'fix: se excluyen los test de back que fallan intermitente' (!1225) from 5035-intermittent_backTest into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1225
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-12 07:40:00 +00:00
Joan Sanchez 882cf6b9c1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix 2023-01-12 08:36:24 +01:00
Vicent Llopis 352fba9acf Merge branch 'dev' into 5035-intermittent_backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 07:32:44 +00:00
Alexandre Riera e51e445b3e Merge pull request 'fixes #3571 Refactorizar E2E (03-worker)' (!1233) from 3571-refactor-e2e into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1233
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-01-12 06:58:26 +00:00
Alexandre Riera 7bdc04cd13 Merge branch 'dev' into 3571-refactor-e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 06:55:09 +00:00
Alex Moreno c2f4648b5c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4839-docuware_send
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-12 07:54:09 +01:00
Joan Sanchez 3f7dee63ac Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-12 06:17:58 +00:00
Guillermo Bonet d448f41ac1 refs #4975 Changed description of last method
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-11 15:39:33 +01:00
Alex Moreno 9f324483d6 refactor(docuware): only use axios and refactor all
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 15:19:09 +01:00
Pau 71db01a45c Merge pull request '4875-fix-back-tests' (!1240) from 4875-fix-back-tests into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1240
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-11 13:25:36 +00:00
Pau c908a71ebf Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:22:40 +00:00
Alexandre Riera a0491de9f9 refs #5036 refactor transaction and fixing ticket logs
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:24:55 +01:00
Vicent Llopis f7ee6c18ca refactor: movido codigo que imprime pdf dentro del try
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 13:04:56 +01:00
Vicent Llopis b801ac676c feat: updated production db
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:41:02 +01:00
Vicent Llopis 1df6ce170d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5000-invoiceOut.global-invoicing
gitea/salix/pipeline/head Build queued... Details
2023-01-11 12:38:47 +01:00
Vicent Llopis 9042eaaf9f add fixtures
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:38:37 +01:00
Vicent Llopis caff537f2e feat: imprime las facturas
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 12:29:03 +01:00
Vicent Llopis 020068006c fix: manejado error si no se selecciona una empresa
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 11:57:52 +01:00
Pau 30524e382b Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:23:40 +00:00
Alexandre Riera a42723210f refs #4951 delete function
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 09:13:18 +01:00
Alexandre Riera 14ca5cc599 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4951-longitud-cuentaContables
gitea/salix/pipeline/head This commit looks good Details
2023-01-11 08:48:46 +01:00
Alexandre Riera bebbe1c846 refs #5036 fixed transaction
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:24:22 +01:00
Alex Moreno b8fe919b2a feat(docuware): upload deliveryNote file
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 15:03:23 +01:00
Vicent Llopis 3e920e6a2f corregida traduccion
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 14:34:25 +01:00
Vicent Llopis b1e12c90ae Merge pull request '2952-ticket.sale-checked' (!1246) from 2952-ticket.sale-checked into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1246
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-10 13:33:02 +00:00
Vicent Llopis ae3b26b202 Merge branch 'dev' into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:14:12 +00:00
Vicent Llopis 6f94987392 Merge branch 'dev' into 2952-ticket.sale-checked
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:11:06 +00:00
Vicent Llopis ef40c15a4e Merge pull request '4846-claim.search-panel' (!1174) from 4846-claim.search-panel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1174
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-10 13:09:19 +00:00
Pau e0cf45546e Merge branch 'dev' into 4875-fix-back-tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 12:57:39 +00:00
Pau 4f2472ea90 Merge branch 'dev' into 4605-Create-Model-PackagingMistake
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 13:56:15 +01:00
Pau d540e278eb refs #4605 @30min
gitea/salix/pipeline/head This commit is unstable Details
2023-01-10 13:52:30 +01:00
Vicent Llopis 484b8d42e1 fix: corregido sql
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 13:31:20 +01:00
Vicent Llopis 984a3294f9 Merge branch 'dev' into 4846-claim.search-panel
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 11:58:00 +00:00
Alexandre Riera 9f1c6e6d1d Merge branch 'dev' into 4866-detalle-faltas
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:48:10 +00:00
Alexandre Riera 02a958ca1e Merge branch 'dev' into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:44:54 +00:00
Alexandre Riera 1f1a69a2b4 Merge pull request 'fixes #4984 Añadir autoincrement a 2 tablas' (!1239) from 4984-autoincrement-vnReport-vnPrinter into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1239
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-01-10 10:43:55 +00:00
Alexandre Riera 6a1e170e91 Merge branch 'dev' into 4984-autoincrement-vnReport-vnPrinter
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:35:29 +00:00
Alexandre Riera 713619ff25 Merge branch '4930-add-zone' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 10:15:48 +01:00
Alexandre Riera 6bdbd77640 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4930-add-zone 2023-01-10 10:15:41 +01:00
Vicent Llopis ac3e68d846 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-intermittent_backTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-10 10:14:46 +01:00
Alexandre Riera 7a36a159ec Merge branch 'dev' into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-01-10 08:49:38 +00:00
Alexandre Riera 73aab50155 Merge pull request 'fixes #4937 viewReceipt added' (!1223) from 4937-marcar-verRecibo into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1223
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-01-10 08:47:40 +00:00