Commit Graph

10378 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz de184c163e color var
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 17:17:46 +02:00
Carlos Jimenez Ruiz 42abeecede hex color now displayed on catalog
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 16:35:32 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Carlos Jimenez Ruiz 30c9e42ded Merge pull request '2438-export_production' (#372) from 2438-export_production into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #372
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-10 12:37:52 +00:00
Carlos Jimenez Ruiz ecc7ae398c column order
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 14:32:44 +02:00
Carlos Jimenez Ruiz e8384e3ec9 added packageFk as column
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 13:26:04 +02:00
Bernat Exposito Domenech 0cf99a5a83 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 11:34:35 +02:00
Bernat Exposito Domenech 87fab5f57c delete duplicated fixtures 2020-09-10 11:34:32 +02:00
Carlos Jimenez Ruiz a9c1f97b72 Merge pull request '2245-ticket_component' (#369) from 2245-ticket_component into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #369
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-10 08:52:23 +00:00
Carlos Jimenez Ruiz 12ceedd80c corrected some typos
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 10:46:56 +02:00
Bernat Exposito Domenech 829d0c3b3c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-10 09:18:16 +02:00
Bernat Exposito Domenech 4f50106e92 fix fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 08:08:00 +02:00
Bernat Exposito Domenech d91a354e4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2438-export_production 2020-09-10 07:51:30 +02:00
Bernat Exposito Domenech 1985a37666 Merge branch '2245-ticket_component' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-10 07:36:07 +02:00
Bernat Exposito Domenech 348412c5db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 15:50:06 +02:00
Bernat Exposito Domenech d4b6d7cd96 cr changes 2020-09-09 15:49:59 +02:00
Bernat Exposito Domenech fb3f01151c update fixtures
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 13:49:03 +02:00
Joan Sanchez c4b8cdf980 Merge pull request '2400-entry_summary_buys + e2e' (#370) from 2400-entry_summary_buys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #370
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-09-09 11:23:13 +00:00
Carlos Jimenez Ruiz f570a07c7c entry.summary e2e buys being listed
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 13:07:06 +02:00
Bernat Exposito Domenech 9ff7232b50 export production and fix test
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 12:54:10 +02:00
Carlos Jimenez Ruiz 46b67308fa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2400-entry_summary_buys
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:39:24 +02:00
Carlos Jimenez Ruiz 957096172d entry summary buys listed 2020-09-09 11:39:18 +02:00
Bernat Exposito b153c60b99 Merge branch 'dev' into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:28:59 +00:00
Bernat Exposito Domenech ed926c39a1 fix e2e
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 11:27:00 +02:00
Carlos Jimenez Ruiz b625ea0eb8 Merge pull request '2385 - Replaced worker nickname' (#367) from 2385-worker_descriptor_refactor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #367
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-09 09:24:19 +00:00
Bernat Exposito Domenech 5bb8aacfb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component 2020-09-09 11:12:18 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 09:06:11 +00:00
Carlos Jimenez Ruiz 99b32ab3ad Merge pull request '#2406 - Sort by occurrences' (#364) from 2406-catalog_sort_by_occurrences into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #364
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-09 09:05:34 +00:00
Joan Sanchez 88cf2e602c Merge branch 'dev' into 2406-catalog_sort_by_occurrences
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:22:45 +00:00
Bernat Exposito Domenech b3b2261b4a delete fdescribe 2020-09-09 08:29:52 +02:00
Joan Sanchez 004c9d7341 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:27:08 +02:00
Bernat Exposito Domenech f99fb69d48 front and back test 2020-09-09 08:20:27 +02:00
Joan Sanchez db081501eb 2440 - Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-09-09 08:14:17 +02:00
Joan Sanchez 5ef9afdb53 Empty url fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 15:07:57 +02:00
Joan Sanchez f56b0607ee Filter changes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-08 14:19:21 +02:00
Joan Sanchez ff5a942771 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 10:16:30 +02:00
Joan Sanchez 8daa3ae89c html changes 2020-09-08 10:11:22 +02:00
Bernat Exposito Domenech d90fb3444c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2378-imap 2020-09-08 08:30:00 +02:00
Bernat Exposito Domenech d79cffb2c3 back test for getComponentsSum 2020-09-08 08:13:54 +02:00
Bernat Exposito Domenech 174cea7bc3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2245-ticket_component
gitea/salix/pipeline/head This commit looks good Details
2020-09-08 07:17:23 +02:00
Bernat Exposito Domenech 92e14d5292 update getComponentSum 2020-09-08 07:17:16 +02:00
Joan Sanchez 7b9205ee1e Actualizados títulos de albarán
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 15:06:00 +02:00
Joan Sanchez fe53d1fd3c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 14:16:23 +02:00
Joan Sanchez 3efe14fc53 Removed unused vars
gitea/salix/pipeline/head This commit looks good Details
2020-09-07 12:52:27 +02:00
Joan Sanchez ee52581a06 Updated param description 2020-09-07 12:52:21 +02:00
Joan Sanchez 8faddef7e8 Renamed sql file 2020-09-07 12:52:13 +02:00
Joan Sanchez 812847d82e Changed sql folder 2020-09-07 12:52:06 +02:00
Joan Sanchez e6804f6ee3 Removed procedures 2020-09-07 12:51:58 +02:00
Joan Sanchez c3e8c0cc58 Changes 2020-09-07 12:51:49 +02:00
Joan Sanchez fa634d2dad 2285 - Added closure paths 2020-09-07 12:51:38 +02:00