 Joan Sanchez
|
e50dcf467f
|
Requested changes
|
2021-03-03 12:21:04 +01:00 |
jorgebl
|
2ba7e922e6
|
Put time in 00:00 when field "shipped" change
|
2021-03-03 10:57:00 +01:00 |
|
Joan Sanchez
|
7c7aba86a8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
|
2021-03-03 09:36:55 +01:00 |
|
Joan Sanchez
|
e52f0eea92
|
Added front unit tests
|
2021-03-03 07:44:09 +01:00 |
|
jorgebl
|
60ca3e87a5
|
Test git
|
2021-03-02 16:53:54 +01:00 |
|
jorgebl
|
3c82a4997b
|
Test gitea
|
2021-03-02 16:52:14 +01:00 |
|
Joan Sanchez
|
fed3657487
|
Export changes & backtest fixes
|
2021-03-02 14:59:02 +01:00 |
|
jorgebl
|
022d31c952
|
remove line break
|
2021-03-02 14:43:55 +01:00 |
|
jorgebl
|
325a7e7235
|
Translate note
|
2021-03-02 12:50:07 +01:00 |
|
jorgebl
|
d6c1f73cf6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component
|
2021-03-02 12:46:19 +01:00 |
|
jorgebl
|
a7973ba276
|
Resolved question PR
|
2021-03-01 11:59:05 +01:00 |
|
Joan Sanchez
|
718021cff8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2595-invoiceIn-index
|
2021-03-01 11:49:31 +01:00 |
|
jorgebl
|
094552e0f2
|
Added ellipsize and align label
|
2021-02-26 12:32:05 +01:00 |
|
jorgebl
|
3fcd5f9dbc
|
removed line break
|
2021-02-26 11:40:46 +01:00 |
|
jorgebl
|
af8f4e88f5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2786-get_tags_from_item
|
2021-02-26 11:36:56 +01:00 |
|
jorgebl
|
f63baafe7d
|
get values from model item
|
2021-02-26 11:36:22 +01:00 |
|
jorgebl
|
0d7a41f862
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2804-ticket_descriptor_salesPerson
|
2021-02-25 15:52:18 +01:00 |
|
jorgebl
|
b9594f5238
|
Add descriptor popover
|
2021-02-25 15:51:51 +01:00 |
|
jorgebl
|
4cedd53bce
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2820-add_item_scopeDays
|
2021-02-25 11:02:51 +01:00 |
|
jorgebl
|
c55d65a7fd
|
QA refactor
|
2021-02-25 10:49:19 +01:00 |
|
jorgebl
|
218a506a4b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
|
2021-02-25 09:54:21 +01:00 |
|
Joan Sanchez
|
89abf424fb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-02-25 08:17:26 +01:00 |
|
jorgebl
|
c9730929e8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
|
2021-02-24 16:14:41 +01:00 |
|
jorgebl
|
1f1db53d41
|
Summary boss shown on descriptor
|
2021-02-24 16:12:44 +01:00 |
|
Joan Sanchez
|
c2a2204437
|
Regex change
|
2021-02-24 16:04:09 +01:00 |
|
Joan Sanchez
|
ddb77a5c05
|
Regex change
|
2021-02-24 15:55:09 +01:00 |
|
Joan Sanchez
|
d3879635a8
|
Regex changes
|
2021-02-24 15:54:02 +01:00 |
|
jorgebl
|
06dcb4b28c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
|
2021-02-24 14:54:23 +01:00 |
|
jorgebl
|
f1c481de64
|
QA refactor
|
2021-02-24 14:49:58 +01:00 |
|
Joan Sanchez
|
1c819e692e
|
Floramondo image download fixes
|
2021-02-24 14:37:49 +01:00 |
|
jorgebl
|
d551389d3a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item
|
2021-02-24 12:26:05 +01:00 |
|
jorgebl
|
df9ca2ad3e
|
Fixed filter description
|
2021-02-24 12:24:50 +01:00 |
|
jorgebl
|
3af50dfc80
|
QA refactor
|
2021-02-24 11:32:31 +01:00 |
|
Joan Sanchez
|
347ac77878
|
Changes to file names
|
2021-02-24 09:59:41 +01:00 |
|
jorgebl
|
7895af8a54
|
Fixed test
|
2021-02-23 17:00:31 +01:00 |
|
jorgebl
|
e32914d990
|
Fixed error test
|
2021-02-23 16:27:18 +01:00 |
|
jorgebl
|
3eae322a6a
|
Added scope days and test
|
2021-02-23 16:09:29 +01:00 |
|
jorgebl
|
71eeaadb43
|
Removed focus on test
|
2021-02-23 14:54:07 +01:00 |
|
jorgebl
|
2e75bf376c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2789-entry_multiple_changes
|
2021-02-23 11:53:07 +01:00 |
|
jorgebl
|
da20eac685
|
Putting propertie name for order and showing the 3 digits of type
|
2021-02-23 11:52:29 +01:00 |
|
jorgebl
|
799bb3a955
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-23 11:10:06 +01:00 |
|
jorgebl
|
9855bd14fe
|
Translate Boss
|
2021-02-23 11:08:57 +01:00 |
|
jorgebl
|
5e549b4d0d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2776-add_boss_summary
|
2021-02-23 10:42:19 +01:00 |
|
jorgebl
|
69f53972d5
|
Added filter for selection
|
2021-02-22 16:43:40 +01:00 |
|
jorgebl
|
5ef48919ec
|
Added translate multiplier
|
2021-02-22 13:41:31 +01:00 |
|
jorgebl
|
3c3dc861ae
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2781-add_stemMultiplier_item
|
2021-02-22 13:37:43 +01:00 |
|
jorgebl
|
56424925e9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
|
2021-02-22 13:02:32 +01:00 |
|
jorgebl
|
77d8388c43
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
|
2021-02-22 09:59:38 +01:00 |
|
jorgebl
|
5692b5f07e
|
Added conditional and test
|
2021-02-22 09:53:03 +01:00 |
|
jorgebl
|
8deb11d333
|
Added boss on basic data and summary
|
2021-02-19 17:45:45 +01:00 |
|
Joan Sanchez
|
ddb443ab8f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-02-18 13:17:34 +01:00 |
|
Joan Sanchez
|
8ddbcc24a7
|
Added priority to image download queue
|
2021-02-18 13:03:49 +01:00 |
Jorge Padawan
|
3763b95f62
|
Added multiplier in sections and filter selection
|
2021-02-17 15:38:57 +01:00 |
|
Jorge Padawan
|
aa29f546ae
|
put global bank entity model
|
2021-02-17 15:05:17 +01:00 |
|
Jorge Padawan
|
d5e53909c6
|
Fixed test
|
2021-02-17 13:32:09 +01:00 |
|
Jorge Padawan
|
29ca6c52af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_account_supplier
|
2021-02-17 12:32:26 +01:00 |
|
Jorge Padawan
|
f10092d2cf
|
Added autocomplete on bank entity
|
2021-02-17 12:07:04 +01:00 |
|
Jorge Padawan
|
0732ff38b1
|
Quit clogs
|
2021-02-17 11:04:46 +01:00 |
|
Jorge Padawan
|
b71b959b49
|
Formated sql and tests passed
|
2021-02-17 11:01:50 +01:00 |
|
Jorge Padawan
|
aaf77677d1
|
Aligned title with column
|
2021-02-16 15:50:48 +01:00 |
|
Jorge Padawan
|
ac4a19841d
|
Added shrink for date
|
2021-02-16 15:40:20 +01:00 |
|
Jorge Padawan
|
2296727f8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
|
2021-02-16 08:32:24 +01:00 |
 Javi Gallego
