Commit Graph

14255 Commits

Author SHA1 Message Date
Alex Moreno f96f22c231 misspelled word
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:44:27 +01:00
Carlos Jimenez Ruiz 5914e8e1ac fixed e2e by adding acls where needed
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:30:55 +01:00
Alex Moreno 815826e891 refactor(ticket): modify transferSales.js for avoid unnecessary logs
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 11:23:18 +01:00
Joan Sanchez 0838f34771 Show alias section for marketing
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 08:14:48 +01:00
Joan Sanchez ab3902ebd8 Restricted account creation
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 08:08:47 +01:00
Joan Sanchez 4162f239cf Allow basic-data access for hhrr
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 07:50:01 +01:00
Joan Sanchez 0fc52cbf1d Updated descriptor ACLs
gitea/salix/pipeline/head This commit looks good Details
2021-11-25 07:43:32 +01:00
Carlos Jimenez Ruiz 09c2b813b5 ACL update
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 15:27:09 +01:00
Joan Sanchez 469f944e47 Merge branch '3368-export_database' of https://gitea.verdnatura.es/verdnatura/salix into 3368-export_database
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 15:01:47 +01:00
Joan Sanchez c3e311f076 Updated route acls 2021-11-24 15:01:44 +01:00
Alex Moreno c03fe359b1 add acl
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 14:36:12 +01:00
Carlos Jimenez Ruiz c4bc89ee29 refactor(entry): back unit tests refactor to transactions
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 14:29:15 +01:00
Alex Moreno fc2e81826d export database
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 13:02:58 +01:00
Carlos Jimenez Ruiz c3da93bfd3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions 2021-11-24 11:22:16 +01:00
Carlos Jimenez Ruiz 537c1bb664 Merge pull request 'fix(sales): update price on any change affecting the ticket total' (#804) from 3363-sale_update_price into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #804
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-24 09:57:44 +00:00
Joan Sanchez f98b0c7bbe Merge branch 'dev' into 3363-sale_update_price
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 09:15:13 +00:00
Carlos Jimenez Ruiz 14270145f8 Merge pull request '3339-entry_latest-buys-search-panel add from and to filter' (#800) from 3339-entry_latest-buys-search-panel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #800
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-24 09:14:35 +00:00
Alex Moreno 00072a7dd1 landing searchable false
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 10:02:52 +01:00
Alex Moreno 8d33041970 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel 2021-11-24 09:59:10 +01:00
Joan Sanchez 8ede14ab40 fix(sales): update price on any change affecting the ticket total
gitea/salix/pipeline/head This commit looks good Details
Refs: 3363
2021-11-24 09:25:24 +01:00
Alex Moreno aaa49bdf78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 09:22:24 +01:00
Alex Moreno 5931692fac test(item_basic-data): add genericFk e2e
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 09:21:41 +01:00
Alex Moreno 02d89e5774 feat(item): add field genericFk in basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 08:51:07 +01:00
Joan Sanchez 1dae7ad792 Merge pull request '3350-Smart_table_unit_tests' (#803) from 3350-Smart_table_unit_tests into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #803
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-11-24 06:42:27 +00:00
Alex Moreno e319af6556 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-24 07:30:10 +01:00
Carlos Jimenez Ruiz c544cbfec7 Merge branch 'dev' into 3350-Smart_table_unit_tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 15:55:45 +00:00
Carlos Jimenez Ruiz ae23f244a0 Merge pull request '3373-client_consumption description sortable' (#802) from 3373-client_consumption into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #802
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-23 15:54:56 +00:00
Javi Gallego d0326fe354 reload section summary
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-23 15:13:34 +01:00
Carlos Jimenez Ruiz 372d5ade17 refactor(smartTable): removeProp updated and tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 13:58:12 +01:00
Carlos Jimenez Ruiz 320cc6c02c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests 2021-11-23 13:52:15 +01:00
Alex Moreno abb33c8514 feat(client): consumption.decription sortable
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 11:39:31 +01:00
Carlos Jimenez Ruiz b9265b79d9 Merge pull request 'fix(sale): disabled clear icons' (#801) from 3388-ticket_sale into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #801
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-23 09:18:58 +00:00
Carlos Jimenez Ruiz 16df8fd2f3 Merge branch 'dev' into 3388-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:03:06 +00:00
Carlos Jimenez Ruiz c67d78e5b9 Merge pull request 'fix(filterValue): fixed sql injection vulnerability' (#799) from 3369-filterValue_sqli into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #799
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-23 09:02:23 +00:00
Joan Sanchez 07dcdab1ef fix(sale): disabled clear icons
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:57:19 +01:00
Carlos Jimenez Ruiz 51a3673160 Merge branch 'dev' into 3369-filterValue_sqli
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 08:54:50 +00:00
Alex Moreno 854ed9936d deleted unnecessary comma
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:05:42 +01:00
Alex Moreno b460579834 feat(entry_latest-buys): add from and to in search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-23 09:00:46 +01:00
Carlos Jimenez Ruiz 6dc373677d Merge pull request '3290-entry_last-buys add filter isFloramondo' (#797) from 3290-entry_latest-buys into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #797
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-22 15:39:15 +00:00
Carlos Jimenez Ruiz 1f2417b55e Merge branch 'dev' into 3290-entry_latest-buys
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 15:34:55 +00:00
Carlos Jimenez Ruiz e6886871da Merge pull request '3389-item and entry/latest-buys search-panels add filter supplier' (#796) from 3332-item_search-panel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #796
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-22 15:34:38 +00:00
Carlos Jimenez Ruiz cae3322c6b Merge branch 'dev' into 3332-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 15:28:21 +00:00
Carlos Jimenez Ruiz 2bba91c6a2 Merge pull request '3375-client_descriptor change phone for payMethod' (#795) from 3375-client_descriptor into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #795
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-22 15:27:59 +00:00
Carlos Jimenez Ruiz ec7cb47ad5 Merge branch 'dev' into 3375-client_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 14:55:56 +00:00
Carlos Jimenez Ruiz c618b7c2ed Merge pull request 'fix(payMethod): alter colums name' (#793) from 3379-payMethod_ibanRequired into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #793
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-22 14:55:32 +00:00
Joan Sanchez 4ebad6b372 filter order was not properly being applied
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 15:54:01 +01:00
Joan Sanchez 3a2e4c54b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli 2021-11-22 15:49:43 +01:00
Joan Sanchez 90ab78d26d Updated unit tests 2021-11-22 15:49:32 +01:00
Carlos Jimenez Ruiz cbcfdd33ec Merge branch 'dev' into 3379-payMethod_ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-22 14:21:46 +00:00
Carlos Jimenez Ruiz 717d5ec3c8 Merge pull request '3381-item_diary-claim only the claim contains the item' (#792) from 3381-item_diary-claim into dev
Reviewed-on: #792
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-22 14:21:17 +00:00