verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 55 Releases Wiki Activity
14,825 Commits 280 Branches 0 Tags 127 MiB
Commit Graph

14825 Commits

Author SHA1 Message Date
Carlos Satorres 9be06c6f4b refs #084200 arreglo lang 2023-03-29 12:07:45 +02:00
Carlos Satorres 71220c58f7 refs #084200 inserts 2023-03-29 12:00:01 +02:00
Carlos Satorres 14f8f98fe9 refs #084200 findOne
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 15:15:15 +02:00
Carlos Satorres aad8fb0a66 refs #084200 i18n
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-27 13:11:38 +02:00
Carlos Satorres ceee1ec79b Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-22 14:55:03 +01:00
Carlos Satorres d05ddef5fa refs #084200 primer commit companyI18n 2023-03-22 14:54:59 +01:00
Carlos Satorres 36e18ff28c Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:03:04 +00:00
Carlos Satorres b5394d3925 refs #084200 footer finalizado, web personalizado
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 12:52:41 +01:00
Joan Sanchez d9f4227ffa Merge pull request 'refs #5368 Fix expedition-pallet-label' (!1378) from 5368-fix-expedition-pallet-label into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1378
 2023-03-13 09:38:01 +00:00
Joan Sanchez b58135f611 Merge pull request '5035-tryToSolve_intermittentBackTest' (!1379) from 5035-tryToSolve_intermittentBackTest into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1379
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-13 09:37:42 +00:00
Joan Sanchez 60c137b280 Merge branch 'dev' into 5368-fix-expedition-pallet-label
gitea/salix/pipeline/head This commit looks good Details
2023-03-13 09:19:39 +00:00
Carlos Satorres 08bda1b05b refs #084200 ultimos cambios footnotes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-13 08:09:28 +01:00
Carlos Satorres da4cbe1148 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-03-10 15:42:52 +01:00
Joan Sanchez 9bc86b1617 Added missing relation
gitea/salix/pipeline/head This commit looks good Details
2023-03-10 13:29:11 +01:00
Carlos Satorres 9e8150dde3 refs #084200 footnotes dinamico
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 15:59:46 +01:00
Carlos Satorres fd67ec00d1 Merge branch '084200-footerAlbaranReport' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 15:07:08 +01:00
Carlos Satorres a48c67aab4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 084200-footerAlbaranReport 2023-03-09 14:09:37 +01:00
Carlos Satorres 73ca811fc0 Merge branch 'dev' into 084200-footerAlbaranReport
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:03:37 +00:00
Carlos Satorres b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 13:41:05 +01:00
Vicent Llopis c105316a04 delete testBack
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 10:05:24 +01:00
Vicent Llopis 9094c4f1cb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5035-tryToSolve_intermittentBackTest
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:42:08 +01:00
Vicent Llopis 223b8f6d00 fix: intermittentBack test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 09:41:51 +01:00
Joan Sanchez 24f0ca5168 Merge pull request '5240-ticket.sale-tracking_2' (!1376) from 5240-ticket.sale-tracking_2 into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1376
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-09 08:05:48 +00:00
Vicent Llopis b85624085a fix backTest: add columns to table tpvTransaction
gitea/salix/pipeline/head This commit looks good Details
2023-03-09 08:24:21 +01:00
Vicent Llopis c46d325e23 fix: add transaction
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-09 07:58:39 +01:00
Guillermo Bonet 0c22c1b0de refs #5368 Fix expedition-pallet-label
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 17:30:28 +01:00
Vicent Llopis e20464cc7c update css
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 13:14:06 +01:00
Joan Sanchez c3cf3f3d91 Merge pull request '5090-renameGoLabel' (!1362) from 5090-renameGoLabel into dev
gitea/salix/pipeline/head There was a failure building this commit Details 
Reviewed-on: #1362
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-08 09:52:53 +00:00
Joan Sanchez 63694f4478 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 09:47:47 +00:00
Joan Sanchez 4d2d75e066 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-03-08 10:19:11 +01:00
Joan Sanchez aeb50b2c19 Removed callback syntax
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 10:19:02 +01:00
Joan Sanchez 56d3b32af5 Merge branch 'dev' into 5090-renameGoLabel
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 09:12:53 +00:00
Joan Sanchez c93d3f8846 Updated front unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-08 07:47:25 +01:00
Javi Gallego bb691ccf1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
2023-03-08 07:45:25 +01:00
Javi Gallego 98c8cd67e5 minor bug 2023-03-08 07:45:22 +01:00
Joan Sanchez 9050c06994 Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-08 07:44:56 +01:00
Joan Sanchez 3ad96b6ad7 Endpoint fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 11:55:13 +01:00
Joan Sanchez 445a0b0e1f Claim fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 10:20:10 +01:00
Joan Sanchez 44e7abd6d3 Merge pull request 'feat(claimLog): added claim log section' (!1370) from 5340-claim_log into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1370
Reviewed-by: Alexandre Riera <alexandre@verdnatura.es>
 2023-03-07 08:28:13 +00:00
Javi Gallego 0a44a39d28 Merge pull request '5187-error-permisos' (!1366) from 5187-error-permisos into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1366
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
 2023-03-07 07:50:26 +00:00
Javi Gallego a856b20dc9 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:20:21 +00:00
Joan Sanchez 0c36c737e2 Merge pull request '5177-smart_check_fix' (!1371) from 5177-smart_check_fix into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1371
 2023-03-07 07:16:26 +00:00
Joan Sanchez 14a5c78303 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 08:13:07 +01:00
Joan Sanchez 0d2339686c Updated changelog
gitea/salix/pipeline/head There was a failure building this commit Details
2023-03-07 08:10:52 +01:00
Joan Sanchez e8e8392e5d Updated changelog 2023-03-07 07:58:08 +01:00
Joan Sanchez c0ff6bea57 fix(smartTable): fixed filtering with an intermediate check
gitea/salix/pipeline/head There was a failure building this commit Details 
Refs: #5177
 2023-03-07 07:47:30 +01:00
Javi Gallego 4a32c164a6 template string
gitea/salix/pipeline/head This commit looks good Details
2023-03-07 07:34:08 +01:00
Joan Sanchez bc0a6c33c4 Merge branch 'dev' into 5187-error-permisos
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 13:50:21 +00:00
Joan Sanchez 9f4aed7d83 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2023-03-06 13:44:03 +01:00
Joan Sanchez 4f091330a7 feat(claimLog): added claim log section
gitea/salix/pipeline/head This commit looks good Details 
Refs: #5340
 2023-03-06 12:37:37 +01:00