 Carlos Andrés
|
dc897854a4
|
merge: refs #6802 merge dev fix conflicts
|
2024-07-11 13:59:55 +02:00 |
|
Carlos Andrés
|
3b5f88fd33
|
refactor: refs #6802 refactor salesPerson to salesDepartment
|
2024-07-11 12:30:43 +02:00 |
 Alex Moreno
|
248000bdcd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-07-09 11:00:36 +02:00 |
|
Alex Moreno
|
213524edb5
|
deploy: dump db
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-07-09 07:52:18 +02:00 |
 Javier Segarra
|
8355d544c3
|
Merge branch '7380_substitutionCondition' of https://gitea.verdnatura.es/verdnatura/salix into 7380_substitutionCondition
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-07-08 09:54:56 +02:00 |
|
Javier Segarra
|
9f57e50f89
|
feat(salix): refs #7380 #7380 add value to fixtures
|
2024-07-08 09:54:40 +02:00 |
|
Javier Segarra
|
3c2a44eb53
|
feat(salix): refs #7380 #7380 add value to fixtures
|
2024-07-07 23:47:00 +02:00 |
 Guillermo Bonet
|
fb07cdccc3
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-07-05 13:51:09 +02:00 |
|
Guillermo Bonet
|
5712fbd782
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-07-05 13:50:43 +02:00 |
 Carlos Satorres
|
f3dcc7dd99
|
Merge branch 'hotfix-sepaCore' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-sepaCore
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-07-04 16:50:57 +02:00 |
|
Carlos Satorres
|
cf621071d0
|
refs #5525 fixear sql, fixtures, js
|
2024-07-04 16:50:54 +02:00 |
|
Guillermo Bonet
|
58ba6d0f4c
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-07-04 09:26:49 +02:00 |
|
Guillermo Bonet
|
5a9850939e
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-07-04 09:26:00 +02:00 |
|
Guillermo Bonet
|
009dcd8fc7
|
refs #7486 Fix tests
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/pr-test There was a failure building this commit
Details
|
2024-07-04 09:23:57 +02:00 |
|
Javier Segarra
|
3710c7c9c8
|
Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-07-03 08:55:01 +02:00 |
|
Javier Segarra
|
beff905e02
|
perf(salix): refs #7648 #7648 remove change role for user 2
|
2024-07-03 08:54:58 +02:00 |
|
Javier Segarra
|
5c73a20f43
|
Merge branch 'dev' into 7648_dev_customerEntries
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-07-03 06:17:34 +00:00 |
|
Javier Segarra
|
08612fc70c
|
perf(salix): refs #7648 #7648 fixtures and firstScript
gitea/salix/pipeline/pr-dev Build started...
Details
|
2024-07-02 10:07:23 +02:00 |
|
Guillermo Bonet
|
9e5f416d55
|
refactor: refs #7418 Item type refactor
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-07-01 12:06:30 +02:00 |
|
Guillermo Bonet
|
df4e5deae6
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-28 13:33:43 +02:00 |
 Pablo Natek
|
478a38b0ab
|
Merge branch 'master' into 6404-sendMailOnDeadLine
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-26 05:14:37 +00:00 |
|
Carlos Satorres
|
ffff851d1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
|
2024-06-25 14:49:32 +02:00 |
|
Carlos Satorres
|
f811e7e96c
|
Merge branch 'dev' into 7406-workerFormation
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-25 10:39:38 +00:00 |
|
Carlos Satorres
|
f5bc0482d2
|
refs #7409 resolve conflicts
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-25 12:36:28 +02:00 |
|
Carlos Satorres
|
95e1bba58b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
|
2024-06-25 12:36:12 +02:00 |
|
Carlos Satorres
|
248358fbd7
|
refs #7409 fix pr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-25 12:35:25 +02:00 |
|
Carlos Satorres
|
655bbe4967
|
refs #7406 fix pr
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-25 12:29:17 +02:00 |
|
Alex Moreno
|
45e8674087
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-25 11:34:35 +02:00 |
|
Alex Moreno
|
6150f64e88
|
build: db dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-25 09:29:42 +02:00 |
|
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
|
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
|
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 |
 Javi Gallego
|
446e180cf0
|
hotfix claim
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-12 11:58:07 +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 |
|
Alex Moreno
|
9c2ccc5df4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-11 09:59:09 +02:00 |
|
Alex Moreno
|
2dec51804c
|
build: dump
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-11 08:38:26 +02:00 |
|
Javi Gallego
|
8f7b034aa7
|
Merge branch 'dev' into 4560-GastosReparto
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-04 14:24:55 +02:00 |