Commit Graph

4111 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz 48e4628c48 refactor(ticket.summary): change state button is now dropdown
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 09:49:11 +01:00
Carlos Jimenez Ruiz a969f1f234 Merge branch 'dev' into 3449-client_credit
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 10:48:15 +00:00
Carlos Jimenez Ruiz 652cbe937f Merge branch 'dev' into 3433-supplier_account
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 10:35:28 +00:00
Carlos Jimenez Ruiz a1da6081b5 Merge branch 'dev' into 3439-item_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 09:51:41 +00:00
Carlos Jimenez Ruiz e7f1d7a1ee Merge branch 'dev' into 3451-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 09:16:34 +00:00
Alex Moreno 6a78ac46c7 fix(client): check businesTypeFk before clientCredit insert
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 08:53:56 +01:00
Alex Moreno d1c7dea218 fix(supplier_account): get countryFk in model.js
gitea/salix/pipeline/head This commit looks good Details
2021-12-23 08:09:48 +01:00
Vicent Llopis a6e5123949 feat: add filter by item.longName
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 13:16:45 +01:00
Alex Moreno 9287f25f24 fix(client_balance): fix if value is 0
gitea/salix/pipeline/head This commit looks good Details
2021-12-22 09:46:18 +01:00
Vicent Llopis 6bd48ab30b delete comment
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 15:06:57 +01:00
Vicent Llopis 19e50d2156 fix(ticket_sale): front test
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 15:00:06 +01:00
Vicent Llopis bdb42437ae Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:45:40 +01:00
Vicent Llopis 5c899d28c3 feat(ticket_sale): add tests and refactor backRoute name
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 14:43:53 +01:00
Carlos Jimenez Ruiz 31da353f07 Merge branch 'dev' into 3457-smart_table_order
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 11:44:16 +00:00
Joan Sanchez 1d28508cba Removed vn-focus directive
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 12:42:18 +01:00
Carlos Jimenez Ruiz 707c9c33f7 Merge branch 'dev' into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 11:27:34 +00:00
Joan Sanchez 76ec1fceae fear(smart-table): now shows the default order with the column arrows
gitea/salix/pipeline/head This commit looks good Details
Refs: 3457
2021-12-21 09:19:28 +01:00
Alex Moreno 831bfb0352 change route for hasRoute
gitea/salix/pipeline/head This commit looks good Details
2021-12-21 08:52:39 +01:00
Alex Moreno 405494c85b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index 2021-12-21 08:31:17 +01:00
Vicent Llopis e30fb0fb37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-21 07:10:19 +01:00
Alex Moreno f67edffcf1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 13:51:44 +01:00
Carlos Jimenez Ruiz 1440f29784 Merge branch 'dev' into 3423-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 10:01:08 +00:00
Joan Sanchez 872f5b488b Merge branch 'dev' into 3411-route_ticket_fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 09:40:34 +00:00
Alex Moreno 7a0221c17d test(supplier): add backTest to check changes in isPayMethodChecked
gitea/salix/pipeline/head This commit looks good Details
2021-12-20 08:02:28 +01:00
Alex Moreno bcc50b0618 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data 2021-12-20 07:33:52 +01:00
Carlos Jimenez Ruiz d2db3054a5 Merge branch 'dev' into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 14:15:41 +00:00
Carlos Jimenez Ruiz 7fbbe2fddd ctx was poluted by tests
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 15:14:31 +01:00
Joan Sanchez da59a556ca refactor(monitor): limited width to the client and zone columns
gitea/salix/pipeline/head This commit looks good Details
Refs: 3458
2021-12-17 13:09:00 +01:00
Joan Sanchez 4cb346c2a8 fix(monitor): changed order to prevent row duplication
gitea/salix/pipeline/head This commit looks good Details
Refs: 3458
2021-12-17 12:40:23 +01:00
Carlos Jimenez Ruiz d83995e64e filter worker id refactor
gitea/salix/pipeline/head This commit looks good Details
2021-12-17 10:41:59 +01:00
Alex Moreno 138f2110e5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 12:15:47 +01:00
Carlos Jimenez Ruiz 5a448234d6 transtaction commits on several endpoints
gitea/salix/pipeline/head This commit looks good Details
2021-12-16 10:56:10 +01:00
Carlos Jimenez Ruiz 2bfc6a5987 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-12-15 15:29:28 +01:00
Carlos Jimenez Ruiz b4f1e66fed order module transactions 2021-12-15 15:29:22 +01:00
Vicent Llopis a6b755138f feat(abono): add option "abono" in ticket_sale
gitea/salix/pipeline/head There was a failure building this commit Details
2021-12-15 15:24:45 +01:00
Alex Moreno be3e8ddd98 feat(ticket_descriptor): add field client.id
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:59:53 +01:00
Alex Moreno 5960d40891 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:43:40 +01:00
Alex Moreno 9cfe6b5b7a feat(ticket): filter by route
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 12:05:06 +01:00
Joan Sanchez f2a8992410 fix(ticketIndex): excluded collectionFk property from date ranges
gitea/salix/pipeline/head This commit looks good Details
Refs: 3431
2021-12-14 09:17:00 +01:00
Alex Moreno 6465a5c460 feat(supplier): payMethodChecked for financial
gitea/salix/pipeline/head This commit looks good Details
2021-12-14 08:23:11 +01:00
Carlos Jimenez Ruiz 6aa3101e42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions 2021-12-02 11:04:44 +01:00
Carlos Jimenez Ruiz 2ebe6b5342 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 15:26:09 +01:00
Carlos Jimenez Ruiz 8285a8a8e9 refactor(route.tickets): updated error description 2021-12-01 15:26:01 +01:00
Vicent Llopis ac3dc039fe feat: add fixtures of ticket and update test
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 12:49:53 +01:00
Alex Moreno 75e32feb16 refactor ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 11:39:48 +01:00
Alex Moreno 77191b6182 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale 2021-12-01 11:29:10 +01:00
Joan Sanchez 7acf7c5bea Changed duplicated button...
gitea/salix/pipeline/head This commit looks good Details
2021-12-01 08:29:05 +01:00
Alex Moreno c7e5c25a28 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 15:13:38 +01:00
Alex Moreno decd4b5a95 separate sql procedures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 15:13:20 +01:00
Vicent Llopis 238577ec8f refactor: change ids by codes and add fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-11-30 13:57:17 +01:00