 Vicent Llopis
|
2d181139b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:58:34 +02:00 |
|
Vicent Llopis
|
09dbd29086
|
refs #5594 cuando se factura se envía automáticamente un mail y quitados logs duplicados
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-26 14:46:16 +02:00 |
 Alexandre Riera
|
5844da4474
|
refs #4713 updated sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:34:29 +02:00 |
 Carlos Satorres
|
15df9518ab
|
Merge branch 'dev' into 084200-arreglarChanges
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:31:33 +00:00 |
|
Carlos Satorres
|
09c1d7e393
|
refs #084200 add table
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:30:58 +02:00 |
|
Alexandre Riera
|
878f232fda
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4713-saleTracking
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 14:20:23 +02:00 |
|
Carlos Satorres
|
480784ee18
|
refs #084200 cambio nombre
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 13:48:31 +02:00 |
|
Vicent Llopis
|
c69e038a56
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5542-refund_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 12:45:54 +02:00 |
|
Carlos Satorres
|
a524d7837d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 11:45:20 +02:00 |
|
Carlos Satorres
|
af875dd67e
|
Merge
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 10:26:54 +02:00 |
|
Carlos Satorres
|
57ec0f8587
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
|
2023-04-26 09:03:37 +02:00 |
 Alex Moreno
|
73153071d6
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-26 05:56:46 +00:00 |
 Pablo Natek
|
e8ce8e42fd
|
refs #5153
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 14:25:22 +02:00 |
|
Alexandre Riera
|
83319894b2
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test-to-dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-25 11:25:29 +02:00 |
|
Alex Moreno
|
618100b68a
|
refs #5542 eliminados procesos que no se usan
|
2023-04-25 10:40:24 +02:00 |
|
Pablo Natek
|
3e15728db4
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 15:33:28 +00:00 |
|
Carlos Satorres
|
67db2f0476
|
Merge branch 'dev' into 5540-validarSupplierIsVies
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-24 06:51:41 +00:00 |
|
Vicent Llopis
|
5b7ca82509
|
Merge branch 'dev' into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-24 04:58:30 +00:00 |
|
Vicent Llopis
|
ea1035311e
|
Merge branch 'dev' into 5128-client.credit-management
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 11:30:58 +00:00 |
|
Alex Moreno
|
7a79dfd4d1
|
deploy: 231401 test to dev
|
2023-04-21 12:49:03 +02:00 |
|
Carlos Satorres
|
d8b5659a5d
|
refs #5540 client vies
|
2023-04-21 09:14:30 +02:00 |
|
Alexandre Riera
|
b3a10698af
|
hotfix negativeBases
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 08:20:38 +02:00 |
|
Pablo Natek
|
de3b4f37c2
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-21 05:54:00 +00:00 |
|
Vicent Llopis
|
bcf7b6ab3d
|
borrado acl innecesario
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 15:17:49 +02:00 |
|
Carlos Satorres
|
d6e6dab03b
|
Merge branch 'dev'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 11:55:52 +02:00 |
|
Alex Moreno
|
7df4a2b15d
|
fix(231401): fix tests and fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-20 08:25:15 +02:00 |
|
Alex Moreno
|
63e0031bc6
|
deploy(231401): test to master
|
2023-04-20 08:24:43 +02:00 |
|
Alexandre Riera
|
aecde484f4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-20 07:52:05 +02:00 |
|
Vicent Llopis
|
187ba032d2
|
refs #5128 rol por ACL
|
2023-04-19 14:43:15 +02:00 |
|
Vicent Llopis
|
34b360040b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 12:18:45 +02:00 |
|
Vicent Llopis
|
be8a11cafc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5318-deviceProductionLog_toSalix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-19 09:52:28 +02:00 |
 Joan Sanchez
