 Guillermo Bonet
|
ca1933cb83
|
feat: refs #7704 Fixtures hedera
|
2024-07-11 13:04:19 +02:00 |
|
Guillermo Bonet
|
7ba2e8d4c5
|
feat: refs #7704 Fix tests
|
2024-07-11 09:48:31 +02:00 |
|
Guillermo Bonet
|
46e8f5b811
|
feat: refs #7511 Rename to multiConfig tables
|
2024-07-10 07:46:18 +02:00 |
|
Guillermo Bonet
|
1f2c0190d0
|
Merge branch 'dev' into 7126-improvedWaste
|
2024-07-09 12:02:15 +02:00 |
 Alex Moreno
|
248000bdcd
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-07-09 11:00:36 +02:00 |
|
Alex Moreno
|
213524edb5
|
deploy: dump db
|
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
|
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
|
2024-07-05 13:51:09 +02:00 |
|
Guillermo Bonet
|
5712fbd782
|
Merge branch 'master' into test
|
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
|
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 |
|
Javier Segarra
|
99efdffe58
|
feat(salix): refs #6321 #6321 retrieve observationType
|
2024-07-04 09:39:06 +02:00 |
|
Guillermo Bonet
|
58ba6d0f4c
|
Merge branch 'test' into dev
|
2024-07-04 09:26:49 +02:00 |
|
Guillermo Bonet
|
5a9850939e
|
Merge branch 'master' into test
|
2024-07-04 09:26:00 +02:00 |
|
Guillermo Bonet
|
009dcd8fc7
|
refs #7486 Fix tests
|
2024-07-04 09:23:57 +02:00 |
|
Javier Segarra
|
b5ea2f12ff
|
Merge remote-tracking branch 'origin/dev' into 6321_negative_tickets
|
2024-07-03 23:05:42 +02:00 |
|
Javier Segarra
|
3710c7c9c8
|
Merge branch '7648_dev_customerEntries' of https://gitea.verdnatura.es/verdnatura/salix into 7648_dev_customerEntries
|
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
|
2024-07-03 06:17:34 +00:00 |
|
Javier Segarra
|
37de252e15
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-07-02 12:22:35 +02:00 |
|
Javier Segarra
|
08612fc70c
|
perf(salix): refs #7648 #7648 fixtures and firstScript
|
2024-07-02 10:07:23 +02:00 |
|
Guillermo Bonet
|
9e5f416d55
|
refactor: refs #7418 Item type refactor
|
2024-07-01 12:06:30 +02:00 |
|
Alex Moreno
|
a26f6eaf21
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
|
2024-07-01 11:32:21 +02:00 |
|
Guillermo Bonet
|
df4e5deae6
|
Merge branch 'test' into dev
|
2024-06-28 13:33:43 +02:00 |
 Pablo Natek
|
478a38b0ab
|
Merge branch 'master' into 6404-sendMailOnDeadLine
|
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
|
2024-06-25 10:39:38 +00:00 |
|
Carlos Satorres
|
f5bc0482d2
|
refs #7409 resolve conflicts
|
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
|
2024-06-25 12:35:25 +02:00 |
|
Carlos Satorres
|
655bbe4967
|
refs #7406 fix pr
|
2024-06-25 12:29:17 +02:00 |
|
Alex Moreno
|
45e8674087
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-06-25 11:34:35 +02:00 |
|
Alex Moreno
|
6150f64e88
|
build: db dump
|
2024-06-25 09:29:42 +02:00 |
|
Carlos Satorres
|
424e0c430c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
|
2024-06-21 09:50:29 +02:00 |
|
Carlos Satorres
|
cf4a7c8fba
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
|
2024-06-21 09:11:40 +02:00 |
|
Carlos Satorres
|
a80b0c3b4c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
|
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
|
2024-06-21 07:20:00 +02:00 |
|
Javier Segarra
|
a1c48974c9
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-06-20 12:21:24 +02:00 |
|
Sergio De la torre
|
182cd3fa8e
|
feat boxPicking refs #7357
|
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
|
2024-06-18 13:28:21 +02:00 |
|
Carlos Satorres
|
fa8c1b3879
|
acls, fixtures, models
|
2024-06-17 13:50:07 +02:00 |
|
Guillermo Bonet
|
43df0ef55d
|
Merge branch 'dev' into 6701-claimRatioRoutine
|
2024-06-17 07:42:33 +00:00 |
|
Guillermo Bonet
|
1d0b89ed52
|
refs #7519 Requested changes
|
2024-06-17 09:42:16 +02:00 |
|
Pablo Natek
|
c3d64b2358
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into 6404-sendMailOnDeadLine
|
2024-06-17 08:49:26 +02:00 |
|
Pablo Natek
|
a30ff44837
|
fix: refs #6404 fix notification
|
2024-06-14 17:40:08 +02:00 |
|
Guillermo Bonet
|
9b80ef73a8
|
Merge branch 'test' into dev
|
2024-06-14 12:48:00 +02:00 |
|
Carlos Satorres
|
e3e9706fb8
|
fix fixtures
|
2024-06-14 09:53:50 +02:00 |
|
Carlos Satorres
|
189c67bd2d
|
warmFix change if
|
2024-06-14 09:43:10 +02:00 |
|
Guillermo Bonet
|
cb056ff789
|
Merge branch 'dev' into 6701-claimRatioRoutine
|
2024-06-13 11:14:00 +02:00 |
|
Guillermo Bonet
|
53c732bcb9
|
Merge branch 'test' into dev
|
2024-06-13 07:12:10 +02:00 |
|
Guillermo Bonet
|
d7317e4067
|
hotfix: refs #7024 Modify booked entries
|
2024-06-13 07:09:48 +02:00 |
 Javi Gallego
