Carlos Satorres
|
424e0c430c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 09:50:29 +02:00 |
Carlos Satorres
|
cf4a7c8fba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 09:11:40 +02:00 |
Carlos Satorres
|
a80b0c3b4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 08:36:50 +02:00 |
Sergio De la torre
|
da40b705c7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7357_dipole_review
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 07:20:00 +02:00 |
Sergio De la torre
|
182cd3fa8e
|
feat boxPicking refs #7357
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-20 11:34:51 +02:00 |
Sergio De la torre
|
c87f060d51
|
feat boxPicking refs #7357
|
2024-06-20 09:21:27 +02:00 |
Carlos Satorres
|
774d55d4ae
|
refs #7407 fix acls fixtures
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-18 13:28:21 +02:00 |
Carlos Satorres
|
fa8c1b3879
|
acls, fixtures, models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-17 13:50:07 +02:00 |
Guillermo Bonet
|
43df0ef55d
|
Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-17 07:42:33 +00:00 |
Guillermo Bonet
|
1d0b89ed52
|
refs #7519 Requested changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-17 09:42:16 +02:00 |
Pablo Natek
|
c3d64b2358
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-06-17 08:49:26 +02:00 |
Pablo Natek
|
a30ff44837
|
fix: refs #6404 fix notification
gitea/salix/pipeline/pr-master There was a failure building this commit
Details
|
2024-06-14 17:40:08 +02:00 |
Guillermo Bonet
|
9b80ef73a8
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-14 12:48:00 +02:00 |
Carlos Satorres
|
e3e9706fb8
|
fix fixtures
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-06-14 09:53:50 +02:00 |
Carlos Satorres
|
189c67bd2d
|
warmFix change if
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-06-14 09:43:10 +02:00 |
Guillermo Bonet
|
cb056ff789
|
Merge branch 'dev' into 6701-claimRatioRoutine
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-13 11:14:00 +02:00 |
Guillermo Bonet
|
53c732bcb9
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-13 07:12:10 +02:00 |
Guillermo Bonet
|
d7317e4067
|
hotfix: refs #7024 Modify booked entries
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-13 07:09:48 +02:00 |
Alex Moreno
|
3b44bdd2bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-11 12:56:56 +02:00 |
Javi Gallego
|
4230d46fe5
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-06-04 09:47:58 +02:00 |
Guillermo Bonet
|
fd237b6d35
|
Merge branch 'dev' into 6701-claimRatioRoutine
|
2024-06-03 11:40:50 +02:00 |
Guillermo Bonet
|
4703ebbdf3
|
refactor: refs #7519 Minor change
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-03 11:38:09 +02:00 |
Guillermo Bonet
|
b9d04e9557
|
Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-03 05:22:15 +00:00 |
Jorge Penadés
|
dc8696b422
|
feat: refs #6889 add back tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 16:31:36 +02:00 |
Jorge Penadés
|
ee09617b27
|
fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 13:05:12 +02:00 |
Jorge Penadés
|
ab9c11ef84
|
fix: refs #6889 modify fixtures
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-31 12:56:22 +02:00 |
Jorge Penadés
|
4772509b67
|
fix: refs #6889 e2e tests
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-31 12:51:06 +02:00 |
Jorge Penadés
|
05e6e10337
|
fix: refs #6889 fix back tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-30 10:04:34 +02:00 |
Javi Gallego
|
7186686548
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-05-30 09:44:06 +02:00 |
Jorge Penadés
|
a32db7840e
|
feat: refs #6889 fixtures & models
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-29 16:54:24 +02:00 |
Alex Moreno
|
08856a9132
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-05-28 12:11:51 +02:00 |
Alex Moreno
|
8ec2a10cbf
|
deploy: dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-05-28 12:05:09 +02:00 |
Robert Ferrús
|
b02995918e
|
Merge branch 'dev' into 6281_buyFk
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 05:04:40 +00:00 |
Carlos Satorres
|
723327918b
|
refs #7406 worker formation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 15:55:23 +02:00 |
Javi Gallego
|
0e5a15dd4e
|
con addressFk
|
2024-05-24 15:14:20 +02:00 |
Jorge Penadés
|
365e5a3ba3
|
fix: refs # 7400 ledger_next
gitea/salix/pipeline/pr-dev This commit looks good
Details
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-05-21 17:31:29 +02:00 |
Robert Ferrús
|
7065cf0b38
|
feat: refs #6281 change fixtures
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 09:58:03 +02:00 |
Robert Ferrús
|
c6f7a0768a
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-14 05:49:39 +00:00 |
Jorge Penadés
|
e16e5e3db3
|
feat: refs #5919 back test
|
2024-05-13 13:19:28 +02:00 |
Guillermo Bonet
|
b324b0c0f3
|
Merge branch 'dev' into 7126-improvedWaste
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-05-10 11:20:33 +00:00 |
Guillermo Bonet
|
6b7a529b55
|
refactor: refs #7345 Renamed column of invoiceInConfig
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 11:39:14 +02:00 |
Guillermo Bonet
|
1ea357a5dd
|
feat: refs #7126 Refactor and added columns in bs.waste table & proc
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-10 10:01:46 +02:00 |
Guillermo Bonet
|
f0b814c79b
|
refactor: refs #6701 Refactor claim_ratio_routine
|
2024-05-03 14:15:55 +02:00 |
Robert Ferrús
|
82ee8d2209
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-03 09:25:06 +00:00 |
Guillermo Bonet
|
110cae3171
|
Merge pull request 'refactor: #6997 Deleted vn.client.eypbc' (!2353) from 6997-eypbc into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2353
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-30 08:23:52 +00:00 |
Guillermo Bonet
|
80b44ccace
|
Merge pull request 'refactor: refs #7258 Deleted all dependences of vn2008 schema' (!2362) from 7258-lastChangesMigrationVn2008 into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2362
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
|
2024-04-30 05:37:33 +00:00 |
Robert Ferrús
|
d2c3034ec6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 12:07:53 +02:00 |
Robert Ferrús
|
2d0d4b5643
|
Merge branch 'dev' into 7039-country-country
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-26 06:48:01 +00:00 |
Pablo Natek
|
4693ba13fa
|
Merge branch 'dev' of https: refs #4988//gitea.verdnatura.es/verdnatura/salix into 4988-new-module-agency
|
2024-04-26 08:37:51 +02:00 |
Pablo Natek
|
4e11e46fff
|
feat: refs #4988 capture error on duplicate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-25 12:40:54 +02:00 |
Guillermo Bonet
|
f7ebd071bf
|
refactor: #7258 Deleted all dependences of vn2008 schema
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 09:53:31 +02:00 |
Robert Ferrús
|
ffe56edc9c
|
feat: refs #7039 country
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-24 09:24:42 +02:00 |
Javi Gallego
|
dcc46494bc
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-24 07:45:02 +02:00 |
Guillermo Bonet
|
1044a24bc7
|
refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-23 12:00:23 +02:00 |
Alex Moreno
|
85491613b0
|
test: refs #7173 fix fixtures
|
2024-04-23 08:47:28 +02:00 |
Juan Ferrer
|
d58607f26e
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-22 19:43:48 +00:00 |
Javi Gallego
|
4416790ce1
|
Merge branch 'dev' into 7108-exchange-rate
|
2024-04-22 11:45:02 +02:00 |
Juan Ferrer
|
a0126748e2
|
fix(binlog): refs #4409 Fix fixtures cursor name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-19 14:19:34 +02:00 |
Sergio De la torre
|
32e2827287
|
refs #6921 feat: addFromDelivery
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-17 13:55:07 +02:00 |
Juan Ferrer
|
7cda14c424
|
Merge branch 'dev' into 4409-binlog
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-17 13:24:32 +02:00 |
Juan Ferrer
|
ae326e6e2e
|
feat(binlog): refs #4409 Old recalc code removed
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
Queues: orderTotal, ticketTotal and travelEntries
|
2024-04-17 13:21:27 +02:00 |
Guillermo Bonet
|
9f9662924d
|
Merge pull request 'feat: refs #6968 Changed groupingMode to enum' (!2306) from 6968-groupingModeRefactor into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2306
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2024-04-17 06:48:43 +00:00 |
Guillermo Bonet
|
7a557be09a
|
feat: refs #6968 Changed groupingMode to enum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 11:07:57 +02:00 |
Javi Gallego
|
58baa45e09
|
Merge branch 'dev' into 7108-exchange-rate
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-16 09:47:21 +02:00 |
Guillermo Bonet
|
91d5f51e73
|
Merge branch '7173-Restricción-eliminar/modificar-vn.invoiceIn' of https://gitea.verdnatura.es/verdnatura/salix into 7173-Restricción-eliminar/modificar-vn.invoiceIn
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-16 08:44:51 +02:00 |
Guillermo Bonet
|
93abfdd8a1
|
feat: refs #7173 Added restrictions in invoiceIn structure
|
2024-04-16 08:44:50 +02:00 |
jcasado
|
dc8a6d1274
|
Merge branch 'dev' into 6641-checkboxMyTeam
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-15 10:11:36 +02:00 |
Pablo Natek
|
3547299c70
|
Merge pull request '6005-backupLabeler' (!2276) from 6005-backupLabeler into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/pr-dev This commit looks good
Details
Reviewed-on: #2276
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2024-04-12 07:12:53 +00:00 |
Guillermo Bonet
|
d503018d5c
|
Fixtures Jorge
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:56:38 +02:00 |
Guillermo Bonet
|
69280c63b4
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-04-12 08:03:12 +02:00 |
Pablo Natek
|
726b1ddc07
|
Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-12 05:14:29 +00:00 |
Javi Gallego
|
bc9149ec37
|
feat: tipo de cambio php to js
|
2024-04-11 14:32:26 +02:00 |
Juan Ferrer
|
ce55058314
|
feat(pbx): refs #7198 country prefix, schedule
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-04-10 18:14:10 +02:00 |
Ivan Mas
|
83befbd120
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-10 15:21:42 +00:00 |
jcasado
|
7d925bac87
|
refs #6641 fix PR changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-10 13:16:41 +02:00 |
Jorge Penadés
|
a3c1bceb7e
|
refactor: refs #6492 use enum
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 15:57:34 +02:00 |
Pablo Natek
|
ed517399dc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
|
2024-04-09 15:04:04 +02:00 |
Ivan Mas
|
f02c4354ba
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 14:45:29 +02:00 |
Pablo Natek
|
da037c5235
|
refactor: refs #6005 delay on productionConfig
|
2024-04-09 13:34:33 +02:00 |
Jorge Penadés
|
9a28a59d00
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-09 11:11:30 +02:00 |
Alex Moreno
|
c69a4e1c98
|
Merge pull request 'refactor(workerDms): adapat to lilium' (!2269) from 6551-workerDms_refactor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2269
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
|
2024-04-09 08:21:20 +00:00 |
Pablo Natek
|
7cb40f5d89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-09 09:42:39 +02:00 |
Alex Moreno
|
9134216332
|
refactor(workerDms): adapat to lilium
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-08 14:46:35 +02:00 |
Guillermo Bonet
|
e27279e20e
|
Merge branch 'dev' into 6636-pickup
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-08 05:18:36 +00:00 |
jcasado
|
84e6e7f7bf
|
refs #6641 test fixtures
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-04-04 14:53:26 +02:00 |
Guillermo Bonet
|
f44e19cae3
|
feat: refs #6636 Modified updateClaim, model and tests
gitea/salix/pipeline/pr-dev Build queued...
Details
|
2024-04-04 14:15:20 +02:00 |
jcasado
|
f5943e4445
|
refs #6324 remove column and dependencies
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-04-04 13:57:23 +02:00 |
Jorge Penadés
|
e851c3b481
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-28 14:15:31 +01:00 |
Alex Moreno
|
0b764ebc1b
|
Merge pull request '#6514 - gestDocSupplier' (!2209) from 6514-gestDocSupplier into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2209
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-28 07:12:51 +00:00 |
Javier Segarra
|
fe042e4d86
|
refs #5858 fix: test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-27 06:50:22 +01:00 |
Jorge Penadés
|
94f6d20bb1
|
feat: refs #6942 add Insert
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 13:41:53 +01:00 |
Jorge Penadés
|
634bfc5091
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6492-refactorProceduresVn2008
|
2024-03-26 12:30:07 +01:00 |
Jon Elias
|
04e42cd3c8
|
feat: #6514 created supplierDms functionality
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-26 08:29:07 +01:00 |
Jon Elias
|
c830c48ca9
|
Merge pull request 'style: #6556 set default user image, set users image' (!2168) from 6556-ChangeImages into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #2168
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
|
2024-03-26 06:35:10 +00:00 |
Jon Elias
|
415b829db0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6514-gestDocSupplier
|
2024-03-25 14:40:02 +01:00 |
Guillermo Bonet
|
df115ec58b
|
refactor: refs #6880 vn.professionalCategory changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-25 09:41:05 +01:00 |
Jon Elias
|
595b86b33e
|
refs #6556 fixed hash changes
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-22 10:10:40 +01:00 |
Jon Elias
|
c49b8bf954
|
refactor: refs #6556 minor changes
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-03-22 09:35:09 +01:00 |
Jon Elias
|
eadd8f750d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6556-ChangeImages
|
2024-03-22 08:22:49 +01:00 |
Ivan Mas
|
db71e69317
|
Merge branch 'dev' into 6827-check-usernames-special-characters
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-03-21 09:21:32 +00:00 |