|
7c0e690f8f
|
sin console
|
2021-02-15 14:34:13 +01:00 |
|
Jorge Padawan
|
bf3391f7f2
|
added test of lastActiveTickets
|
2021-02-15 13:20:17 +01:00 |
|
Jorge Padawan
|
4e36fd118e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
|
2021-02-15 10:45:46 +01:00 |
|
Javi Gallego
|
737f5a1c91
|
Merge branch 'dev' into refactor-loopback-context
|
2021-02-12 18:11:50 +01:00 |
|
Jorge Padawan
|
366f241b3f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-12 17:04:10 +01:00 |
|
Jorge Padawan
|
4bcb948aff
|
Updated code for better read
|
2021-02-12 16:41:29 +01:00 |
|
Jorge Padawan
|
4b1d86c9b1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-12 15:12:15 +01:00 |
|
Javi Gallego
|
a3d7fc9313
|
done
|
2021-02-12 13:18:02 +01:00 |
|
Joan Sanchez
|
d7ad90d573
|
Updated caniuse
|
2021-02-12 12:25:44 +01:00 |
|
Joan Sanchez
|
e7c1dc2210
|
Changes
|
2021-02-12 12:19:42 +01:00 |
|
Jorge Padawan
|
1512a34a73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2764-Ticket_sale_consignee
|
2021-02-12 11:57:54 +01:00 |
|
Jorge Padawan
|
1ef2c2ff0a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
|
2021-02-12 11:48:00 +01:00 |
|
Jorge Padawan
|
dad3e7c155
|
Requested changes realized
|
2021-02-12 11:27:24 +01:00 |
|
Jorge Padawan
|
2a2009b287
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-12 11:25:44 +01:00 |
|
Jorge Padawan
|
211ffb8f30
|
Delete supplierAccount from this branch
|
2021-02-12 09:50:23 +01:00 |
|
Jorge Padawan
|
433a0094c4
|
Fixed errors detected
|
2021-02-12 09:11:43 +01:00 |
|
Jorge Padawan
|
eb3ac6de72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-11 18:48:58 +01:00 |
|
Jorge Padawan
|
53b06bc464
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
|
2021-02-11 18:41:41 +01:00 |
|
Jorge Padawan
|
1634c81682
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2782-Add_permisions_administrative_entry_module
|
2021-02-11 18:38:27 +01:00 |
|
Jorge Padawan
|
0c335b9705
|
Put bankEntity on global components, and fixed conflict updates
|
2021-02-11 18:35:23 +01:00 |
|
Jorge Padawan
|
a1ca8d90c3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2583-create_supplierAccount_section
|
2021-02-11 16:07:04 +01:00 |
|
Joan Sanchez
|
c270ec6207
|
Contextmenu fixes
|
2021-02-11 15:06:41 +01:00 |
 Carlos Jimenez Ruiz
