Commit Graph

193 Commits

Author SHA1 Message Date
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 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
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
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 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
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
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 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 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