|
32c9e22d96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 11:41:55 +02:00 |
|
Joan Sanchez
|
a0d8ed1433
|
E2e fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 11:33:36 +02:00 |
|
Alexandre Riera
|
2df362327f
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:33:15 +00:00 |
|
Alexandre Riera
|
28a7722bb6
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 08:01:42 +00:00 |
|
Vicent Llopis
|
c9dffe9175
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:39:43 +02:00 |
|
Joan Sanchez
|
6fd5c8ae2d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-18 08:34:20 +02:00 |
|
Carlos Satorres
|
8b60e9f5fd
|
sql arreglado
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 08:07:35 +02:00 |
|
Alex Moreno
|
560b5b374f
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-18 05:37:12 +00:00 |
|
Vicent Llopis
|
d99815356a
|
refs #5144 manejado que el usuario sea NULL
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-18 07:26:35 +02:00 |
|
Carlos Satorres
|
f76727903a
|
update insert
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 15:17:05 +02:00 |
|
Alex Moreno
|
0c475be10b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4617-use_tmp_in_ticketToInvoice
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:23:02 +02:00 |
|
Joan Sanchez
|
06a845e7f0
|
Cambios SQL
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 14:15:39 +02:00 |
|
Alex Moreno
|
b5434c5e4e
|
tab
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 12:58:55 +02:00 |
|
Alexandre Riera
|
7d8a0597c1
|
Merge branch 'dev' into 5518-log-user-role
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 09:53:36 +00:00 |
|
Alexandre Riera
|
2675c02d13
|
refs #5518 moved models to account
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 11:52:52 +02:00 |
|
Alex Moreno
|
f97d169cbf
|
observationEmail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 11:52:31 +02:00 |
|
Alexandre Riera
|
2bc190b01e
|
Merge branch 'dev' into 5293-claim-sections
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:49:41 +00:00 |
|
Alexandre Riera
|
0dcbc9fc8b
|
refs #5293 redirected claim.photos to lilium
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 10:46:26 +02:00 |
|
Joan Sanchez
|
3ee29553b4
|
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-04-17 09:00:52 +02:00 |
|
Joan Sanchez
|
610f51aaf8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-17 08:59:49 +02:00 |
|
Joan Sanchez
|
02c573bd23
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4480-vnUser
|
2023-04-17 08:57:24 +02:00 |
|
Carlos Satorres
|
60d3729b4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5316-kkeoEntryNotes
|
2023-04-17 08:55:22 +02:00 |
|
Alex Moreno
|
0bfdbcb750
|
refs #4617 use temporary instead of vn
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-17 08:44:24 +02:00 |
|
Joan Sanchez
|
51e42e485b
|
Merge pull request 'refs #5284 new onCreateClaimAccepted y createClaim' (!1372) from 5284-fueraPlazo into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1372
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-17 06:44:17 +00:00 |
 Juan Ferrer
