Commit Graph

6024 Commits

Author SHA1 Message Date
Alexandre Riera df3e818182 refs #5074 refactor this.receipt.description
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-06 08:07:50 +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
Alexandre Riera fd31547b22 Merge branch 'dev' into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-06 06:00:41 +00:00
Alexandre Riera 546b3f6c9b refs #3291 lateral menu added, fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 15:21:27 +01: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
Vicent Llopis ba5616055b feat: item.descriptor en summary coge el warehouse por defecto
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 14:31:50 +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
Vicent Llopis c32a627fe5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day 2023-02-03 13:23:42 +01: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
Alexandre Riera 141ae7b11c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 11:56:09 +01:00
Alex Moreno 575784c870 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-03 10:03:59 +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
Pau 6c8609e180 Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 07:52:14 +00:00
Vicent Llopis 508bce73bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5097-item.summary_available
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-03 08:41:35 +01:00
Pau 199dd2ba8d Merge branch 'dev' into 5181-ticket.summary-recargo
gitea/salix/pipeline/head This commit looks good Details
2023-02-03 06:09:38 +00:00
Alex Moreno 8a50c56284 fix(updateWorkCenter): use vnNew()
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 14:52:40 +01:00
Alex Moreno 6c772643a8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-02-02 11:55:11 +01:00
Alexandre Riera 16a6167db0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3291-entryLatestBuys-buscador
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 10:39:26 +01:00
Pau cadd525380 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-02-02 08:36:07 +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 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 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
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 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 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 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 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 d17f9396ad refs #3291 save button
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 08:43:13 +01:00
Alex Moreno 00ffc82f8d use CURDATE() in rawSQL
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:34:14 +01:00
Pau dcd74bacc0 refs #5181 @1h30
gitea/salix/pipeline/head There was a failure building this commit Details
2023-02-01 08:32:22 +01:00
Alex Moreno ae6e0f0772 Merge branch 'master' into hotFix_getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:20:48 +00:00
Alex Moreno 2528b2d3ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 07:10:51 +01:00
Guillermo Bonet 909f0c3532 Merge branch 'master' into 4975-mdbConfig-and-upload
gitea/salix/pipeline/head This commit looks good Details
2023-02-01 06:09:44 +00:00
Alexandre Riera 11a605ea04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 15:40:54 +01:00
Alexandre Riera c6f87f9084 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5131-cambios-ticketAdvance
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:39:03 +01:00
Alexandre Riera 349829e5ed refs #5131 fixed tests
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:29:00 +01:00
Alexandre Riera 3622eda589 refs #5131 added lines liters to origin ticket
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 15:09:16 +01:00
Guillermo Bonet 18168b07bb refs #4975 Changes
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:47:24 +01:00
Alexandre Riera 19d7e7e610 refs #5131 totalWithVat order
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:23:40 +01:00
Alexandre Riera b70557ee86 refs #5131 agencies icon
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:20:08 +01:00
Juan Ferrer 5045a8f670 #5175 TpvTransaction.confirm(): Return response
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 14:00:10 +01:00
Guillermo Bonet e12f183968 refs #4975 Added chat/send in mdbVersion/upload
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:46:42 +01:00
Juan Ferrer 5a4ae7d742 refs #5174 TpvTransaction: Methods start & end added, fixes & refactor
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:29:17 +01:00
Alexandre Riera 87bef62e35 refs #5131 hasStock refers to origin
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:21:51 +01:00
Alexandre Riera e5b7ebd8b4 refs #5131 IPT null or value
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 13:06:58 +01:00
Alexandre Riera 331b278726 refs #5131 checkbox pending origin destination
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 13:00:25 +01:00
Pau 20ffcff219 Merge branch 'dev' into 5174-refactor-ticket-weekly
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:57:56 +00:00
Alexandre Riera 906f80da5a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5104-convert-prices
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:56:41 +01:00
Alexandre Riera 9d0891e080 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5129-enriquecer-mensaje
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:49 +01:00
Alexandre Riera c121f184b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:43:26 +01:00
Alexandre Riera 1b12770655 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5072-comprobar-email-clientFiscalData
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:31:01 +01:00
Alex Moreno 292898708b result not null
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:24:09 +01:00
Alex Moreno 320ceb3e2c fix: getRate2
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:17:31 +01:00
Alexandre Riera ca967a7223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5138-cambiarOrdenCampos-routeSummary
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 11:15:46 +01:00
Alex Moreno 62cd6ab0c9 Merge branch 'dev' into fix_e2e_state_and_date
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 09:39:08 +00:00
Alex Moreno 4740cdbbb9 fix: e2e
gitea/salix/pipeline/head This commit looks good Details
2023-01-31 10:37:18 +01:00
Vicent Llopis 19120ef102 feat: el descriptor coge el warehouseFk dependiendo de la sección
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:28:28 +01:00
Alexandre Riera 7d617c0ac4 refs #5129 translations and userErrors added
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-31 09:04:45 +01:00
Juan Ferrer 82bc7307f0 #5174 Signature verification fixed & enabled
gitea/salix/pipeline/head Build queued... Details
2023-01-31 00:41:36 +01:00
Juan Ferrer 424dcb954c refs #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 20:23:52 +01:00
Juan Ferrer 64d8ae1f49 refs #5174 Hotfix
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-01-30 20:22:52 +01:00
Juan Ferrer 339cdab3c4 refs #5174 Debug enabled
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:59:46 +01:00
Juan Ferrer d6794cb4c8 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 19:51:01 +01:00
Juan Ferrer b20194b6d0 #5174 Hotfix
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:45:36 +01:00
Juan Ferrer 5744759d53 refs #5122 Hotfix: Signature verification
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 17:33:15 +01:00
Alexandre Riera 444d2ae4c4 refs #5104 grouping/packing unified
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 15:28:47 +01:00
Alex Moreno a74fb31b5b fix: vn.time
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 15:15:27 +01:00
Alexandre Riera 5a72398393 Merge branch 'dev' into 5074-ticketBalance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:01:17 +00:00
Alex Moreno c990b9a564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:37:24 +01:00
Vicent Llopis a1e86f2bd6 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:28:50 +00:00
Alex Moreno d2b21d401a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date 2023-01-30 14:27:22 +01:00
Joan Sanchez 8969882793 Removed where property dependency
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 14:13:38 +01:00
Alexandre Riera c3346ebb93 Merge branch 'dev' into 5074-ticketBalance-null
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:35:07 +00:00
Alexandre Riera 9cb363e4e5 refs #5074 deleted null in reference
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 13:34:08 +01:00
Vicent Llopis 0d044b3a73 Merge branch 'dev' into fix_e2e_item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 11:51:10 +00:00
Juan Ferrer 109556ae2e refs #5122 Hotfix: Basic implementation for payment confirmation
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 12:39:47 +01:00
Alexandre Riera 8119b301c5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4927-permitir-razonSocial-duplicada 2023-01-30 12:21:54 +01:00
Alexandre Riera 77742d94d7 refs #5138 summary changed like route/tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 12:19:11 +01:00
Pau cf64de39f9 refs #5146 @1h add step to vn-inputs
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 09:01:20 +01:00
Alexandre Riera 7e5f50e637 refs #5072 email validation added
gitea/salix/pipeline/head This commit looks good Details
2023-01-30 08:30:39 +01:00
Alex Moreno 4e65e88621 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5043-mock_Date
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-30 07:56:12 +01:00
Vicent Llopis 79bf1739ba fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 13:52:14 +01:00
Vicent Llopis 29c6ca35ff fix: test e2e
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 13:39:19 +01:00
Pau b1de5bc94e refs #5174, fix banch being created from another branch and not from dev
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 10:06:46 +01:00
Alexandre Riera 0f1f671b84 Merge branch 'dev' into 5077-horaEnvio-ticketBasicData
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 09:06:08 +00:00
Alexandre Riera 35157207dd refs #5077 hours set 00:00:00 only when date change
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-27 10:05:03 +01:00
Alex Moreno 7d9e7d93e5 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:12:32 +00:00
Vicent Llopis 7bcddf73c6 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:07:19 +00:00
Vicent Llopis eb00d98885 Merge branch 'dev' into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:01:25 +00:00
Vicent Llopis fe3d81ddd3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4873-zone.delivery-day
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:59:52 +01:00
Vicent Llopis f7969c616c fix: tiene el cuenta zonEvent.type
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:59:28 +01:00
Alexandre Riera fccfabdcd1 hotfix viewReceipt clientBalance
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:31:14 +01:00
Vicent Llopis 67a64582e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4925-item.tags
gitea/salix/pipeline/head This commit looks good Details
2023-01-27 08:21:30 +01:00
Vicent Llopis 17b3e8c396 Merge branch 'dev' into 4860-route.index_downloadZip
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 13:36:50 +00:00
Alexandre Riera 25f0c0d9e3 refs #5141 province added
gitea/salix/pipeline/head This commit looks good Details
2023-01-26 14:16:30 +01:00
Vicent Llopis 366748a136 fix: se la pasa la fecha shipped para calcular el visible y disponible
gitea/salix/pipeline/head There was a failure building this commit Details
2023-01-26 14:00:29 +01:00