 Joan Sanchez
|
765d3c7553
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 07:19:57 +02:00 |
|
Joan Sanchez
|
43a48994e0
|
Image path fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 16:33:58 +02:00 |
Carlos Jimenez Ruiz
|
edea60dd94
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 15:38:49 +02:00 |
|
Carlos Jimenez Ruiz
|
2abd45f498
|
setDelivered and open delivery notes and tests
|
2020-06-17 15:38:37 +02:00 |
|
Joan Sanchez
|
fd97845979
|
Revert "Removed sms excluded tests"
This reverts commit 30912bd5e9.
|
2020-06-17 14:00:04 +02:00 |
Bernat Exposito Domenech
|
ebcbd5068f
|
add restrictions in ticket descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 09:49:14 +02:00 |
|
Carlos Jimenez Ruiz
|
fb37e156d4
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
|
2020-06-17 09:22:09 +02:00 |
|
Joan Sanchez
|
30912bd5e9
|
Removed sms excluded tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 15:11:24 +02:00 |
|
Carlos Jimenez Ruiz
|
b44942c7d7
|
open delivery notes on ticket index
|
2020-06-16 12:36:34 +02:00 |
 Bernat Exposito
|
e335775cdb
|
Merge pull request '2325 - Search address' (#308) from 2325-address_searchbar into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-15 06:24:23 +00:00 |
|
Bernat Exposito
|
70d5c641ad
|
Merge pull request '2293 - getVolume() call to saleVolume' (#309) from 2293-getVolume into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-15 06:16:55 +00:00 |
|
Joan Sanchez
|
25b1c6bd8f
|
2239 - Added services
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 14:28:29 +02:00 |
|
Joan Sanchez
|
36ec930878
|
Updated test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 12:01:53 +02:00 |
|
Joan Sanchez
|
3d388ad226
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-12 11:39:33 +02:00 |
|
Joan Sanchez
|
dddfe2773a
|
2293 - getVolume() call to saleVolume
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-12 11:26:32 +02:00 |
|
Joan Sanchez
|
48034b234f
|
2325 - Search address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 10:53:33 +02:00 |
|
Carlos Jimenez Ruiz
|
538ae75b89
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2283_e2e_delete_ticket_with_stowaway
|
2020-06-10 16:24:17 +02:00 |
|
Joan Sanchez
|
5edfc59d97
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 13:57:32 +02:00 |
|
Joan Sanchez
|
461fec7e64
|
Updated unit test
|
2020-06-10 13:57:08 +02:00 |
|
Carlos Jimenez Ruiz
|
4b1e79a433
|
2314 server side unit test fixed
|
2020-06-10 13:50:03 +02:00 |
|
Joan Sanchez
|
3cfb8b4730
|
2323 - Filter by myTeam fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 12:13:07 +02:00 |
|
Joan Sanchez
|
4b262dc3cc
|
Disabled contextmenu option
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 13:18:29 +02:00 |
|
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
|
Joan Sanchez
|
7d53f274de
|
Merge pull request '2303-fix_descriptor_show' (#300) from 2303-fix_descriptor_show into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-08 14:08:56 +00:00 |
 Carlos Jimenez Ruiz
|
d8593ea3e0
|
Merge pull request '2176-contextmenu' (#302) from 2176-contextmenu into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-06-08 12:59:59 +00:00 |
|
Joan Sanchez
|
05b5c452a9
|
Removed attribute
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 13:17:18 +02:00 |
|
Joan Sanchez
|
ba9a44dec1
|
Updated back unit test
|
2020-06-08 13:06:33 +02:00 |
|
Joan Sanchez
|
ab1e8fb622
|
2176 First working version
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 12:14:27 +02:00 |
|
Bernat Exposito Domenech
|
e24c5b00e9
|
fix descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 11:05:17 +02:00 |
|
Joan Sanchez
|
181f2f0148
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2176-contextmenu
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-08 08:19:18 +02:00 |
 Javi Gallego
|
762c39eb23
|
:: para watcher
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-08 07:52:30 +02:00 |
|
Bernat Exposito Domenech
|
56c9b08101
|
fix show.descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 07:52:23 +02:00 |
|
Javi Gallego
|
faa053a3d2
|
Merge branch 'dev' into 2035-el-parametro-vShowExpiredZones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 10:01:52 +02:00 |
|
Javi Gallego
|
b40be5cca9
|
2035
gitea/salix/pipeline/head Build queued...
Details
|
2020-06-05 10:01:21 +02:00 |
|
Bernat Exposito Domenech
|
a81862baad
|
set deleteded skiped
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-05 08:29:51 +02:00 |
|
Bernat Exposito Domenech
|
f340466daf
|
fix test 2296
|
2020-06-04 14:23:48 +02:00 |
|
Joan Sanchez
|
94dcf7679b
|
Merge pull request '2265-item_request_filters' (#289) from 2265-item_request_filters into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
|
2020-06-03 10:54:41 +00:00 |
|
Joan Sanchez
|
613937dc8d
|
Fixed order
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:21:03 +02:00 |
|
Joan Sanchez
|
18edd523d2
|
Excluded failing test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:40:18 +02:00 |
|
Joan Sanchez
|
b7ceeae65a
|
Excluded back unit tests. TLS error
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-03 11:27:14 +02:00 |
|
Joan Sanchez
|
751f79373a
|
Merge pull request '2230-log_ticket_request' (#282) from 2230-log_ticket_request into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:28:14 +00:00 |
|
Bernat Exposito
|
fac64c45c0
|
Merge pull request 'zone delete' (#285) from 2244-zone_descriptor into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 09:18:24 +00:00 |
|
Bernat Exposito Domenech
|
aac47e52e9
|
update log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 11:15:07 +02:00 |
|
Joan Sanchez
|
a0767a6ea2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2265-item_request_filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 10:56:40 +02:00 |
|
Bernat Exposito
|
0fe2212f64
|
Merge pull request '2282-setDeleted_stowaway' (#287) from 2282-setDeleted_stowaway into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Bernat Exposito <bernat@verdnatura.es>
|
2020-06-02 08:24:59 +00:00 |
|
Joan Sanchez
|
21bb4a778c
|
Merge pull request '2278-ticket_summary_invoiceOut' (#286) from 2278-ticket_summary_invoiceOut into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 08:11:44 +00:00 |
|
Joan Sanchez
|
1926f90f4b
|
Merge pull request 'add column in ticket split' (#279) from 2236-ticket_sale_split into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-02 07:47:50 +00:00 |
|
Joan Sanchez
|
1e4f36b775
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 09:34:42 +02:00 |
|
Bernat Exposito Domenech
|
546272cc3f
|
zone delete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-02 08:59:04 +02:00 |
|
Joan Sanchez
|
052c51cee5
|
2282 - Change stowaway state to FIXING
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-06-01 12:47:04 +02:00 |
Joan Sanchez
|
3f1109aee3
|
Test changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-29 12:10:04 +02:00 |
|
Joan Sanchez
|
90ae1562dd
|
Added filters
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-29 11:10:58 +02:00 |
|
Bernat Exposito Domenech
|
f28f88a100
|
ticket summary invoiceOut popover
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-27 12:29:01 +02:00 |
|
Carlos Jimenez Ruiz
|
98157fc45a
|
Merge pull request '2141-print_reply_to' (#272) from 2141-print_reply_to into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-27 07:10:27 +00:00 |
|
Bernat Exposito Domenech
|
8be929c1da
|
log tiquet request
|
2020-05-27 08:07:14 +02:00 |
|
Bernat Exposito Domenech
|
60d50afb2e
|
fix traduction
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 12:20:06 +02:00 |
|
Javi Gallego
|
5188f80da5
|
Merge branch 'dev' into 2234-getVisibleAvailable
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:47:48 +02:00 |
|
Bernat Exposito Domenech
|
e7fc70a4b4
|
add column in ticket split
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:43:53 +02:00 |
|
Javi Gallego
|
d8871c0bce
|
cr
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 10:37:52 +02:00 |
|
Joan Sanchez
|
4d2d57d646
|
2265 Changes to filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-26 08:08:09 +02:00 |
|
Carlos Jimenez Ruiz
|
d02655d4d3
|
Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-25 12:58:08 +00:00 |
|
Joan Sanchez
|
73a6148a77
|
2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 14:45:26 +02:00 |
|
Joan Sanchez
|
d60f8721f1
|
1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 13:49:24 +02:00 |
|
Joan Sanchez
|
4878c0dc46
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-25 07:25:21 +02:00 |
|
Joan Sanchez
|
e9e7ae08f2
|
Locale refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-22 15:20:55 +02:00 |
|
Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
|
2020-05-20 08:40:02 +00:00 |
|
Bernat Exposito Domenech
|
4133021e5c
|
fix translate on plural
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-20 08:52:20 +02:00 |
 Juan Ferrer
|
c998097ba1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 12:30:00 +02:00 |
|
Javi Gallego
|
692af6078c
|
Merge pull request 'Tarea-#2242-zone-upcomingDeliveries' (#260) from Tarea-#2242-zone-upcomingDeliveries into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
|
2020-05-19 10:21:33 +00:00 |
|
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:27:22 +02:00 |
|
Juan Ferrer
|
d7f2e686b1
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-19 09:28:50 +02:00 |
|
Javi Gallego
|
a7e6e3d4b7
|
cr juan
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 08:46:42 +02:00 |
|
Bernat Exposito Domenech
|
2681060878
|
update mehod ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:59:58 +02:00 |
|
Bernat Exposito Domenech
|
369d8d59d8
|
fix error
|
2020-05-18 14:58:06 +02:00 |
|
Bernat Exposito Domenech
|
c205c173f8
|
invoiceOut descriptor popover in ticket summary
|
2020-05-18 10:28:33 +02:00 |
|
Javi Gallego
|
3815edfbea
|
falta CR
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-15 12:17:34 +02:00 |
|
Juan Ferrer
|
7a1bb7e68d
|
Merge branch 'dev' into 1882-descriptorRefactor
|
2020-05-08 14:01:49 +02:00 |
|
Javi Gallego
|
8453d25852
|
#2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 18:42:50 +02:00 |
|
Juan Ferrer
|
6c14743017
|
Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-06 14:38:09 +02:00 |
|
Juan Ferrer
|
6a8e1bf6b5
|
#1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-30 12:48:52 +02:00 |
|
Juan Ferrer
|
b536c8291a
|
#1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-28 14:26:02 +02:00 |
|
Juan Ferrer
|
5826099601
|
#1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-04-25 11:50:04 +02:00 |
|
Javi Gallego
|
6dacf20bd9
|
ticket.index modificar orden de las secciones
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-23 17:59:46 +02:00 |
|
Javi Gallego
|
dbb2257430
|
test de zone_getLanded y zone_getFromGeo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-20 13:49:33 +02:00 |
|
Javi Gallego
|
397872ee19
|
mejoradas las descripciones de los test
|
2020-04-08 13:15:07 +02:00 |
|
Javi Gallego
|
09e425c33c
|
2174 ticket.weekly con campo agencyModeFk con E2E
gitea/salix/pipeline/head This commit looks good
Details
|
2020-04-08 12:33:36 +02:00 |
|
Juan Ferrer
|
2249f68d6e
|
SCSS px to em: rem for font-size
|
2020-04-02 15:11:42 +02:00 |
|
Juan Ferrer
|
559cc5eb8c
|
SCSS em to px: Second step
|
2020-04-02 14:52:02 +02:00 |
|
Juan Ferrer
|
734c86c5f5
|
SCSS px to em - First step
|
2020-04-02 14:20:57 +02:00 |
|
Juan Ferrer
|
bf68d15264
|
E2E expeditions fixes, scss px/em fixes
|
2020-04-02 11:39:39 +02:00 |
|
Juan Ferrer
|
dfb9d32c2a
|
Client & ticket E2E fixes
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-03-30 17:30:03 +02:00 |
|
Joan Sanchez
|
59fadf410e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2208-ticket_summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:45:10 +01:00 |
|
Joan Sanchez
|
d640b66ef5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1934-ticket_stowaway
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:22:00 +01:00 |
|
Bernat Exposito Domenech
|
74b27778ab
|
add phones in ticket summary
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:10:20 +01:00 |
|
Joan Sanchez
|
598ebe96d1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2203-ticket_sale
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 11:06:35 +01:00 |
|
Joan Sanchez
|
6a66f47cc1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2178_ticket_index_payout
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 10:19:47 +01:00 |
|
Joan Sanchez
|
d4ca58edad
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-27 09:10:30 +01:00 |
|
Joan Sanchez
|
835c415ba7
|
1934 - Moved procedure logic to method
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-26 14:45:38 +01:00 |
|
Bernat Exposito Domenech
|
6928092594
|
fix ticket.sale state autocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-26 12:00:07 +01:00 |
|
Joan Sanchez
|
f231fabef1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2195-setDeleted_itemShelving
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-25 16:14:13 +01:00 |
|
Carlos Jimenez Ruiz
|
f06c7d3d47
|
front test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-25 15:17:43 +01:00 |
|
Carlos Jimenez Ruiz
|
9b4546edad
|
minor refactor plus path fix after merge
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-25 14:18:51 +01:00 |
|
Joan Sanchez
|
9bae89a672
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-23 16:03:27 +01:00 |
|
Joan Sanchez
|
27b1376799
|
changes
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-23 11:21:25 +01:00 |
|
Joan Sanchez
|
9b933e7d88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-20 12:00:53 +01:00 |
|
Joan Sanchez
|
3d23583e0b
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 14:08:04 +01:00 |
|
Joan Sanchez
|
a9c622377e
|
Refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 12:55:22 +01:00 |
|
Joan Sanchez
|
934e057a67
|
Fixed watcher changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 09:41:23 +01:00 |
|
Joan Sanchez
|
f25c8bb644
|
Ticket refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 08:35:59 +01:00 |
|
Juan Ferrer
|
b4a5a88943
|
E2E fixed
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-17 14:01:25 +01:00 |
|
Juan Ferrer
|
56a21edeca
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult
|
2020-03-16 18:33:39 +01:00 |
|
Bernat Exposito Domenech
|
f6ca9eee01
|
ticketlog in componentUpdate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-16 09:13:44 +01:00 |
|
Juan Ferrer
|
9d1bc8eb54
|
First functional version (No tests)
|
2020-03-13 20:33:12 +01:00 |
|
Bernat Exposito Domenech
|
fdd1c73485
|
refactor componentUpdate
|
2020-03-13 12:26:15 +01:00 |
|
Bernat Exposito Domenech
|
dae89489ed
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos
|
2020-03-13 12:23:06 +01:00 |
|
Joan Sanchez
|
2d755c9094
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-13 08:47:41 +01:00 |
|
Joan Sanchez
|
f8c69306f4
|
Updated unit test
|
2020-03-13 08:44:01 +01:00 |
|
Joan Sanchez
|
d51356f11b
|
Add line on change item
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-13 08:20:30 +01:00 |
|
Bernat Exposito Domenech
|
3ab80e1479
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2088-ticket_datosBasicos
|
2020-03-12 12:04:35 +01:00 |
|
Joan Sanchez
|
b9a482fc37
|
2181 - Ticket sale fix item search
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-11 15:56:02 +01:00 |
|
Joan Sanchez
|
1c8541376b
|
Fixed removed letter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-11 12:54:28 +01:00 |
|
Joan Sanchez
|
8fe6c651e3
|
Updated translations
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-11 12:02:12 +01:00 |
|
Joan Sanchez
|
668c337fb1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2175-ticket_send_sms
|
2020-03-11 08:46:22 +01:00 |
|
Joan Sanchez
|
581e2fcd1f
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-11 08:45:54 +01:00 |
|
Joan Sanchez
|
3736dcf792
|
Added ticket sms options
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-10 15:01:33 +01:00 |
|
Joan Sanchez
|
0cd4e2ad9e
|
Added autocomplete property
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-10 14:28:50 +01:00 |
|
Joan Sanchez
|
6d437d0e2e
|
Allow empty agency on ticket creation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-10 11:46:58 +01:00 |
|
Carlos Jimenez Ruiz
|
8688ecc810
|
eliminado el campo id en advanced search
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-10 07:38:21 +01:00 |
|
Carlos Jimenez Ruiz
|
ebc0889011
|
Merge branch '2171-show_payment_button' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-09 15:51:39 +00:00 |
|
Joan Sanchez
|
209251bf8b
|
2173 - descriptor_quicklink
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-09 14:11:43 +01:00 |
|
Joan Sanchez
|
d173ab6a2b
|
2171 - Mostrar botón "Pago a cuenta" en índice de tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-09 11:50:23 +01:00 |
|
Joan Sanchez
|
97671fd4a1
|
Merge branch '1878-print_with_auth' of verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-06 10:34:38 +00:00 |
|
Bernat Exposito Domenech
|
1951e8bcf9
|
fix setter client
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-06 08:50:55 +01:00 |
|
Bernat Exposito Domenech
|
666ccbf370
|
ticket.basicData address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-06 08:38:03 +01:00 |
|
Joan Sanchez
|
1f714718bb
|
1878 - Implementar autenticación en servicio print
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-05 13:56:45 +01:00 |
|
Joan Sanchez
|
24becf7872
|
Updated var names
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-04 11:17:35 +01:00 |
|
Joan Sanchez
|
d6278e0df9
|
2164 - Show confirmation only when data is not empty
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-04 09:26:12 +01:00 |
|
Joan Sanchez
|
7e694c3e80
|
2073 - Filter by pending tickets
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-02 11:35:43 +01:00 |
|
Bernat Exposito Domenech
|
1d98c44c3e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-02 09:51:05 +01:00 |
|
Bernat Exposito Domenech
|
42b151c849
|
fix isEditable spec
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-03-02 09:43:22 +01:00 |
|
Bernat Exposito Domenech
|
bd46f6a302
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor
|
2020-03-02 09:28:43 +01:00 |
|
Bernat Exposito Domenech
|
63cd436d3c
|
fix request changes
|
2020-03-02 08:30:33 +01:00 |
|
Joan Sanchez
|
28b7f5d3a2
|
2151 - Added thermograph edit section
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-02-28 14:18:55 +01:00 |
|
Bernat Exposito Domenech
|
4561b6eeef
|
refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good
Details
|
2020-02-27 12:31:38 +01:00 |
|
Carlos Jimenez Ruiz
|
6c668131a4
|
replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good
Details
|
2020-02-27 07:19:42 +01:00 |
|
Carlos Jimenez Ruiz
|
0fd012930e
|
#2131 jest.spyOn
gitea/salix/2131_jest_spyOn This commit looks good
Details
|
2020-02-26 15:02:47 +01:00 |
|
Carlos Jimenez Ruiz
|
aedd551371
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2131_jest_spyOn
gitea/salix/2131_jest_spyOn This commit looks good
Details
|
2020-02-26 13:24:41 +01:00 |
|
Carlos Jimenez Ruiz
|
794b20fc83
|
#2131 jest.spyOn
|
2020-02-26 13:22:52 +01:00 |
|
Joan Sanchez
|
37ff99d838
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-26 13:19:32 +01:00 |
|
Joan Sanchez
|
e15ef3386e
|
Translation changes
gitea/salix/test This commit looks good
Details
|
2020-02-26 13:18:29 +01:00 |
|
Bernat Exposito Domenech
|
9cad13f166
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1970-test_crud_model
gitea/salix/1970-test_crud_model This commit looks good
Details
|
2020-02-26 08:24:21 +01:00 |
|
Bernat Exposito Domenech
|
85db094f1d
|
componentUpdate
|
2020-02-25 12:36:33 +01:00 |
|
Bernat Exposito Domenech
|
2fdd275085
|
log in ticketUpdate
|
2020-02-25 11:43:50 +01:00 |
|
Joan Sanchez
|
415316d7d0
|
2081 - Fix ticket search by order id
gitea/salix/2081-fix_ticket_search_by_order This commit looks good
Details
|
2020-02-24 13:28:59 +01:00 |
|
Joan Sanchez
|
d0c2f88a77
|
2126 - Search by client name
gitea/salix/2126-ticket_weekly_search_by_name This commit looks good
Details
|
2020-02-24 12:08:53 +01:00 |
|
Joan Sanchez
|
bf4e0d09c5
|
Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good
Details
|
2020-02-21 08:37:37 +01:00 |
|
Joan Sanchez
|
2f089681df
|
Don't throw error if no salesPerson is assigned
|
2020-02-20 12:52:05 +01:00 |
|
Carlos Jimenez Ruiz
|
587653fb40
|
#2119 e2e item.request
gitea/salix/1835-e2e-item-request This commit looks good
Details
|
2020-02-20 09:31:44 +01:00 |
|
Joan Sanchez
|
a9b8fab51d
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev Something is wrong with the build of this commit
Details
|
2020-02-17 14:55:26 +01:00 |
|
Joan Sanchez
|
a148daa368
|
2125 - ticket create invalid type fix
gitea/salix/master This commit looks good
Details
|
2020-02-17 14:47:43 +01:00 |
|
Bernat Exposito Domenech
|
f900b7ef62
|
crud model test
|
2020-02-17 13:50:54 +01:00 |
|
Joan Sanchez
|
84bf95db13
|
2106 - Sms max length fix
gitea/salix/2106-sms_send_with_dots This commit looks good
Details
|
2020-02-14 12:01:17 +01:00 |
|
Bernat Exposito Domenech
|
4b48a89eaa
|
ticket descriptor update acl
gitea/salix/2079-acl_update_ticket_weekly This commit looks good
Details
|
2020-02-13 08:31:29 +01:00 |
|
Bernat Exposito Domenech
|
e0f7b917d7
|
db test ticket_recalcComponent
gitea/salix/1893-dbTest_ticket_recalcComponents This commit looks good
Details
|
2020-02-12 10:39:46 +01:00 |
|
Carlos Jimenez Ruiz
|
420f059211
|
Merge branch '1684-ticket_transfer_salesLog' of verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2020-02-11 08:30:08 +00:00 |
|
Joan Sanchez
|
91210c3a0d
|
1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good
Details
|
2020-02-11 08:19:03 +01:00 |
|
Bernat Exposito Domenech
|
d26597c395
|
fix ticket.sale sms
gitea/salix/master This commit looks good
Details
|
2020-02-10 14:34:53 +01:00 |
|
Bernat Exposito Domenech
|
d1c8c8ad58
|
ticket/client.sms validations
|
2020-02-10 14:33:38 +01:00 |
|
Joan Sanchez
|
e1942875af
|
1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit
Details
|
2020-02-10 14:32:52 +01:00 |
|
Bernat Exposito Domenech
|
f6674448f8
|
ticket/client.sms validations
gitea/salix/2090-sms.validations This commit looks good
Details
|
2020-02-10 13:22:43 +01:00 |
|
Bernat Exposito Domenech
|
bafec3ce90
|
fix ticket.sale sms
gitea/salix/2091-ticket_sms This commit looks good
Details
|
2020-02-10 09:36:40 +01:00 |
|
Bernat Exposito Domenech
|
7a643eff34
|
fix index step-two
gitea/salix/2041-ticket_datos_basico This commit looks good
Details
|
2020-02-10 07:03:09 +01:00 |
|
Bernat Exposito Domenech
|
dd368a8c3f
|
refactor ticket.basicData steps
gitea/salix/2041-ticket_datos_basico This commit looks good
Details
|
2020-02-07 13:38:32 +01:00 |
|
Carlos Jimenez Ruiz
|
f28a80b855
|
#2078 ticket. step-one
|
2020-02-07 11:25:56 +01:00 |
|
Bernat Exposito Domenech
|
5cd3bde306
|
ticketRequest front test
gitea/salix/2054-ticket_request_frontTest This commit looks good
Details
|
2020-02-06 14:59:00 +01:00 |
|
Bernat Exposito Domenech
|
bb09fc9746
|
update ticket.isEditable
gitea/salix/2070-ticket_tracking_update_permissions This commit looks good
Details
|
2020-02-06 11:50:32 +01:00 |
|
Carlos Jimenez Ruiz
|
1e8059c9f5
|
Merge branch '2023-ticket_index_advanced_search' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-02-06 07:26:39 +00:00 |
|
Bernat Exposito Domenech
|
8193b0ffc0
|
update ticket.filter
gitea/salix/2023-ticket_index_advanced_search This commit looks good
Details
|
2020-02-06 07:37:41 +01:00 |
|
Carlos Jimenez Ruiz
|
76fc5a3311
|
#1944 ticket.summary
|
2020-02-05 12:44:14 +01:00 |
|
Joan Sanchez
|
218ed38b54
|
changed comment
gitea/salix/2069-ticket_index_scope_days This commit looks good
Details
|
2020-02-05 08:24:29 +01:00 |
|
Joan Sanchez
|
bee814f6a6
|
#2069 bug-fix ticket scope days
gitea/salix/2069-ticket_index_scope_days This commit looks good
Details
|
2020-02-05 08:23:23 +01:00 |
|
Bernat Exposito Domenech
|
eab2593306
|
update ticket.dms.create
gitea/salix/2075-ticket_gestdoc This commit looks good
Details
|
2020-02-03 14:36:04 +01:00 |
|
Bernat Exposito Domenech
|
6265796260
|
add icon in ticket.basicData
gitea/salix/2039-ticket_basicData This commit looks good
Details
|
2020-02-03 09:24:49 +01:00 |
|
Joan Sanchez
|
b27d514918
|
percentage hotfix
gitea/salix/2049-hotfix_percentage This commit looks good
Details
|
2020-01-29 11:09:42 +01:00 |
|
Bernat Exposito Domenech
|
35b9820e73
|
update ticket request
gitea/salix/2044-ticket.request There was a failure building this commit
Details
|
2020-01-28 09:05:01 +01:00 |
|
Bernat Exposito Domenech
|
b244df4807
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2014-remove_bi_from_db
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-24 12:56:01 +01:00 |
|
Bernat Exposito Domenech
|
439f9009ff
|
fix model componentType
gitea/salix/2014-remove_bi_from_db This commit looks good
Details
|
2020-01-23 13:47:00 +01:00 |
|
Joan Sanchez
|
57acca2f5e
|
refactor & updated tests
gitea/salix/2018-deprecate_message_send This commit looks good
Details
|
2020-01-23 13:31:07 +01:00 |
|
Bernat Exposito Domenech
|
64bd721287
|
update structure db
|
2020-01-23 12:58:38 +01:00 |
|
Joan Sanchez
|
3ff1fb7d2d
|
Added back unit tests
gitea/salix/2015-chat_sendCheckingPresence This commit looks good
Details
|
2020-01-20 11:59:15 +01:00 |
|
Bernat Exposito
|
e1aefc795b
|
Merge branch '2008-item_buyer_waste_detail' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-16 13:42:12 +00:00 |
|
Bernat Exposito Domenech
|
ba2300288f
|
sendSms test
gitea/salix/1998-client_sms This commit looks good
Details
|
2020-01-16 12:40:28 +01:00 |
|
Bernat Exposito Domenech
|
b42b2ec8c3
|
refactor sms send
gitea/salix/1998-client_sms Something is wrong with the build of this commit
Details
|
2020-01-15 13:27:14 +01:00 |
|
Joan Sanchez
|
708789502d
|
Added waste section
gitea/salix/2008-item_buyer_waste_detail There was a failure building this commit
Details
|
2020-01-15 13:07:33 +01:00 |
|
Joan Sanchez
|
048fcb733d
|
added zone name to ticket summary
gitea/salix/1995-ticket_summary_with_zone This commit looks good
Details
|
2020-01-13 07:42:41 +01:00 |
|
Joan Sanchez
|
5cf8328476
|
added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit
Details
|
2020-01-09 13:58:50 +01:00 |
|
Bernat Exposito Domenech
|
e9d3b14da7
|
refactor models component and componentType
gitea/salix/1965-update_models This commit looks good
Details
|
2019-12-27 08:01:53 +01:00 |
|
Joan Sanchez
|
b74de37c82
|
updated selectors
gitea/salix/dev This commit looks good
Details
|
2019-12-26 13:29:50 +01:00 |
|
Joan Sanchez
|
fd8eeb626d
|
removed console.log
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 08:45:55 +01:00 |
|
Joan Sanchez
|
5273e90a30
|
Added params to ticket method & updated unit tests
gitea/salix/1935-ticket_create_auto_fill This commit looks good
Details
|
2019-12-26 07:12:34 +01:00 |
|
Joan Sanchez
|
42239815e0
|
removed fdescribe
gitea/salix/dev There was a failure building this commit
Details
|
2019-12-19 15:01:33 +01:00 |
|
Joan Sanchez
|
8a54da6fd3
|
fixed dms links
|
2019-12-19 14:13:24 +01:00 |
|
Juan Ferrer
|
9947021736
|
#1953 Temporal fix
gitea/salix/master This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-12-19 12:17:53 +01:00 |
|
Joan Sanchez
|
f42f46dc42
|
Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good
Details
|
2019-12-17 12:53:06 +00:00 |
|
Joan Sanchez
|
9d487f3cee
|
updated translation
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 13:25:30 +01:00 |
|
Juan Ferrer
|
4da83ef963
|
Hotfixes: vnTicketSale menu, vnItemDiary width
|
2019-12-17 12:23:31 +01:00 |
|
Joan Sanchez
|
ef95244d07
|
stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good
Details
|
2019-12-17 08:38:36 +01:00 |
|
Joan Sanchez
|
8808e49a10
|
updated unit test
gitea/salix/1919-ticket_service_type This commit looks good
Details
|
2019-12-13 12:07:36 +01:00 |
|
Joan Sanchez
|
780f1e4773
|
renamed expence to expense and added field
gitea/salix/1919-ticket_service_type There was a failure building this commit
Details
|
2019-12-13 11:59:25 +01:00 |
|
Joan Sanchez
|
af47ab6cac
|
fixed styles & discounts
gitea/salix/1923-ticket-summary-discount There was a failure building this commit
Details
|
2019-12-12 08:22:04 +01:00 |
|
Bernat
|
f38210ddd2
|
udate structure db
|
2019-12-04 11:09:36 +01:00 |
|
Joan Sanchez
|
974bf67e8d
|
removed focus
gitea/salix/dev This commit looks good
Details
|
2019-11-25 07:46:00 +01:00 |
|
Joan Sanchez
|
27cab0e722
|
added sms option to client descriptor
gitea/salix/1875-send-sms-dialog This commit looks good
Details
|
2019-11-21 14:00:27 +01:00 |
|
Joan Sanchez
|
423240ac7d
|
open dialog
|
2019-11-21 13:02:46 +01:00 |
|
Joan Sanchez
|
fd72f206bc
|
Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 12:00:56 +01:00 |
|
Joan Sanchez
|
fee0d674a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1770-calculate_components
gitea/salix/1770-calculate_components This commit looks good
Details
|
2019-11-21 11:06:31 +01:00 |
|
Joan Sanchez
|
5bb7f7f14a
|
deprecated getItemVisibleAvailable() #1887
gitea/salix/dev This commit has test failures
Details
|
2019-11-20 11:14:11 +01:00 |
|
Joan Sanchez
|
c6d1536500
|
recalculate ticket components
gitea/salix/1770-calculate_components This commit has test failures
Details
|
2019-11-20 06:53:37 +01:00 |
|
Carlos Jimenez Ruiz
|
eeead2cc86
|
corrected a typo
|
2019-11-18 16:37:03 +01:00 |
|
Javi Gallego
|
f12b1b8595
|
test fron arreglados
gitea/salix/dev This commit looks good
Details
|
2019-11-18 16:03:10 +01:00 |
|
Javi Gallego
|
c736e4de29
|
#1850 descomentar test back
gitea/salix/dev There was a failure building this commit
Details
|
2019-11-18 12:32:50 +01:00 |
|
Juan Ferrer
|
4f5c1404d7
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit looks good
Details
|
2019-11-14 15:24:08 +01:00 |
|
Juan Ferrer
|
09a187ecfe
|
Merge
|
2019-11-14 15:05:49 +01:00 |
|
Joan Sanchez
|
c028233012
|
ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good
Details
|
2019-11-14 14:19:39 +01:00 |
|
Juan Ferrer
|
4436acec10
|
Merge
|
2019-11-14 14:07:48 +01:00 |
|
Joan Sanchez
|
236dcbf207
|
changed isRaid to isVirtual, atenderFk to attenderFk
gitea/salix/dev This commit looks good
Details
|
2019-11-13 13:22:39 +01:00 |
|
Joan Sanchez
|
c166067888
|
updated tests & email compatibility with phone
gitea/salix/dev This commit looks good
Details
|
2019-11-13 12:18:30 +01:00 |
|
Joan Sanchez
|
308c4dfb88
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-13 08:09:54 +01:00 |
|
Joan Sanchez
|
603bb034a1
|
Excluded specs with calls to setDeleted #1874
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:56:09 +01:00 |
|
Joan Sanchez
|
7f2af116bc
|
updated translation
gitea/salix/dev This commit looks good
Details
|
2019-11-13 07:04:47 +01:00 |
|
Joan Sanchez
|
c3962c3d78
|
updated test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 15:07:37 +01:00 |
|
Joan Sanchez
|
b320d64462
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-11-12 14:54:13 +01:00 |
|
Joan Sanchez
|
1b70721b0e
|
#1864 added restrictions, send rocketchat message
|
2019-11-12 14:53:58 +01:00 |
|
Joan Sanchez
|
05c4c9e96a
|
ticket.weekly removed create section already on ticket descriptor #1841
|
2019-11-12 14:48:03 +01:00 |
|
Juan Ferrer
|
a4f6c64e59
|
Merge
|
2019-11-12 09:24:08 +01:00 |
|
Juan Ferrer
|
f6050a6c65
|
Merge
|
2019-11-12 09:24:01 +01:00 |
|
Bernat
|
74a2c58954
|
Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good
Details
|
2019-11-12 08:51:50 +01:00 |
|
Juan Ferrer
|
95d943e515
|
E2E fixes
|
2019-11-11 16:32:03 +01:00 |
|
Juan Ferrer
|
efa6ddc0f1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-11 16:25:00 +01:00 |
|
Joan Sanchez
|
42524c7f1d
|
increased width to expand class #1845
gitea/salix/dev This commit looks good
Details
|
2019-11-11 13:22:25 +01:00 |
|
Joan Sanchez
|
6f7962935d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1466-print_refactor
|
2019-11-11 11:24:26 +01:00 |
|
Juan Ferrer
|
cf6961f5c5
|
E2E fixes
gitea/salix/1838-searchbar_refactor This commit has test failures
Details
|
2019-11-10 14:13:55 +01:00 |
|
Juan Ferrer
|
976782738e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1838-searchbar_refactor
|
2019-11-10 13:27:31 +01:00 |
|
Juan Ferrer
|
515234187a
|
First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit
Details
|
2019-11-10 11:08:44 +01:00 |
|
Bernat
|
84ccfe0422
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-07 07:51:21 +01:00 |
|
Javi Gallego
|
eaa2ef4570
|
zone warehouse error
gitea/salix/dev This commit looks good
Details
|
2019-11-07 07:49:37 +01:00 |
|
Joan Sanchez
|
3d701f534a
|
updated tests
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-11-06 09:32:54 +01:00 |
|
Joan Sanchez
|
23f6c8843d
|
#1860 refactorizar llamadas al servicio print
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-06 08:20:45 +01:00 |
|
Joan Sanchez
|
cac8cb6a6a
|
dev pull request
gitea/salix/1466-print_refactor There was a failure building this commit
Details
|
2019-11-05 09:16:16 +01:00 |
|
Bernat
|
1be61b16d5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-11-05 08:56:59 +01:00 |
|
Juan Ferrer
|
38b4483edf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-31 13:43:15 +01:00 |
|
Javi Gallego
|
03a4da307d
|
Tarea #1848 test back arreglados/comentados
gitea/salix/dev This commit looks good
Details
|
2019-10-31 12:54:16 +01:00 |
|
Juan Ferrer
|
c41fb1d0f4
|
#1847 vnDialog refactor
|
2019-10-30 16:57:14 +01:00 |
|
Bernat
|
9353d54b16
|
add alias on weekly filter
|
2019-10-29 14:55:05 +01:00 |
|
Joan Sanchez
|
443aa56fed
|
refactor
gitea/salix/1466-print_refactor This commit looks good
Details
|
2019-10-29 07:46:44 +01:00 |
|
Juan Ferrer
|
0a4a22ec87
|
vnInputFile fixed
gitea/salix/dev This commit looks good
Details
|
2019-10-28 21:40:24 +01:00 |
|
Juan Ferrer
|
1b2c383502
|
vnDialog opens in body, nightmare extensions with detailed errors
|
2019-10-28 17:31:33 +01:00 |
|
Juan Ferrer
|
47998aaa97
|
vnDialog opens in body
|
2019-10-27 01:30:01 +02:00 |
|
Juan Ferrer
|
5ae558e965
|
Watchers performance fixes
|
2019-10-26 12:04:48 +02:00 |
|
Juan Ferrer
|
5fdfda47b2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-25 00:53:57 +02:00 |
|
Juan Ferrer
|
c7384bb3ac
|
API path prefix, repeated code removed from tests
|
2019-10-25 00:53:53 +02:00 |
|
Bernat
|
afd7c5684a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1773-1774-travel_summary
gitea/salix/1773-1774-travel_summary This commit looks good
Details
|
2019-10-24 12:49:23 +02:00 |
|
Joan Sanchez
|
2ed4cf3e4a
|
Item request refactor #1818
gitea/salix/dev This commit looks good
Details
gitea/salix/test This commit looks good
Details
|
2019-10-22 13:44:36 +02:00 |
|
Joan Sanchez
|
58a763acf5
|
added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-10-21 14:21:52 +02:00 |
|
Bernat
|
939c507fba
|
#1810 El método listPackaging filtrar por isPackagingReturnable
|
2019-10-21 09:16:52 +02:00 |
|
Joan Sanchez
|
e2a7c09e4a
|
Uploadfile parameters are now required + fixed date filters
gitea/salix/dev This commit looks good
Details
|
2019-10-21 08:31:14 +02:00 |
|
Joan Sanchez
|
55f3390f85
|
added validation for confirmed purcharse requests
gitea/salix/dev This commit has test failures
Details
|
2019-10-21 07:08:47 +02:00 |
|
Juan Ferrer
|
72017a64ac
|
Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures
Details
|
2019-10-19 01:18:25 +02:00 |
|
Juan Ferrer
|
17a150370c
|
Style fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-18 21:54:13 +02:00 |
|
Juan Ferrer
|
43fd8fe75e
|
Merge
|
2019-10-18 21:37:28 +02:00 |
|
Juan Ferrer
|
457034daad
|
Tests fixed
|
2019-10-18 21:36:30 +02:00 |
|
Joan Sanchez
|
04785d3f72
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1757-drag_and_drop_department
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:28:07 +02:00 |
|
Joan Sanchez
|
b2b76b05d8
|
css fixes + back unit tests
gitea/salix/1757-drag_and_drop_department This commit looks good
Details
|
2019-10-17 13:27:50 +02:00 |
|
Carlos Jimenez Ruiz
|
8ce804a099
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-17 11:56:12 +02:00 |
|
Carlos Jimenez Ruiz
|
e0d9f69aef
|
corrected a description
|
2019-10-16 10:59:42 +02:00 |
|
Juan Ferrer
|
a2881e5b1a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-10-15 16:19:38 +02:00 |
|
Juan Ferrer
|
3bf44d08de
|
vnDatePicker refactor
|
2019-10-15 16:19:35 +02:00 |
|
Bernat
|
ed1ed7f50b
|
#1738 exportar estructura y datos de produccion a la local
gitea/salix/dev This commit looks good
Details
|
2019-10-15 07:23:34 +02:00 |
|
Joan Sanchez
|
300ba61fd3
|
#1759 Forzar desenrutado al cambiar datos básicos de ticket
|
2019-10-14 14:43:10 +02:00 |
|
Joan Sanchez
|
ecda659a8c
|
Bug #1796 fixed edit discount dialog position
gitea/salix/dev This commit looks good
Details
|
2019-10-14 14:17:18 +02:00 |
|
Joan Sanchez
|
81097287fa
|
#1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good
Details
|
2019-10-14 11:44:54 +02:00 |
|
Joan Sanchez
|
4a2d61ddcb
|
#1769 removed route report from ticket descriptor
gitea/salix/dev This commit looks good
Details
|
2019-10-14 08:52:48 +02:00 |
|
Juan Ferrer
|
7dfd1fe6f2
|
Merge
gitea/salix/dev This commit looks good
Details
|
2019-10-11 17:43:29 +02:00 |
|
Juan Ferrer
|
a72c12e1c9
|
Tests passed
|
2019-10-11 17:38:04 +02:00 |
|
Joan Sanchez
|
9bfc87f1e2
|
changed state to stowaway ticket
gitea/salix/dev This commit looks good
Details
|
2019-10-10 09:59:28 +02:00 |
|
Joan Sanchez
|
756acd41ef
|
added data-viewer
gitea/salix/dev This commit has test failures
Details
|
2019-10-10 09:26:44 +02:00 |
|
Joan Sanchez
|
21c32b0af2
|
dialog css fixes
gitea/salix/dev This commit has test failures
Details
|
2019-10-10 08:07:11 +02:00 |
|
Juan Ferrer
|
a9d5e87078
|
vnField alpha with ngModel
|
2019-10-10 00:47:29 +02:00 |
|
Juan Ferrer
|
fc09d76422
|
Merge
|
2019-10-08 23:57:54 +02:00 |
|
Juan Ferrer
|
757fc6fe23
|
vnField stable & applied to all field except vnTextfield
|
2019-10-08 23:57:02 +02:00 |
|
Joan Sanchez
|
c0403873e7
|
stowaway changed to correct field name
gitea/salix/dev This commit has test failures
Details
|
2019-10-08 14:36:02 +02:00 |
|
Joan Sanchez
|
c7d2c33ffb
|
merge
gitea/salix/test There was a failure building this commit
Details
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:48:13 +02:00 |
|
Joan Sanchez
|
edecadc78e
|
#1756 stowaway no muestra resultados
gitea/salix/dev This commit looks good
Details
|
2019-10-08 11:41:17 +02:00 |
|
Juan Ferrer
|
eeef468964
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures
Details
|
2019-10-05 00:17:10 +02:00 |
|
Juan Ferrer
|
b12a666653
|
CSS padding/margin refactor, glob styles in core
|
2019-10-05 00:16:57 +02:00 |
|
Carlos Jimenez Ruiz
|
4fa532abb8
|
#1744 ticket.index ocultar columnas expendables
gitea/salix/dev This commit looks good
Details
|
2019-10-04 17:49:51 +02:00 |
|
Joan Sanchez
|
b4c23b86a2
|
fixed summary button
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:39:24 +02:00 |
|
Joan Sanchez
|
7b7d7664e1
|
disabled autoload on stowaway model #1747
gitea/salix/dev This commit looks good
Details
|
2019-10-04 11:18:07 +02:00 |
|
Joan Sanchez
|
69ef2c2e27
|
update zone and shipped on #1746
gitea/salix/dev This commit looks good
Details
|
2019-10-04 09:28:09 +02:00 |
|
Juan Ferrer
|
ec9797a4b3
|
vnDataViewer applied to all module indexes
gitea/salix/dev This commit looks good
Details
|
2019-10-02 21:02:49 +02:00 |
|
Juan Ferrer
|
76604744d1
|
Global & client style fixes
|
2019-10-01 16:17:57 +02:00 |
|
Juan Ferrer
|
a4892845e0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 13:46:16 +02:00 |
|
Juan Ferrer
|
4e4919c1e2
|
Agency fixes & exclusion with left calendar
|
2019-10-01 13:45:43 +02:00 |
|
Carlos Jimenez Ruiz
|
fb846baaa4
|
#1740 Intermitencia test de back
|
2019-10-01 13:19:22 +02:00 |
|
Juan Ferrer
|
daeb4bed09
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-10-01 11:15:25 +02:00 |
|
Juan Ferrer
|
0bd852604a
|
Refactor: vnCheck, vnRadio, vnTreeview, vnNumber
|
2019-10-01 11:15:15 +02:00 |
|
Carlos Jimenez Ruiz
|
e8a9de6acd
|
ticket.index.total warning css range from 1 to 50
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 11:06:20 +02:00 |
|
Joan Sanchez
|
fe95406594
|
Ticket list order by zone hour #1728
gitea/salix/dev This commit has test failures
Details
|
2019-10-01 08:14:08 +02:00 |
|
Juan Ferrer
|
a177ad8e26
|
Fixes
|
2019-09-30 13:02:11 +02:00 |
|
Juan Ferrer
|
84572dc398
|
Merge & fixes
|
2019-09-30 13:02:03 +02:00 |
|
Juan Ferrer
|
2bcdcaa133
|
#1285 fixed, vnInputTime fixes
|
2019-09-30 11:30:54 +02:00 |
|
Carlos Jimenez Ruiz
|
6e50c1fad9
|
#1685 ticket.transferSale
|
2019-09-27 16:55:40 +02:00 |
|
Carlos Jimenez Ruiz
|
a8c6c57b7e
|
#1719 claim.detail final amends and tests
gitea/salix/1719-claim-detail This commit looks good
Details
|
2019-09-26 12:07:40 +02:00 |
|
Carlos Jimenez Ruiz
|
e57210fdfc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-26 11:52:42 +02:00 |
|
Joan Sanchez
|
b64a6fd05c
|
Mostrar fotos de reclamaciones en el summary #1732
gitea/salix/dev This commit looks good
Details
|
2019-09-26 11:41:56 +02:00 |
|
Carlos Jimenez Ruiz
|
2a2c5ae3c4
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 10:56:49 +02:00 |
|
Carlos Jimenez Ruiz
|
156c9ec3ab
|
#1716 ticket.summary añadir link a la Ruta
gitea/salix/dev This commit looks good
Details
|
2019-09-26 09:05:54 +02:00 |
|
Carlos Jimenez Ruiz
|
65981099b6
|
#1719 claim.detail cambiar descuento falla
|
2019-09-26 09:05:18 +02:00 |
|
Carlos Jimenez Ruiz
|
1841e4edb0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:53:42 +02:00 |
|
Carlos Jimenez Ruiz
|
be65c5acad
|
#1719 claim.detail cambiar descuento falla
|
2019-09-25 11:53:12 +02:00 |
|
Joan Sanchez
|
73eca9905e
|
fixed #1734 canHaveStowaway validation
gitea/salix/dev This commit looks good
Details
|
2019-09-25 11:26:12 +02:00 |
|
Carlos Jimenez Ruiz
|
92eef27f37
|
#1723 ticket.index si el total es menor de 50€
gitea/salix/dev This commit looks good
Details
|
2019-09-24 16:38:57 +02:00 |
|
Carlos Jimenez Ruiz
|
0c27b90c5d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:39:22 +02:00 |
|
Carlos Jimenez Ruiz
|
b3bd40e2dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 14:25:56 +02:00 |
|
Carlos Jimenez Ruiz
|
99ef8a6010
|
#1719 claim.detail cambiar descuento falla
|
2019-09-24 14:23:21 +02:00 |
|
Bernat
|
de0034f145
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:22:46 +02:00 |
|
Joan Sanchez
|
d627a8ba25
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-09-24 14:03:42 +02:00 |
|
Joan Sanchez
|
d0fc74cefd
|
updated e2e and unit tests
|
2019-09-24 14:03:30 +02:00 |
|
Bernat
|
2b80c4f7bf
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2019-09-24 13:56:31 +02:00 |
|
Bernat
|
bf5a9967cf
|
Refactor #1682 modificar modelos componentRate y componentTypeRate
|
2019-09-24 13:45:54 +02:00 |
|
Carlos Jimenez Ruiz
|
d56c7ff540
|
#1727 ticlet.line foco en cambiar hora
gitea/salix/dev This commit looks good
Details
|
2019-09-24 13:25:18 +02:00 |
|
Joan Sanchez
|
3af26900e3
|
watcher preventing claim creation
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:55:36 +02:00 |
|
Joan Sanchez
|
5851784e41
|
Create new order now opens on new window
gitea/salix/dev This commit looks good
Details
|
2019-09-24 11:41:00 +02:00 |
|
Juan Ferrer
|
52a6221b59
|
recover getLeaves
|
2019-09-24 10:38:05 +02:00 |
|
Joan Sanchez
|
15183df65f
|
transfer sales error fixed
gitea/salix/dev This commit looks good
Details
|
2019-09-24 08:51:21 +02:00 |
|
Carlos Jimenez Ruiz
|
0f04aed2fe
|
#1670 Crear icono isDeleted para ticket.descriptor
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-20 17:20:54 +02:00 |
|
Bernat
|
cbbce91def
|
#1693 export structure, data and fix back test
|
2019-09-17 13:52:29 +02:00 |
|
Carlos Jimenez Ruiz
|
206dec59a3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit
Details
|
2019-09-13 16:09:27 +02:00 |
|
Carlos Jimenez Ruiz
|
2251fb65ad
|
#1615 migrar karma a jest
|
2019-09-13 16:09:14 +02:00 |
|
Bernat
|
2e1b329584
|
#1681 delete comment
gitea/salix/dev This commit looks good
Details
|
2019-09-13 11:27:32 +02:00 |
|
Bernat
|
c6507fc2bb
|
#1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good
Details
|
2019-09-13 07:40:27 +02:00 |
|
Joan Sanchez
|
8b8463e936
|
Updated dms colums size #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 12:12:39 +02:00 |
|
Joan Sanchez
|
f6bd915ae6
|
Ticket dms CSS fixes #1692
gitea/salix/dev This commit looks good
Details
|
2019-09-12 11:47:56 +02:00 |
|
Bernat
|
c344d8088b
|
merge
gitea/salix/dev This commit looks good
Details
|
2019-09-11 14:18:21 +02:00 |
|
Joan Sanchez
|
ff626764d8
|
fixed back unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-11 08:24:28 +02:00 |
|
Joan Sanchez
|
342886942f
|
fixed sale loggable transaction error #1686
gitea/salix/dev This commit has test failures
Details
|
2019-09-11 08:12:27 +02:00 |
|
Bernat
|
ac6d1ed829
|
#1663 update ticketLog
|
2019-09-10 14:43:00 +02:00 |
|
Bernat
|
8932aa4e5a
|
Tarea #1663 ticket-sale al hacer un slit de lineas debe dejar rastro en el log
|
2019-09-10 13:27:41 +02:00 |
|
Joan Sanchez
|
73f438c300
|
reset watcher on changes #1678
|
2019-09-09 12:35:59 +02:00 |
|
Joan Sanchez
|
1f5a75b285
|
fixed karma unit tests
gitea/salix/dev This commit looks good
Details
|
2019-09-09 10:57:10 +02:00 |