Commit Graph

4120 Commits

Author SHA1 Message Date
Javi Gallego bc34be85ef fix
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 17:49:25 +02:00
Carlos Jimenez Ruiz 6b465f9150 Merge branch 'dev' into 3068-ticket_colletion
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 13:07:57 +00:00
Carlos Jimenez Ruiz 0337a1d6db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3079-export_production
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 14:17:50 +02:00
Carlos Jimenez Ruiz f2f81442d9 fix(cloneWithEntries): endpoint was broken due to production changes 2021-09-02 14:17:35 +02:00
Carlos Jimenez Ruiz 85844973d6 refactor(geolocation): create province now uses autonomy instead of country
gitea/salix/pipeline/head There was a failure building this commit Details
2021-09-02 11:56:59 +02:00
Joan Sanchez 0b704db353 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-09-02 08:56:19 +02:00
Joan Sanchez b68e99b412 fix(invoice): invoicing was throwing a transaction error
gitea/salix/pipeline/head This commit looks good Details
Refs: 3077
2021-09-02 08:55:41 +02:00
Carlos Jimenez Ruiz f5548a82a3 test(clone): invoiceIn clone production trigger broke the test
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 15:02:27 +02:00
Carlos Jimenez Ruiz 158c15afa1 fix(filter): removed fixtures that no longer work due to structure changes 2021-09-01 13:12:32 +02:00
Carlos Jimenez Ruiz ec9c061051 fix(getUpcomingDeliveries) fixtures were broken due to db structure changes
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 12:37:46 +02:00
Joan Sanchez 7a98613ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-09-01 11:48:21 +02:00
Joan Sanchez 0370cbf207 feat(Searchbar): You can now filter by a ticket collection
gitea/salix/pipeline/head This commit looks good Details
Refs: 3068
2021-09-01 11:27:24 +02:00
Javi Gallego d4fc64484a fix
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 16:37:09 +02:00
Carlos Jimenez Ruiz 74a3b5cf89 refactor(basicdata): order basicdata requires address and landed to show agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 14:10:37 +02:00
Carlos Jimenez Ruiz 9cdf34642f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 13:15:37 +02:00
Carlos Jimenez Ruiz 88aada2895 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3047-order_basicdata_valid_agencies 2021-08-31 13:02:24 +02:00
Carlos Jimenez Ruiz 614c23fd77 refactor(basicdata): order basicdata now shows only available agencies 2021-08-31 13:02:14 +02:00
Joan Sanchez 0de6af5633 fix(searchbar): wasn't applying a search by postcode on page refresh
gitea/salix/pipeline/head This commit looks good Details
Refs: #3072
2021-08-31 11:41:42 +02:00
Carlos Jimenez Ruiz c00201b236 corrected a typo 2021-08-31 11:01:14 +02:00
Joan Sanchez a0efe5f896 Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-31 06:27:23 +00:00
Joan Sanchez 17a732e811 Merge branch 'dev' into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:00:02 +00:00
Joan Sanchez 4dc107bc58 Removed console.log()
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:51:02 +02:00
Joan Sanchez 3247f35b90 3075 - Show closure hour from an event
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 14:14:21 +02:00
Carlos Jimenez Ruiz 3e0f2b5c26 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3070_deprecate_item_niches
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 13:31:57 +02:00
Carlos Jimenez Ruiz 52e1df2af5 removed the usage of niches from item index and summary 2021-08-30 13:31:24 +02:00
Carlos Jimenez Ruiz 8a6da66916 removed niche section 2021-08-30 13:31:07 +02:00
Carlos Jimenez Ruiz e6bc856b35 removed niches model, relations and its usages 2021-08-30 13:29:16 +02:00
Joan Sanchez 74dfa9f757 3063 - Get item from card without a name
gitea/salix/pipeline/head This commit looks good Details
2021-08-30 11:23:46 +02:00
Javi Gallego 488ef17559 insert mail
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-27 09:01:21 +02:00
Javi Gallego 072f88d1a5 refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-23 14:47:26 +02:00
Javi Gallego cffe25d41f Merge branch 'dev' into 2995-supplierAccount-modificaciones
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:38:41 +02:00
Javi Gallego bb764e206a test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 12:36:18 +02:00
Javi Gallego d0f0b52b66 minor changes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-18 08:24:07 +02:00
Javi Gallego 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +02:00
Joan Sanchez 23b73aaa41 Merge branch 'dev' into 3038-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 15:28:58 +00:00
Carlos Jimenez Ruiz 7a7bbe2ba8 more module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz cd334bf967 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-13 16:29:15 +02:00
Carlos Jimenez Ruiz 1a045442d4 added acl to goToUser button on client and worker descriptors 2021-08-13 14:53:39 +02:00
Carlos Jimenez Ruiz e1fe2aa5b5 added the claim icon to the ticket summary lines
gitea/salix/pipeline/head Build started... Details
2021-08-13 12:30:22 +02:00
Carlos Jimenez Ruiz d5e40320ae removed unwanted console.log 2021-08-13 12:29:48 +02:00
Javi Gallego 249ea918dd Merge branch 'dev' into 2407-eliminar-trigger-ticketAfterUpdate
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:18:34 +02:00
Joan Sanchez 48e6079527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 08:04:42 +02:00
Joan Sanchez 4aad4ee2e0 3044 - FIX: Load correct tickets on different situations
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 13:55:10 +02:00
Carlos Jimenez Ruiz 2b4afdd04d ticket module transactions + tests 2021-08-12 11:21:59 +02:00
Carlos Jimenez Ruiz 708c0035c0 deprecated changeWorker as it is no longer in use 2021-08-12 11:06:49 +02:00
Carlos Jimenez Ruiz 2c3f46f394 added throw to catch in many tests 2021-08-12 10:55:04 +02:00
Javi Gallego 87fe3c529a Merge branch 'dev' into 2940-invoiceInTax-section 2021-08-12 09:39:35 +02:00
Javi Gallego 92c3a24b1b dash
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 09:24:42 +02:00
Javi Gallego 3b9bdc18bf funciona
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-12 09:23:19 +02:00
Javi Gallego 54634ed22d test okl
gitea/salix/pipeline/head This commit looks good Details
2021-08-12 07:39:26 +02:00
Carlos Jimenez Ruiz da7bda2d0e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-11 16:06:52 +02:00
Joan Sanchez de2bda5284 Removed PDF generation from transaction
gitea/salix/pipeline/head This commit looks good Details
2021-08-11 08:47:05 +02:00
Joan Sanchez 6ed0dcc4c5 Removed exclusion
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 14:28:37 +02:00
Joan Sanchez b3db1cda13 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 13:57:03 +02:00
Joan Sanchez e65e90d00f Global invoicing improvements
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-10 11:48:29 +02:00
Carlos Jimenez Ruiz d4c5d54fa8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3038-module_transactions 2021-08-10 08:29:11 +02:00
Javi Gallego d49242751e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:23:13 +02:00
Javi Gallego 3424fabd5b test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-08-10 08:18:52 +02:00
Joan Sanchez cbaba8a075 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 14:06:23 +02:00
Joan Sanchez 3a45c99594 Merge branch '2985-invoiceOut_manual' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-09 13:00:41 +02:00
Joan Sanchez 8e84f98629 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2984-invoiceOut_global 2021-08-09 12:59:00 +02:00
Carlos Jimenez Ruiz a9b2e45683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual 2021-08-06 13:30:14 +02:00
Carlos Jimenez Ruiz ec6d4b29c1 Merge branch 'dev' into 2954-order_catalog_types
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:48:51 +00:00
Joan Sanchez 9048ce238e Added translation
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:47:46 +02:00
Carlos Jimenez Ruiz 7d442c40ec Merge branch 'dev' into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 10:39:15 +00:00
Joan Sanchez 9911a6d6a2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2985-invoiceOut_manual
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:37:25 +02:00
Joan Sanchez 9dc1168ad2 Transaction refactor
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 12:24:36 +02:00
Carlos Jimenez Ruiz 3432fab6af now shows only the itemType of available items
gitea/salix/pipeline/head This commit looks good Details
2021-08-06 11:53:38 +02:00
Joan Sanchez 886d38ad8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2879-import_buys 2021-08-05 14:33:28 +02:00
Joan Sanchez eba39cc706 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:44:31 +02:00
Joan Sanchez 1b9ca13391 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:42:19 +02:00
Joan Sanchez d4b1105cda Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-08-05 13:39:11 +02:00
Carlos Jimenez Ruiz 870314277f add sale and canbeInvoice refactor + tests 2021-08-05 13:32:35 +02:00
Carlos Jimenez Ruiz 82259eee16 added catalog calculate join to show only available item types
gitea/salix/pipeline/head This commit looks good Details
2021-08-04 11:48:21 +02:00
Carlos Jimenez Ruiz 51a8077f4d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3033-price_and_discount_ticket_sale_popover
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:17:07 +02:00
Carlos Jimenez Ruiz 3d2de99129 vn-popover containing non-descriptor components now relocates correctly for ticket.sale
gitea/salix/pipeline/head This commit looks good Details
2021-08-03 11:16:43 +02:00
Joan Sanchez 41a1b3d909 2984 - Global invoicing endpoint
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-02 13:35:38 +02:00
Carlos Jimenez Ruiz a771fd584f minor refactors + missing transaction on discount
gitea/salix/pipeline/head This commit looks good Details
2021-07-30 10:29:57 +02:00
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted
gitea/salix/pipeline/head This commit looks good Details
2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Joan Sanchez c9f235df97 Merge branch 'dev' into 3032-ticket_card_components_volume_error
gitea/salix/pipeline/head This commit looks good Details
2021-07-28 07:35:28 +00:00
Carlos Jimenez Ruiz 6e3a18a923 removed test for deprecated function
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 18:18:32 +02:00
Carlos Jimenez Ruiz 88ecaff1d2 prevented an error if resultant length is 0
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 16:17:47 +02:00
Carlos Jimenez Ruiz 6d4b97443e autoload refreshes the model when url is set
gitea/salix/pipeline/head There was a failure building this commit Details
2021-07-27 15:59:59 +02:00
Joan Sanchez 8b005ae012 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 12:24:45 +02:00
Joan Sanchez 531937ebbc 2985 - Create a manual invoice from a ticket or client
gitea/salix/pipeline/head This commit looks good Details
2021-07-27 09:07:04 +02:00
Carlos Jimenez Ruiz caedfff34e Merge branch '3014-invoiceIn_clone_from_descriptor' of https://gitea.verdnatura.es/verdnatura/salix into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-07-23 15:18:08 +02:00
Carlos Jimenez Ruiz b837a8c328 fixed a selector for ticket sale 2021-07-23 15:17:30 +02:00
Carlos Jimenez Ruiz 72535f87e1 Merge branch 'dev' into 3014-invoiceIn_clone_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-07-23 12:47:36 +00:00
Carlos Jimenez Ruiz abbce74100 clone invoiceIn from descriptor 2021-07-23 14:06:48 +02:00
Carlos Jimenez Ruiz c1162b1b8a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3023-client_webAccess_block_simultaneous_changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-21 10:07:21 +02:00
Carlos Jimenez Ruiz 0676eb5f30 web access inputs can't be modified together anymore 2021-07-21 10:06:50 +02:00
Joan Sanchez 9d855a80d5 3028 - Added visible column on ticket sales
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 12:33:27 +02:00
Joan Sanchez f24e7cafce Merge branch 'dev' into 2989-client_debt_sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:07:36 +00:00
Joan Sanchez 1b373503a6 Added translation & removed fields property
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 11:07:04 +02:00
Joan Sanchez 3080936963 Merge branch 'dev' into 3025-client_summary_additions
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 08:10:42 +00:00
Joan Sanchez 266ffde86b Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 07:53:56 +00:00
Carlos Jimenez Ruiz af321be095 Merge branch 'dev' into 3026-send_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 07:52:42 +00:00
Carlos Jimenez Ruiz 4cbaf247ed removed unused showfield in model log
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:33:45 +02:00
Joan Sanchez bfd6c995ad 2989 - Added client deb statement sample
gitea/salix/pipeline/head This commit looks good Details
2021-07-20 09:09:46 +02:00
Carlos Jimenez Ruiz 0163b6c21b added agency and route columns to client.summary tickets
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 15:59:39 +02:00
Carlos Jimenez Ruiz e784403fd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3027-itemBotanical_deprecated_column
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 14:46:32 +02:00
Carlos Jimenez Ruiz 29f1f7e89e itemTaxCountry and item bonanical no longer use the bonanical prop 2021-07-19 14:46:18 +02:00
Joan Sanchez 63b502b368 Updated model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 13:01:06 +02:00
Joan Sanchez e9b6c6b63e 3026 - Send invoice PDF
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 12:31:09 +02:00
Carlos Jimenez Ruiz e5b1f47478 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-07-19 11:20:38 +02:00
Joan Sanchez 94b668c01e Filter item from a dialog
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 13:41:29 +02:00
Javi Gallego ee30bc9e1e test fixed
gitea/salix/pipeline/head This commit looks good Details
2021-07-15 12:51:10 +02:00
Carlos Jimenez Ruiz 559eaf5853 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:22:04 +02:00
Carlos Jimenez Ruiz 9f5df91be4 workers without active contract no longer set calendar and timeControl at fault 2021-07-14 11:21:29 +02:00
Joan Sanchez ff71e6f2c7 2879 - Autocomplete item field from imported buys
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 11:14:53 +02:00
Joan Sanchez 675a48d8ad Merge branch 'dev' into 3018-time_control_info
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 08:36:09 +00:00
Carlos Jimenez Ruiz ae4f1d1730 the absences are now fetched alongside the hours
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 10:09:24 +02:00
Javi Gallego c509509963 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-07-14 07:57:22 +02:00
Joan Sanchez 4eabba115f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-13 11:21:26 +02:00
Joan Sanchez ea78db1441 3012 - Hotfix: Get ticket list
gitea/salix/pipeline/head This commit looks good Details
2021-07-13 08:59:36 +02:00
Javi Gallego 3ec8d4583f bug
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:29:53 +02:00
Javi Gallego 2f265760b4 permisos invoceInTax
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:27:36 +02:00
Carlos Jimenez Ruiz 98a691c152 minor changes
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 15:00:20 +02:00
Carlos Jimenez Ruiz 1835171fe8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-more_module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 13:56:58 +02:00
Carlos Jimenez Ruiz 21e34de1dd item module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 12:54:59 +02:00
Carlos Jimenez Ruiz dd3473b93d small refactors correcting constants and adding transactions 2021-07-12 12:50:15 +02:00
Joan Sanchez c0d75e20d8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 08:32:11 +02:00
Joan Sanchez 878e989c02 HOTFIX: Disable address without a province
gitea/salix/pipeline/head This commit looks good Details
2021-07-12 08:29:21 +02:00
Carlos Jimenez Ruiz 3b2b4e3819 client module changes for transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-08 15:53:30 +02:00
Javi Gallego 3ca2dd820d Merge branch 'dev' into 2940-invoiceInTax-section 2021-07-08 08:20:30 +02:00
Javi Gallego d57c71dba7 minor fix 2021-07-08 08:19:30 +02:00
Carlos Jimenez Ruiz 10c7aa70d6 claim module transactions for filter, summary and isEditable 2021-07-05 12:00:49 +02:00
Javi Gallego 2ec2a89f88 test ok 2021-07-03 09:19:03 +02:00
Joan Sanchez ae091a3b11 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:41:45 +02:00
Joan Sanchez 35e3c8ce65 HOTFIX: 3009 - Unlock report button
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:35:24 +02:00
Joan Sanchez 48730be203 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 14:12:37 +02:00
Joan Sanchez 057d138991 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-07-02 13:44:44 +02:00
Joan Sanchez 4849355c9b Changed limit value
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:22:37 +02:00
Joan Sanchez 9ad54b9622 HOTFIX: Renamed 'in' to 'invalue'
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 13:17:48 +02:00
Joan Sanchez eeb9a1861e HOTFIX: Added pagination 2021-07-02 13:10:46 +02:00
Joan Sanchez 249f5074df Show client id
gitea/salix/pipeline/head This commit looks good Details
2021-07-02 10:57:17 +02:00
Carlos Jimenez Ruiz d20b717c1b tested controller modifications accordingly
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 16:19:59 +02:00
Carlos Jimenez Ruiz 0c71b915ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2967-zone_deliverydays_keep_search_on_url 2021-07-01 15:04:45 +02:00
Carlos Jimenez Ruiz 03b1ab0166 Merge branch 'dev' into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 12:30:54 +00:00
Joan Sanchez 3246101574 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 14:03:28 +02:00
Joan Sanchez 319a168b89 Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:43:13 +02:00
Joan Sanchez 92b6318c79 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:31:04 +02:00
Joan Sanchez 79f20a404d Merge branch 'dev' into 3003-worker_sections_without_contract_faults
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 11:18:15 +00:00
Carlos Jimenez Ruiz be850571d9 updated the field name
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 13:14:36 +02:00
Carlos Jimenez Ruiz 243636ccf6 item category name as category
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 12:34:30 +02:00
Carlos Jimenez Ruiz 8cf2b241cd route delivery days now gets params from url 2021-07-01 12:08:48 +02:00
Carlos Jimenez Ruiz 3ea2772e1e Merge branch 'dev' into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 09:54:57 +00:00
Joan Sanchez c8bfc911c2 2974 - Get amount unpaid from customer_risk
gitea/salix/pipeline/head This commit looks good Details
2021-07-01 08:33:56 +02:00
Joan Sanchez 7e836e570f 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 16:10:26 +02:00
Joan Sanchez d30a3490fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2983-ticket_invoice
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 15:21:47 +02:00
Carlos Jimenez Ruiz 4148500c61 workers without active contract no longer set calendar and timeControl at fault
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 14:05:16 +02:00
Carlos Jimenez Ruiz d946750113 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3006-item_filter_category
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 10:48:27 +02:00
Carlos Jimenez Ruiz 2469540f66 item category filter is now working again 2021-06-30 10:48:19 +02:00
Javi Gallego 9054aa0885 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:30:40 +02:00
Javi Gallego 9371c49922 cambios solicitados
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-30 08:26:03 +02:00
Joan Sanchez 33d03c8f21 Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
gitea/salix/pipeline/head This commit looks good Details
2021-06-30 06:15:05 +00:00
Carlos Jimenez Ruiz 08360bfdc4 deprecated alertLevel.alertLevel now using alertLevel.id
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 18:01:33 +02:00
Carlos Jimenez Ruiz 15c7c0cb4b read acl set on the model
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 15:31:58 +02:00
Carlos Jimenez Ruiz a51494e784 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2949-client_basicdata_businesstype 2021-06-29 15:03:56 +02:00
Carlos Jimenez Ruiz 01a9154015 Merge branch 'dev' into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:23:47 +00:00
Carlos Jimenez Ruiz d67e36212f added validation for the dms id field
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 11:59:21 +02:00
Carlos Jimenez Ruiz f30cd1aeda added business type to client basic data
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:51:27 +02:00
Carlos Jimenez Ruiz f3193f0dc1 added businesType model and relation to client 2021-06-29 10:51:01 +02:00
Javi Gallego 59fac7edfa fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 10:33:01 +02:00
Javi Gallego e217f02321 test front
gitea/salix/pipeline/head This commit looks good Details
2021-06-29 08:59:55 +02:00
Carlos Jimenez Ruiz 8ca3e0d120 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 16:45:19 +02:00
Carlos Jimenez Ruiz e2ff3ff17f validation message for dup entry 2021-06-28 13:30:49 +02:00
Joan Sanchez c6504140af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 12:23:11 +02:00
Joan Sanchez 52e6c9d793 CSS fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 12:06:21 +02:00
Carlos Jimenez Ruiz 0e47cf72e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing 2021-06-28 11:19:07 +02:00
Carlos Jimenez Ruiz e054145b49 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2996-route_tickets_recalc
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 10:44:19 +02:00
Carlos Jimenez Ruiz 32d0aa4e10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3002-backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 10:17:30 +02:00
Carlos Jimenez Ruiz e9bcddc29f invoice modules transactions and tests 2021-06-28 10:15:54 +02:00
Joan Sanchez 65ac3fc205 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:58:27 +02:00
Joan Sanchez 66a2563552 Added line break
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-28 08:48:35 +02:00
Joan Sanchez e7dcb54efb Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:33:41 +02:00
Joan Sanchez ef9f3b13e4 html fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-28 08:28:31 +02:00
Carlos Jimenez Ruiz 8b9bfb4ba0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2999-ticket_dms_import_from_existing
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 10:12:52 +02:00
Carlos Jimenez Ruiz 832452df95 ticketDms import 2021-06-25 10:12:41 +02:00
Carlos Jimenez Ruiz 2548fdc891 #3000 add buyer to ticket isEditable 2021-06-25 09:46:18 +02:00
Javi Gallego 02cd2283a7 summary total
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 09:30:24 +02:00
Javi Gallego 82e65ec1c3 rellena campo rate
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 07:47:53 +02:00
Joan Sanchez 0941b2423e 2983 - Invoice tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 13:33:51 +02:00
Joan Sanchez db30ac3175 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 11:40:23 +02:00
Carlos Jimenez Ruiz 3bfc08b117 route.summary order by priority
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 10:06:31 +02:00
Carlos Jimenez Ruiz 320c04b2d3 update volume is not called when add/remove tickets from route
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:54:07 +02:00
Joan Sanchez 362c404aba Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-24 09:16:59 +02:00
Carlos Jimenez Ruiz 6aae09f070 front unit tests final amend
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 14:21:48 +02:00
Carlos Jimenez Ruiz 2da72fc993 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild 2021-06-23 14:20:12 +02:00
Carlos Jimenez Ruiz 12c9f3fd7d Merge branch '2997-export_production' of https://gitea.verdnatura.es/verdnatura/salix into 2997-export_production_rebuild 2021-06-23 14:18:23 +02:00
Joan Sanchez b2feb5227c Merge branch 'dev' into 2974-client_balance
gitea/salix/pipeline/head This commit looks good Details
2021-06-23 12:15:36 +00:00
Carlos Jimenez Ruiz 029b2f2fdd Merge branch 'dev' into 2955-entry_summary_show_receved_sent
gitea/salix/pipeline/head This commit looks good Details
2021-06-23 12:12:37 +00:00
Carlos Jimenez Ruiz 9389bbf779 front unit tests fix
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:32:23 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz c88033a69d deprecated listWorkers endpoint as it was not in use 2021-06-23 13:22:35 +02:00
Joan Sanchez deaade92b0 Shortened packing type
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:27:45 +02:00
Joan Sanchez 256203944e HOTFIX: Prevent error on tickets without state
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 14:11:33 +02:00
Joan Sanchez a1b4164b5d 2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 13:57:32 +02:00
Joan Sanchez 79296ac857 2974 - Client balance default company and fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 11:57:43 +02:00
Carlos Jimenez Ruiz 565f343e19 added isDelivered, isReceived and removed travel descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-22 09:39:33 +02:00
Carlos Jimenez Ruiz 0421fd8828 back end unit tests for zone endpoints
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 15:04:23 +02:00
Carlos Jimenez Ruiz b651fdebe6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 14:35:01 +02:00
Joan Sanchez 8c0171096f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2742--invoiceIn-create
gitea/salix/pipeline/head This commit looks good Details
2021-06-21 09:19:00 +00:00
Carlos Jimenez Ruiz 48a2bb7b10 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions 2021-06-21 09:08:03 +02:00
Carlos Jimenez Ruiz 05c630533a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:38:33 +02:00
Joan Sanchez 8f24c3f39b Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 14:34:48 +00:00
Joan Sanchez 9506a8fd90 Disabled sortable column
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:34:34 +02:00
Joan Sanchez 6acf922d3b Merge branch 'dev' into 2980-invoiceIn_fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 14:15:42 +00:00
Joan Sanchez dd7f37e36c Merge pull request 'added ticket.nickname to basicdata' (#663) from 2960-ticket_basicdata_add_alias into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2021-06-18 14:15:15 +00:00
Joan Sanchez a4f20daf17 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 16:14:30 +02:00
Joan Sanchez a50eebfed4 Replaced salesPerson by packages column 2021-06-18 16:07:13 +02:00
Carlos Jimenez Ruiz 4656b2e25a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2960-ticket_basicdata_add_alias
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:54:41 +02:00
Carlos Jimenez Ruiz 1afae3d56d address nickname now gets updated when client or address updates 2021-06-18 15:54:33 +02:00
Carlos Jimenez Ruiz ba0fdcd743 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2973-module_zone_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 15:05:10 +02:00
Carlos Jimenez Ruiz 82cb9ed749 zone module endpoints now have transactions 2021-06-18 15:05:03 +02:00
Joan Sanchez 20e933ed07 2980 - Invoice in fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 13:29:59 +02:00
Joan Sanchez 0ff114ff36 Ammends
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 12:32:37 +02:00
Joan Sanchez c622f24b0a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 11:12:58 +02:00
Carlos Jimenez Ruiz e74f1f109e Merge branch 'dev' into 2906-deliveryNote_packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:27:46 +00:00
Joan Sanchez 325afe2245 2906 - Number of packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:42:55 +02:00
Joan Sanchez b36b48f4b3 Merge branch 'dev' into 2874-timeEntry_direction
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 06:04:33 +00:00
Joan Sanchez bc7c288742 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:03:55 +02:00
Joan Sanchez 8695fadc18 Merge branch 'dev' into 2948-ticket_sale_itemPackingType
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 05:21:01 +00:00
Javi Gallego a6c093cf16 Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 07:07:52 +02:00
Joan Sanchez bbbf008076 Added done() to async beforeAll()
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 16:09:17 +02:00
Joan Sanchez bb80621890 2874 - Edit time entry direction
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-17 15:09:04 +02:00
Carlos Jimenez Ruiz b906a8e91d added ticket.nickname to basicdata
gitea/salix/pipeline/head This commit looks good Details
2021-06-17 11:52:12 +02:00
Javi Gallego e2f32a60fd cambio campos en front 2021-06-17 07:30:22 +02:00
Javi Gallego dc0212d2fc chip
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 18:36:42 +02:00
Carlos Jimenez Ruiz 7370269e4d ticket.sale now shows Packing type 2021-06-16 17:06:11 +02:00
Carlos Jimenez Ruiz 47ad63c154 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2928-entry_latestsbuys_weight
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 12:29:46 +02:00
Carlos Jimenez Ruiz 588a499c44 editLatestsBuys now is called only with id and itemFk 2021-06-16 12:29:40 +02:00
Carlos Jimenez Ruiz f5ad0c9c1c Merge branch 'dev' into 2961-summary_tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:18:47 +00:00
Joan Sanchez 447d8341e7 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:49:12 +00:00
Joan Sanchez 76623d8c95 Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:45 +00:00
Joan Sanchez 0ce782a4de Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:40:00 +02:00
Joan Sanchez 3e938fa9fb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:15:17 +02:00
Carlos Jimenez Ruiz b9cdc5ed6a Merge branch 'dev' into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 08:19:01 +00:00
Joan Sanchez efc9edb384 Fixes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 10:13:06 +02:00
Joan Sanchez df94190a8c Removed console log 2021-06-16 09:59:54 +02:00
Carlos Jimenez Ruiz 34e0d0b7cf translations update
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:50:32 +02:00
Joan Sanchez 225bfd09b9 Missing translation
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:47:54 +02:00
Joan Sanchez c10f792619 Merge branch 'dev' into 2929-entry_latestsbuys_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:44:30 +00:00
Joan Sanchez 353d0e352d 2961 - Show tickets on summary
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 09:43:07 +02:00
Joan Sanchez 55908c0fca Merge branch 'dev' into 2941-salesMonitor_changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 07:41:16 +00:00
Carlos Jimenez Ruiz 1a053942a1 Merge branch 'dev' into 2963-creditInsurance_acl
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:41:52 +00:00
Carlos Jimenez Ruiz 8c1df0743d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2965-delete_travel_from_descriptor
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 16:41:12 +02:00
Carlos Jimenez Ruiz 8aa3d269ea Travel descriptor now shows delete option if there are no entries 2021-06-15 16:41:01 +02:00
Joan Sanchez 9591f04853 Merge branch 'dev' into 2938-entry_buy_style
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:18:59 +00:00
Joan Sanchez 92e8f528e8 2963 - Show section to all employee
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 14:16:12 +02:00
Joan Sanchez 2469409068 2941 - Monitor changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 13:48:42 +02:00
Carlos Jimenez Ruiz db3d5ca4d8 added missing html closing tag
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 13:14:21 +02:00
Carlos Jimenez Ruiz 7004ad5ade removed several columns from bulk edit and added packingOut
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 12:47:40 +02:00
Javi Gallego 500b68162b summary con chip
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 09:58:21 +02:00
Javi Gallego 5369e8d97e Merge branch 'dev' into 2940-invoiceInTax-section
gitea/salix/pipeline/head This commit looks good Details
2021-06-15 09:09:08 +02:00
Javi Gallego a8e01909d0 ancho ok 2021-06-15 09:02:00 +02:00
Carlos Jimenez Ruiz 9c0cff2f3a removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 16:09:28 +02:00
Carlos Jimenez Ruiz 88a5443d64 table style changes
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 15:52:46 +02:00
Carlos Jimenez Ruiz e85b7b9817 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination 2021-06-14 12:07:54 +02:00
Carlos Jimenez Ruiz cdbab4d7bf Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 10:00:47 +00:00
Carlos Jimenez Ruiz c09d25ba48 Merge branch 'dev' into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:59:13 +00:00
Joan Sanchez 59e90c2c10 Removed commented block
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:58:39 +02:00
Joan Sanchez 722c9ad4d4 Merge branch 'dev' into 2957-ticket_summary_postcode
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:42:40 +00:00
Carlos Jimenez Ruiz 7f69909bbd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2931-entry_summary_pagination
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 11:39:04 +02:00
Carlos Jimenez Ruiz f36b54f97b invoiceOut summary tickets pagination + refactor 2021-06-14 11:38:57 +02:00
Joan Sanchez a303b98093 Merge branch 'dev' into 2933-route_tickets_new_ticket_to_route
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:37:23 +00:00
Javi Gallego 44ce54ede4 seccion en summary
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 09:47:04 +02:00
Joan Sanchez de30a2d978 Total holidays fix
gitea/salix/pipeline/head This commit looks good Details
2021-06-14 08:09:53 +02:00
Carlos Jimenez Ruiz 5d8a9938d6 formattedAddress tests amended for postcode 2021-06-13 19:16:35 +02:00
Carlos Jimenez Ruiz 48f80fad8f added postcode to summary + basic data translation 2021-06-13 19:11:05 +02:00
Carlos Jimenez Ruiz 7bf832079d route.tickets suggested tickets now shows both descriptors
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 13:02:18 +02:00
Joan Sanchez 17a6dfc81b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:40 +02:00
Joan Sanchez a72010554c Fixes and E2E updated
gitea/salix/pipeline/head This commit looks good Details
2021-06-11 10:58:00 +02:00
Carlos Jimenez Ruiz c776d34cdf invoiceIn basic data and summary added some fields
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 17:08:21 +02:00
Joan Sanchez e8fd1c9c9c Merge branch 'dev' into 2951-fix_unit_test
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 14:24:17 +00:00
Joan Sanchez be791d1f00 2951 - Added transaction to updateVolume() method
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:08:44 +02:00
Joan Sanchez 3f3e5c2735 Unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 16:05:10 +02:00
Joan Sanchez 1b62233ea7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-10 14:22:13 +02:00
Joan Sanchez 8284702603 2567 - Working calendar refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-10 11:24:32 +02:00
Carlos Jimenez Ruiz fc3af7b6a6 ticket expedition now shows scan worker and scanned date
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 14:25:50 +02:00
Javi Gallego acf03959f5 creada seccion invoiceInTax
gitea/salix/pipeline/head This commit looks good Details
2021-06-09 10:20:18 +02:00
Carlos Jimenez Ruiz f969323a86 ticket create now takes clientFk from params
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 17:30:00 +02:00
Joan Sanchez 3c8629b3f3 Added entilementRate effects
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-08 16:36:16 +02:00
Carlos Jimenez Ruiz 76e723cc34 Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 07:47:42 +00:00
Javi Gallego 8878a2280a models
gitea/salix/pipeline/head This commit looks good Details
2021-06-08 08:04:38 +02:00
Carlos Jimenez Ruiz 238975644f Merge branch 'dev' into 2943-timecontrol_now_showing_hours
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 13:02:27 +00:00
Carlos Jimenez Ruiz 3894fe94ec Merge branch 'dev' into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 13:02:20 +00:00
Joan Sanchez 8fa64122f8 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-07 14:58:24 +02:00
Carlos Jimenez Ruiz a46fef5295 endpoint minor refactor
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 14:26:34 +02:00
Carlos Jimenez Ruiz 8fd7faa47b fixed bug module importation + rewritten tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 11:12:56 +02:00
Javi Gallego c90fa41fae accountingType.isAutoConciliated == true
gitea/salix/pipeline/head This commit looks good Details
2021-06-07 07:57:46 +02:00
Carlos Jimenez Ruiz 647b7a93cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 17:16:10 +02:00
Carlos Jimenez Ruiz b38605442e transactions for entry module endpoints 2021-06-04 17:16:02 +02:00
Joan Sanchez c853cfc86f Refactor 2021-06-04 15:49:48 +02:00
Joan Sanchez 2c0fc7e45e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:37 +02:00
Joan Sanchez 6b65aa87d8 HOTFIX: Max width for client name field
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 11:46:09 +02:00
Joan Sanchez b77ecc2c06 changes2 2021-06-04 11:45:35 +02:00
Joan Sanchez f8df3f1f3d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2567-calendar_rework 2021-06-04 11:10:43 +02:00
Joan Sanchez 651a9356f3 Merge branch 'dev' into 2932-invoiceIn_log
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 07:54:18 +00:00
Javi Gallego 2604c81533 falta solucionar test
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-04 08:24:33 +02:00
Joan Sanchez e1c1bb8425 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-04 08:00:08 +02:00
Joan Sanchez 8bb254e93f HOTFIX: Ticket monitor clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:29:45 +02:00
Joan Sanchez edf18938a6 HOTFIX: clientGetDebt
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:21:43 +02:00
Carlos Jimenez Ruiz b0bed3c1c4 invoiceInLog section, model and table
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 16:14:52 +02:00
Joan Sanchez d1daed3540 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 13:39:51 +02:00
Joan Sanchez 5962a68d15 HOTFIX: Sort by zone hour
gitea/salix/pipeline/head This commit looks good Details
2021-06-03 12:40:27 +02:00
Joan Sanchez 3fcd78e1f3 Changes 2021-06-03 11:00:40 +02:00
Carlos Jimenez Ruiz 86631c84d0 moved transferor from fiscal data to basic data + e2e
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 17:35:30 +02:00
Joan Sanchez 655380a52c Removed focus
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:33:10 +02:00
Joan Sanchez 07026a68bb #2934 - HOTFIX: Route suggested tickets
gitea/salix/pipeline/head This commit looks good Details
2021-06-02 10:29:56 +02:00
Joan Sanchez a594e63566 Chip color
gitea/salix/pipeline/head This commit looks good Details
2021-06-01 11:39:40 +02:00
Javi Gallego 70fc260eae vnConfig solucionado
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-01 10:10:09 +02:00
Javi Gallego 3a5d84b34c rutas reparadas
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-31 08:21:16 +02:00
Joan Sanchez a24cfe0087 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 09:42:27 +00:00
Joan Sanchez 27cd54bef1 Updated icons title
gitea/salix/pipeline/head This commit looks good Details
2021-05-27 11:41:45 +02:00
Joan Sanchez 920e7b1daf E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 13:05:58 +02:00
Carlos Jimenez Ruiz 3f167de10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2801_ticket_sale_restrictions
gitea/salix/pipeline/head This commit looks good Details
2021-05-26 09:14:30 +02:00
Carlos Jimenez Ruiz d6ef5352a2 sale module now has canEdit endpoint to check arrays of sales 2021-05-26 09:14:18 +02:00
Joan Sanchez 099ff657e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 14:08:02 +02:00
Joan Sanchez f6a0bcb12c Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 13:33:17 +02:00
Joan Sanchez 26cc3a3dec 2891 - Show problems on tickets sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-25 10:01:18 +02:00
Carlos Jimenez Ruiz e418d6239b fixed getSummary unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 11:28:23 +02:00
Carlos Jimenez Ruiz 2a4ff5a97b fixed a problem where warehouseFk wasn't yet defined upon updateStock call
gitea/salix/pipeline/head This commit looks good Details
2021-05-24 10:31:51 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 5c18c5c94c ticket module descriptor now takes warehouseFk from the ticket 2021-05-21 15:31:28 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez 60185bdf34 Merge branch 'dev' into 2891-ticket_sale_problems
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 07:24:34 +00:00
Joan Sanchez a103c8d7fc 2891 - Get ticket problems for every sale
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 08:49:32 +02:00
Joan Sanchez 6f245698f2 Merge branch 'dev' into 2620-mostrar-disponible
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 06:29:43 +00:00
Joan Sanchez b7049122fe Url fix
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 10:28:37 +02:00
Joan Sanchez fbc11b7a39 Merge branch 'dev' into 2921-notification_url
gitea/salix/pipeline/head This commit looks good Details
2021-05-20 08:23:45 +00:00
Javi Gallego df073cce2f refactor tod usa get sales
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 17:04:13 +02:00
Carlos Jimenez Ruiz 2494af0113 removed unused relation from item @addSale 2021-05-19 15:33:35 +02:00
Carlos Jimenez Ruiz 5eb0ab8296 add and edit sales no longer intervene the prices
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 15:25:49 +02:00
Carlos Jimenez Ruiz 72a0b774de add and get sales now sets item.price from packaging for EMB items
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 14:15:28 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Joan Sanchez 714142f868 Merge branch 'dev' into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:53:33 +00:00
Joan Sanchez 98d7f246a4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:38 +02:00
Joan Sanchez a9e33abacc FIX: Show employee list
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 14:44:24 +02:00
Carlos Jimenez Ruiz e10dc53a9c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text 2021-05-18 14:22:36 +02:00
Joan Sanchez 3402bd119d Css fixes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:46:43 +02:00
Carlos Jimenez Ruiz 06d396a76a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2908-label_value_full_text
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 13:22:57 +02:00
Carlos Jimenez Ruiz c0e2ff12da moved vn-log to salix components + css changes and renamed worker-log to log 2021-05-18 13:22:40 +02:00
Joan Sanchez 5c760b3faa Max height
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 12:21:01 +02:00
Joan Sanchez b87e79b9d3 Changes 2021-05-18 11:58:32 +02:00
Joan Sanchez 6ec28cbc86 Removed transaction block 2021-05-18 11:58:32 +02:00
Joan Sanchez bc7f2d8193 Responsive 2021-05-18 11:58:32 +02:00
Joan Sanchez bb67277c68 #2913, #2914 - Changes to sales monitors 2021-05-18 11:58:32 +02:00
Joan Sanchez 400bf7b4f2 Changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:05:13 +02:00
Joan Sanchez 5d278f416f Removed transaction block
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 10:04:01 +02:00
Joan Sanchez bf250b77ef Responsive
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 09:12:47 +02:00
Joan Sanchez 10387ee40b #2913, #2914 - Changes to sales monitors
gitea/salix/pipeline/head This commit looks good Details
2021-05-18 08:41:36 +02:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 12:27:26 +02:00
Carlos Jimenez Ruiz e848b94859 removed LEFT from join
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:42:48 +02:00
Carlos Jimenez Ruiz 3a25dbc3b1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 09:05:15 +02:00
Joan Sanchez 085a5a104b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 08:39:55 +02:00
Joan Sanchez b67c95e5f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:38:04 +02:00
Joan Sanchez 378175224c HOTFIX: Buyer ACL
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 07:24:24 +02:00
Carlos Jimenez Ruiz b902a4dd4a front unit test fix 2021-05-14 19:56:54 +02:00
Carlos Jimenez Ruiz 97e9dc57bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-14 19:22:15 +02:00
Carlos Jimenez Ruiz 1e8ab4d348 added transactions to several endpoints 2021-05-14 19:21:04 +02:00
Joan Sanchez e45af1c60a Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 13:56:04 +02:00
Joan Sanchez c0f2590b61 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-14 12:56:10 +02:00
Joan Sanchez e39758ee16 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:46:54 +02:00
Joan Sanchez a70b29f9bf #2916 - HOTFIX: Grouping selection limit
gitea/salix/pipeline/head This commit looks good Details
2021-05-14 12:44:23 +02:00
Carlos Jimenez Ruiz 2b83abeefd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2896-route_tickets_refactor 2021-05-14 10:13:02 +02:00
Joan Sanchez c4357ea577 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 12:27:01 +02:00
Joan Sanchez e6f7ef41b0 Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 12:21:12 +02:00
Joan Sanchez ac02f8b309 Ticket request hotfix 2021-05-13 12:18:21 +02:00
Joan Sanchez 24981912e4 2907 - Proper claim rate percentage 2021-05-13 12:13:15 +02:00
Joan Sanchez 6fdb91fdc8 Removed line
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 10:20:22 +02:00
Carlos Jimenez Ruiz 95666ccc1d Merge branch 'dev' into 2905-restore_ticket_date
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 07:44:01 +00:00
Joan Sanchez 4a1d286a95 2907 - Proper claim rate percentage
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 09:17:49 +02:00
Joan Sanchez af49a66911 Unit test fix
gitea/salix/pipeline/head This commit looks good Details
2021-05-13 08:57:49 +02:00
Joan Sanchez e6e91ced99 2905 - Restore ticket shipped and landed 2021-05-13 08:56:26 +02:00
Joan Sanchez 8af66a7ca5 HOTFIX: Sort by column
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 15:11:07 +02:00
Joan Sanchez b3cbf9374c Hotfix: Catalog items without ink
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 14:22:29 +02:00
Joan Sanchez 9363726d67 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 13:37:01 +02:00
Joan Sanchez 873fc54dff More ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 13:18:58 +02:00
Joan Sanchez 65f0cb4612 More ammends 2021-05-12 13:14:41 +02:00
Joan Sanchez 6f5df10413 Removed controller
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 13:06:36 +02:00
Joan Sanchez eecba426ee Removed unused class 2021-05-12 13:00:54 +02:00
Joan Sanchez b828609d33 Ammends
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:39:45 +02:00
Joan Sanchez 2e7d56cc26 Test fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-12 12:11:27 +02:00
Carlos Jimenez Ruiz 83d6581349 indentation correction 2021-05-12 09:52:04 +02:00
Carlos Jimenez Ruiz 457d23dc16 reoute tickets order columns + endpoint refactor 2021-05-12 09:51:32 +02:00
Joan Sanchez e22da9b0d5 Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 07:14:08 +00:00
Joan Sanchez 88616862cb Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-05-12 09:12:46 +02:00
Carlos Jimenez Ruiz d4eedc69e1 indentation on route filter 2021-05-11 12:53:08 +02:00
Joan Sanchez 6ae8b72268 Merge branch 'dev' into 2902-error-getSuggestedTickets
gitea/salix/pipeline/head This commit looks good Details
2021-05-11 09:52:42 +00:00
Joan Sanchez d2169000f4 Merge branch 'dev' into 2863-monitor_module
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 07:46:18 +00:00
Joan Sanchez dc44af148d 2863 - Added sales monitor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-05-11 09:43:15 +02:00
Carlos Jimenez Ruiz ac917b6115 mino changes on translations
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:46:17 +02:00
Carlos Jimenez Ruiz 58447c8168 transaltion changes
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:39:51 +02:00
Carlos Jimenez Ruiz 657896bce0 increased section width
gitea/salix/pipeline/head This commit looks good Details
2021-05-10 10:32:00 +02:00
Javi Gallego 84cd89d7f7 modifica la descripcion de la compensacion
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 08:45:20 +02:00
Javi Gallego 19b35f5f6c landed en lugar de shipped
gitea/salix/pipeline/head This commit looks good Details
2021-05-07 07:52:03 +02:00
Javi Gallego f1c30ca6d1 cambio landed por created
gitea/salix/pipeline/head This commit looks good Details
2021-05-06 08:13:17 +02:00
Carlos Jimenez Ruiz 245243aa14 routes without vehicle or vehicles without drop off now throw
gitea/salix/pipeline/head This commit looks good Details
2021-05-05 13:36:54 +02:00
Joan Sanchez db148c8177 2863 - Added monitor module
gitea/salix/pipeline/head This commit looks good Details
2021-05-04 12:44:21 +02:00
Joan Sanchez 1efe8cb683 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2727-supplier_consumption
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 14:03:41 +02:00
Carlos Jimenez Ruiz 47e36913a1 Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 11:55:55 +00:00
Joan Sanchez 8f3d2d892d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:13:20 +02:00
Joan Sanchez 03e77685a1 SMS hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-05-03 12:09:12 +02:00
Joan Sanchez 4d90006aa6 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 14:27:50 +02:00
Joan Sanchez 07dbeaf515 2727 - Send consumption report to an email address
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-30 13:50:41 +02:00
Joan Sanchez fcc8ab4236 Added model ACL
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 10:08:40 +02:00
Joan Sanchez dbe22844a6 Removed unused method
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 09:53:20 +02:00
Joan Sanchez 5445764043 Added supplier address fixtures
gitea/salix/pipeline/head This commit looks good Details
2021-04-30 08:26:05 +02:00
Joan Sanchez 61a63ad76f Merge branch 'dev' into 2770-supplier_address
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 12:42:42 +00:00
Joan Sanchez 330b6bdf8a 2770 - Added supplier addresses section
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 14:41:10 +02:00
Joan Sanchez 5a53cb09da Create receipt button changed role to salesAssistant
gitea/salix/pipeline/head This commit looks good Details
2021-04-29 08:48:11 +02:00
Carlos Jimenez Ruiz eea8ed9a3c front unit test entry import buys fix
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 22:56:02 +02:00
Carlos Jimenez Ruiz 3c280eed2e e2e path for entry buy after entry import path
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-28 18:29:29 +02:00
Carlos Jimenez Ruiz 9ef4497ea6 translations and tittles
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 12:11:49 +02:00
Carlos Jimenez Ruiz d3b22d7078 controller refactor to remove repeated code
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 11:55:04 +02:00
Carlos Jimenez Ruiz e53298f35c test new uses transaction
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 11:24:02 +02:00
Carlos Jimenez Ruiz ddc19ddbcd enpoint now receives all data for a buy + css refactor 2021-04-28 11:15:02 +02:00
Carlos Jimenez Ruiz 65457d6dac Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2167-entry_buy
gitea/salix/pipeline/head This commit looks good Details
2021-04-28 10:32:35 +02:00
Carlos Jimenez Ruiz daa94e4eb5 entry buy index 2021-04-28 10:32:24 +02:00
Javi Gallego 9ee1385cd1 test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-26 12:33:33 +02:00
Javi Gallego 2395a0af63 done 2021-04-26 12:24:16 +02:00
Javi Gallego 4a7a4f6dcf test ok
gitea/salix/pipeline/head This commit looks good Details
2021-04-22 09:06:08 +02:00
Carlos Jimenez Ruiz 0abb8f2d5f Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-21 13:21:16 +00:00
Carlos Jimenez Ruiz 94cd6cfb3e watcher aint looking after data changed to disable test conn button
gitea/salix/pipeline/head This commit looks good Details
2021-04-19 13:23:08 +02:00
Carlos Jimenez Ruiz 857c508391 Merge branch 'dev' into 2729-prices_popover
gitea/salix/pipeline/head This commit looks good Details
2021-04-19 07:59:09 +00:00
Javi Gallego cd4f93f326 minor fixes
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 18:35:03 +02:00
Javi f7fa363fa5 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 18:32:00 +02:00
Carlos Jimenez Ruiz 420f05bb03 mocked api client due to service instability
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 12:40:41 +02:00
Carlos Jimenez Ruiz 56ec7b4729 input number made wider
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 10:17:59 +02:00
Carlos Jimenez Ruiz 9a4c056059 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2729-prices_popover 2021-04-16 10:07:18 +02:00
Carlos Jimenez Ruiz 17904c4edb only undo and save buttons are disabled until data changed now
gitea/salix/pipeline/head This commit looks good Details
2021-04-16 09:20:02 +02:00
Joan Sanchez 2cdafeecf4 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 14:30:47 +02:00
Joan Sanchez bf976a3e8f 2729 - Prices popover refactor 2021-04-15 14:30:30 +02:00
Carlos Jimenez Ruiz 2ebd812a1f updated model + translations
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 11:54:40 +02:00
Carlos Jimenez Ruiz 41ab1bbe35 fixed a test where invoiceIn was nested into the summary
gitea/salix/pipeline/head This commit looks good Details
2021-04-15 10:50:10 +02:00
Carlos Jimenez Ruiz 38f43eca3b invoiceIn basicData + index preview of summary 2021-04-15 10:47:39 +02:00
Carlos Jimenez Ruiz 69069d5e28 invoiceIn summary frontend 2021-04-15 10:46:23 +02:00
Carlos Jimenez Ruiz ec378a17ae invoiceIn model updated a summary registered 2021-04-15 10:45:27 +02:00
Carlos Jimenez Ruiz 8faa1531c6 summary route + test 2021-04-15 10:44:25 +02:00
Carlos Jimenez Ruiz d8628379dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2744-invoiceIn-module_rdy_n_summary 2021-04-14 11:11:40 +02:00
Carlos Jimenez Ruiz b2ecd7d3c2 Merge branch 'dev' into 2878-activeWorkers_refactor
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 08:15:06 +00:00
Joan Sanchez dac95805e8 2882 - Replaced worker userFk property by user id
gitea/salix/pipeline/head This commit looks good Details
2021-04-14 09:02:08 +02:00
Joan Sanchez 78313bd9a7 Updated unit tests 2021-04-14 08:15:03 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Carlos Jimenez Ruiz 01f0fed0c3 Merge branch 'dev' into 2483-email_replyTo
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 08:41:56 +00:00
Joan Sanchez 7033ec2c11 Added missing translations
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 10:39:42 +02:00
Carlos Jimenez Ruiz 90a7c803fd descriptor invoiceIn amount 2021-04-12 16:32:13 +02:00
Carlos Jimenez Ruiz b6f31d7d44 invoiceIn descriptor implementation 2021-04-12 12:43:17 +02:00
Carlos Jimenez Ruiz 6f0c48847a Merge branch 'dev' into 2815-ticket_without_state
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 11:53:25 +00:00
Joan Sanchez af0307a419 2859 - Force translation for SMS
gitea/salix/pipeline/head This commit looks good Details
2021-04-08 13:39:11 +02:00
Joan Sanchez 418d7a2d12 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 14:14:31 +02:00
Joan Sanchez e40911e833 2815 - Fix ticket without state
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 13:39:36 +02:00
Joan Sanchez 465955d0c5 2483 - Added replyTo param when sending an email to client
gitea/salix/pipeline/head There was a failure building this commit Details
2021-04-07 13:09:53 +02:00
Carlos Jimenez Ruiz 2d041142c3 Merge branch 'dev' into 2631-notify_incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 09:30:05 +00:00
Joan Sanchez 93399d6de6 Updated description
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 11:18:44 +02:00
Joan Sanchez 6c36ab3905 Removed back button
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 10:47:31 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Joan Sanchez 65dc0e3780 2615 - Waste breakdown
gitea/salix/pipeline/head This commit looks good Details
2021-04-06 13:46:38 +02:00
Joan Sanchez 5ef3ff40ce Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-06 09:14:11 +02:00
Joan Sanchez a2144405ab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 17:04:37 +02:00
Joan Sanchez 9bbf43c590 Replace http with https
gitea/salix/pipeline/head This commit looks good Details
2021-04-02 14:34:16 +02:00
Javi Gallego 47a3779c45 Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:39:18 +02:00
Javi Gallego 336472291d test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 18:38:40 +02:00
Javi Gallego eec901684a reviso test
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 17:36:27 +02:00
Carlos Jimenez Ruiz 893de63f74 Merge branch 'dev' into 2866-descriptor_photo
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:51:05 +00:00
Joan Sanchez b4cceff4cb 2866 - Limit descriptor photo size to width 100%
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:20:00 +02:00
Joan Sanchez fa0b01a0d5 Fixed buttons alignment
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 14:00:34 +02:00
Joan Sanchez 91c26ee5a5 Removed filter import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:55:01 +02:00
Joan Sanchez 389f10bda0 Removed entry import
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:51:55 +02:00
Joan Sanchez f89419962d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2589-entry_index 2021-04-01 13:42:38 +02:00
Javi Gallego 67f822ebdc Merge branch 'dev' into 2873-create-supplier-beneficiary
gitea/salix/pipeline/head This commit looks good Details
2021-04-01 13:14:26 +02:00
Joan Sanchez 41ee6e70a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2615-waste_detail 2021-04-01 08:42:02 +02:00
Javi Gallego c036c7c7fe model ok
gitea/salix/pipeline/head This commit looks good Details
2021-03-31 07:33:00 +02:00
Carlos Jimenez Ruiz 694055f85c width changed from medium to large
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 16:19:54 +02:00
Carlos Jimenez Ruiz 75155c796d removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:59:30 +02:00
Carlos Jimenez Ruiz 4207bfcc70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 15:19:38 +02:00
Carlos Jimenez Ruiz 061626e521 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2855-claim_module_backend_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 14:51:05 +02:00
Carlos Jimenez Ruiz 847e0bd2c8 tests fixed for production sneaky changes 2021-03-30 14:43:21 +02:00
Joan Sanchez e2a9a64f88 #2871 and #2868. Included ticket filter unit test 2021-03-30 11:20:26 +02:00
Joan Sanchez 4aa616601e 2615 - Waste changes 2021-03-30 10:28:44 +02:00
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz dbf5296041 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2869-getSuggestedTickets_started_to_created
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:56:12 +02:00
Carlos Jimenez Ruiz 70f6728c8f started to created date changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 09:55:51 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +02:00
Joan Sanchez eddd769af0 Excluded unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 08:39:33 +02:00
Joan Sanchez 3f0fe15763 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:34 +02:00
Joan Sanchez dbb6ccd89d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:50:16 +02:00
Joan Sanchez 13d71b590a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:33:49 +02:00
Joan Sanchez 407c0e6280 Supplier "Contacts" changes
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 07:33:20 +02:00
Joan Sanchez 320e3143cd Ticket filter hotfix
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:51:14 +01:00
Joan Sanchez 4dbcc0dd5c HOTFIX: Ticket filter changed ticketGetTotal() args
gitea/salix/pipeline/head This commit looks good Details
2021-03-26 12:32:32 +01:00