Commit Graph

8274 Commits

Author SHA1 Message Date
Javi Gallego 1b13e58e10 item basic-data añadir isFragile
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:58:00 +02:00
Joan Sanchez cf2c8ca0c8 Updated translation
gitea/salix/pipeline/head This commit looks good Details
2020-09-17 09:16:13 +02:00
Carlos Jimenez Ruiz 1d0e227ddc Merge pull request '2430-catalog_multi_tag' (#371) from 2430-catalog_multi_tag into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #371
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-16 14:15:26 +00:00
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz 2ebe476751 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag 2020-09-16 14:56:09 +02:00
Carlos Jimenez Ruiz 91f6a92036 Merge pull request 'Añadido campo CIF/NIF' (#379) from 2454-sepa_fiscal_id into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #379
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-09-16 12:55:02 +00:00
Joan Sanchez 27a1a45d71 Añadido CIF/NIF
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 14:46:37 +02:00
Carlos Jimenez Ruiz f50f4514fd fixtures enhanced for tags
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 11:11:18 +02:00
Joan Sanchez b6499370e1 Merge branch 'dev' into 2430-catalog_multi_tag
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 09:06:08 +00:00
Joan Sanchez c980155e6f Merge pull request 'salesPersonUser replaces salesPerson relation' (#378) from 2396-client_model_replace_relation_salesPerson into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #378
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-09-16 08:36:26 +00:00
Joan Sanchez f8ea14ecab Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 10:11:09 +02:00
Joan Sanchez 312faeb3b0 Changes to lag list
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-16 09:54:04 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 19:43:07 +02:00
Joan Sanchez b5b7172b72 Updated test
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:26:23 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 14:14:13 +02:00
Joan Sanchez 538c217b59 Store tagGroups on catalog url
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-15 10:48:34 +02:00
Carlos Jimenez Ruiz 826b4a6f4b Merge pull request 'added invoiceOut descriptor' (#377) from 2446-ticket_index_overlap_ref_and_state into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #377
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-09-14 14:41:14 +00:00
Carlos Jimenez Ruiz 031e40df51 removed unused dash if empty
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:34:11 +02:00
Carlos Jimenez Ruiz 1eb088521c ticket.index ref and state columns merged
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 16:08:37 +02:00
Carlos Jimenez Ruiz f7a5b4bdce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2446-ticket_index_overlap_ref_and_state
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 13:58:53 +02:00
Carlos Jimenez Ruiz 13a5c4c4c9 test enhanced 2020-09-14 13:58:42 +02:00
Joan Sanchez 652812bca4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-09-14 13:37:20 +02:00
Joan Sanchez 26f0958838 Trigger build
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2020-09-14 13:25:37 +02:00
Carlos Jimenez Ruiz 0b4c53a655 added invoiceOut descriptor
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 13:11:53 +02:00
Joan Sanchez 1348cc9df8 Merge pull request 'entry.latestBuys v2' (#376) from 2444-entry_latestBuys_v2 into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #376
2020-09-14 10:34:39 +00:00
Joan Sanchez c077afcfed Changed var 2020-09-14 12:34:13 +02:00
Carlos Jimenez Ruiz a767d256b2 Merge branch 'dev' into 2444-entry_latestBuys_v2
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 10:22:17 +00:00
Joan Sanchez 076ee50c0f Config file path fix
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 12:14:22 +02:00
Joan Sanchez 559a2e9721 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:56:58 +02:00
Joan Sanchez 746bf55bcd Updated dms path
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:54:34 +02:00
Carlos Jimenez Ruiz 22e7e035c3 column tags added
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:44:47 +02:00
Joan Sanchez 7043b833d0 Pdf optimization
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 11:44:10 +02:00
Joan Sanchez f94728845e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-14 10:32:34 +02:00
Joan Sanchez ea6aed351a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:56:48 +02:00
Carlos Jimenez Ruiz 43d011ea60 isIgnored displayed as vn-check
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:43:00 +02:00
Joan Sanchez 279120dd03 Launch puppeteer browser on app start
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 09:38:48 +02:00
Joan Sanchez 21c4b8db14 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 08:59:59 +02:00
Joan Sanchez edf3f1e96e Removed temporary table on ticket closure
gitea/salix/pipeline/head This commit looks good Details
2020-09-14 08:51:46 +02:00
Joan Sanchez 9bbe50c62b Changes to catalog filters
gitea/salix/pipeline/head There was a failure building this commit Details
2020-09-14 07:42:43 +02:00
Bernat Exposito e0056e291e Merge pull request '2401-entry_basic_data' (#375) from 2401-entry_basic_data into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #375
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
2020-09-14 05:24:08 +00:00
Carlos Jimenez Ruiz 8a8a200bdd e2e for entry basic data
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 16:36:56 +02:00
Carlos Jimenez Ruiz bf17d428e4 entry basic data + some minor refactors
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:51:58 +02:00
Juan Ferrer 901c00066f Front test fixed
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:47:23 +02:00
Juan Ferrer 61f3f82117 Merge branch 'dev' into 2381-mariaDB
gitea/salix/pipeline/head This commit looks good Details
2020-09-11 14:39:02 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Carlos Jimenez Ruiz fab76b0dfa Merge pull request 'catalog colors' (#368) from 2404-catalog_color into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #368
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2020-09-10 15:21:52 +00:00
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