Commit Graph

14255 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 6c02eca6cd Merge branch 'dev' into 3281-entry_buys_new
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 08:20:01 +00:00
Joan Sanchez a6f8a682db fix(fixed-price): confirm on deletion
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 08:41:27 +01:00
Joan Sanchez 5b22892500 fix(fixed-price): changed active buyers endpoint and added pagination
gitea/salix/pipeline/head This commit looks good Details
2021-11-16 07:45:15 +01:00
Carlos Jimenez Ruiz 3f6e1ce9aa refactor(entry.buy): moved add button
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 18:24:01 +01:00
Joan Sanchez 5a7047bf7e Merge pull request '2970-smart-table' (#777) from 2970-smart-table into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #777
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-11-15 14:47:03 +00:00
Alex Moreno ec25df39e4 transaction activeWithBuyer.js
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:50:02 +01:00
Vicent Llopis 7efb19ab83 feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:49:14 +01:00
Carlos Jimenez Ruiz c011a82edc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 14:40:50 +01:00
Carlos Jimenez Ruiz bdff28a465 removed unused code 2021-11-15 14:40:35 +01:00
Alex Moreno 54dc9aacaa feat(item): add checkbox isFloramondo in search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 13:53:18 +01:00
Alex Moreno 73211c5b3b Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 12:14:37 +01:00
Alex Moreno adf295ebf3 fix(item): add ng-model, add fixture and transaction back test 2021-11-15 12:14:34 +01:00
Carlos Jimenez Ruiz d69ee4a597 Merge branch 'dev' into 3328-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:34:48 +00:00
Carlos Jimenez Ruiz 7f64f4d8ad Merge pull request '3317-client_create add businessType' (#776) from 3317-client_create into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #776
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-15 09:34:19 +00:00
Carlos Jimenez Ruiz 8c5523a3d1 Merge branch 'dev' into 3317-client_create
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:28:46 +00:00
Joan Sanchez a41ab4d1dd Merge pull request '3346-item_diary claim cambiar ruta' (#775) from 3346-item_diary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #775
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-15 09:19:04 +00:00
Joan Sanchez 5eec8480c0 Merge pull request '3261-ticket_request' (#774) from 3261-ticket_request into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #774
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-11-15 09:18:08 +00:00
Alex Moreno df7980f2f9 separate in two vn-horizontal
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 10:16:23 +01:00
Joan Sanchez fac1122438 Merge branch 'dev' into 3261-ticket_request
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:14:55 +00:00
Vicent Llopis 095e137c06 translate to english
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 10:10:57 +01:00
Carlos Jimenez Ruiz 4ef6e2b23b Merge branch 'dev' into 3346-item_diary
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 09:07:58 +00:00
Joan Sanchez 4dfb7dac82 Merge pull request '3314-invoice-out summary implementar los 3 puntos' (#773) from 3314-invoice-out_summary into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #773
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-11-15 09:00:35 +00:00
Carlos Jimenez Ruiz 1f8a6b9636 Merge branch 'dev' into 3314-invoice-out_summary
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 08:53:25 +00:00
Carlos Jimenez Ruiz d53a07dbf2 Merge pull request '3312-ibanRequired' (#772) from 3312-ibanRequired into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #772
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-11-15 08:52:54 +00:00
Carlos Jimenez Ruiz 59cdf00134 Merge branch 'dev' into 3312-ibanRequired
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 08:24:29 +00:00
Joan Sanchez e62e57bcde Monitor smart-table ammends 2021-11-15 08:45:21 +01:00
Alex Moreno df6d547ad9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel 2021-11-15 08:34:40 +01:00
Alex Moreno 8a5ed6782a feat(ticket): change default ticketUpdateOption for salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2021-11-15 08:32:16 +01:00
Joan Sanchez b83f0fb52f fix(smart-table): load default viewConfig
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 17:51:27 +01:00
Carlos Jimenez Ruiz 266b1c8073 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 17:32:03 +01:00
Carlos Jimenez Ruiz 2e359fd8b7 Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 16:14:14 +01:00
Carlos Jimenez Ruiz 0cd04040f1 e2e fixed for client billing data and entry latests buys 2021-11-12 16:13:47 +01:00
Joan Sanchez 58f329c561 Updated empty-rows style
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 15:54:07 +01:00
Joan Sanchez 86f8e81251 Fixed alignment for number columns
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 15:17:30 +01:00
Carlos Jimenez Ruiz 906fce5ae3 extensions refactor and item index e2e fix 2021-11-12 15:17:09 +01:00
Joan Sanchez 3e35e7e0b8 Changed to single scope for all inputs
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 14:15:35 +01:00
Alex Moreno c1a7f1eb9e add field in one e2e
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 13:21:07 +01:00
Alex Moreno 243113053e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3317-client_create
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 13:10:43 +01:00
Alex Moreno 5faef913eb feat(client): add field businessTypeFk and modify her tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 13:10:11 +01:00
Joan Sanchez f28401303e Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 12:14:26 +01:00
Joan Sanchez 3a655d393b Remove search inputs scope on element removal 2021-11-12 12:13:50 +01:00
Carlos Jimenez Ruiz aaed7c82f6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-11-12 11:45:57 +01:00
Carlos Jimenez Ruiz 259c192c8b empty rows class moved to the tr from td
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 11:33:34 +01:00
Carlos Jimenez Ruiz 62e03f4752 item create e2e fix
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 11:03:23 +01:00
Carlos Jimenez Ruiz ab7e1c9f11 item summary e2e fix
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 10:21:54 +01:00
Joan Sanchez 02e651eac8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:45:05 +01:00
Joan Sanchez f32db33ed9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:43:50 +01:00
Joan Sanchez 93c766e3ca fix(supplier): removed everyone read acl
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:32:42 +01:00
Alex Moreno 6fe7875d73 change route
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 09:28:19 +01:00
Joan Sanchez bcaa11a3c4 fix(invoice): order by shipped
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 08:45:02 +01:00