Commit Graph

14391 Commits

Author SHA1 Message Date
Alexandre Riera 6cb815faaf .
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-10 10:13:41 +01:00
Alexandre Riera 4787de3df5 fixing merge
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 09:04:49 +01:00
Alexandre Riera a468fb2c66 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 5194-cambios-ticketFutureAdvance
gitea/salix/pipeline/head Build queued... Details
2023-02-10 09:02:44 +01:00
Alexandre Riera 9dc07d88d6 fixing e2e
gitea/salix/pipeline/head This commit looks good Details
2023-02-10 08:56:30 +01:00
Alexandre Riera 194069c0c2 refs #5194 fixed stock, lines 2023-02-10 08:46:54 +01:00
Alex Moreno a094eedfe3 Merge pull request 'fix(delivery-note_report): fix taxes' (!1318) from hotFix_delivery-note-report into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1318
2023-02-09 13:02:39 +00: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
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 0e75a5f23a Merge pull request 'hotfix ticketFutureAdvance warehouse' (!1316) from hotFix-ticketFutureAdvance-warehouse into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1316
2023-02-09 07:18:06 +00:00
Alexandre Riera 725b7b9bce Merge branch 'master' into hotFix-ticketFutureAdvance-warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 12:48:23 +00:00
Alexandre Riera ef5b29d6f3 hotfix ticketFutureAdvance warehouse
gitea/salix/pipeline/head This commit looks good Details
2023-02-08 13:47:35 +01:00
Joan Sanchez 71c9ed3a4e Merge pull request 'MASTER-fix(invoiceIn_descriptor): supplier.email' (!1307) from hotFix_invoiceIn_supplier_email into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1307
2023-02-07 08:39:16 +00:00
Alex Moreno 3d27879ce8 Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good Details
2023-02-07 08:09:10 +00:00
Joan Sanchez 90830e7ce9 Merge pull request 'hotfix balanceCompensation' (!1303) from hotFix-balance-compensation into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1303
2023-02-07 07:39:02 +00:00
Alex Moreno f891b5a00f Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 14:12:51 +00:00
Alexandre Riera 6d3bcc97f3 Merge branch 'master' into hotFix-balance-compensation
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 12:00:03 +00:00
Joan Sanchez 9b177a17a7 Merge pull request 'hotfix itemConfig' (!1309) from hotfix-itemConfig into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1309
2023-02-06 08:13:43 +00:00
Alexandre Riera 0a9d37ca08 hotfix itemConfig
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 09:01:13 +01:00
Alex Moreno c11df75a82 Merge branch 'master' into hotFix_invoiceIn_supplier_email
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 06:30:56 +00:00
Alex Moreno 2717c6420c fix(invoiceIn_descriptor): supplier.email
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 14:58:58 +01:00
Joan Sanchez 38f34adc9a Merge pull request 'master → test' (!1305) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1305
2023-02-03 12:44:42 +00:00
Guillermo Bonet 220f7ee0f8 Merge pull request '4975-mdbBranch-dsName' (!1304) from 4975-mdbBranch-dsName into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1304
2023-02-03 12:09:27 +00:00
Guillermo Bonet ca24de7ee5 refs #4975 Changed description
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:50:19 +01:00
Guillermo Bonet dddeca0832 refs #4975 Added property dsName in mdbBranch tab
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 12:46:01 +01:00
Juan Ferrer f4fc597c2c Merge pull request 'master to test' (!1302) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1302
2023-02-03 08:12:09 +00:00
Alexandre Riera 6533b92ad3 Merge branch 'master' into hotFix-balance-compensation
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:15:05 +00: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 d5cf1f4ff8 Merge pull request 'fix: getRate2' (!1290) from hotFix_getRate2 into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1290
2023-02-02 10:50:03 +00:00
Joan Sanchez d45c0cb99a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:59:39 +01:00
Joan Sanchez 52d2e091ac Merge pull request 'fixes #5131 Cambios en Ticket Advance' (!1291) from 5131-cambios-ticketAdvance into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1291
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:59:20 +00:00
Joan Sanchez 4477486f8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-02-02 08:58:44 +01:00
Alexandre Riera 5f656a894f buscador
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:52:38 +01:00
Joan Sanchez 37b0b32c0d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:50:48 +01:00
Joan Sanchez 85bde58752 Merge pull request 'fixes #4927 supplier.fiscal-data permitir 'Razón social' duplicada' (!1230) from 4927-permitir-razonSocial-duplicada into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1230
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:47:38 +00:00
Joan Sanchez 176b47bf97 Merge pull request 'fixes #5077 Ticket/Basic Data no guarda la hora de envío' (!1274) from 5077-horaEnvio-ticketBasicData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1274
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2023-02-02 07:44:24 +00:00
Alexandre Riera 780018e4df Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-02 08:40:49 +01:00
Alexandre Riera 52a3f77bc5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:39:28 +01:00
Alex Moreno 5b228c5e71 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 07:35:34 +00:00
Alexandre Riera 96a3ae8912 Merge pull request 'fixes #5072 client.fiscal-data comprobar que tiene email' (!1278) from 5072-comprobar-email-clientFiscalData into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1278
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 08:55:33 +00:00
Alexandre Riera 547c7a336b Merge branch 'dev' into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:17 +00:00
Alexandre Riera 5871909401 Merge pull request 'fixes #5138 route summary cambiar orden de campos' (!1281) from 5138-cambiarOrdenCampos-routeSummary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1281
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 08:51:37 +00:00
Alexandre Riera 6af6a17a45 Merge pull request 'hotfix #5157 No se pueden desplegar los campos de fecha' (!1299) from 5157-desplegar-fechas into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1299
2023-02-01 08:05:08 +00:00
Alexandre Riera 73b7a1d761 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:53 +01:00
Alexandre Riera fc5206d56a Merge branch '5072-comprobar-email-clientFiscalData' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:52:06 +01:00
Alexandre Riera 62766706b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData 2023-02-01 08:52:03 +01:00
Alexandre Riera b810e54b95 Merge branch 'master' into 5157-desplegar-fechas
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:49:53 +00:00
Alexandre Riera 2ef7b0d756 refs #5157 clip-path deleted
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:48:33 +01:00
Alexandre Riera 7d7e1a74da Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:46:28 +01:00
Alexandre Riera 5d0ac58850 Merge pull request 'fixes #5088 client.balance quitar texto en balance' (!1296) from 5088-clientBalance-ponerReceiptId into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1296
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-02-01 06:26:50 +00:00
Guillermo Bonet d30f471bc5 Merge pull request 'refs #4975 Added chat/send in mdbVersion/upload' (!1295) from 4975-mdbConfig-and-upload into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1295
2023-02-01 06:21:03 +00:00