Commit Graph

4482 Commits

Author SHA1 Message Date
Alex Moreno 3f483d36f2 refactor(order_search-panel): change orderFk to ticketFk
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 14:28:16 +01:00
Alex Moreno 4046617eab short form
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:37:44 +01:00
Alex Moreno ab6b5aa803 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 13:14:34 +01:00
Alex Moreno c9188658ca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 12:40:52 +01:00
Alex Moreno 60e908d82a feat(claim_summary): parentReload(), and test 2022-02-28 12:40:44 +01:00
Carlos Jimenez Ruiz 2647b4e423 Merge branch 'dev' into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:05:07 +00:00
Carlos Jimenez Ruiz d1c884deb2 Merge branch 'dev' into 3609-ticket_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 09:58:27 +00:00
Carlos Jimenez Ruiz 4b963804c6 added transalation to item waste
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:54:32 +01:00
Carlos Jimenez Ruiz bf0734ca67 excluded 3 test suites until db export
gitea/salix/pipeline/head This commit looks good Details
2022-02-28 10:46:14 +01:00
Carlos Jimenez Ruiz a2d2e79738 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding 2022-02-28 10:21:21 +01:00
Alex Moreno 5434dd3baf feat(claim_index): implemented smart-table and change state in summary
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-28 07:57:46 +01:00
Alex Moreno 62286c2f9a refactor(defaulter): simple route
gitea/salix/pipeline/head This commit looks good Details
2022-02-25 10:34:17 +01:00
Alex Moreno bf712ba5af feat(worker): absences can return all absences of worker 2022-02-25 10:33:47 +01:00
Vicent Llopis 90dc3bc5b7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-25 08:22:15 +01:00
Vicent Llopis 7aa6601ec1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3638-export_database 2022-02-25 07:52:22 +01:00
Juan Ferrer c3e480b2e7 MariaDB user sync disabled in dev environment
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 15:02:16 +01:00
Vicent Llopis 19887bdd16 feat: add section autonomous
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-24 14:52:32 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Carlos Jimenez Ruiz 9ba13f90d3 #3015 feat(unlink): tickets link to route can now be removed from the suggested tickets to route
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 16:12:29 +01:00
Vicent Llopis ca40eee5ad feat: add backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:53:49 +01:00
Alex Moreno c33b8fbb83 refactor(worker): absences return one or all abscences
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 14:50:59 +01:00
Vicent Llopis 9e06538fd0 fix: execute updatePortfolio after submit changes 2022-02-23 12:57:43 +01:00
Alex Moreno 52cf79516a refactor(claim_summary): move responsability and improve fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:23:47 +01:00
Joan Sanchez 9d298c2a5e Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:07:05 +01:00
Alex Moreno a5614e5d5d change client.name for client.socialName
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:52:45 +01:00
Vicent Llopis c7db8c6b06 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3626-client_basic-data 2022-02-23 09:12:25 +01:00
Vicent Llopis 30763e5c08 fix: backTest
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 09:05:53 +01:00
Alex Moreno 8a8951b8b0 feat(client_defaulter): add columns to search
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 08:53:25 +01:00
Alex Moreno 4e89c66e2c refactor(client_defaulter): add column date
gitea/salix/pipeline/head This commit looks good Details
2022-02-22 08:58:22 +01:00
Alex Moreno 812d79f2d5 feat(client_defaulter): implemented smart-table
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 15:11:39 +01:00
Alex Moreno 8bbb5d5c27 variable name
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 11:28:00 +01:00
Alex Moreno 6a5d49a535 tabulations
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:59:42 +01:00
Alex Moreno 71ddccb9a1 tabulations
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:57:43 +01:00
Alex Moreno 32e3af0c25 tabulations
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:53:37 +01:00
Alex Moreno 0f4649c50f feat(ticket_descriptor-menu): docuware implemented
gitea/salix/pipeline/head This commit looks good Details
2022-02-21 08:48:53 +01:00
Alex Moreno 06255e0a07 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware 2022-02-21 08:12:40 +01:00
Juan Ferrer 17b178b6bf Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2022-02-19 14:06:18 +01:00
Juan Ferrer 6f1bfbd955 roleConfig: fixes & refactor
gitea/salix/pipeline/head This commit looks good Details
2022-02-19 14:05:35 +01:00
Vicent Llopis 578685e05e feat(client): add back route 'updatePortfolio'
gitea/salix/pipeline/head This commit looks good Details
2022-02-18 13:56:18 +01:00
Alex Moreno 6b1bd4ee92 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware 2022-02-18 10:17:18 +01:00
Vicent Llopis 05aa579156 fix: add role salesBoss to filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 12:29:09 +01:00
Alex Moreno 89eee042b5 refactor(ticket_basic-data): zeroFill and move getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-17 08:02:02 +01:00
Alex Moreno d4b06d2d1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data 2022-02-17 07:31:31 +01:00
Alex Moreno 3aeb2adb56 feat(ticket): docuware pdf
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-16 14:57:47 +01:00
Vicent Llopis 34730f48ed fix: add role salesBoss to filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 12:51:45 +01:00
Alex Moreno 651c92698f feat(docuware): start download docuware
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 16:48:37 +01:00
Carlos Jimenez Ruiz 401174b27a removed focus on describe
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 13:46:25 +01:00
Carlos Jimenez Ruiz 71875070e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3595-item-waste-folding
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 13:00:10 +01:00
Carlos Jimenez Ruiz ac0e55107a 3595 feat(toggleHidden): itemWaste now can hide panels 2022-02-15 12:59:57 +01:00
Joan Sanchez 633679e26e Merge branch 'dev' into 3315-notify_metrics
gitea/salix/pipeline/head This commit looks good Details
2022-02-15 10:52:34 +00:00
Joan Sanchez 5518fac357 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-14 08:44:22 +01:00
Alex Moreno 9c9bcb68aa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3609-ticket_basic-data 2022-02-10 11:34:38 +01:00
Alex Moreno 4e5e6dccca fix(test): change movable expeted
gitea/salix/pipeline/head This commit looks good Details
2022-02-10 10:15:43 +01:00
Alex Moreno b4bed608ab refactor(ticket): getMovable
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 15:01:02 +01:00
Joan Sanchez f4ff854a1f feat(notification): notify client metrics
gitea/salix/pipeline/head This commit looks good Details
Refs: 3315
2022-02-09 14:06:06 +01:00
Alex Moreno ef281bb663 feat(order_summary): change salesPersonFk for clientFk
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 12:39:08 +01:00
Alex Moreno 2e649e81d6 fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-09 08:23:41 +01:00
Joan Sanchez 8db6424b6d Merge branch 'dev' into 3585-invoiceIn_dueDate
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 08:41:02 +00:00
Carlos Jimenez Ruiz 4f1d34069b corrected some typos
gitea/salix/pipeline/head This commit looks good Details
2022-02-08 09:27:39 +01:00
Carlos Jimenez Ruiz 00f8946675 feat(entry.buys): each buy groupingMode can now changed
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 18:01:45 +01:00
Carlos Jimenez Ruiz 485da4d0a7 added groupingMode to getBuys 2022-02-07 18:00:23 +01:00
Carlos Jimenez Ruiz cb21d4db01 removed a typo 2022-02-07 17:59:40 +01:00
Vicent Llopis f7297801f8 add due day section
gitea/salix/pipeline/head This commit looks good Details
2022-02-07 12:24:08 +01:00
Carlos Jimenez Ruiz 9501d93217 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys 2022-02-04 15:25:12 +01:00
Alex Moreno dc47af7224 feat(ticket): isEmpty ticketRequest not necessary isOk 2022-02-03 11:51:50 +01:00
Carlos Jimenez Ruiz e9189509c2 Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:50:01 +00:00
Carlos Jimenez Ruiz 4641f53108 Merge branch 'dev' into 3586-claim_filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:37:48 +00:00
Alex Moreno c004ee638c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:34:48 +01:00
Alex Moreno 902714ba7d feat(item_index): add producer basic filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 10:32:59 +01:00
Alex Moreno 1250382209 missing zero
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:52:17 +01:00
Alex Moreno 91b6dcee05 fix(test): fixed bugs non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 14:33:16 +01:00
Alex Moreno 001aed3cb5 fix(claim): filter created 2022-02-02 14:32:16 +01:00
Joan Sanchez 483a67e8b5 fix(salesFilter): search by ticket id
gitea/salix/pipeline/head This commit looks good Details
2022-02-02 09:26:33 +01:00
Alex Moreno cb5c4146cd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state 2022-02-02 07:23:17 +01:00
Joan Sanchez 8be7f9153e Removed non compatible ECMA options
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 14:50:24 +01:00
Carlos Jimenez Ruiz 5a9523642d Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:07:41 +00:00
Joan Sanchez 52e5c6bc6b Ammends
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 13:01:56 +01:00
Alex Moreno 13230a2fe9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3563-item_index_producer 2022-02-01 12:40:04 +01:00
Alex Moreno a012740742 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 12:38:22 +01:00
Carlos Jimenez Ruiz bce66899c5 corrected a typo 2022-02-01 12:24:11 +01:00
Joan Sanchez a8900b06b7 Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 10:57:39 +00:00
Alex Moreno 0eb5d8fe1c feat(icons): import new icons
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 11:48:47 +01:00
Carlos Jimenez Ruiz 054b112223 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3258-import_buys 2022-02-01 11:06:25 +01:00
Carlos Jimenez Ruiz 01e269db6d Merge branch 'dev' into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:03:47 +00:00
Alex Moreno 56331da20b feat(item_index): add column producer
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 09:37:11 +01:00
Alex Moreno 368498d763 refactor(defaulter): array request 2022-02-01 08:49:56 +01:00
Alex Moreno 7cf252a8f1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-02-01 07:29:38 +01:00
Alex Moreno 60adb6f37c translations
gitea/salix/pipeline/head This commit looks good Details
2022-02-01 07:21:34 +01:00
Alex Moreno 3d2f661bf0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-02-01 07:20:21 +01:00
Joan Sanchez 9878780006 Merge branch 'dev' into 3552-monitor_ticket_state
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 15:41:20 +00:00
Alex Moreno f21cdeb3b6 fix(item_waste): title background dark
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 13:27:33 +01:00
Alex Moreno 78b3df0b6a feat(monitor_ticket): classColor in db
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 13:15:37 +01:00
Joan Sanchez e618423ef8 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 12:27:42 +01:00
Alex Moreno 746cbede4b feat(client_defaulter): move tool-bar up , add column author
gitea/salix/pipeline/head This commit looks good Details
2022-01-31 08:17:15 +01:00
Joan Sanchez 78507240ee Merge branch 'dev' into 3258-import_buys
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 13:14:14 +00:00
Joan Sanchez db54d92b69 Updated E2E
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 14:11:26 +01:00
Joan Sanchez c5ffc16486 Filters items with last item buy 2022-01-28 09:35:30 +01:00
Alex Moreno 072ac5fb6a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter 2022-01-28 09:28:13 +01:00
Alex Moreno b25ffa8feb feat(ticket_step-two): redirect to new ticket
gitea/salix/pipeline/head This commit looks good Details
2022-01-28 09:15:41 +01:00
Alex Moreno 38100eeda4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 15:15:08 +01:00
Carlos Jimenez Ruiz abd758721e Merge branch 'dev' into 3553-travel_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-27 09:36:22 +00:00
Carlos Jimenez Ruiz d4d761150e Merge branch 'dev' into 3549-travel_search-panel
gitea/salix/pipeline/head This commit looks good Details
2022-01-27 08:26:28 +00:00
Alex Moreno 74916c182a Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-27 07:22:39 +01:00
Alex Moreno d0c4099255 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-27 07:20:39 +01:00
Joan Sanchez b991fe73b2 Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-26 13:45:50 +00:00
Alex Moreno 5970a6dfde refactor(client_defaulter): title of columns
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 14:05:33 +01:00
Alex Moreno 8e75a28f7c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3052-client_defaulter
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 12:46:59 +01:00
Alex Moreno 65c32c9ed3 fix(travel_summary): vn-check change value to ng-model
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 11:40:44 +01:00
Joan Sanchez bacc0101db Updated tests
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 10:55:55 +01:00
Alex Moreno 0a8153d44c feat(travel_search-panel): add continent filter
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 10:09:47 +01:00
Joan Sanchez f8f9ece4a5 refactor(importBuys): get data from last item buy
Refs: 3258
2022-01-26 09:20:49 +01:00
Alex Moreno f8a0094321 word movible
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 08:54:48 +01:00
Alex Moreno 57e4b400c9 Merge branch '3430-ticket_step-two' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-26 07:12:57 +01:00
Alex Moreno 442d58f59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two 2022-01-26 07:11:22 +01:00
Alex Moreno f67a4355db refactor(ticket_sale): split e2e, change name backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 15:09:29 +01:00
Alex Moreno 8794f8639f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3542-ticket_sale_payback 2022-01-25 15:04:52 +01:00
Alex Moreno 2455a24b68 feat(client_defaulter): section and test
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 14:27:30 +01:00
Juan Ferrer 022c2cde3c Merge branch 'dev' into 3536-DbUserSync
gitea/salix/pipeline/head This commit looks good Details
2022-01-25 11:18:50 +01:00
Javi Gallego 5fbbae7ac6 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-24 15:40:37 +01:00
Javi Gallego dad4119300 getTotal remove ()
gitea/salix/pipeline/head This commit looks good Details
2022-01-24 15:35:32 +01:00
Joan Sanchez ddf62d2496 Updated back unit test 2022-01-21 16:16:39 +01:00
Alex Moreno 6d9afd5f4c feat(ticket_sale): role restriction to create payBack
gitea/salix/pipeline/head This commit looks good Details
2022-01-21 11:40:48 +01:00
Juan Ferrer 997b7990d4 Docker connectTimeout && MySQL/MariaDB user sync
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 15:33:53 +01:00
Joan Sanchez 4237cd56df Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 14:12:21 +01:00
Joan Sanchez 2c05ed7c37 Disabled auto load
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 13:17:08 +01:00
Joan Sanchez b7494afbe2 Eliminado orden predeterminado
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 12:57:36 +01:00
Joan Sanchez dfd746f84d Sort by clientFk
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 12:48:12 +01:00
Joan Sanchez cf2ad0d61e feat(smartTag): added sort priority between multiple sorting
Refs: 3528
2022-01-20 12:29:12 +01:00
Joan Sanchez a9e8c5b374 Merge branch 'dev' into 3521-Monitors_ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 11:03:33 +00:00
Carlos Jimenez Ruiz 3741417fd6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3521-Monitors_ticket_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 11:06:23 +01:00
Carlos Jimenez Ruiz 4ac071d55c #3521 refactor(descriptor): navigation to index after deletion 2022-01-20 11:06:15 +01:00
Joan Sanchez e3795ea072 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 11:05:25 +01:00
Joan Sanchez 464bc6d767 Merge branch 'dev' into 3456-entry_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 09:48:08 +00:00
Javi Gallego 6d66ab7bea getTotals without transaction
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 10:05:24 +01:00
Joan Sanchez 74b7b0592e feat(smartTag): added sort priority between multiple sorting
gitea/salix/pipeline/head This commit looks good Details
Refs: 3528
2022-01-20 09:34:53 +01:00
Alex Moreno 9b5e9a617d feat(entry_basic-data): add new filter in travels
gitea/salix/pipeline/head This commit looks good Details
2022-01-20 08:31:30 +01:00
Javi Gallego 563b93a7be test front checkToBook
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 14:21:19 +01:00
Javi Gallego 3c8e6a16a2 Merge branch 'dev' into 2883-invoiceIn-Booking
gitea/salix/pipeline/head This commit looks good Details
2022-01-19 14:19:29 +01:00
Joan Sanchez 0b2d62b2bf Added axios as http package
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 17:08:58 +01:00
Carlos Jimenez Ruiz ef6d8db495 added supplierFk to advanced invoiceIn search
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 14:44:41 +01:00
Joan Sanchez 352c3205bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3245-print_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:57:26 +01:00
Alex Moreno e91730cdec fix(sms): static response for backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 13:20:35 +01:00
Joan Sanchez 47c7b36936 CSV method refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-18 13:15:42 +01:00
Alex Moreno 9ddf11c6bc test(ticket): update to advanceable
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:49:16 +01:00
Alex Moreno 8e1c3e107c refactor(ticket): advanceable code
gitea/salix/pipeline/head This commit looks good Details
2022-01-18 12:48:39 +01:00
Alex Moreno b8355320f2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 14:50:10 +01:00
Alex Moreno 4b2153d638 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 13:37:25 +01:00
Alex Moreno 83d2dd2d80 refacto(ticket_volume): tests and front js
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 13:17:06 +01:00
Alex Moreno b05f464517 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3491-ticket_volume
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:14:58 +01:00
Alex Moreno 5824acf3bc change tests to advanceable
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 10:12:13 +01:00
Carlos Jimenez Ruiz 941d43b9a2 Merge branch 'dev' into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 09:06:27 +00:00
Vicent Llopis 13ce7991ec refactor: uppercase in model type
gitea/salix/pipeline/head This commit looks good Details
2022-01-17 09:49:45 +01:00
Alex Moreno 61859a23c9 feat(ticket): getAdvanceable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-17 07:14:29 +01:00
Alex Moreno 0d06ae309b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-14 10:08:01 +01:00
Joan Sanchez b86c32c97b fix(importBuy): prevent action
gitea/salix/pipeline/head This commit looks good Details
2022-01-14 08:06:38 +01:00
Alex Moreno c87e3e1210 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
gitea/salix/pipeline/head This commit looks good Details
2022-01-13 07:20:23 +01:00
Alex Moreno 6f7c1b6a46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:56:34 +01:00
Alex Moreno 757fe73ecd test(ticket_volume): backTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:55:20 +01:00
Alex Moreno c9564e817a test(ticket_volume): frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 14:04:16 +01:00
Alex Moreno fba09e8c40 feat(ticket_volume): volume for packingType
gitea/salix/pipeline/head There was a failure building this commit Details
2022-01-12 14:02:58 +01:00
Vicent Llopis e850fdaf4e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays 2022-01-12 12:15:32 +01:00
Carlos Jimenez Ruiz 98e621305d Merge branch 'dev' into 3490-sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 10:29:49 +00:00
Carlos Jimenez Ruiz 98cd0b659c Merge branch 'dev' into 3506-ticket_sale_transfer
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 09:19:51 +00:00
Carlos Jimenez Ruiz cc3e2fbc3a can't transfer claimed sales without claimManager role
gitea/salix/pipeline/head This commit looks good Details
2022-01-12 10:17:51 +01:00
Alex Moreno b02695a14b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 14:49:36 +01:00
Alex Moreno 94a2d3cc16 refactor(supplier): add isFarmer in getSummary
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 14:49:22 +01:00
Alex Moreno aaae5e157e replace query for searchPanel
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 13:52:01 +01:00
Vicent Llopis 4f0edbda6b add prefix +34
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 10:03:59 +01:00
Alex Moreno 9e491082e7 test(send): backTest and fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-01-11 08:39:06 +01:00
Carlos Jimenez Ruiz 7b5e6e8a23 added shorcuts for order, monitor and worker modules
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 16:08:45 +01:00
Alex Moreno ebac06e4fc refactor(send): update got sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 15:14:05 +01:00
Alex Moreno de28bfec8e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms 2022-01-10 15:09:08 +01:00
Alex Moreno fc69151f7f update sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 13:20:57 +01:00
Alex Moreno 75de01ed72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 12:29:03 +01:00
Alex Moreno 1983eb012b refactor(sms): got and apiKey
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 12:28:39 +01:00
Carlos Jimenez Ruiz 5de6f437a8 Merge branch 'dev' into 3485-monitors-ticketAddProblem
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 10:41:39 +00:00
Alex Moreno 5462af91ee extract to variable
gitea/salix/pipeline/head This commit looks good Details
2022-01-10 11:38:02 +01:00
Alex Moreno 1f79a3047d feat(monitors_ticket): add isTooLittle
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 11:26:16 +01:00
Alex Moreno 860499db82 refactor(ticket): add more text in error when change zone
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 08:28:57 +01:00
Alex Moreno 4f799d3e00 remove focus test
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 08:10:13 +01:00
Alex Moreno a528161b93 refactor(supplier.summary): separate isFarmer()
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 08:08:41 +01:00
Vicent Llopis 74d7dad243 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-01-07 07:50:39 +01:00
Alex Moreno 19a6b55a72 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary 2022-01-07 07:43:14 +01:00
Joan Sanchez c24df3ade9 Updated translations
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 16:23:58 +01:00
Joan Sanchez 4e6d8d17f5 Throw invalid businessType for new clients
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 15:41:26 +01:00
Joan Sanchez 2279b3d9ab Prevent businessTypeFk validation for other invalid fields
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 15:17:21 +01:00
Alex Moreno e1c9195495 update condition
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 14:53:29 +01:00
Alex Moreno ed84aa46bd feat(client): add more condition for businessType Validation
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 14:29:03 +01:00
Alex Moreno 961dc100cc feat(client): add isWorker condition in hasBusinessType
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 12:44:18 +01:00
Vicent Llopis d5e4d99625 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
gitea/salix/pipeline/head This commit looks good Details
2022-01-05 12:30:49 +01:00
Carlos Jimenez Ruiz d86aa5535c refactor(createFromSales): now claimManager can claim any time
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 16:16:39 +01:00
Alex Moreno e4db123672 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 13:55:36 +01:00
Vicent Llopis 914fca0814 fix: delete unnecessary ng-if
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 10:28:06 +01:00
Carlos Jimenez Ruiz 8dbd184cce invoiceOut donwload test fixed for any year
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 10:01:34 +01:00
Alex Moreno 2a9cc2f465 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3472-supplier_summary
gitea/salix/pipeline/head This commit looks good Details
2022-01-03 09:54:11 +01:00
Carlos Jimenez Ruiz 7dbf03ed72 front unit test and e2e for change state
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 10:45:19 +01:00
Carlos Jimenez Ruiz 48e4628c48 refactor(ticket.summary): change state button is now dropdown
gitea/salix/pipeline/head This commit looks good Details
2021-12-30 09:49:11 +01:00
Alex Moreno 83a28bc0ee test(supplier_summary): test for sageWithholdingFk to isFarmer
gitea/salix/pipeline/head This commit looks good Details
2021-12-29 11:52:45 +01:00
Alex Moreno e9f77bb9b4 feat(supplier_summary): remove supplier.isFarmer and add verification by sageWithholdingFk 2021-12-29 11:51:56 +01:00
Carlos Jimenez Ruiz a969f1f234 Merge branch 'dev' into 3449-client_credit
gitea/salix/pipeline/head This commit looks good Details
2021-12-24 10:48:15 +00:00