|
3374356d58
|
both created tickets are now discarded after tests
|
2021-02-11 11:53:30 +01:00 |
|
Jorge Padawan
|
f146c6a279
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2783-itemPriceFixed_advanced_search
|
2021-02-11 11:15:10 +01:00 |
|
Jorge Padawan
|
745d25f0c7
|
Showed filter on browser search bar
|
2021-02-11 11:14:52 +01:00 |
|
Jorge Padawan
|
31e5d3fd1e
|
Created test and optimized sql query
|
2021-02-11 08:32:16 +01:00 |
|
Jorge Padawan
|
bb02a0de6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2603-travel_create_autocomplete_date
|
2021-02-10 16:59:29 +01:00 |
|
Joan Sanchez
|
84c82ed32d
|
2595 - Added invoiceIn module
|
2021-02-10 15:03:11 +01:00 |
|
Jorge Padawan
|
2cf37a9e96
|
Added permissions to role administrative
|
2021-02-10 09:10:15 +01:00 |
|
Jorge Padawan
|
1c6bddbfb6
|
Added functionality to autocomplete the inputs
|
2021-02-10 08:47:58 +01:00 |
|
Joan Sanchez
|
dcad6dc8c8
|
Merge branch 'dev' into 2725-ticket-create-crear-shimpent
|
2021-02-10 07:21:29 +00:00 |
|
Javi Gallego
|
f87ea1b051
|
arrow-spacing
|
2021-02-10 08:13:45 +01:00 |
|
Javi Gallego
|
3a3dae179c
|
done
|
2021-02-10 07:58:11 +01:00 |
|
Carlos Jimenez Ruiz
|
8b97236f22
|
texfield no longer performs queries
|
2021-02-09 12:53:40 +01:00 |
|
Carlos Jimenez Ruiz
|
83ed70abda
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2722-item_log_highlighted_by_clientType
|
2021-02-09 10:43:26 +01:00 |
|
Carlos Jimenez Ruiz
|
3d948ef317
|
warning color added lines with clientType loses
|
2021-02-09 10:43:19 +01:00 |
|
Joan Sanchez
|
c092bf58b4
|
Import buys
|
2021-02-09 07:59:55 +01:00 |
|
Carlos Jimenez Ruiz
|
a62bebd51e
|
minor refactor
|
2021-02-08 10:14:41 +01:00 |