Vicent Llopis
|
2f87ac8c96
|
add test
|
2022-03-03 14:42:12 +01:00 |
Alex Moreno
|
6748426f67
|
correct loopback form
|
2022-03-03 13:48:18 +01:00 |
Alex Moreno
|
29d63d1e4d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3671-supplier_account
|
2022-03-03 13:05:08 +01:00 |
Alex Moreno
|
e082d18564
|
change description
|
2022-03-03 13:03:43 +01:00 |
Alex Moreno
|
f143619777
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3669-order_search-panel
|
2022-03-03 13:03:13 +01:00 |
Carlos Jimenez Ruiz
|
63fc58b6ba
|
Merge branch 'dev' into 3649-claim_log
|
2022-03-03 12:00:02 +00:00 |
Joan Sanchez
|
9b4d091692
|
Merge branch 'dev' into 3669-order_search-panel
|
2022-03-03 10:38:16 +00:00 |
Vicent Llopis
|
4811254ccb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3604-route_agencyTerm
|
2022-03-02 15:07:38 +01:00 |
Vicent Llopis
|
ade34c1e0a
|
add section Autonomous
|
2022-03-02 14:59:30 +01:00 |
Alex Moreno
|
619baf2896
|
refactor claim_main controller
|
2022-03-02 11:07:35 +01:00 |
Alex Moreno
|
7c3945a921
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
|
2022-03-02 10:47:56 +01:00 |
Alex Moreno
|
a05223681e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state
|
2022-03-02 10:43:06 +01:00 |
Alex Moreno
|
5efb678a53
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
|
2022-03-02 10:32:18 +01:00 |
Alex Moreno
|
ccb5261ff6
|
Merge branch '3598-worker_calendar_absences' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
|
2022-03-02 10:31:27 +01:00 |
Alex Moreno
|
26ed4b3c30
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3598-worker_calendar_absences
|
2022-03-02 10:24:11 +01:00 |
Carlos Jimenez Ruiz
|
2b0f54c3aa
|
Merge branch 'dev' into 3646-claim-summary
|
2022-03-02 09:17:19 +00:00 |
Alex Moreno
|
44318903e7
|
feat(claim): add log section
|
2022-03-01 15:15:58 +01:00 |
Alex Moreno
|
2026e909e9
|
disable search observation
|
2022-03-01 11:43:35 +01:00 |
Alex Moreno
|
5a906d075a
|
Merge branch '3622-client_defaulter' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter
|
2022-03-01 11:39:20 +01:00 |
Alex Moreno
|
772c85e5cd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3622-client_defaulter
|
2022-03-01 11:39:09 +01:00 |
Joan Sanchez
|
10af48a739
|
Merge branch 'dev' into 3015-route_tickets_unlink
|
2022-03-01 10:13:41 +00:00 |
Joan Sanchez
|
b71e7440b3
|
Merge branch 'dev' into 3634-rocketchat_status
|
2022-03-01 09:49:11 +00:00 |
Alex Moreno
|
a27a48f251
|
fix(supplier_account): fix setWireTransfer and add test
|
2022-03-01 10:44:46 +01:00 |
Alex Moreno
|
2137a34b36
|
feat(supplier-account): isPayMethodChecked false when change model
|
2022-03-01 10:44:04 +01:00 |
Joan Sanchez
|
b7dd4952df
|
Merge branch 'dev' into 3622-client_defaulter
|
2022-03-01 09:33:38 +00:00 |
Alex Moreno
|
3f483d36f2
|
refactor(order_search-panel): change orderFk to ticketFk
|
2022-02-28 14:28:16 +01:00 |
Alex Moreno
|
4046617eab
|
short form
|
2022-02-28 13:37:44 +01:00 |
Alex Moreno
|
ab6b5aa803
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3352-docuware
|
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
|
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
|
2022-02-28 10:05:07 +00:00 |
Carlos Jimenez Ruiz
|
d1c884deb2
|
Merge branch 'dev' into 3609-ticket_basic-data
|
2022-02-28 09:58:27 +00:00 |
Carlos Jimenez Ruiz
|
4b963804c6
|
added transalation to item waste
|
2022-02-28 10:54:32 +01:00 |
Carlos Jimenez Ruiz
|
bf0734ca67
|
excluded 3 test suites until db export
|
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
|
2022-02-28 07:57:46 +01:00 |
Alex Moreno
|
62286c2f9a
|
refactor(defaulter): simple route
|
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
|
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
|
2022-02-24 15:02:16 +01:00 |
Vicent Llopis
|
19887bdd16
|
feat: add section autonomous
|
2022-02-24 14:52:32 +01:00 |
Alex Moreno
|
fc3a46eb26
|
refactor(claim): removed importTicketSales and fix tests
|
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
|
2022-02-23 16:12:29 +01:00 |
Vicent Llopis
|
ca40eee5ad
|
feat: add backTest
|
2022-02-23 14:53:49 +01:00 |
Alex Moreno
|
c33b8fbb83
|
refactor(worker): absences return one or all abscences
|
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
|
2022-02-23 12:23:47 +01:00 |
Joan Sanchez
|
9d298c2a5e
|
Updated unit tests
|
2022-02-23 12:07:05 +01:00 |
Alex Moreno
|
a5614e5d5d
|
change client.name for client.socialName
|
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
|
2022-02-23 09:05:53 +01:00 |
Alex Moreno
|
8a8951b8b0
|
feat(client_defaulter): add columns to search
|
2022-02-23 08:53:25 +01:00 |
Alex Moreno
|
4e89c66e2c
|
refactor(client_defaulter): add column date
|
2022-02-22 08:58:22 +01:00 |
Alex Moreno
|
812d79f2d5
|
feat(client_defaulter): implemented smart-table
|
2022-02-21 15:11:39 +01:00 |
Alex Moreno
|
8bbb5d5c27
|
variable name
|
2022-02-21 11:28:00 +01:00 |
Alex Moreno
|
6a5d49a535
|
tabulations
|
2022-02-21 08:59:42 +01:00 |
Alex Moreno
|
71ddccb9a1
|
tabulations
|
2022-02-21 08:57:43 +01:00 |
Alex Moreno
|
32e3af0c25
|
tabulations
|
2022-02-21 08:53:37 +01:00 |
Alex Moreno
|
0f4649c50f
|
feat(ticket_descriptor-menu): docuware implemented
|
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
|
2022-02-19 14:06:18 +01:00 |
Juan Ferrer
|
6f1bfbd955
|
roleConfig: fixes & refactor
|
2022-02-19 14:05:35 +01:00 |
Vicent Llopis
|
578685e05e
|
feat(client): add back route 'updatePortfolio'
|
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
|
2022-02-17 12:29:09 +01:00 |
Alex Moreno
|
89eee042b5
|
refactor(ticket_basic-data): zeroFill and move getMovable
|
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
|
2022-02-16 14:57:47 +01:00 |
Vicent Llopis
|
34730f48ed
|
fix: add role salesBoss to filter
|
2022-02-16 12:51:45 +01:00 |
Vicent Llopis
|
d7f252a57d
|
feat(invoiceIn): add section intrastat
|
2022-02-16 10:30:56 +01:00 |
Alex Moreno
|
651c92698f
|
feat(docuware): start download docuware
|
2022-02-15 16:48:37 +01:00 |
Carlos Jimenez Ruiz
|
401174b27a
|
removed focus on describe
|
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
|
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
|
2022-02-15 10:52:34 +00:00 |
Joan Sanchez
|
5518fac357
|
Updated unit tests
|
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
|
2022-02-10 10:15:43 +01:00 |
Alex Moreno
|
b4bed608ab
|
refactor(ticket): getMovable
|
2022-02-09 15:01:02 +01:00 |
Joan Sanchez
|
f4ff854a1f
|
feat(notification): notify client metrics
Refs: 3315
|
2022-02-09 14:06:06 +01:00 |
Alex Moreno
|
ef281bb663
|
feat(order_summary): change salesPersonFk for clientFk
|
2022-02-09 12:39:08 +01:00 |
Alex Moreno
|
2e649e81d6
|
fix(test): fixed bugs non compatible ECMA options
|
2022-02-09 08:23:41 +01:00 |
Joan Sanchez
|
8db6424b6d
|
Merge branch 'dev' into 3585-invoiceIn_dueDate
|
2022-02-08 08:41:02 +00:00 |
Carlos Jimenez Ruiz
|
4f1d34069b
|
corrected some typos
|
2022-02-08 09:27:39 +01:00 |
Carlos Jimenez Ruiz
|
00f8946675
|
feat(entry.buys): each buy groupingMode can now changed
|
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
|
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
|
2022-02-03 09:50:01 +00:00 |
Carlos Jimenez Ruiz
|
4641f53108
|
Merge branch 'dev' into 3586-claim_filter
|
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
|
2022-02-03 10:34:48 +01:00 |
Alex Moreno
|
902714ba7d
|
feat(item_index): add producer basic filter
|
2022-02-03 10:32:59 +01:00 |
Alex Moreno
|
1250382209
|
missing zero
|
2022-02-03 09:52:17 +01:00 |
Alex Moreno
|
91b6dcee05
|
fix(test): fixed bugs non compatible ECMA options
|
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
|
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
|
2022-02-01 14:50:24 +01:00 |
Carlos Jimenez Ruiz
|
5a9523642d
|
Merge branch 'dev' into 3258-import_buys
|
2022-02-01 12:07:41 +00:00 |
Joan Sanchez
|
52e5c6bc6b
|
Ammends
|
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
|
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
|
2022-02-01 10:57:39 +00:00 |
Alex Moreno
|
0eb5d8fe1c
|
feat(icons): import new icons
|
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
|
2022-02-01 09:03:47 +00:00 |
Alex Moreno
|
56331da20b
|
feat(item_index): add column producer
|
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
|
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
|
2022-01-31 15:41:20 +00:00 |
Alex Moreno
|
f21cdeb3b6
|
fix(item_waste): title background dark
|
2022-01-31 13:27:33 +01:00 |
Alex Moreno
|
78b3df0b6a
|
feat(monitor_ticket): classColor in db
|
2022-01-31 13:15:37 +01:00 |
Joan Sanchez
|
e618423ef8
|
Updated unit tests
|
2022-01-31 12:27:42 +01:00 |
Alex Moreno
|
746cbede4b
|
feat(client_defaulter): move tool-bar up , add column author
|
2022-01-31 08:17:15 +01:00 |
Joan Sanchez
|
78507240ee
|
Merge branch 'dev' into 3258-import_buys
|
2022-01-28 13:14:14 +00:00 |
Joan Sanchez
|
db54d92b69
|
Updated E2E
|
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
|
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
|
2022-01-27 09:36:22 +00:00 |
Carlos Jimenez Ruiz
|
d4d761150e
|
Merge branch 'dev' into 3549-travel_search-panel
|
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
|
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
|
2022-01-26 13:45:50 +00:00 |
Alex Moreno
|
5970a6dfde
|
refactor(client_defaulter): title of columns
|
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
|
2022-01-26 12:46:59 +01:00 |
Alex Moreno
|
65c32c9ed3
|
fix(travel_summary): vn-check change value to ng-model
|
2022-01-26 11:40:44 +01:00 |
Joan Sanchez
|
bacc0101db
|
Updated tests
|
2022-01-26 10:55:55 +01:00 |
Alex Moreno
|
0a8153d44c
|
feat(travel_search-panel): add continent filter
|
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
|
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
|
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
|
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
|
2022-01-25 14:27:30 +01:00 |
Juan Ferrer
|
022c2cde3c
|
Merge branch 'dev' into 3536-DbUserSync
|
2022-01-25 11:18:50 +01:00 |
Javi Gallego
|
5fbbae7ac6
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2022-01-24 15:40:37 +01:00 |
Javi Gallego
|
dad4119300
|
getTotal remove ()
|
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
|
2022-01-21 11:40:48 +01:00 |
Juan Ferrer
|
997b7990d4
|
Docker connectTimeout && MySQL/MariaDB user sync
|
2022-01-20 15:33:53 +01:00 |
Joan Sanchez
|
4237cd56df
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2022-01-20 14:12:21 +01:00 |
Joan Sanchez
|
2c05ed7c37
|
Disabled auto load
|
2022-01-20 13:17:08 +01:00 |
Joan Sanchez
|
b7494afbe2
|
Eliminado orden predeterminado
|
2022-01-20 12:57:36 +01:00 |
Joan Sanchez
|
dfd746f84d
|
Sort by clientFk
|
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
|
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
|
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
|
2022-01-20 11:05:25 +01:00 |
Joan Sanchez
|
464bc6d767
|
Merge branch 'dev' into 3456-entry_basic-data
|
2022-01-20 09:48:08 +00:00 |
Javi Gallego
|
6d66ab7bea
|
getTotals without transaction
|
2022-01-20 10:05:24 +01:00 |
Joan Sanchez
|
74b7b0592e
|
feat(smartTag): added sort priority between multiple sorting
Refs: 3528
|
2022-01-20 09:34:53 +01:00 |
Alex Moreno
|
9b5e9a617d
|
feat(entry_basic-data): add new filter in travels
|
2022-01-20 08:31:30 +01:00 |
Javi Gallego
|
563b93a7be
|
test front checkToBook
|
2022-01-19 14:21:19 +01:00 |
Javi Gallego
|
3c8e6a16a2
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2022-01-19 14:19:29 +01:00 |
Joan Sanchez
|
0b2d62b2bf
|
Added axios as http package
|
2022-01-18 17:08:58 +01:00 |
Carlos Jimenez Ruiz
|
ef6d8db495
|
added supplierFk to advanced invoiceIn search
|
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
|
2022-01-18 13:57:26 +01:00 |
Alex Moreno
|
e91730cdec
|
fix(sms): static response for backTest
|
2022-01-18 13:20:35 +01:00 |
Joan Sanchez
|
47c7b36936
|
CSV method refactor
|
2022-01-18 13:15:42 +01:00 |
Alex Moreno
|
9ddf11c6bc
|
test(ticket): update to advanceable
|
2022-01-18 12:49:16 +01:00 |
Alex Moreno
|
8e1c3e107c
|
refactor(ticket): advanceable code
|
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
|
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
|
2022-01-17 13:37:25 +01:00 |
Alex Moreno
|
83d2dd2d80
|
refacto(ticket_volume): tests and front js
|
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
|
2022-01-17 10:14:58 +01:00 |
Alex Moreno
|
5824acf3bc
|
change tests to advanceable
|
2022-01-17 10:12:13 +01:00 |
Carlos Jimenez Ruiz
|
941d43b9a2
|
Merge branch 'dev' into 3448-worker_calendar-payedHolidays
|
2022-01-17 09:06:27 +00:00 |
Vicent Llopis
|
13ce7991ec
|
refactor: uppercase in model type
|
2022-01-17 09:49:45 +01:00 |
Alex Moreno
|
61859a23c9
|
feat(ticket): getAdvanceable
|
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
|
2022-01-14 10:08:01 +01:00 |
Joan Sanchez
|
b86c32c97b
|
fix(importBuy): prevent action
|
2022-01-14 08:06:38 +01:00 |
Alex Moreno
|
bf6d196414
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3467-travelThermograph
|
2022-01-13 08:33:27 +01:00 |
Alex Moreno
|
c87e3e1210
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
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
|
2022-01-12 14:56:34 +01:00 |
Alex Moreno
|
757fe73ecd
|
test(ticket_volume): backTest
|
2022-01-12 14:55:20 +01:00 |
Alex Moreno
|
c9564e817a
|
test(ticket_volume): frontTest
|
2022-01-12 14:04:16 +01:00 |
Alex Moreno
|
fba09e8c40
|
feat(ticket_volume): volume for packingType
|
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
|
2022-01-12 10:29:49 +00:00 |
Carlos Jimenez Ruiz
|
98cd0b659c
|
Merge branch 'dev' into 3506-ticket_sale_transfer
|
2022-01-12 09:19:51 +00:00 |
Carlos Jimenez Ruiz
|
cc3e2fbc3a
|
can't transfer claimed sales without claimManager role
|
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
|
2022-01-11 14:49:36 +01:00 |
Alex Moreno
|
94a2d3cc16
|
refactor(supplier): add isFarmer in getSummary
|
2022-01-11 14:49:22 +01:00 |
Alex Moreno
|
aaae5e157e
|
replace query for searchPanel
|
2022-01-11 13:52:01 +01:00 |
Vicent Llopis
|
4f0edbda6b
|
add prefix +34
|
2022-01-11 10:03:59 +01:00 |
Alex Moreno
|
9e491082e7
|
test(send): backTest and fixtures
|
2022-01-11 08:39:06 +01:00 |
Carlos Jimenez Ruiz
|
7b5e6e8a23
|
added shorcuts for order, monitor and worker modules
|
2022-01-10 16:08:45 +01:00 |
Alex Moreno
|
ebac06e4fc
|
refactor(send): update got sms
|
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
|
2022-01-10 13:20:57 +01:00 |
Alex Moreno
|
75de01ed72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3490-sms
|
2022-01-10 12:29:03 +01:00 |
Alex Moreno
|
1983eb012b
|
refactor(sms): got and apiKey
|
2022-01-10 12:28:39 +01:00 |
Carlos Jimenez Ruiz
|
5de6f437a8
|
Merge branch 'dev' into 3485-monitors-ticketAddProblem
|
2022-01-10 10:41:39 +00:00 |
Alex Moreno
|
5462af91ee
|
extract to variable
|
2022-01-10 11:38:02 +01:00 |
Alex Moreno
|
1f79a3047d
|
feat(monitors_ticket): add isTooLittle
|
2022-01-07 11:26:16 +01:00 |
Alex Moreno
|
860499db82
|
refactor(ticket): add more text in error when change zone
|
2022-01-07 08:28:57 +01:00 |
Alex Moreno
|
4f799d3e00
|
remove focus test
|
2022-01-07 08:10:13 +01:00 |
Alex Moreno
|
a528161b93
|
refactor(supplier.summary): separate isFarmer()
|
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
|
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
|
2022-01-05 16:23:58 +01:00 |
Joan Sanchez
|
4e6d8d17f5
|
Throw invalid businessType for new clients
|
2022-01-05 15:41:26 +01:00 |
Joan Sanchez
|
2279b3d9ab
|
Prevent businessTypeFk validation for other invalid fields
|
2022-01-05 15:17:21 +01:00 |
Alex Moreno
|
e1c9195495
|
update condition
|
2022-01-05 14:53:29 +01:00 |
Alex Moreno
|
ed84aa46bd
|
feat(client): add more condition for businessType Validation
|
2022-01-05 14:29:03 +01:00 |
Alex Moreno
|
961dc100cc
|
feat(client): add isWorker condition in hasBusinessType
|
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
|
2022-01-05 12:30:49 +01:00 |
Carlos Jimenez Ruiz
|
d86aa5535c
|
refactor(createFromSales): now claimManager can claim any time
|
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
|
2022-01-04 13:55:36 +01:00 |
Vicent Llopis
|
914fca0814
|
fix: delete unnecessary ng-if
|
2022-01-04 10:28:06 +01:00 |
Carlos Jimenez Ruiz
|
8dbd184cce
|
invoiceOut donwload test fixed for any year
|
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
|
2022-01-03 09:54:11 +01:00 |
Carlos Jimenez Ruiz
|
7dbf03ed72
|
front unit test and e2e for change state
|
2021-12-30 10:45:19 +01:00 |
Carlos Jimenez Ruiz
|
48e4628c48
|
refactor(ticket.summary): change state button is now dropdown
|
2021-12-30 09:49:11 +01:00 |
Alex Moreno
|
83a28bc0ee
|
test(supplier_summary): test for sageWithholdingFk to isFarmer
|
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
|
2021-12-24 10:48:15 +00:00 |
Carlos Jimenez Ruiz
|
652cbe937f
|
Merge branch 'dev' into 3433-supplier_account
|
2021-12-24 10:35:28 +00:00 |
Vicent Llopis
|
7d2820c7ee
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3448-worker_calendar-payedHolidays
|
2021-12-24 11:30:47 +01:00 |
Vicent Llopis
|
ac833ac625
|
feat: add field payedHolidays
|
2021-12-24 11:30:28 +01:00 |
Carlos Jimenez Ruiz
|
a1da6081b5
|
Merge branch 'dev' into 3439-item_search-panel
|
2021-12-24 09:51:41 +00:00 |
Carlos Jimenez Ruiz
|
e7f1d7a1ee
|
Merge branch 'dev' into 3451-client_balance
|
2021-12-24 09:16:34 +00:00 |
Alex Moreno
|
8e274f4f17
|
refactor(travel): deprecated travelThermograph.temperature
|
2021-12-24 10:10:28 +01:00 |
Vicent Llopis
|
e1c4f144a7
|
feat: add code
|
2021-12-23 14:57:22 +01:00 |
Vicent Llopis
|
671a35f8c9
|
upload branch
|
2021-12-23 13:11:17 +01:00 |
Alex Moreno
|
6a78ac46c7
|
fix(client): check businesTypeFk before clientCredit insert
|
2021-12-23 08:53:56 +01:00 |
Alex Moreno
|
d1c7dea218
|
fix(supplier_account): get countryFk in model.js
|
2021-12-23 08:09:48 +01:00 |
Vicent Llopis
|
a6e5123949
|
feat: add filter by item.longName
|
2021-12-22 13:16:45 +01:00 |
Alex Moreno
|
9287f25f24
|
fix(client_balance): fix if value is 0
|
2021-12-22 09:46:18 +01:00 |
Alex Moreno
|
e609994efa
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2021-12-21 21:01:18 +01:00 |
Alex Moreno
|
18b6efe8f1
|
test(ticket_basic-data): test and fixtures
|
2021-12-21 20:58:58 +01:00 |
Vicent Llopis
|
6bd48ab30b
|
delete comment
|
2021-12-21 15:06:57 +01:00 |
Vicent Llopis
|
19e50d2156
|
fix(ticket_sale): front test
|
2021-12-21 15:00:06 +01:00 |
Vicent Llopis
|
bdb42437ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
|
2021-12-21 14:45:40 +01:00 |
Vicent Llopis
|
5c899d28c3
|
feat(ticket_sale): add tests and refactor backRoute name
|
2021-12-21 14:43:53 +01:00 |
Carlos Jimenez Ruiz
|
31da353f07
|
Merge branch 'dev' into 3457-smart_table_order
|
2021-12-21 11:44:16 +00:00 |
Joan Sanchez
|
1d28508cba
|
Removed vn-focus directive
|
2021-12-21 12:42:18 +01:00 |
Carlos Jimenez Ruiz
|
707c9c33f7
|
Merge branch 'dev' into 3273-supplier_billing-data
|
2021-12-21 11:27:34 +00:00 |
Joan Sanchez
|
76ec1fceae
|
fear(smart-table): now shows the default order with the column arrows
Refs: 3457
|
2021-12-21 09:19:28 +01:00 |
Alex Moreno
|
831bfb0352
|
change route for hasRoute
|
2021-12-21 08:52:39 +01:00 |
Alex Moreno
|
405494c85b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-21 08:31:17 +01:00 |
Vicent Llopis
|
e30fb0fb37
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3427-ticket_line-abono
|
2021-12-21 07:10:19 +01:00 |
Alex Moreno
|
f67edffcf1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-20 13:51:44 +01:00 |
Alex Moreno
|
50db693e51
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2021-12-20 13:50:50 +01:00 |
Alex Moreno
|
b0019d09ad
|
feat(ticket_basic-data_step-two): adapted for available and transfer sales in back
|
2021-12-20 13:50:31 +01:00 |
Carlos Jimenez Ruiz
|
1440f29784
|
Merge branch 'dev' into 3423-ticket_sale
|
2021-12-20 10:01:08 +00:00 |
Joan Sanchez
|
872f5b488b
|
Merge branch 'dev' into 3411-route_ticket_fixtures
|
2021-12-20 09:40:34 +00:00 |
Alex Moreno
|
6426a629e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3430-ticket_step-two
|
2021-12-20 09:26:54 +01:00 |
Alex Moreno
|
7a0221c17d
|
test(supplier): add backTest to check changes in isPayMethodChecked
|
2021-12-20 08:02:28 +01:00 |
Alex Moreno
|
bcc50b0618
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-20 07:33:52 +01:00 |
Carlos Jimenez Ruiz
|
d2db3054a5
|
Merge branch 'dev' into 3256-order_transactions
|
2021-12-17 14:15:41 +00:00 |
Carlos Jimenez Ruiz
|
7fbbe2fddd
|
ctx was poluted by tests
|
2021-12-17 15:14:31 +01:00 |
Joan Sanchez
|
da59a556ca
|
refactor(monitor): limited width to the client and zone columns
Refs: 3458
|
2021-12-17 13:09:00 +01:00 |
Joan Sanchez
|
4cb346c2a8
|
fix(monitor): changed order to prevent row duplication
Refs: 3458
|
2021-12-17 12:40:23 +01:00 |
Alex Moreno
|
850ea2ef39
|
getVisible sql
|
2021-12-17 12:38:56 +01:00 |
Carlos Jimenez Ruiz
|
d83995e64e
|
filter worker id refactor
|
2021-12-17 10:41:59 +01:00 |
Alex Moreno
|
138f2110e5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3273-supplier_billing-data
|
2021-12-16 12:15:47 +01:00 |
Carlos Jimenez Ruiz
|
5a448234d6
|
transtaction commits on several endpoints
|
2021-12-16 10:56:10 +01:00 |
Alex Moreno
|
87f994aa77
|
test(ticket_basci-data_step-two): back and front
|
2021-12-16 08:14:27 +01:00 |
Carlos Jimenez Ruiz
|
2bfc6a5987
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-12-15 15:29:28 +01:00 |
Carlos Jimenez Ruiz
|
b4f1e66fed
|
order module transactions
|
2021-12-15 15:29:22 +01:00 |
Vicent Llopis
|
a6b755138f
|
feat(abono): add option "abono" in ticket_sale
|
2021-12-15 15:24:45 +01:00 |
Alex Moreno
|
3e91929d0d
|
half test
|
2021-12-15 15:16:21 +01:00 |
Alex Moreno
|
e01d676bb1
|
feat(ticket_basic-data_step-two): show visible and option withoutNegatives
|
2021-12-15 14:45:45 +01:00 |
Alex Moreno
|
be3e8ddd98
|
feat(ticket_descriptor): add field client.id
|
2021-12-14 12:59:53 +01:00 |
Alex Moreno
|
5960d40891
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3426-ticket_index
|
2021-12-14 12:43:40 +01:00 |
Alex Moreno
|
9cfe6b5b7a
|
feat(ticket): filter by route
|
2021-12-14 12:05:06 +01:00 |
Javi Gallego
|
af670ae3e9
|
fdescribe
|
2021-12-14 09:51:12 +01:00 |
Javi Gallego
|
a99174e42a
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2021-12-14 09:50:39 +01:00 |
Joan Sanchez
|
f2a8992410
|
fix(ticketIndex): excluded collectionFk property from date ranges
Refs: 3431
|
2021-12-14 09:17:00 +01:00 |
Javi Gallego
|
f669e7148c
|
onAcceptToBook test ok
|
2021-12-14 08:33:29 +01:00 |
Alex Moreno
|
6465a5c460
|
feat(supplier): payMethodChecked for financial
|
2021-12-14 08:23:11 +01:00 |
Carlos Jimenez Ruiz
|
6aa3101e42
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-12-02 11:04:44 +01:00 |
Carlos Jimenez Ruiz
|
2ebe6b5342
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3386-route_ticket_buscaman
|
2021-12-01 15:26:09 +01:00 |
Carlos Jimenez Ruiz
|
8285a8a8e9
|
refactor(route.tickets): updated error description
|
2021-12-01 15:26:01 +01:00 |
Vicent Llopis
|
ac3dc039fe
|
feat: add fixtures of ticket and update test
|
2021-12-01 12:49:53 +01:00 |
Alex Moreno
|
75e32feb16
|
refactor ticket_sale
|
2021-12-01 11:39:48 +01:00 |
Alex Moreno
|
77191b6182
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-12-01 11:29:10 +01:00 |
Joan Sanchez
|
7acf7c5bea
|
Changed duplicated button...
|
2021-12-01 08:29:05 +01:00 |
Alex Moreno
|
c7e5c25a28
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-11-30 15:13:38 +01:00 |
Alex Moreno
|
decd4b5a95
|
separate sql procedures
|
2021-11-30 15:13:20 +01:00 |
Vicent Llopis
|
238577ec8f
|
refactor: change ids by codes and add fixtures
|
2021-11-30 13:57:17 +01:00 |
Alex Moreno
|
d5c0be5a9d
|
refactor(ticket_sale): logic and tests
|
2021-11-30 13:47:16 +01:00 |
Carlos Jimenez Ruiz
|
d760eba446
|
Merge branch 'dev' into 3275-worker_calendar
|
2021-11-30 11:40:54 +00:00 |
Vicent Llopis
|
21bd625b3b
|
add exceprion to half day absence
|
2021-11-30 12:31:02 +01:00 |
Alex Moreno
|
85721dcf45
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3372-ticket_sale
|
2021-11-30 09:51:30 +01:00 |
Carlos Jimenez Ruiz
|
1176b23bb9
|
Merge branch 'dev' into 2676-worker_time-control
|
2021-11-30 08:16:10 +00:00 |
Joan Sanchez
|
5c342ae463
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-30 09:11:40 +01:00 |
Vicent Llopis
|
4c064f8a80
|
feat(worker_calendar): add restrictions to add absence and to add hours recorded
|
2021-11-30 09:11:23 +01:00 |
Joan Sanchez
|
495510efed
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-11-30 09:08:19 +01:00 |
Alex Moreno
|
594f258232
|
modify js date format
|
2021-11-30 07:16:43 +01:00 |
Alex Moreno
|
85e3b47408
|
test(worker_time-control): tested url parameter timestamp
|
2021-11-29 15:22:16 +01:00 |
Alex Moreno
|
07e092f9bd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2676-worker_time-control
|
2021-11-29 11:52:43 +01:00 |
Joan Sanchez
|
f93da5f60d
|
Merge branch 'dev' into 3387-route_ticket
|
2021-11-29 09:21:34 +00:00 |
Alex Moreno
|
49e9fcaa7c
|
remove unnecesary on-accept
|
2021-11-29 10:11:47 +01:00 |
Alex Moreno
|
8bd1db2e97
|
remove unnecesary on-accept
|
2021-11-29 10:10:53 +01:00 |
Alex Moreno
|
cff4c90651
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-29 10:10:04 +01:00 |
Alex Moreno
|
8ea3307230
|
feat(ticket_sale): allow multi-check for recalculatePrice
|
2021-11-29 08:30:36 +01:00 |
Joan Sanchez
|
e4d7d957eb
|
Rectified icons
|
2021-11-26 14:48:55 +01:00 |
Joan Sanchez
|
452d4557d1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-26 14:11:33 +01:00 |
Joan Sanchez
|
9d6b870940
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-11-26 14:08:50 +01:00 |
Joan Sanchez
|
b0cb7e1424
|
Updated fonts
|
2021-11-26 13:53:39 +01:00 |
Alex Moreno
|
65053f5f28
|
feat(worker_time-control): add timestamp url param
|
2021-11-26 13:26:48 +01:00 |
Joan Sanchez
|
bcca33bc33
|
Updated icons
|
2021-11-26 13:04:07 +01:00 |
Vicent Llopis
|
e13f2d4ae3
|
feat(route_ticket): add column province and change order other columns
|
2021-11-26 10:06:13 +01:00 |
Joan Sanchez
|
c986fe9557
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-11-26 09:59:21 +01:00 |
Joan Sanchez
|
eb101ffc76
|
refactor(fonts): updated fonts and changed invoiceOut icon
|
2021-11-26 09:59:05 +01:00 |
Joan Sanchez
|
25371ef97b
|
Translation fix
|
2021-11-26 09:06:58 +01:00 |
Alex Moreno
|
2ab5c9818a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-26 08:35:00 +01:00 |
Alex Moreno
|
eea9413628
|
fix(item_basic-data): controller, test e2e and model
|
2021-11-26 08:34:32 +01:00 |
Carlos Jimenez Ruiz
|
ba29df16c0
|
Merge branch 'dev' into 3377-modifyStyles
|
2021-11-25 15:02:47 +00:00 |
Vicent Llopis
|
74fbae6510
|
refactor(route_ticket): add style in a style.scss
|
2021-11-25 15:15:51 +01:00 |
Joan Sanchez
|
6b6a1b4329
|
refactor(fonts): updated fonts and changed invoiceOut icon
|
2021-11-25 14:14:01 +01:00 |
Vicent Llopis
|
6afc694f6c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3377-modifyStyles
|
2021-11-25 14:07:14 +01:00 |
Alex Moreno
|
9fce06dfe0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-25 11:53:26 +01:00 |
Carlos Jimenez Ruiz
|
cdbd1964a6
|
Merge branch 'dev' into 3368-export_database
|
2021-11-25 10:49:17 +00:00 |
Carlos Jimenez Ruiz
|
5914e8e1ac
|
fixed e2e by adding acls where needed
|
2021-11-25 11:30:55 +01:00 |
Alex Moreno
|
815826e891
|
refactor(ticket): modify transferSales.js for avoid unnecessary logs
|
2021-11-25 11:23:18 +01:00 |
Joan Sanchez
|
0838f34771
|
Show alias section for marketing
|
2021-11-25 08:14:48 +01:00 |
Joan Sanchez
|
ab3902ebd8
|
Restricted account creation
|
2021-11-25 08:08:47 +01:00 |
Joan Sanchez
|
4162f239cf
|
Allow basic-data access for hhrr
|
2021-11-25 07:50:01 +01:00 |
Joan Sanchez
|
0fc52cbf1d
|
Updated descriptor ACLs
|
2021-11-25 07:43:32 +01:00 |
Carlos Jimenez Ruiz
|
09c2b813b5
|
ACL update
|
2021-11-24 15:27:09 +01:00 |
Joan Sanchez
|
c3e311f076
|
Updated route acls
|
2021-11-24 15:01:44 +01:00 |
Carlos Jimenez Ruiz
|
c4bc89ee29
|
refactor(entry): back unit tests refactor to transactions
|
2021-11-24 14:29:15 +01:00 |
Carlos Jimenez Ruiz
|
c3da93bfd3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-11-24 11:22:16 +01:00 |
Joan Sanchez
|
f98b0c7bbe
|
Merge branch 'dev' into 3363-sale_update_price
|
2021-11-24 09:15:13 +00:00 |
Alex Moreno
|
00072a7dd1
|
landing searchable false
|
2021-11-24 10:02:52 +01:00 |
Alex Moreno
|
8d33041970
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
|
2021-11-24 09:59:10 +01:00 |
Joan Sanchez
|
8ede14ab40
|
fix(sales): update price on any change affecting the ticket total
Refs: 3363
|
2021-11-24 09:25:24 +01:00 |
Alex Moreno
|
aaa49bdf78
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3384-item_basic-data
|
2021-11-24 09:22:24 +01:00 |
Alex Moreno
|
02d89e5774
|
feat(item): add field genericFk in basic-data
|
2021-11-24 08:51:07 +01:00 |
Alex Moreno
|
e319af6556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3339-entry_latest-buys-search-panel
|
2021-11-24 07:30:10 +01:00 |
Carlos Jimenez Ruiz
|
c544cbfec7
|
Merge branch 'dev' into 3350-Smart_table_unit_tests
|
2021-11-23 15:55:45 +00:00 |
Javi Gallego
|
d0326fe354
|
reload section summary
|
2021-11-23 15:13:34 +01:00 |
Carlos Jimenez Ruiz
|
320cc6c02c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests
|
2021-11-23 13:52:15 +01:00 |
Alex Moreno
|
abb33c8514
|
feat(client): consumption.decription sortable
|
2021-11-23 11:39:31 +01:00 |
Carlos Jimenez Ruiz
|
16df8fd2f3
|
Merge branch 'dev' into 3388-ticket_sale
|
2021-11-23 09:03:06 +00:00 |
Joan Sanchez
|
07dcdab1ef
|
fix(sale): disabled clear icons
|
2021-11-23 09:57:19 +01:00 |
Carlos Jimenez Ruiz
|
51a3673160
|
Merge branch 'dev' into 3369-filterValue_sqli
|
2021-11-23 08:54:50 +00:00 |
Alex Moreno
|
854ed9936d
|
deleted unnecessary comma
|
2021-11-23 09:05:42 +01:00 |
Alex Moreno
|
b460579834
|
feat(entry_latest-buys): add from and to in search-panel
|
2021-11-23 09:00:46 +01:00 |
Carlos Jimenez Ruiz
|
1f2417b55e
|
Merge branch 'dev' into 3290-entry_latest-buys
|
2021-11-22 15:34:55 +00:00 |
Carlos Jimenez Ruiz
|
cae3322c6b
|
Merge branch 'dev' into 3332-item_search-panel
|
2021-11-22 15:28:21 +00:00 |
Carlos Jimenez Ruiz
|
ec7cb47ad5
|
Merge branch 'dev' into 3375-client_descriptor
|
2021-11-22 14:55:56 +00:00 |
Joan Sanchez
|
4ebad6b372
|
filter order was not properly being applied
|
2021-11-22 15:54:01 +01:00 |
Joan Sanchez
|
3a2e4c54b6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3369-filterValue_sqli
|
2021-11-22 15:49:43 +01:00 |
Joan Sanchez
|
90ab78d26d
|
Updated unit tests
|
2021-11-22 15:49:32 +01:00 |
Carlos Jimenez Ruiz
|
cbcfdd33ec
|
Merge branch 'dev' into 3379-payMethod_ibanRequired
|
2021-11-22 14:21:46 +00:00 |
Carlos Jimenez Ruiz
|
9fdfe64909
|
Merge branch 'dev' into 3381-item_diary-claim
|
2021-11-22 13:51:51 +00:00 |
Joan Sanchez
|
a940d14256
|
fix(filterValue): fixed sql injection vulnerability
Refs: 3369
|
2021-11-22 14:40:03 +01:00 |
Carlos Jimenez Ruiz
|
ff0a3acd6e
|
Merge branch 'dev' into 3379-payMethod_ibanRequired
|
2021-11-22 13:32:18 +00:00 |
Carlos Jimenez Ruiz
|
dd19ac975d
|
Merge branch 'dev' into 3338-worker_calendar
|
2021-11-22 13:18:53 +00:00 |
Vicent Llopis
|
cb81ad3722
|
delete unnecessay space
|
2021-11-22 14:02:21 +01:00 |
Vicent Llopis
|
709a300388
|
fix: extracting logic gates to constants
|
2021-11-22 13:44:22 +01:00 |
Vicent Llopis
|
abf3c1c84b
|
Merge branch '3338-worker_calendar' of https://gitea.verdnatura.es/verdnatura/salix into 3338-worker_calendar
|
2021-11-22 13:34:44 +01:00 |
Vicent Llopis
|
cdf7c20b16
|
feat(worker_createAbsense): update backTest
|
2021-11-22 13:34:42 +01:00 |
Vicent Llopis
|
a5ba02e2ec
|
feat(route_tickets): update frontTest
|
2021-11-22 13:28:12 +01:00 |
Vicent Llopis
|
fb6e443f03
|
feat(routes_tickets): button up when add tickets
|
2021-11-22 12:52:02 +01:00 |
Alex Moreno
|
80f651f37d
|
add entries less than a year ago
|
2021-11-22 12:34:20 +01:00 |
Alex Moreno
|
fe46dbd343
|
feat(entry_last-buys): add filter isFloramondo
|
2021-11-22 11:49:30 +01:00 |
Alex Moreno
|
97a66754a7
|
feat(item and entry): add back test
|
2021-11-22 08:58:54 +01:00 |
Alex Moreno
|
1e6805a161
|
remove unnecessary tabulation
|
2021-11-22 08:30:28 +01:00 |
Alex Moreno
|
d2729e67e9
|
feat(item and latest-buys: add supplier filter
|
2021-11-22 08:27:14 +01:00 |
Carlos Jimenez Ruiz
|
ca0c3be843
|
Merge branch 'dev' into 3381-item_diary-claim
|
2021-11-19 12:55:11 +00:00 |
Carlos Jimenez Ruiz
|
fad44c0b74
|
Merge branch 'dev' into 3374-itemPackingType
|
2021-11-19 11:59:50 +00:00 |
Carlos Jimenez Ruiz
|
e5977be502
|
Merge branch 'dev' into 3374-itemPackingType
|
2021-11-19 11:47:37 +00:00 |
Alex Moreno
|
e64e06b9ab
|
feat(client): change phone for payMethod in descriptor
|
2021-11-19 12:10:53 +01:00 |
Vicent Llopis
|
8f2e29787b
|
fix(payMethod): alter colums name
|
2021-11-19 10:07:33 +01:00 |
Alex Moreno
|
ac9ed90f4a
|
feat(item): modify item_getBalance and do test
|
2021-11-19 10:02:40 +01:00 |
Joan Sanchez
|
46d7a6e765
|
Added unit tests
|
2021-11-19 09:24:49 +01:00 |
Joan Sanchez
|
8c5f0d3019
|
feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
|
2021-11-19 09:24:31 +01:00 |
Vicent Llopis
|
98195bf7b0
|
fix(route_tickets): dialog show the name of clients
|
2021-11-19 08:44:56 +01:00 |
Vicent Llopis
|
9de3db1961
|
fix(client_summary): show 10 tickets at least
|
2021-11-19 08:43:30 +01:00 |
Javi Gallego
|
c8e9416448
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2021-11-19 07:33:54 +01:00 |
Carlos Jimenez Ruiz
|
92142c4f93
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests
|
2021-11-18 17:00:33 +01:00 |
Joan Sanchez
|
c101bbb6be
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-18 16:10:11 +01:00 |
Joan Sanchez
|
9c5939b661
|
Updated styles
|
2021-11-18 16:02:47 +01:00 |
Carlos Jimenez Ruiz
|
cdc0d4dbe5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3350-Smart_table_unit_tests
|
2021-11-18 15:26:34 +01:00 |
Carlos Jimenez Ruiz
|
52cc927f85
|
Merge branch 'dev' into 3351-ticket_step-two-two
|
2021-11-18 14:10:23 +00:00 |
Carlos Jimenez Ruiz
|
c1adba3249
|
Merge branch 'dev' into 3338-worker_calendar
|
2021-11-18 14:01:25 +00:00 |
Carlos Jimenez Ruiz
|
334da3da9d
|
Merge branch 'dev' into 3370-client_create
|
2021-11-18 14:00:22 +00:00 |
Carlos Jimenez Ruiz
|
3eb7b4cf55
|
refactor(item.filter): buildFilter switch refactor
|
2021-11-18 14:49:05 +01:00 |
Alex Moreno
|
caf6320d53
|
feat(ticket): default ticketAction for salesAssistant
|
2021-11-18 14:27:05 +01:00 |
Joan Sanchez
|
c98730e6b9
|
Updated styles
|
2021-11-18 14:00:45 +01:00 |
Carlos Jimenez Ruiz
|
e31f98bfa9
|
Merge branch 'dev' into 3370-client_create
|
2021-11-18 12:57:33 +00:00 |
Carlos Jimenez Ruiz
|
2bfcaa810c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel
|
2021-11-18 12:40:50 +01:00 |
Joan Sanchez
|
ba60523012
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-18 12:31:43 +01:00 |
Joan Sanchez
|
5d2693f949
|
Updated latest buys icon
|
2021-11-18 12:23:21 +01:00 |
Alex Moreno
|
eea1e39a6a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3370-client_create
|
2021-11-18 12:21:31 +01:00 |
Alex Moreno
|
16c28cfa56
|
fix(client): validate businessType
|
2021-11-18 12:15:37 +01:00 |
Carlos Jimenez Ruiz
|
129e811271
|
Merge branch 'dev' into 3360-supplier_descriptor
|
2021-11-18 11:01:25 +00:00 |
Joan Sanchez
|
3ffbdc3fde
|
Updated fonts
|
2021-11-18 11:48:13 +01:00 |
Carlos Jimenez Ruiz
|
8676a1df90
|
updated method description
|
2021-11-18 11:28:11 +01:00 |
Carlos Jimenez Ruiz
|
4fc01e6a0d
|
typos corrected
|
2021-11-18 11:18:45 +01:00 |
Carlos Jimenez Ruiz
|
1d253fc53d
|
definitions corrected for myOptions of endpoints
|
2021-11-18 11:17:30 +01:00 |
Carlos Jimenez Ruiz
|
e53af13b3c
|
unit tests for smart table and ticket index
|
2021-11-18 11:04:51 +01:00 |
Carlos Jimenez Ruiz
|
a40e8ad2d8
|
Merge branch 'dev' into 3328-item_search-panel
|
2021-11-18 09:35:39 +00:00 |
Joan Sanchez
|
e9342af3f5
|
refactor(theme): enabled dark theme
|
2021-11-18 10:12:21 +01:00 |
Vicent Llopis
|
f87f60f00a
|
feat(item-itemPackingType): add model and dumpedFixtures
|
2021-11-18 09:16:36 +01:00 |
Javi Gallego
|
d46c590ccb
|
test
|
2021-11-18 08:21:02 +01:00 |
Javi Gallego
|
b936272898
|
Merge branch 'dev' into 2883-invoiceIn-Booking
|
2021-11-18 07:36:03 +01:00 |
Vicent Llopis
|
00a33fabb3
|
update backTest
|
2021-11-17 14:38:12 +01:00 |
Vicent Llopis
|
651a925708
|
feat(worker_calendar): only can choose one halfHoliday by year
|
2021-11-17 14:20:26 +01:00 |
Alex Moreno
|
40656da725
|
fix(zone): calendar event
|
2021-11-17 13:27:56 +01:00 |
Alex Moreno
|
146337b30f
|
change for error
|
2021-11-17 13:19:22 +01:00 |
Alex Moreno
|
a35d36b84f
|
fix(zone): calendar event
|
2021-11-17 13:15:59 +01:00 |
Alex Moreno
|
1a95b03359
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3364-zone_events
|
2021-11-17 12:38:52 +01:00 |
Alex Moreno
|
72c724c1e7
|
refactor(ticket): loadDefaultTicketAction()
|
2021-11-17 09:59:34 +01:00 |
Alex Moreno
|
b59cabe41a
|
feat(item): add filterParams in main
|
2021-11-17 09:11:26 +01:00 |
Alex Moreno
|
26815ad5a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3341-item_search-panel
|
2021-11-17 08:36:35 +01:00 |
Alex Moreno
|
b45b8950fb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3351-ticket_step-two
|
2021-11-17 07:20:08 +01:00 |
Joan Sanchez
|
5672bfec7a
|
fix(client): businessTypeFk is not longer a required field
|
2021-11-16 15:23:54 +01:00 |
Alex Moreno
|
4981a41d0c
|
fix(supplier): delete verified supplier icon
|
2021-11-16 14:36:53 +01:00 |
Alex Moreno
|
6fa60e597a
|
refactor(item): activeBuyer.spec.js
|
2021-11-16 14:13:15 +01:00 |
Alex Moreno
|
f27420c14a
|
refactor(item): activeBuyers
|
2021-11-16 13:56:09 +01:00 |
Joan Sanchez
|
2bc20242e6
|
fix(salesMonitor): allow scope days to zero
|
2021-11-16 13:43:30 +01:00 |
Alex Moreno
|
23b567046b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
|
2021-11-16 12:30:28 +01:00 |
Vicent Llopis
|
180fb95a00
|
feat(createAbsence): add backTest
|
2021-11-16 10:09:42 +01:00 |
Joan Sanchez
|
7894b32163
|
Merge pull request 'refactor(entry.buy): moved add button' (#780) from 3281-entry_buys_new into dev
Reviewed-on: #780
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-11-16 09:05:11 +00:00 |
Carlos Jimenez Ruiz
|
6c02eca6cd
|
Merge branch 'dev' into 3281-entry_buys_new
|
2021-11-16 08:20:01 +00:00 |
Joan Sanchez
|
a6f8a682db
|
fix(fixed-price): confirm on deletion
|
2021-11-16 08:41:27 +01:00 |
Joan Sanchez
|
5b22892500
|
fix(fixed-price): changed active buyers endpoint and added pagination
|
2021-11-16 07:45:15 +01:00 |
Carlos Jimenez Ruiz
|
3f6e1ce9aa
|
refactor(entry.buy): moved add button
|
2021-11-15 18:24:01 +01:00 |
Alex Moreno
|
ec25df39e4
|
transaction activeWithBuyer.js
|
2021-11-15 14:50:02 +01:00 |
Vicent Llopis
|
7efb19ab83
|
feat(worker_calendar): add restriction to choose "Vacaciones 1/2 día"
|
2021-11-15 14:49:14 +01:00 |
Carlos Jimenez Ruiz
|
c011a82edc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-15 14:40:50 +01:00 |
Carlos Jimenez Ruiz
|
bdff28a465
|
removed unused code
|
2021-11-15 14:40:35 +01:00 |
Alex Moreno
|
54dc9aacaa
|
feat(item): add checkbox isFloramondo in search-panel
|
2021-11-15 13:53:18 +01:00 |
Alex Moreno
|
73211c5b3b
|
Merge branch '3328-item_search-panel' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
|
2021-11-15 12:14:37 +01:00 |
Alex Moreno
|
adf295ebf3
|
fix(item): add ng-model, add fixture and transaction back test
|
2021-11-15 12:14:34 +01:00 |
Carlos Jimenez Ruiz
|
d69ee4a597
|
Merge branch 'dev' into 3328-item_search-panel
|
2021-11-15 09:34:48 +00:00 |
Carlos Jimenez Ruiz
|
8c5523a3d1
|
Merge branch 'dev' into 3317-client_create
|
2021-11-15 09:28:46 +00:00 |
Joan Sanchez
|
a41ab4d1dd
|
Merge pull request '3346-item_diary claim cambiar ruta' (#775) from 3346-item_diary into dev
Reviewed-on: #775
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-11-15 09:19:04 +00:00 |
Alex Moreno
|
df7980f2f9
|
separate in two vn-horizontal
|
2021-11-15 10:16:23 +01:00 |
Joan Sanchez
|
fac1122438
|
Merge branch 'dev' into 3261-ticket_request
|
2021-11-15 09:14:55 +00:00 |
Carlos Jimenez Ruiz
|
4ef6e2b23b
|
Merge branch 'dev' into 3346-item_diary
|
2021-11-15 09:07:58 +00:00 |
Carlos Jimenez Ruiz
|
1f8a6b9636
|
Merge branch 'dev' into 3314-invoice-out_summary
|
2021-11-15 08:53:25 +00:00 |
Carlos Jimenez Ruiz
|
59cdf00134
|
Merge branch 'dev' into 3312-ibanRequired
|
2021-11-15 08:24:29 +00:00 |
Joan Sanchez
|
e62e57bcde
|
Monitor smart-table ammends
|
2021-11-15 08:45:21 +01:00 |
Alex Moreno
|
df6d547ad9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3328-item_search-panel
|
2021-11-15 08:34:40 +01:00 |
Alex Moreno
|
8a5ed6782a
|
feat(ticket): change default ticketUpdateOption for salesAssistant
|
2021-11-15 08:32:16 +01:00 |
Carlos Jimenez Ruiz
|
266b1c8073
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3256-order_transactions
|
2021-11-12 17:32:03 +01:00 |
Carlos Jimenez Ruiz
|
2e359fd8b7
|
Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-12 16:14:14 +01:00 |
Joan Sanchez
|
3e35e7e0b8
|
Changed to single scope for all inputs
|
2021-11-12 14:15:35 +01:00 |
Alex Moreno
|
243113053e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3317-client_create
|
2021-11-12 13:10:43 +01:00 |
Alex Moreno
|
5faef913eb
|
feat(client): add field businessTypeFk and modify her tests
|
2021-11-12 13:10:11 +01:00 |
Carlos Jimenez Ruiz
|
aaed7c82f6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-12 11:45:57 +01:00 |
Carlos Jimenez Ruiz
|
62e03f4752
|
item create e2e fix
|
2021-11-12 11:03:23 +01:00 |
Joan Sanchez
|
02e651eac8
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-12 09:45:05 +01:00 |
Joan Sanchez
|
f32db33ed9
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-11-12 09:43:50 +01:00 |
Joan Sanchez
|
93c766e3ca
|
fix(supplier): removed everyone read acl
|
2021-11-12 09:32:42 +01:00 |
Alex Moreno
|
6fe7875d73
|
change route
|
2021-11-12 09:28:19 +01:00 |
Alex Moreno
|
2581ce43a7
|
refactor(descriptor): separate es.yml
|
2021-11-12 08:32:15 +01:00 |
Joan Sanchez
|
c40a73b891
|
Merge branch '2970-smart-table' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-11 17:19:07 +01:00 |
Joan Sanchez
|
04da06d778
|
refactor(smart-table): style changes and added smart-table to sales monitor
|
2021-11-11 17:18:44 +01:00 |
Carlos Jimenez Ruiz
|
acd2d2e51f
|
front unit tests fix for lastests buys
|
2021-11-11 17:18:19 +01:00 |
Carlos Jimenez Ruiz
|
4fe7d4f566
|
ticket index rollback
|
2021-11-11 17:17:48 +01:00 |
Carlos Jimenez Ruiz
|
d2dc0bd147
|
multi check now behaves properly
|
2021-11-11 16:38:41 +01:00 |
Alex Moreno
|
dd47f209a2
|
feat(descriptor-menu): handle error empty input
|
2021-11-11 14:46:05 +01:00 |
Alex Moreno
|
509e002e34
|
feat(summary): get email
|
2021-11-11 13:14:34 +01:00 |
Alex Moreno
|
5c7efbb838
|
feat(item): back filter buyer in search panel ans test
|
2021-11-11 10:33:21 +01:00 |
Joan Sanchez
|
95dfd4c2dd
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-11-11 08:27:59 +01:00 |
Alex Moreno
|
62cdf52227
|
refactor(time-control): getWorkedHours.spec
|
2021-11-11 08:24:57 +01:00 |
Alex Moreno
|
a3bb3122ed
|
fix(time-control): modify select & refactor dates
|
2021-11-11 08:24:41 +01:00 |
Carlos Jimenez Ruiz
|
0bf553e11e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-10 17:07:39 +01:00 |
Carlos Jimenez Ruiz
|
d87e8ac226
|
refactor(entry.lastBuys): usage of smart table on latests buys
|
2021-11-10 17:07:16 +01:00 |
Vicent Llopis
|
41974669e5
|
fix(testBack): add context
|
2021-11-10 15:11:42 +01:00 |
Alex Moreno
|
7880fb8de9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3314-invoice-out_summary
|
2021-11-10 14:54:15 +01:00 |
Alex Moreno
|
f34130cbd7
|
feat(invoiceOut): separate index.js and jest test
|
2021-11-10 14:48:17 +01:00 |
Carlos Jimenez Ruiz
|
717ea60084
|
Merge branch 'dev' into 3116-client_balance
|
2021-11-10 13:40:56 +00:00 |
Vicent Llopis
|
d3ff60719c
|
fix(last-entries): dateFrom -75 days
|
2021-11-10 12:34:56 +01:00 |
Vicent Llopis
|
0849f40df7
|
feat: update backTest
|
2021-11-10 11:44:29 +01:00 |
Carlos Jimenez Ruiz
|
d8c3113adc
|
Merge branch 'dev' into 3308-supplier_basic-data
|
2021-11-10 09:57:06 +00:00 |
Alex Moreno
|
2ca48f2ae0
|
refactor(supplier): remove console.log
|
2021-11-10 10:48:05 +01:00 |
Carlos Jimenez Ruiz
|
766d9c6464
|
Merge branch 'dev' into 3319-worker_time-control
|
2021-11-10 09:38:54 +00:00 |
Vicent Llopis
|
18aec14fe9
|
update backTest
|
2021-11-10 08:46:09 +01:00 |
Alex Moreno
|
119d5e45b9
|
feat(supplier): add checkbox isPayMethodChecked
|
2021-11-10 08:43:25 +01:00 |
Alex Moreno
|
a52c06057f
|
feat(invoiceOut): separate descriptor
|
2021-11-09 15:10:43 +01:00 |
Vicent Llopis
|
833822978a
|
feat(client_balance): test e2e
|
2021-11-09 14:36:39 +01:00 |
Carlos Jimenez Ruiz
|
469c544536
|
item.index default columns and filter with like
|
2021-11-09 11:47:54 +01:00 |
Alex Moreno
|
0aa0358b50
|
refactor(events): name of variable
|
2021-11-09 10:21:28 +01:00 |
Alex Moreno
|
f45db68e0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3319-worker_time-control
|
2021-11-09 10:10:20 +01:00 |
Alex Moreno
|
da80fee0e2
|
refactor(time-control): getWorkedHours.spec
|
2021-11-09 10:09:44 +01:00 |
Carlos Jimenez Ruiz
|
345be297f0
|
Merge branch 'dev' into 3116-client_balance
|
2021-11-09 08:26:41 +00:00 |
Alex Moreno
|
7009cc0cc0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
|
2021-11-09 08:40:42 +01:00 |
Alex Moreno
|
9ab51fc21f
|
feat(eventsFiltered): add backTest & refactor zone
|
2021-11-09 08:39:20 +01:00 |
Carlos Jimenez Ruiz
|
e4ea05fd07
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-11-08 17:46:50 +01:00 |
Carlos Jimenez Ruiz
|
262e46d7c9
|
added autocompletes to item index
|
2021-11-08 17:46:40 +01:00 |
Vicent Llopis
|
395ad1c76d
|
fix(ibanRequired): set different ibanRequired for Client and Supplier
|
2021-11-08 15:04:33 +01:00 |
Joan Sanchez
|
eb36f86b9d
|
Added smart-table to item index
|
2021-11-08 14:46:23 +01:00 |
Alex Moreno
|
9e4627617d
|
fix(time-control): modify select & refactor dates
|
2021-11-08 14:08:44 +01:00 |
Joan Sanchez
|
2bf7250117
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-11-08 13:40:22 +01:00 |
Joan Sanchez
|
a48617e267
|
Group first
|
2021-11-08 13:39:12 +01:00 |
Vicent Llopis
|
bfbc9b50c4
|
feat(client_balance): add maxImport if "cash"
|
2021-11-08 13:02:42 +01:00 |
Joan Sanchez
|
7dc95b8cbf
|
Group first
|
2021-11-08 12:50:13 +01:00 |
Alex Moreno
|
9c877ceb7a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3271-zone_calendar
|
2021-11-08 11:31:26 +01:00 |
Alex Moreno
|
6e2f7d9e0d
|
feat(events): get range date of calendar
|
2021-11-08 11:30:00 +01:00 |
Vicent Llopis
|
fbbb1ecdf6
|
feat(client_balance): add maxImport if "cash"
|
2021-11-08 08:59:42 +01:00 |
Carlos Jimenez Ruiz
|
8fff96ca05
|
Merge branch 'dev' into 3295-claim_search-panel
|
2021-11-08 07:54:10 +00:00 |
Alex Moreno
|
3324f4acd2
|
fix(zone): back remoteMethod
|
2021-11-04 07:56:12 +01:00 |
Alex Moreno
|
bb0745532b
|
fix(claim): salesPersonFk where add officeBoss
|
2021-11-02 11:24:52 +01:00 |
Alex Moreno
|
b01298ed17
|
feat(entry_descriptor): add supplier button
|
2021-11-02 08:25:43 +01:00 |
Alex Moreno
|
b2dd9e6076
|
feat(zone): filter calendar
|
2021-11-02 07:55:35 +01:00 |
Carlos Jimenez Ruiz
|
04a31f4cff
|
vn table now receives show buttons options
|
2021-10-29 16:55:19 +02:00 |
Carlos Jimenez Ruiz
|
11f24372e5
|
autocomplete options added to smart table
|
2021-10-29 15:52:04 +02:00 |
Carlos Jimenez Ruiz
|
89b7f5ed7a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2970-smart-table
|
2021-10-28 13:46:41 +02:00 |
Joan Sanchez
|
dfb2b0b3d8
|
Updated checked property
|
2021-10-28 09:09:52 +02:00 |
Joan Sanchez
|
bfc9228eef
|
Restored ticket table and added table compatibility on contextmenu
|
2021-10-28 09:06:03 +02:00 |
Carlos Jimenez Ruiz
|
b27a443729
|
show/hide columns and load default view
|
2021-10-27 17:11:33 +02:00 |
Vicent Llopis
|
cd6f0057a1
|
test
|
2021-10-27 13:41:59 +02:00 |
Vicent Llopis
|
b1b6d93c8e
|
change column value : checkbox for text
|
2021-10-27 13:39:38 +02:00 |
Vicent Llopis
|
f60fa5a852
|
change receiver to requesterId
|
2021-10-27 12:22:32 +02:00 |
Vicent Llopis
|
d94e2900d0
|
feat(ticket-request): send rocket message when ticket-reques is denied
|
2021-10-27 12:16:37 +02:00 |
Alex Moreno
|
21686b4a92
|
feat(test): modify jest test
|
2021-10-27 09:55:35 +02:00 |
Carlos Jimenez Ruiz
|
c976f1ed07
|
multiple search by column feature
|
2021-10-26 17:16:01 +02:00 |
Alex Moreno
|
92b916580e
|
feat(description): concat bank with tickets
|
2021-10-26 10:20:35 +02:00 |
Joan Sanchez
|
bf386929d3
|
Deletion ammends and selection fixed
|
2021-10-25 17:18:57 +02:00 |
Carlos Jimenez Ruiz
|
7ce58c5f33
|
sorting arrows for multiple columns
|
2021-10-25 14:20:17 +02:00 |
Carlos Jimenez Ruiz
|
f62814e81e
|
refactor(order): catalogFilter, confirm and filter transactions
|
2021-10-25 13:13:05 +02:00 |
Joan Sanchez
|
6578a498ca
|
feat(exportation): added exportation report & send report with client invoicing
Refs: 3254
|
2021-10-25 12:13:33 +02:00 |
Joan Sanchez
|
66830f32fd
|
feat(exportation): added exportation report & send report with client invoicing
Refs: 3254
|
2021-10-25 11:58:23 +02:00 |
Joan Sanchez
|
d5264486c7
|
Simplified to one component
|
2021-10-23 14:26:42 +02:00 |
Carlos Jimenez Ruiz
|
13c06bf5be
|
refactor(monitors): added transactions to endpoints
|
2021-10-22 17:32:10 +02:00 |
Joan Sanchez
|
e6304d026c
|
feat(smart-table): added smart-table and smart-table-menu components
|
2021-10-22 15:01:54 +02:00 |
Joan Sanchez
|
2cdc22bc4d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-22 11:46:16 +02:00 |
Joan Sanchez
|
aa27ebffc9
|
renamed method
|
2021-10-22 10:47:44 +02:00 |
Joan Sanchez
|
8a679b2c8b
|
fix(invoice): fixed error for invoice with incoterms
|
2021-10-22 10:26:40 +02:00 |
Carlos Jimenez Ruiz
|
683f01ddd8
|
refactor(zone): removed deprecated column m3Max
|
2021-10-21 13:19:41 +02:00 |
Carlos Jimenez Ruiz
|
14a72b32bd
|
refactor(itemMaxSize): added itemMaxSize column and used it instead of m3Max
|
2021-10-21 11:37:09 +02:00 |
Carlos Jimenez Ruiz
|
5ea014aeff
|
feat(monitors): added auto-refresh feature to ticket monitors
|
2021-10-20 15:42:09 +02:00 |
Carlos Jimenez Ruiz
|
1c51d34f7d
|
feat(monitors): added auto-refresh feature to ticket monitors
|
2021-10-20 14:40:08 +02:00 |
Vicent Llopis
|
601d358b51
|
refactor(entry_summary): ident a line
|
2021-10-20 10:02:03 +02:00 |
Vicent Llopis
|
f6de57a9b5
|
Merge branch '3235-entry_summary' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
|
2021-10-20 07:50:55 +02:00 |
Vicent Llopis
|
4a5cf187a5
|
refactor(entry_summary): ident a line
|
2021-10-20 07:50:51 +02:00 |
Carlos Jimenez Ruiz
|
97242031eb
|
Merge branch 'dev' into 3235-entry_summary
|
2021-10-19 14:43:06 +00:00 |
Vicent Llopis
|
1ba7f16ad3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
|
2021-10-19 14:53:54 +02:00 |
Alex Moreno
|
b4986b619a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3105-ticket_sale
|
2021-10-19 14:50:39 +02:00 |
Carlos Jimenez Ruiz
|
5be2eb974f
|
refactor(test): adapted the new thermograph front unit test to expect thermograph data to be defined
|
2021-10-19 11:08:03 +02:00 |
Carlos Jimenez Ruiz
|
e3942c0bb9
|
refactor(thermograph): empty fields handler added and correct usage of thermograph.code
|
2021-10-19 10:58:58 +02:00 |
Alex Moreno
|
1cb0cda3a8
|
fix(sale): delete :: in image
|
2021-10-19 10:26:00 +02:00 |
Carlos Jimenez Ruiz
|
b41a0bd849
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3108-item_isBargain_isOnOffer_deprecation
|
2021-10-19 09:57:45 +02:00 |
Vicent Llopis
|
788bd76014
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3235-entry_summary
|
2021-10-19 07:34:53 +02:00 |
Carlos Jimenez Ruiz
|
fa067f94d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
|
2021-10-18 16:55:28 +02:00 |
Vicent Llopis
|
40ab2ce5bc
|
feat(entry_summary): add reference
|
2021-10-18 14:00:59 +02:00 |
Alex Moreno
|
44f174103c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
|
2021-10-18 12:12:17 +02:00 |
Carlos Jimenez Ruiz
|
cec04a307d
|
refactor:(item): deprecation of isBargain and isOnOffer columns at model and fixtures
|
2021-10-18 12:05:38 +02:00 |
Vicent Llopis
|
e61e74ed36
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3172-item_last-entries
|
2021-10-18 10:27:59 +02:00 |
Alex Moreno
|
bf100f339e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3173-item_diary
|
2021-10-18 10:22:53 +02:00 |
Joan Sanchez
|
ee1a7952ad
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
|
2021-10-18 09:44:27 +02:00 |
Carlos Jimenez Ruiz
|
ace1c9c84b
|
fix(transaction): priceDifference now commits its created transaction
|
2021-10-15 16:02:50 +02:00 |
Carlos Jimenez Ruiz
|
c4c1aa929a
|
refactor(endpoints): corrected indentation and removed unused code
|
2021-10-15 16:00:50 +02:00 |
Carlos Jimenez Ruiz
|
de7af0fee2
|
fix(transaction): priceDifference now commits its created transaction
|
2021-10-15 15:59:59 +02:00 |
Carlos Jimenez Ruiz
|
270b2802c8
|
refactor(transactions): added transaction to sendChechingPresence and corrected a typo
|
2021-10-15 15:31:13 +02:00 |
Carlos Jimenez Ruiz
|
05df98939b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-15 14:47:34 +02:00 |
Carlos Jimenez Ruiz
|
580ba36357
|
refactor(jasmine): usage of done on async functions is deprecated
|
2021-10-15 14:45:41 +02:00 |
Joan Sanchez
|
d5cf57fbb1
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-15 14:07:48 +02:00 |
Joan Sanchez
|
b6a9896cba
|
Fixed monitor problems filter
|
2021-10-15 12:10:28 +02:00 |
Joan Sanchez
|
85b4730c6c
|
feat(monitor): show client risk to future on tickets
Refs: 2624
|
2021-10-15 10:49:23 +02:00 |
Vicent Llopis
|
6d05b046e8
|
feat(last-entries): add dateTo & delete style.scss
|
2021-10-15 10:34:32 +02:00 |
Carlos Jimenez Ruiz
|
99043bd94e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-14 16:21:55 +02:00 |
Carlos Jimenez Ruiz
|
b81d6b022c
|
refactor(buy): removed width limit for a column that was breaking e2e behavior
|
2021-10-14 16:18:04 +02:00 |
Carlos Jimenez Ruiz
|
35a2a71602
|
refactor(sales): transaction correctly passed to findById
|
2021-10-14 16:16:00 +02:00 |
Joan Sanchez
|
e278491ad2
|
refactor(order): index filter optimization
|
2021-10-14 08:48:57 +02:00 |
Joan Sanchez
|
d06385fc73
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-13 15:09:34 +02:00 |
Joan Sanchez
|
c0e1f2f0dc
|
Changed column order
|
2021-10-13 14:55:53 +02:00 |
Joan Sanchez
|
1b9b918812
|
Fixed format
|
2021-10-13 14:29:11 +02:00 |
Joan Sanchez
|
b2cdfd9785
|
Removed empty spaces
|
2021-10-13 14:29:01 +02:00 |
Joan Sanchez
|
31e160559b
|
fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
|
2021-10-13 14:28:50 +02:00 |
Joan Sanchez
|
d951ca02f0
|
Fixed format
|
2021-10-13 14:21:42 +02:00 |
Joan Sanchez
|
491cca2bd6
|
Removed empty spaces
|
2021-10-13 14:19:29 +02:00 |
Joan Sanchez
|
a0a01de937
|
fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
|
2021-10-13 14:17:45 +02:00 |
Alex Moreno
|
1684c1bf87
|
feat(diary): modify sql item_getBalance
|
2021-10-13 14:03:06 +02:00 |
Alex Moreno
|
a8f8248c41
|
feat(diary): Add column claim
|
2021-10-13 12:33:48 +02:00 |
Joan Sanchez
|
e641a947b3
|
Updated unit tests
|
2021-10-08 09:51:42 +02:00 |
Joan Sanchez
|
e6b60d73f1
|
Added unit tests
|
2021-10-07 13:36:23 +02:00 |
Joan Sanchez
|
4610ed83d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
|
2021-10-07 10:28:06 +02:00 |
Joan Sanchez
|
82a14088d0
|
Added options to invoiceOut
|
2021-10-07 10:04:50 +02:00 |
Carlos Jimenez Ruiz
|
8e05301792
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-07 09:58:32 +02:00 |
Carlos Jimenez Ruiz
|
cb7d1b24e8
|
refactor(ticket): all ticket endpoints are using transactions now
|
2021-10-07 09:57:07 +02:00 |
Javi Gallego
|
2dee9fec20
|
falta test checkToBook
|
2021-10-05 11:19:48 +02:00 |
Joan Sanchez
|
3d57e9a618
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-05 08:13:13 +02:00 |
Joan Sanchez
|
1ff3e1f429
|
Increased date range from +10 to +60 days
|
2021-10-05 08:12:25 +02:00 |
Joan Sanchez
|
b299efa63e
|
Changed zone_getShippedWarehouse() to zone_getShipped()
|
2021-10-04 14:58:38 +02:00 |
Joan Sanchez
|
bb4a32293d
|
Changed zone_getShippedWarehouse() to zone_getShipped()
|
2021-10-04 14:45:39 +02:00 |
Carlos Jimenez Ruiz
|
0b46e9ce35
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-04 10:21:09 +02:00 |
Joan Sanchez
|
6b59bdd01c
|
fix(descriptorMenu): show PDF regeneration option
|
2021-10-04 10:19:53 +02:00 |
Carlos Jimenez Ruiz
|
a61a7f7d49
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-04 09:37:27 +02:00 |
Joan Sanchez
|
495b06b932
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-04 09:37:15 +02:00 |
Joan Sanchez
|
b3a34489b0
|
fix(calendar): Event colors were not showing properly
Refs: 3166
|
2021-10-04 09:30:55 +02:00 |
Carlos Jimenez Ruiz
|
16b27c2074
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-10-04 09:23:28 +02:00 |
Joan Sanchez
|
580231d30b
|
Updated unit tests
|
2021-10-01 14:59:12 +02:00 |
Joan Sanchez
|
313db4960e
|
refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
|
2021-10-01 14:59:08 +02:00 |
Joan Sanchez
|
68178bdb1f
|
Updated unit tests
|
2021-10-01 14:48:25 +02:00 |
Joan Sanchez
|
f60c754c59
|
refactor(invoice): Show generate PDF option if it was never generated before
Refs: 3162
|
2021-10-01 14:31:42 +02:00 |
Joan Sanchez
|
1ec20e250c
|
feat(invoice): Send invoice and delivery-note on CSV format
|
2021-10-01 12:41:31 +02:00 |
Joan Sanchez
|
1c8bb35eae
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-01 11:41:55 +02:00 |
Joan Sanchez
|
3df03b31a3
|
fix(invoice): invalid date for PDF storage
|
2021-10-01 10:56:40 +02:00 |
Joan Sanchez
|
c80457142f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-10-01 08:18:56 +02:00 |
Joan Sanchez
|
a41ae85226
|
Removed PDF creation on download
|
2021-10-01 08:11:26 +02:00 |
Joan Sanchez
|
26df12a70a
|
fix(invoice): fixed pdf generation condition race
|
2021-09-30 15:28:34 +02:00 |
Joan Sanchez
|
54fa419255
|
fix(invoice): was storing invoices on incorrect path folder
|
2021-09-30 14:43:37 +02:00 |
Joan Sanchez
|
479d4892ce
|
Updated unit test
|
2021-09-29 12:23:55 +02:00 |
Joan Sanchez
|
a7c75fcbd4
|
fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
|
2021-09-29 12:23:47 +02:00 |
Joan Sanchez
|
458d2670b3
|
Updated unit test
|
2021-09-29 12:17:21 +02:00 |
Joan Sanchez
|
197ed2009f
|
fix(invoicePdf): Create PDF document on invoice download
Refs: 3109, 3110
|
2021-09-29 12:15:42 +02:00 |
Carlos Jimenez Ruiz
|
156ecb32ec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-09-29 08:27:53 +02:00 |
Carlos Jimenez Ruiz
|
392c4dcba3
|
refactor(sale): ticket.sale endpoints now use transactions
|
2021-09-29 08:27:18 +02:00 |
Carlos Jimenez Ruiz
|
e690febc7f
|
refactor(updateAll): usage of documented methods as update alias is not documented in loopback
|
2021-09-29 08:26:10 +02:00 |
Carlos Jimenez Ruiz
|
6cf1737c0d
|
refactor(thermograph): temperature column now displays the correct data
|
2021-09-28 11:59:04 +02:00 |
Javi Gallego
|
4f1fd5412d
|
faltan test
|
2021-09-28 10:57:51 +02:00 |
Joan Sanchez
|
06b49f36b6
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-09-28 10:03:00 +02:00 |
Joan Sanchez
|
19d3b19e5a
|
Updated translation
|
2021-09-28 09:59:00 +02:00 |
Joan Sanchez
|
ee0e1e122b
|
Removed crudModel default params
|
2021-09-24 13:02:20 +02:00 |
Joan Sanchez
|
4ea0f92c35
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-09-24 12:54:22 +02:00 |
Joan Sanchez
|
4545a5c8fa
|
fix(filter): single search results don't use scopeDates
|
2021-09-24 12:51:20 +02:00 |
Carlos Jimenez Ruiz
|
8c446edc9e
|
Merge branch 'dev' into 3098-item_tag_productor
|
2021-09-24 08:02:19 +00:00 |
Carlos Jimenez Ruiz
|
c6692ca951
|
Merge branch 'dev' into 3059-ticket_index_filter
|
2021-09-24 07:54:50 +00:00 |
Carlos Jimenez Ruiz
|
5f0e2825b8
|
Merge branch 'dev' into 3059-ticket_index_filter
|
2021-09-24 07:46:09 +00:00 |
Carlos Jimenez Ruiz
|
7369f4aa54
|
Merge branch 'dev' into 3010-send_invoice
|
2021-09-24 07:44:24 +00:00 |
Carlos Jimenez Ruiz
|
14b92e530a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-09-24 09:37:37 +02:00 |
Javi Gallego
|
e5c9ea850b
|
testback done
|
2021-09-24 08:24:34 +02:00 |
Carlos Jimenez Ruiz
|
8fc17f05c6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3098-item_tag_productor
|
2021-09-23 17:35:07 +02:00 |
Carlos Jimenez Ruiz
|
368f54b872
|
refactor(tags): unified the style rules for tags under fetched-tags component and all display subName if present
|
2021-09-23 17:19:47 +02:00 |
Carlos Jimenez Ruiz
|
f74d2cc302
|
test(tags): moved code used on a single test to the correct place
|
2021-09-22 15:16:45 +02:00 |
Carlos Jimenez Ruiz
|
95ff46db09
|
refactor(buys): entry buys now show item.subName
|
2021-09-22 15:15:52 +02:00 |
Carlos Jimenez Ruiz
|
23ba5657c5
|
refactor(sales): ticket sales now shows item.subName
|
2021-09-22 15:14:29 +02:00 |
Carlos Jimenez Ruiz
|
c971d3ee01
|
refactor(consumption): client consuption now shows item.subName
|
2021-09-22 15:13:29 +02:00 |
Javi Gallego
|
40e589203e
|
test fixed
|
2021-09-22 07:42:58 +02:00 |
Carlos Jimenez Ruiz
|
aae54b5707
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
|
2021-09-21 18:49:35 +02:00 |
Carlos Jimenez Ruiz
|
cc90a08f03
|
refactor(ticket): ticket endpoins now can receive transactions
|
2021-09-21 18:48:59 +02:00 |
Joan Sanchez
|
08cba0a9c8
|
fix(filter): search limit by date range was not being applied
Refs: 3059
|
2021-09-21 15:49:59 +02:00 |
Javi Gallego
|
3365eadf5e
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
|
2021-09-21 14:02:07 +02:00 |
Joan Sanchez
|
6e89fa1b5e
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
|
2021-09-21 12:56:49 +02:00 |
Joan Sanchez
|
689662f9bb
|
fix code duplication
|
2021-09-21 12:48:51 +02:00 |
Carlos Jimenez Ruiz
|
95b4d23599
|
added agency and route columns to client.summary tickets
|
2021-09-21 12:39:54 +02:00 |
Joan Sanchez
|
786589f214
|
fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
Refs: 3093
|
2021-09-21 12:25:22 +02:00 |
Joan Sanchez
|
cd478a9f7b
|
Removed line break
|
2021-09-20 14:02:04 +02:00 |
Joan Sanchez
|
369b79c6af
|
refactor(invoice): removed unnecessary class
|
2021-09-20 14:01:40 +02:00 |
Joan Sanchez
|
a0ac55bc3e
|
refactor(invoice): send invoice to specific email address from descriptor option
Refs: 3010
|
2021-09-20 13:59:57 +02:00 |
Joan Sanchez
|
e07e8ec658
|
Merge branch 'dev' into 2389-calendar_weeks
|
2021-09-20 08:11:21 +00:00 |
Joan Sanchez
|
7223344aa0
|
Merge pull request 'fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination' (#736) from 3093-fix_dup_tickets into dev
Reviewed-on: #736
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2021-09-17 09:59:29 +00:00 |
Joan Sanchez
|
01db0f6ece
|
Merge branch 'dev' into 3081-newbankentity_component_refactor
|
2021-09-17 07:47:25 +00:00 |
Carlos Jimenez Ruiz
|
b3c70de6e0
|
Merge branch 'dev' into 3093-fix_dup_tickets
|
2021-09-17 07:38:12 +00:00 |
Carlos Jimenez Ruiz
|
183fe85e07
|
Merge branch 'dev' into 3086-monitor_index_hours
|
2021-09-17 07:22:12 +00:00 |
Joan Sanchez
|
079f99ca0d
|
fix(tickets): fixed ticket duplications on ticket summary and ticket index caused by pagination
Refs: 3093
|
2021-09-17 08:50:22 +02:00 |
Joan Sanchez
|
4494522ad1
|
feat(calendar): component shows now the year week numbers
Refs: 2389
|
2021-09-16 12:13:20 +02:00 |
Carlos Jimenez Ruiz
|
34038b885c
|
refactor(newBankEntity): client.billingData and supplier.account refactor to use newBankEntity Dialog
|
2021-09-15 17:58:58 +02:00 |
Carlos Jimenez Ruiz
|
d8a2302b18
|
refactor(newbankentity): both client.billingdata and supplier.account now use newbankentity component
|
2021-09-15 13:25:26 +02:00 |
Carlos Jimenez Ruiz
|
6e67dd408e
|
prevented an error if resultant length is 0
|
2021-09-13 10:29:35 +02:00 |
Joan Sanchez
|
b0d291e49c
|
Fixed error for clients without a previous credit
|
2021-09-09 16:44:15 +02:00 |
Carlos Jimenez Ruiz
|
f7e2dd25e4
|
refactor(monitors): added column practicalHour to tickets monitor and renamed two columns
|
2021-09-09 16:07:46 +02:00 |
Carlos Jimenez Ruiz
|
46b59473a3
|
refactor(lastbuyrefresh): moved last buy refresh calls to fixtures + some more fixtures
|
2021-09-09 16:06:44 +02:00 |
Joan Sanchez
|
e8792d5686
|
refactor(client): added restriction to change the credit amount from zero set by a manager
Refs: 3087
|
2021-09-09 14:43:18 +02:00 |
Carlos Jimenez Ruiz
|
76c55cb551
|
Merge branch 'dev' into 3049-item_index_show_lastbuy_landed
|
2021-09-08 09:27:23 +00:00 |
Carlos Jimenez Ruiz
|
8370b5dc1d
|
refactor(fiscaldata): isTaxDataChecked checkbox no longer disabled by businessType presence
|
2021-09-08 11:03:58 +02:00 |
Javi Gallego
|
8160912fe7
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
|
2021-09-08 10:41:26 +02:00 |
Carlos Jimenez Ruiz
|
0472deb9b4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3049-item_index_show_lastbuy_landed
|
2021-09-08 10:40:07 +02:00 |
Carlos Jimenez Ruiz
|
538805828e
|
refactor(item): item index now shows last buy landing
|
2021-09-08 10:39:54 +02:00 |
Carlos Jimenez Ruiz
|
398e79c069
|
Merge branch 'dev' into 3065-client_businessTypeFk_required
|
2021-09-08 07:55:55 +00:00 |
Javi Gallego
|
2fe4fad28a
|
test front ok
|
2021-09-08 09:44:46 +02:00 |
Joan Sanchez
|
903caef155
|
fix(path): Was not showing the old inactive client
|
2021-09-08 08:39:37 +02:00 |
Joan Sanchez
|
db538a3f6f
|
Merge branch 'dev' into 3041-monitor_sort_problems
|
2021-09-08 06:11:39 +00:00 |
Joan Sanchez
|
29bc0c04fb
|
test(monitor): Updated back unit tests
|
2021-09-08 08:08:10 +02:00 |
Carlos Jimenez Ruiz
|
99f4a2ed7d
|
refactor(isTaxDataChecked): client fiscal data now needs business type to change isTaxDataChecked
|
2021-09-07 16:07:46 +02:00 |
Carlos Jimenez Ruiz
|
2ce79a8d49
|
Merge branch 'dev' into 3061-send_thermograph
|
2021-09-07 10:10:09 +00:00 |
Carlos Jimenez Ruiz
|
471da0f4da
|
fix(clone): invoiceIn clone now adds (2) to the ref
|
2021-09-07 11:55:26 +02:00 |
Carlos Jimenez Ruiz
|
c7558dfb0b
|
refactor(temperatures): added crudmodel autoload for temperatures
|
2021-09-07 11:54:53 +02:00 |
Carlos Jimenez Ruiz
|
8bdb02c0fc
|
refactor(createThermograph): endpoint rollsback only if transaction was created in it
|
2021-09-07 10:30:53 +02:00 |
Joan Sanchez
|
6ca7ced067
|
refactor(monitor): removed unused code
|
2021-09-07 10:27:19 +02:00 |
Joan Sanchez
|
04a817c4f9
|
fix(problems): problems filter was not working properly on sales monitor
Refs: 3040
|
2021-09-07 07:41:57 +02:00 |
Carlos Jimenez Ruiz
|
c4e51146fd
|
refactor(thermograph): temperatures source updated on frontend
|
2021-09-06 16:39:44 +02:00 |
Carlos Jimenez Ruiz
|
56276783db
|
test(thermograph): e2e and unit tests for the backend of thermograph
|
2021-09-06 16:39:04 +02:00 |
Carlos Jimenez Ruiz
|
1f0bcb63f1
|
refactor(thermograph): added temperature model + updated thermographs models and endpoints
|
2021-09-06 16:38:27 +02:00 |
Joan Sanchez
|
4db25bf722
|
refactor(risk): the risk icon now is colored red when the client has a risk greater than the risk tolerance
Refs: 3045
|
2021-09-03 16:30:25 +02:00 |
Joan Sanchez
|
13f78359d5
|
fix(bank): the search by bank was not differentiating between numerical values and string values
Refs: 3084
|
2021-09-03 14:00:47 +02:00 |
Joan Sanchez
|
273086472a
|
test(salesfilter): updated unit test for sales filter
|
2021-09-03 12:27:19 +02:00 |
Joan Sanchez
|
8623f914c7
|
feat(monitor): Sort by amount of problems on a ticket list
|
2021-09-03 12:09:37 +02:00 |
Joan Sanchez
|
559ff95fd7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-09-03 07:36:42 +02:00 |
Joan Sanchez
|
681b8afb15
|
fix(invoice): missing UserError import
|
2021-09-03 07:23:26 +02:00 |
Javi Gallego
|
bc34be85ef
|
fix
|
2021-09-02 17:49:25 +02:00 |
Carlos Jimenez Ruiz
|
6b465f9150
|
Merge branch 'dev' into 3068-ticket_colletion
|
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
|
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
|
2021-09-02 11:56:59 +02:00 |
Joan Sanchez
|
0b704db353
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-09-02 08:56:19 +02:00 |
Joan Sanchez
|
b68e99b412
|
fix(invoice): invoicing was throwing a transaction error
Refs: 3077
|
2021-09-02 08:55:41 +02:00 |
Carlos Jimenez Ruiz
|
f5548a82a3
|
test(clone): invoiceIn clone production trigger broke the test
|
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
|
2021-09-01 12:37:46 +02:00 |
Joan Sanchez
|
7a98613ef8
|
Updated unit tests
|
2021-09-01 11:48:21 +02:00 |
Joan Sanchez
|
0370cbf207
|
feat(Searchbar): You can now filter by a ticket collection
Refs: 3068
|
2021-09-01 11:27:24 +02:00 |
Javi Gallego
|
d4fc64484a
|
fix
|
2021-08-31 16:37:09 +02:00 |
Carlos Jimenez Ruiz
|
74a3b5cf89
|
refactor(basicdata): order basicdata requires address and landed to show agencies
|
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
|
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
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
|
2021-08-31 06:27:23 +00:00 |
Joan Sanchez
|
17a732e811
|
Merge branch 'dev' into 3070_deprecate_item_niches
|
2021-08-30 13:00:02 +00:00 |
Joan Sanchez
|
4dc107bc58
|
Removed console.log()
|
2021-08-30 14:51:02 +02:00 |
Joan Sanchez
|
3247f35b90
|
3075 - Show closure hour from an event
|
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
|
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
|
2021-08-30 11:23:46 +02:00 |
Javi Gallego
|
488ef17559
|
insert mail
|
2021-08-27 09:01:21 +02:00 |
Javi Gallego
|
072f88d1a5
|
refactor
|
2021-08-23 14:47:26 +02:00 |
Javi Gallego
|
cffe25d41f
|
Merge branch 'dev' into 2995-supplierAccount-modificaciones
|
2021-08-18 12:38:41 +02:00 |
Javi Gallego
|
bb764e206a
|
test
|
2021-08-18 12:36:18 +02:00 |
Javi Gallego
|
d0f0b52b66
|
minor changes
|
2021-08-18 08:24:07 +02:00 |
Javi Gallego
|
78a98cd6b7
|
shrink-datetime
|
2021-08-15 08:35:14 +02:00 |
Joan Sanchez
|
23b73aaa41
|
Merge branch 'dev' into 3038-module_transactions
|
2021-08-13 15:28:58 +00:00 |
Carlos Jimenez Ruiz
|
7a7bbe2ba8
|
more module transactions
|
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
|
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
|
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
|
2021-08-13 08:04:42 +02:00 |
Joan Sanchez
|
4aad4ee2e0
|
3044 - FIX: Load correct tickets on different situations
|
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
|
2021-08-12 09:24:42 +02:00 |
Javi Gallego
|
3b9bdc18bf
|
funciona
|
2021-08-12 09:23:19 +02:00 |
Javi Gallego
|
54634ed22d
|
test okl
|
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
|
2021-08-11 08:47:05 +02:00 |
Joan Sanchez
|
6ed0dcc4c5
|
Removed exclusion
|
2021-08-10 14:28:37 +02:00 |
Joan Sanchez
|
b3db1cda13
|
Updated unit tests
|
2021-08-10 13:57:03 +02:00 |
Joan Sanchez
|
e65e90d00f
|
Global invoicing improvements
|
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
|
2021-08-10 08:23:13 +02:00 |
Javi Gallego
|
3424fabd5b
|
test fixed
|
2021-08-10 08:18:52 +02:00 |
Joan Sanchez
|
cbaba8a075
|
Ammends
|
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
|
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
|
2021-08-06 10:48:51 +00:00 |
Joan Sanchez
|
9048ce238e
|
Added translation
|
2021-08-06 12:47:46 +02:00 |
Carlos Jimenez Ruiz
|
7d442c40ec
|
Merge branch 'dev' into 2985-invoiceOut_manual
|
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
|
2021-08-06 12:37:25 +02:00 |
Joan Sanchez
|
9dc1168ad2
|
Transaction refactor
|
2021-08-06 12:24:36 +02:00 |
Carlos Jimenez Ruiz
|
3432fab6af
|
now shows only the itemType of available items
|
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
|
2021-08-05 13:44:31 +02:00 |
Joan Sanchez
|
1b9ca13391
|
Ammends
|
2021-08-05 13:42:19 +02:00 |
Joan Sanchez
|
d4b1105cda
|
Ammends
|
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
|
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
|
2021-08-03 11:17:07 +02:00 |
Carlos Jimenez Ruiz
|
3d2de99129
|
vn-popover containing non-descriptor components now relocates correctly for ticket.sale
|
2021-08-03 11:16:43 +02:00 |
Joan Sanchez
|
41a1b3d909
|
2984 - Global invoicing endpoint
|
2021-08-02 13:35:38 +02:00 |
Carlos Jimenez Ruiz
|
a771fd584f
|
minor refactors + missing transaction on discount
|
2021-07-30 10:29:57 +02:00 |
Carlos Jimenez Ruiz
|
9578895f95
|
backend unit tests adapted
|
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
|
2021-07-28 07:35:28 +00:00 |
Carlos Jimenez Ruiz
|
6e3a18a923
|
removed test for deprecated function
|
2021-07-27 18:18:32 +02:00 |
Carlos Jimenez Ruiz
|
88ecaff1d2
|
prevented an error if resultant length is 0
|
2021-07-27 16:17:47 +02:00 |
Carlos Jimenez Ruiz
|
6d4b97443e
|
autoload refreshes the model when url is set
|
2021-07-27 15:59:59 +02:00 |
Joan Sanchez
|
8b005ae012
|
Updated unit tests
|
2021-07-27 12:24:45 +02:00 |
Joan Sanchez
|
531937ebbc
|
2985 - Create a manual invoice from a ticket or client
|
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
|
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
|
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
|
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
|
2021-07-20 12:33:27 +02:00 |
Joan Sanchez
|
f24e7cafce
|
Merge branch 'dev' into 2989-client_debt_sample
|
2021-07-20 09:07:36 +00:00 |
Joan Sanchez
|
1b373503a6
|
Added translation & removed fields property
|
2021-07-20 11:07:04 +02:00 |
Joan Sanchez
|
3080936963
|
Merge branch 'dev' into 3025-client_summary_additions
|
2021-07-20 08:10:42 +00:00 |
Joan Sanchez
|
266ffde86b
|
Merge branch 'dev' into 3026-send_invoice
|
2021-07-20 07:53:56 +00:00 |
Carlos Jimenez Ruiz
|
af321be095
|
Merge branch 'dev' into 3026-send_invoice
|
2021-07-20 07:52:42 +00:00 |
Carlos Jimenez Ruiz
|
4cbaf247ed
|
removed unused showfield in model log
|
2021-07-20 09:33:45 +02:00 |
Joan Sanchez
|
bfd6c995ad
|
2989 - Added client deb statement sample
|
2021-07-20 09:09:46 +02:00 |
Carlos Jimenez Ruiz
|
0163b6c21b
|
added agency and route columns to client.summary tickets
|
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
|
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
|
2021-07-19 13:01:06 +02:00 |
Joan Sanchez
|
e9b6c6b63e
|
3026 - Send invoice PDF
|
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
|
2021-07-19 11:20:38 +02:00 |
Joan Sanchez
|
94b668c01e
|
Filter item from a dialog
|
2021-07-15 13:41:29 +02:00 |
Javi Gallego
|
ee30bc9e1e
|
test fixed
|
2021-07-15 12:51:10 +02:00 |
Carlos Jimenez Ruiz
|
559eaf5853
|
the absences are now fetched alongside the hours
|
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
|
2021-07-14 11:14:53 +02:00 |
Joan Sanchez
|
675a48d8ad
|
Merge branch 'dev' into 3018-time_control_info
|
2021-07-14 08:36:09 +00:00 |
Carlos Jimenez Ruiz
|
ae4f1d1730
|
the absences are now fetched alongside the hours
|
2021-07-14 10:09:24 +02:00 |
Javi Gallego
|
c509509963
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
2021-07-14 07:57:22 +02:00 |
Joan Sanchez
|
4eabba115f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-07-13 11:21:26 +02:00 |
Joan Sanchez
|
ea78db1441
|
3012 - Hotfix: Get ticket list
|
2021-07-13 08:59:36 +02:00 |
Javi Gallego
|
3ec8d4583f
|
bug
|
2021-07-12 15:29:53 +02:00 |
Javi Gallego
|
2f265760b4
|
permisos invoceInTax
|
2021-07-12 15:27:36 +02:00 |
Carlos Jimenez Ruiz
|
98a691c152
|
minor changes
|
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
|
2021-07-12 13:56:58 +02:00 |
Carlos Jimenez Ruiz
|
21e34de1dd
|
item module transactions
|
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
|
2021-07-12 08:32:11 +02:00 |
Joan Sanchez
|
878e989c02
|
HOTFIX: Disable address without a province
|
2021-07-12 08:29:21 +02:00 |
Carlos Jimenez Ruiz
|
3b2b4e3819
|
client module changes for transactions
|
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
|
2021-07-02 14:41:45 +02:00 |
Joan Sanchez
|
35e3c8ce65
|
HOTFIX: 3009 - Unlock report button
|
2021-07-02 14:35:24 +02:00 |
Joan Sanchez
|
48730be203
|
Updated unit test
|
2021-07-02 14:12:37 +02:00 |
Joan Sanchez
|
057d138991
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-07-02 13:44:44 +02:00 |
Joan Sanchez
|
4849355c9b
|
Changed limit value
|
2021-07-02 13:22:37 +02:00 |
Joan Sanchez
|
9ad54b9622
|
HOTFIX: Renamed 'in' to 'invalue'
|
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
|
2021-07-02 10:57:17 +02:00 |
Carlos Jimenez Ruiz
|
d20b717c1b
|
tested controller modifications accordingly
|
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
|
2021-07-01 12:30:54 +00:00 |
Joan Sanchez
|
3246101574
|
Updated unit tests
|
2021-07-01 14:03:28 +02:00 |
Joan Sanchez
|
319a168b89
|
Removed focus
|
2021-07-01 13:43:13 +02:00 |
Joan Sanchez
|
92b6318c79
|
Ammends
|
2021-07-01 13:31:04 +02:00 |
Joan Sanchez
|
79f20a404d
|
Merge branch 'dev' into 3003-worker_sections_without_contract_faults
|
2021-07-01 11:18:15 +00:00 |
Carlos Jimenez Ruiz
|
be850571d9
|
updated the field name
|
2021-07-01 13:14:36 +02:00 |
Carlos Jimenez Ruiz
|
243636ccf6
|
item category name as category
|
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
|
2021-07-01 09:54:57 +00:00 |
Joan Sanchez
|
c8bfc911c2
|
2974 - Get amount unpaid from customer_risk
|
2021-07-01 08:33:56 +02:00 |
Joan Sanchez
|
7e836e570f
|
2983 - Invoice tickets
|
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
|
2021-06-30 15:21:47 +02:00 |
Carlos Jimenez Ruiz
|
4148500c61
|
workers without active contract no longer set calendar and timeControl at fault
|
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
|
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
|
2021-06-30 08:30:40 +02:00 |
Javi Gallego
|
9371c49922
|
cambios solicitados
|
2021-06-30 08:26:03 +02:00 |
Joan Sanchez
|
33d03c8f21
|
Merge branch 'dev' into 2950-alertlevel_to_alertlevel_id
|
2021-06-30 06:15:05 +00:00 |
Carlos Jimenez Ruiz
|
08360bfdc4
|
deprecated alertLevel.alertLevel now using alertLevel.id
|
2021-06-29 18:01:33 +02:00 |
Carlos Jimenez Ruiz
|
15c7c0cb4b
|
read acl set on the model
|
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
|
2021-06-29 10:23:47 +00:00 |
Carlos Jimenez Ruiz
|
d67e36212f
|
added validation for the dms id field
|
2021-06-29 11:59:21 +02:00 |
Carlos Jimenez Ruiz
|
f30cd1aeda
|
added business type to client basic data
|
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
|
2021-06-29 10:33:01 +02:00 |
Javi Gallego
|
e217f02321
|
test front
|
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
|
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
|
2021-06-28 12:23:11 +02:00 |
Joan Sanchez
|
52e6c9d793
|
CSS fixes
|
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
|
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
|
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
|
2021-06-28 08:58:27 +02:00 |
Joan Sanchez
|
66a2563552
|
Added line break
|
2021-06-28 08:48:35 +02:00 |
Joan Sanchez
|
e7dcb54efb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-06-28 08:33:41 +02:00 |
Joan Sanchez
|
ef9f3b13e4
|
html fixes
|
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
|
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
|
2021-06-25 09:30:24 +02:00 |
Javi Gallego
|
82e65ec1c3
|
rellena campo rate
|
2021-06-25 07:47:53 +02:00 |
Joan Sanchez
|
0941b2423e
|
2983 - Invoice tickets
|
2021-06-24 13:33:51 +02:00 |
Joan Sanchez
|
db30ac3175
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-06-24 11:40:23 +02:00 |
Carlos Jimenez Ruiz
|
3bfc08b117
|
route.summary order by priority
|
2021-06-24 10:06:31 +02:00 |
Carlos Jimenez Ruiz
|
320c04b2d3
|
update volume is not called when add/remove tickets from route
|
2021-06-24 09:54:07 +02:00 |
Joan Sanchez
|
362c404aba
|
Css fixes
|
2021-06-24 09:16:59 +02:00 |
Carlos Jimenez Ruiz
|
6aae09f070
|
front unit tests final amend
|
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
|
2021-06-23 12:15:36 +00:00 |
Carlos Jimenez Ruiz
|
029b2f2fdd
|
Merge branch 'dev' into 2955-entry_summary_show_receved_sent
|
2021-06-23 12:12:37 +00:00 |
Carlos Jimenez Ruiz
|
9389bbf779
|
front unit tests fix
|
2021-06-23 13:32:23 +02:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
|
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
|
2021-06-22 14:27:45 +02:00 |
Joan Sanchez
|
256203944e
|
HOTFIX: Prevent error on tickets without state
|
2021-06-22 14:11:33 +02:00 |
Joan Sanchez
|
a1b4164b5d
|
2974 - Client balance default company and fixes
|
2021-06-22 13:57:32 +02:00 |
Joan Sanchez
|
79296ac857
|
2974 - Client balance default company and fixes
|
2021-06-22 11:57:43 +02:00 |
Carlos Jimenez Ruiz
|
565f343e19
|
added isDelivered, isReceived and removed travel descriptor
|
2021-06-22 09:39:33 +02:00 |
Carlos Jimenez Ruiz
|
0421fd8828
|
back end unit tests for zone endpoints
|
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
|
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
|
2021-06-18 16:38:33 +02:00 |
Joan Sanchez
|
8f24c3f39b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
|
2021-06-18 14:34:48 +00:00 |
Joan Sanchez
|
9506a8fd90
|
Disabled sortable column
|
2021-06-18 16:34:34 +02:00 |
Joan Sanchez
|
6acf922d3b
|
Merge branch 'dev' into 2980-invoiceIn_fixes
|
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
Reviewed-on: #663
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2021-06-18 14:15:15 +00:00 |
Joan Sanchez
|
a4f20daf17
|
Updated unit test
|
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
|
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
|
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
|
2021-06-18 13:29:59 +02:00 |
Joan Sanchez
|
0ff114ff36
|
Ammends
|
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
|
2021-06-18 11:12:58 +02:00 |
Carlos Jimenez Ruiz
|
e74f1f109e
|
Merge branch 'dev' into 2906-deliveryNote_packages
|
2021-06-18 08:27:46 +00:00 |
Joan Sanchez
|
325afe2245
|
2906 - Number of packages
|
2021-06-18 08:42:55 +02:00 |
Joan Sanchez
|
b36b48f4b3
|
Merge branch 'dev' into 2874-timeEntry_direction
|
2021-06-18 06:04:33 +00:00 |
Joan Sanchez
|
bc7c288742
|
Updated unit tests
|
2021-06-18 08:03:55 +02:00 |
Joan Sanchez
|
8695fadc18
|
Merge branch 'dev' into 2948-ticket_sale_itemPackingType
|
2021-06-18 05:21:01 +00:00 |
Javi Gallego
|
a6c093cf16
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
2021-06-18 07:07:52 +02:00 |
Joan Sanchez
|
bbbf008076
|
Added done() to async beforeAll()
|
2021-06-17 16:09:17 +02:00 |
Joan Sanchez
|
bb80621890
|
2874 - Edit time entry direction
|
2021-06-17 15:09:04 +02:00 |
Carlos Jimenez Ruiz
|
b906a8e91d
|
added ticket.nickname to basicdata
|
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
|
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
|
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
|
2021-06-16 10:18:47 +00:00 |
Joan Sanchez
|
447d8341e7
|
Merge branch 'dev' into 2941-salesMonitor_changes
|
2021-06-16 09:49:12 +00:00 |
Joan Sanchez
|
76623d8c95
|
Merge branch 'dev' into 2941-salesMonitor_changes
|
2021-06-16 09:47:45 +00:00 |
Joan Sanchez
|
0ce782a4de
|
Updated unit tests
|
2021-06-16 11:40:00 +02:00 |
Joan Sanchez
|
3e938fa9fb
|
Updated unit tests
|
2021-06-16 11:15:17 +02:00 |
Carlos Jimenez Ruiz
|
b9cdc5ed6a
|
Merge branch 'dev' into 2965-delete_travel_from_descriptor
|
2021-06-16 08:19:01 +00:00 |
Joan Sanchez
|
efc9edb384
|
Fixes
|
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
|
2021-06-16 09:50:32 +02:00 |
Joan Sanchez
|
225bfd09b9
|
Missing translation
|
2021-06-16 09:47:54 +02:00 |
Joan Sanchez
|
c10f792619
|
Merge branch 'dev' into 2929-entry_latestsbuys_refactor
|
2021-06-16 07:44:30 +00:00 |
Joan Sanchez
|
353d0e352d
|
2961 - Show tickets on summary
|
2021-06-16 09:43:07 +02:00 |
Joan Sanchez
|
55908c0fca
|
Merge branch 'dev' into 2941-salesMonitor_changes
|
2021-06-16 07:41:16 +00:00 |
Carlos Jimenez Ruiz
|
1a053942a1
|
Merge branch 'dev' into 2963-creditInsurance_acl
|
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
|
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
|
2021-06-15 12:18:59 +00:00 |
Joan Sanchez
|
92e8f528e8
|
2963 - Show section to all employee
|
2021-06-15 14:16:12 +02:00 |
Joan Sanchez
|
2469409068
|
2941 - Monitor changes
|
2021-06-15 13:48:42 +02:00 |
Carlos Jimenez Ruiz
|
db3d5ca4d8
|
added missing html closing tag
|
2021-06-15 13:14:21 +02:00 |
Carlos Jimenez Ruiz
|
7004ad5ade
|
removed several columns from bulk edit and added packingOut
|
2021-06-15 12:47:40 +02:00 |
Javi Gallego
|
500b68162b
|
summary con chip
|
2021-06-15 09:58:21 +02:00 |
Javi Gallego
|
5369e8d97e
|
Merge branch 'dev' into 2940-invoiceInTax-section
|
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
|
2021-06-14 16:09:28 +02:00 |
Carlos Jimenez Ruiz
|
88a5443d64
|
table style changes
|
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 |