Commit Graph

777 Commits

Author SHA1 Message Date
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
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 78a98cd6b7 shrink-datetime
gitea/salix/pipeline/head There was a failure building this commit Details
2021-08-15 08:35:14 +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
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 2c3f46f394 added throw to catch in many tests 2021-08-12 10:55:04 +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
Carlos Jimenez Ruiz 0676eb5f30 web access inputs can't be modified together anymore 2021-07-21 10:06:50 +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 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
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
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 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
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 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
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
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 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
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
Javi Gallego 82e65ec1c3 rellena campo rate
gitea/salix/pipeline/head This commit looks good Details
2021-06-25 07:47:53 +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
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 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 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
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 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
Joan Sanchez 325afe2245 2906 - Number of packages
gitea/salix/pipeline/head This commit looks good Details
2021-06-18 08:42:55 +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 0ce782a4de Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-06-16 11:40:00 +02:00
Joan Sanchez df94190a8c Removed console log 2021-06-16 09:59:54 +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 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
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
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 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
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 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02: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 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
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 24981912e4 2907 - Proper claim rate percentage 2021-05-13 12:13:15 +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 f1c30ca6d1 cambio landed por created
gitea/salix/pipeline/head This commit looks good Details
2021-05-06 08:13:17 +02: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
Javi Gallego 2395a0af63 done 2021-04-26 12:24:16 +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
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
Joan Sanchez 7033ec2c11 Added missing translations
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 10:39:42 +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 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
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 e767e95729 Loggable fixes
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 13:09:35 +01:00
Joan Sanchez 32805dbafb Added model unit test
gitea/salix/pipeline/head This commit looks good Details
2021-03-24 12:45:26 +01:00
Joan Sanchez b3d333368b #2819 - Notify worker assignment
gitea/salix/pipeline/head This commit looks good Details
2021-03-23 16:19:45 +01:00
Carlos Jimenez Ruiz 2b8286eb28 deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good Details
2021-03-12 17:15:26 +01:00
jorgebl 77d8388c43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-22 09:59:38 +01:00
Jorge Padawan aa29f546ae put global bank entity model
gitea/salix/pipeline/head This commit looks good Details
2021-02-17 15:05:17 +01:00
Jorge Padawan 2296727f8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-16 08:32:24 +01:00
Javi Gallego 7c0e690f8f sin console
gitea/salix/pipeline/head This commit looks good Details
2021-02-15 14:34:13 +01:00
Jorge Padawan bf3391f7f2 added test of lastActiveTickets
gitea/salix/pipeline/head This commit looks good Details
2021-02-15 13:20:17 +01:00
Jorge Padawan 4e36fd118e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-15 10:45:46 +01:00
Javi Gallego 737f5a1c91 Merge branch 'dev' into refactor-loopback-context
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 18:11:50 +01:00
Jorge Padawan 4bcb948aff Updated code for better read 2021-02-12 16:41:29 +01:00
Javi Gallego a3d7fc9313 done
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 13:18:02 +01:00
Jorge Padawan 1512a34a73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head This commit looks good Details
2021-02-12 11:57:54 +01:00
Jorge Padawan bb02a0de6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-10 16:59:29 +01:00
Javi Gallego 3a3dae179c done
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-10 07:58:11 +01:00
Jorge Padawan 25de8904b6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-05 13:04:52 +01:00
Jorge Padawan 8dc291798f Added tooltip on address and removed workhouse 2021-02-05 13:04:32 +01:00
Joan Sanchez 3f4ebdebf6 Merge branch 'dev' into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 08:22:34 +00:00
Javi Gallego a08c5c6ff7 error de ruta arreglado
gitea/salix/pipeline/head This commit looks good Details
2021-02-01 10:51:17 +01:00
Jorge Padawan 7408d22b66 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date 2021-02-01 09:05:06 +01:00
Jorge Padawan 9cf5d73be7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2723-Format_emails_for_summaries
gitea/salix/pipeline/head This commit looks good Details
2021-01-29 16:15:26 +01:00
Carlos Jimenez Ruiz c442eaa0c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2517-clientBalanceCompensaciones 2021-01-29 09:13:58 +01:00
Carlos Jimenez Ruiz 5c466e1163 vn-fetched-tags visual refactor 2021-01-28 15:10:47 +01:00
Javi Gallego 4b302915b5 fallo validateasync
gitea/salix/pipeline/head This commit looks good Details
2021-01-27 09:14:37 +01:00