Commit Graph

3960 Commits

Author SHA1 Message Date
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
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
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 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
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
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 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
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 62e03f4752 item create e2e fix
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 11:03:23 +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
Alex Moreno 2581ce43a7 refactor(descriptor): separate es.yml
gitea/salix/pipeline/head This commit looks good Details
2021-11-12 08:32:15 +01:00
Joan Sanchez c40a73b891 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-11 17:19:07 +01:00
Joan Sanchez 04da06d778 refactor(smart-table): style changes and added smart-table to sales monitor 2021-11-11 17:18:44 +01:00
Carlos Jimenez Ruiz acd2d2e51f front unit tests fix for lastests buys
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 17:18:19 +01:00
Carlos Jimenez Ruiz 4fe7d4f566 ticket index rollback 2021-11-11 17:17:48 +01:00
Carlos Jimenez Ruiz d2dc0bd147 multi check now behaves properly
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-11 16:38:41 +01:00
Alex Moreno dd47f209a2 feat(descriptor-menu): handle error empty input
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 14:46:05 +01:00
Alex Moreno 509e002e34 feat(summary): get email
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 13:14:34 +01:00
Alex Moreno 5c7efbb838 feat(item): back filter buyer in search panel ans test
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 10:33:21 +01:00
Joan Sanchez 95dfd4c2dd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 08:27:59 +01:00
Alex Moreno 62cdf52227 refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details
2021-11-11 08:24:57 +01:00
Alex Moreno a3bb3122ed fix(time-control): modify select & refactor dates 2021-11-11 08:24:41 +01:00
Carlos Jimenez Ruiz 0bf553e11e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:39 +01:00
Carlos Jimenez Ruiz d87e8ac226 refactor(entry.lastBuys): usage of smart table on latests buys
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-10 17:07:16 +01:00
Vicent Llopis 41974669e5 fix(testBack): add context
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 15:11:42 +01:00
Alex Moreno 7880fb8de9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 14:54:15 +01:00
Alex Moreno f34130cbd7 feat(invoiceOut): separate index.js and jest test
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 14:48:17 +01:00
Carlos Jimenez Ruiz 717ea60084 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 13:40:56 +00:00
Vicent Llopis d3ff60719c fix(last-entries): dateFrom -75 days
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 12:34:56 +01:00
Vicent Llopis 0849f40df7 feat: update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 11:44:29 +01:00
Carlos Jimenez Ruiz d8c3113adc Merge branch 'dev' into 3308-supplier_basic-data
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 09:57:06 +00:00
Alex Moreno 2ca48f2ae0 refactor(supplier): remove console.log
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 10:48:05 +01:00
Carlos Jimenez Ruiz 766d9c6464 Merge branch 'dev' into 3319-worker_time-control
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 09:38:54 +00:00
Vicent Llopis 18aec14fe9 update backTest
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 08:46:09 +01:00
Alex Moreno 119d5e45b9 feat(supplier): add checkbox isPayMethodChecked
gitea/salix/pipeline/head This commit looks good Details
2021-11-10 08:43:25 +01:00
Alex Moreno a52c06057f feat(invoiceOut): separate descriptor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-09 15:10:43 +01:00
Vicent Llopis 833822978a feat(client_balance): test e2e
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 14:36:39 +01:00
Carlos Jimenez Ruiz 469c544536 item.index default columns and filter with like
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-09 11:47:54 +01:00
Alex Moreno 0aa0358b50 refactor(events): name of variable
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:21:28 +01:00
Alex Moreno f45db68e0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:10:20 +01:00
Alex Moreno da80fee0e2 refactor(time-control): getWorkedHours.spec
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 10:09:44 +01:00
Carlos Jimenez Ruiz 345be297f0 Merge branch 'dev' into 3116-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 08:26:41 +00:00
Alex Moreno 7009cc0cc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 08:40:42 +01:00
Alex Moreno 9ab51fc21f feat(eventsFiltered): add backTest & refactor zone
gitea/salix/pipeline/head This commit looks good Details
2021-11-09 08:39:20 +01:00
Carlos Jimenez Ruiz e4ea05fd07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 17:46:50 +01:00
Carlos Jimenez Ruiz 262e46d7c9 added autocompletes to item index 2021-11-08 17:46:40 +01:00
Vicent Llopis 395ad1c76d fix(ibanRequired): set different ibanRequired for Client and Supplier
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 15:04:33 +01:00
Joan Sanchez eb36f86b9d Added smart-table to item index
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 14:46:23 +01:00
Alex Moreno 9e4627617d fix(time-control): modify select & refactor dates
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 14:08:44 +01:00
Joan Sanchez 2bf7250117 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 13:40:22 +01:00
Joan Sanchez a48617e267 Group first
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 13:39:12 +01:00
Vicent Llopis bfbc9b50c4 feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 13:02:42 +01:00
Joan Sanchez 7dc95b8cbf Group first
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 12:50:13 +01:00
Alex Moreno 9c877ceb7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 11:31:26 +01:00
Alex Moreno 6e2f7d9e0d feat(events): get range date of calendar
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 11:30:00 +01:00
Vicent Llopis fbbb1ecdf6 feat(client_balance): add maxImport if "cash"
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-08 08:59:42 +01:00
Carlos Jimenez Ruiz 8fff96ca05 Merge branch 'dev' into 3295-claim_search-panel
gitea/salix/pipeline/head This commit looks good Details
2021-11-08 07:54:10 +00:00
Alex Moreno 3324f4acd2 fix(zone): back remoteMethod
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-04 07:56:12 +01:00
Alex Moreno bb0745532b fix(claim): salesPersonFk where add officeBoss
gitea/salix/pipeline/head This commit looks good Details
2021-11-02 11:24:52 +01:00
Alex Moreno b01298ed17 feat(entry_descriptor): add supplier button
gitea/salix/pipeline/head This commit looks good Details
2021-11-02 08:25:43 +01:00
Alex Moreno b2dd9e6076 feat(zone): filter calendar
gitea/salix/pipeline/head There was a failure building this commit Details
2021-11-02 07:55:35 +01:00
Carlos Jimenez Ruiz 04a31f4cff vn table now receives show buttons options
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-29 16:55:19 +02:00
Carlos Jimenez Ruiz 11f24372e5 autocomplete options added to smart table
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-29 15:52:04 +02:00
Carlos Jimenez Ruiz 89b7f5ed7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table 2021-10-28 13:46:41 +02:00
Joan Sanchez dfb2b0b3d8 Updated checked property
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-28 09:09:52 +02:00
Joan Sanchez bfc9228eef Restored ticket table and added table compatibility on contextmenu
gitea/salix/pipeline/head This commit looks good Details
2021-10-28 09:06:03 +02:00
Carlos Jimenez Ruiz b27a443729 show/hide columns and load default view
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 17:11:33 +02:00
Vicent Llopis cd6f0057a1 test
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:41:59 +02:00
Vicent Llopis b1b6d93c8e change column value : checkbox for text
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 13:39:38 +02:00
Vicent Llopis f60fa5a852 change receiver to requesterId
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 12:22:32 +02:00
Vicent Llopis d94e2900d0 feat(ticket-request): send rocket message when ticket-reques is denied
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 12:16:37 +02:00
Alex Moreno 21686b4a92 feat(test): modify jest test
gitea/salix/pipeline/head This commit looks good Details
2021-10-27 09:55:35 +02:00
Carlos Jimenez Ruiz c976f1ed07 multiple search by column feature
gitea/salix/pipeline/head This commit looks good Details
2021-10-26 17:16:01 +02:00
Alex Moreno 92b916580e feat(description): concat bank with tickets
gitea/salix/pipeline/head This commit looks good Details
2021-10-26 10:20:35 +02:00
Joan Sanchez bf386929d3 Deletion ammends and selection fixed
gitea/salix/pipeline/head This commit looks good Details
2021-10-25 17:18:57 +02:00
Carlos Jimenez Ruiz 7ce58c5f33 sorting arrows for multiple columns
gitea/salix/pipeline/head This commit looks good Details
2021-10-25 14:20:17 +02:00
Joan Sanchez 6578a498ca feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 12:13:33 +02:00
Joan Sanchez 66830f32fd feat(exportation): added exportation report & send report with client invoicing
gitea/salix/pipeline/head This commit looks good Details
Refs: 3254
2021-10-25 11:58:23 +02:00
Joan Sanchez d5264486c7 Simplified to one component
gitea/salix/pipeline/head This commit looks good Details
2021-10-23 14:26:42 +02:00
Carlos Jimenez Ruiz 13c06bf5be refactor(monitors): added transactions to endpoints
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 17:32:10 +02:00
Joan Sanchez e6304d026c feat(smart-table): added smart-table and smart-table-menu components
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 15:01:54 +02:00
Joan Sanchez 2cdc22bc4d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 11:46:16 +02:00
Joan Sanchez aa27ebffc9 renamed method
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 10:47:44 +02:00
Joan Sanchez 8a679b2c8b fix(invoice): fixed error for invoice with incoterms
gitea/salix/pipeline/head This commit looks good Details
2021-10-22 10:26:40 +02:00
Carlos Jimenez Ruiz 683f01ddd8 refactor(zone): removed deprecated column m3Max
gitea/salix/pipeline/head This commit looks good Details
2021-10-21 13:19:41 +02:00
Carlos Jimenez Ruiz 14a72b32bd refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max 2021-10-21 11:37:09 +02:00
Carlos Jimenez Ruiz 5ea014aeff feat(monitors): added auto-refresh feature to ticket monitors
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 15:42:09 +02:00
Carlos Jimenez Ruiz 1c51d34f7d feat(monitors): added auto-refresh feature to ticket monitors
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 14:40:08 +02:00
Vicent Llopis 601d358b51 refactor(entry_summary): ident a line
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 10:02:03 +02:00
Vicent Llopis f6de57a9b5 Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good Details
2021-10-20 07:50:55 +02:00
Vicent Llopis 4a5cf187a5 refactor(entry_summary): ident a line 2021-10-20 07:50:51 +02:00
Carlos Jimenez Ruiz 97242031eb Merge branch 'dev' into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 14:43:06 +00:00
Vicent Llopis 1ba7f16ad3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
gitea/salix/pipeline/head This commit looks good Details
2021-10-19 14:53:54 +02:00