|
c5dcfd3cab
|
refs #4480, #5484 Front & back tests passed, md5 password removed from code, some e2e missing
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-15 14:24:50 +02:00 |
|
Juan Ferrer
|
add3a8b1fa
|
merge with dev
|
2023-04-15 01:49:23 +02:00 |
|
Alexandre Riera
|
ad3836552e
|
refs #5518 sections added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-14 14:16:29 +02:00 |
|
Vicent Llopis
|
4c18efa589
|
refs #5128 creado método setRating
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 13:05:57 +02:00 |
|
Vicent Llopis
|
83dd386eed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5128-client.credit-management
|
2023-04-14 10:39:16 +02:00 |
|
Alexandre Riera
|
b9b52c6b1d
|
Merge branch 'dev' into 5418-buscador-lateral-fixed-price
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-14 07:08:02 +00:00 |
|
Alexandre Riera
|
8ade602563
|
hotfix one sign for every ticket
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 14:18:01 +02:00 |
|
Joan Sanchez
|
7a02a3213a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-13 13:47:34 +02:00 |
|
Joan Sanchez
|
6d5167ab7f
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:47:18 +02:00 |
|
Alexandre Riera
|
ac4772e44e
|
refs #5418 mistake doing git pull origin dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 13:46:29 +02:00 |
|
Carlos Satorres
|
44eab101cc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5284-fueraPlazo
|
2023-04-13 08:44:56 +02:00 |
|
Carlos Satorres
|
ad267c933c
|
refs #5540 country.code
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 08:30:33 +02:00 |
|
Joan Sanchez
|
eb1798100f
|
Added version 23.16
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-13 08:16:06 +02:00 |
|
Carlos Satorres
|
747efc4342
|
refs #5540 sql mod
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-12 14:52:59 +02:00 |
|
Carlos Satorres
|
117849f093
|
refs #5540 supplier js
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 12:03:55 +02:00 |
|
Vicent Llopis
|
58750aa065
|
refs #5318 eliminido triggers y añadido loggable en salix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-12 10:02:06 +02:00 |
|
Pablo Natek
|
c928274e24
|
Merge branch 'dev' into 5075-client_balance
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-11 13:19:54 +00:00 |
|
Vicent Llopis
|
d03ca01b73
|
refs #5128 añadida subseccion "Gestión de crédito"
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-11 14:57:56 +02:00 |
|
Alexandre Riera
|
245b0e70f4
|
hotfix rollback delivery.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 14:51:39 +02:00 |
|
Alexandre Riera
|
3ee08e0300
|
changed folder
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 12:34:26 +02:00 |
|
Alexandre Riera
|
c6db5f1a4b
|
hotfix apply changes procedure
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-11 12:29:09 +02:00 |
|
Alexandre Riera
|
d5d18d5376
|
hotfix apply SQL delivery.sql
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 11:02:08 +02:00 |
|
Carlos Satorres
|
d21ab7a5a7
|
refs #5316 primer kkeo
gitea/salix/pipeline/head This commit is unstable
Details
|
2023-04-11 10:32:21 +02:00 |
|
Alexandre Riera
|
53bd6cd729
|
Merge branch 'dev' into 5522-loggable-deadlock
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-11 07:52:16 +00:00 |
|
Alexandre Riera
|
ce28339973
|
refs #5522 deleted trigger afterInsert, added hook beforeInsert
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-11 09:48:31 +02:00 |
|
Carlos Satorres
|
9f4d027014
|
refs #5316 sql
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-06 15:36:14 +02:00 |
|
Carlos Satorres
|
b3f946e15f
|
Merge branch 'dev' into 5250-observacionesWorker
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-06 08:32:05 +00:00 |
|
Alexandre Riera
|
05912610f8
|
Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-06 07:47:06 +00:00 |
|
Carlos Satorres
|
f307f79dc2
|
refs #5250 cambio a ult version de changes
|
2023-04-06 09:34:46 +02:00 |
|
Carlos Satorres
|
68a24b7335
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
|
2023-04-06 09:33:50 +02:00 |
|
Joan Sanchez
|
213766afdf
|
Merge pull request 'fixes #5259 Envío de factura electrónica en clientes sin el check "Factura electrónica"' (!1423) from 5259-invoice-electronic-without-check into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-on: #1423
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-04-06 07:27:13 +00:00 |
|
Alexandre Riera
|
5cbc826281
|
Merge branch 'dev' into 4954-client-isTaxDataChecked-businessTypeFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-06 07:16:00 +00:00 |
|
Alexandre Riera
|
8f4de7e7e9
|
refs #5259 undo delete, update trigger
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 15:27:10 +02:00 |
|
Alexandre Riera
|
589e996b69
|
refs #5259 minor fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 15:17:19 +02:00 |
|
Alexandre Riera
|
81cf35f2d3
|
refs #5259 drop procedure invoiceOut_afterInsert
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 14:55:37 +02:00 |
|
Alexandre Riera
|
eed1ecc208
|
refs #4954 trigger modified
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 14:47:13 +02:00 |
|
Vicent Llopis
|
c89f95a33e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5410-client.defaulter_getChecked
gitea/salix/pipeline/head This commit looks good
Details
|
2023-04-04 13:40:12 +02:00 |
|
Alexandre Riera
|
32df51ecca
|
refs #5092 moved sql
gitea/salix/pipeline/head Build queued...
Details
|
2023-04-04 08:40:51 +02:00 |
|
Alexandre Riera
|
24f576a4b8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5092-listado-ticketsSinFacturar
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-04-04 08:40:03 +02:00 |
|
Joan Sanchez
|
8b4c70e8ba
|
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-30 14:57:00 +02:00 |
|
Joan Sanchez
|
6ff6004627
|
Added version 2314.01
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-30 08:35:04 +02:00 |
|
Carlos Satorres
|
60383eda0c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5250-observacionesWorker
gitea/salix/pipeline/head This commit looks good
Details
|
2023-03-30 08:26:45 +02:00 |
|
Joan Sanchez
|
6aca23e466
|
Merge pull request 'fixes #5056 Nuevo sistema de sacado de pedidos: Gestión de vagones' (!1386) from 5056-gestion-vagones into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1386
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2023-03-30 05:23:29 +00:00 |
|
Joan Sanchez
|
3bab90f9e5
|
Merge pull request '5416-supplierAccount_isPayMethodChecked' (!1411) from 5416-supplierAccount_isPayMethodChecked into dev
Reviewed-on: #1411
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2023-03-30 05:19:07 +00:00 |
|
Carlos Satorres
|
71220c58f7
|
refs #084200 inserts
|
2023-03-29 12:00:01 +02:00 |