|
446e180cf0
|
hotfix claim
|
2024-06-12 11:58:07 +02:00 |
|
Javier Segarra
|
02bc3afcda
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-06-11 13:53:30 +02:00 |
|
Alex Moreno
|
3b44bdd2bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
|
2024-06-11 12:56:56 +02:00 |
|
Alex Moreno
|
9c2ccc5df4
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-06-11 09:59:09 +02:00 |
|
Alex Moreno
|
2dec51804c
|
build: dump
|
2024-06-11 08:38:26 +02:00 |
|
Javi Gallego
|
8f7b034aa7
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-06-04 14:24:55 +02:00 |
|
Javi Gallego
|
4089c7deb3
|
feat: refs #4560 minorChanges
|
2024-06-04 12:23:28 +02:00 |
|
Javi Gallego
|
4230d46fe5
|
Merge branch 'dev' into 4560-GastosReparto
|
2024-06-04 09:47:58 +02:00 |
|
Javier Segarra
|
149aeac54e
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-06-04 09:26:15 +02:00 |
 Robert Ferrús
|
3720f7acfe
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
|
2024-06-04 06:57:29 +00: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
|
2024-06-03 11:38:09 +02:00 |
|
Guillermo Bonet
|
b9d04e9557
|
Merge branch 'dev' into 7126-improvedWaste
|
2024-06-03 05:22:15 +00:00 |
 Jorge Penadés
|
dc8696b422
|
feat: refs #6889 add back tests
|
2024-05-31 16:31:36 +02:00 |
|
Jorge Penadés
|
ee09617b27
|
fix: refs #6889 e2e tests
|
2024-05-31 13:05:12 +02:00 |
|
Jorge Penadés
|
ab9c11ef84
|
fix: refs #6889 modify fixtures
|
2024-05-31 12:56:22 +02:00 |
|
Jorge Penadés
|
4772509b67
|
fix: refs #6889 e2e tests
|
2024-05-31 12:51:06 +02:00 |
|
Robert Ferrús
|
fd233a5e51
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
|
2024-05-31 05:09:16 +00:00 |
|
Jorge Penadés
|
05e6e10337
|
fix: refs #6889 fix back tests
|
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
|
2024-05-29 16:54:24 +02:00 |
|
Javier Segarra
|
aab7a7ec73
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-05-28 12:45:50 +02:00 |
|
Alex Moreno
|
08856a9132
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-05-28 12:11:51 +02:00 |
|
Alex Moreno
|
8ec2a10cbf
|
deploy: dump
|
2024-05-28 12:05:09 +02:00 |
|
Robert Ferrús
|
cf5d520692
|
Merge branch 'dev' into 7296-expeditionTruckToRoadmapStop
|
2024-05-27 07:09:34 +00:00 |
|
Robert Ferrús
|
eb503238d7
|
feat refs #7296 routesMonitor.expeditionTruckFk to routesMonitor.roadmapStopFk
|
2024-05-27 09:07:23 +02:00 |
|
Robert Ferrús
|
b02995918e
|
Merge branch 'dev' into 6281_buyFk
|
2024-05-27 05:04:40 +00:00 |
|
Carlos Satorres
|
723327918b
|
refs #7406 worker formation
|
2024-05-24 15:55:23 +02:00 |
|
Javi Gallego
|
0e5a15dd4e
|
con addressFk
|
2024-05-24 15:14:20 +02:00 |
|
Javier Segarra
|
8366cfa348
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-05-24 11:12:52 +02:00 |
|
Jorge Penadés
|
365e5a3ba3
|
fix: refs # 7400 ledger_next
|
2024-05-21 17:31:29 +02:00 |
|
Robert Ferrús
|
7065cf0b38
|
feat: refs #6281 change fixtures
|
2024-05-21 09:58:03 +02:00 |
|
Javier Segarra
|
3401f0d745
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-05-15 08:55:10 +02:00 |
|
Alex Moreno
|
d487d13cdb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-05-14 11:26:11 +02:00 |
|
Alex Moreno
|
2ddadcd8a4
|
deploy: dump
|
2024-05-14 09:38:03 +02:00 |
|
Robert Ferrús
|
c6f7a0768a
|
Merge branch 'dev' into 7039-country-country
|
2024-05-14 05:49:39 +00:00 |
|
Jorge Penadés
|
cfea648103
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6321_negative_tickets
|
2024-05-13 13:25:52 +02: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
|
2024-05-10 11:20:33 +00:00 |
|
Guillermo Bonet
|
6b7a529b55
|
refactor: refs #7345 Renamed column of invoiceInConfig
|
2024-05-10 11:39:14 +02:00 |
|
Guillermo Bonet
|
1ea357a5dd
|
feat: refs #7126 Refactor and added columns in bs.waste table & proc
|
2024-05-10 10:01:46 +02:00 |
|
Robert Ferrús
|
0498b425b3
|
Merge branch 'dev' into 7039-country-country
|
2024-05-09 10:51:18 +00:00 |
|
Javier Segarra
|
e30c66313f
|
Merge branch 'dev' into 6321_negative_tickets
|
2024-05-08 12:29:06 +02:00 |
|
Alex Moreno
|
966b7794f0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2024-05-07 08:03:37 +02:00 |
|
Alex Moreno
|
56008ba51f
|
dump: db dump
|
2024-05-07 07:53:11 +02:00 |
|
Guillermo Bonet
|
f0b814c79b
|
refactor: refs #6701 Refactor claim_ratio_routine
|
2024-05-03 14:15:55 +02:00 |