Bernat Exposito Domenech
|
ee2a4771ff
|
delete coment code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-23 11:22:33 +02:00 |
|
Bernat Exposito Domenech
|
6a021b5767
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2061-ticket_descriptor
|
2020-06-23 10:00:50 +02:00 |
|
Bernat Exposito Domenech
|
e96df49622
|
refactor delete zone
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-23 07:38:36 +02:00 |
 Joan Sanchez
|
356c1a7b45
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Something is wrong with the build of this commit
Details
|
2020-06-22 11:54:50 +02:00 |
|
Joan Sanchez
|
4ad3334de6
|
Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-22 11:49:44 +02:00 |
|
Joan Sanchez
|
3cb783740f
|
Added unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-22 10:01:55 +02:00 |
|
Joan Sanchez
|
8729d1c765
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-19 10:35:57 +02:00 |
|
Joan Sanchez
|
2930b60adc
|
Entitlement rate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-19 10:28:08 +02:00 |
|
Joan Sanchez
|
41eeaeef0b
|
Entitlement rate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-19 09:58:09 +02:00 |
Carlos Jimenez Ruiz
|
e6a72d0f09
|
clean code refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 15:26:15 +02:00 |
|
Carlos Jimenez Ruiz
|
3c2a392cb8
|
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-18 13:51:00 +02:00 |
|
Carlos Jimenez Ruiz
|
4d97357213
|
update estate without model.refresh()
|
2020-06-18 13:50:52 +02:00 |
|
Joan Sanchez
|
322085ffd7
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-18 13:15:45 +02:00 |
|
Joan Sanchez
|
7c45858764
|
Sms dialog fix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 12:59:37 +02:00 |
|
Joan Sanchez
|
fa73911452
|
Added tests
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-18 12:43:33 +02:00 |
|
Bernat Exposito Domenech
|
9af33d1b96
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2322-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 11:23:35 +02:00 |
|
Bernat Exposito Domenech
|
84bacfd379
|
add message before delete a line on a claim
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-18 10:10:42 +02:00 |
|
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 |
 Juan Ferrer
|
8e51104e1b
|
Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-17 13:31:54 +02:00 |
|
Bernat Exposito Domenech
|
f1b26133cf
|
refactor order index
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-17 13:25:12 +02:00 |
|
Joan Sanchez
|
63ed592312
|
902 - Added unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 11:51:57 +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
|
686203db18
|
Merge pull request '2275-claim_detail' (#311) from 2275-claim_detail into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-17 05:44:17 +00:00 |
|
Bernat Exposito Domenech
|
930e167a8e
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 07:25:05 +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
|
98300b2fec
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2319_show_delivery_note
|
2020-06-16 13:10:56 +02:00 |
|
Carlos Jimenez Ruiz
|
b44942c7d7
|
open delivery notes on ticket index
|
2020-06-16 12:36:34 +02:00 |
|
Bernat Exposito Domenech
|
d80d520fba
|
fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-16 12:00:38 +02:00 |
|
Bernat Exposito Domenech
|
b6d50f7d8d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail
|
2020-06-16 11:36:06 +02:00 |
 Javi Gallego
|
9e62fd78a2
|
hasta precio
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 10:57:18 +02:00 |
|
Javi Gallego
|
552828a1ba
|
hasta precio
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 10:47:01 +02:00 |
|
Joan Sanchez
|
2f8fa59561
|
2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 09:04:13 +02:00 |
|
Joan Sanchez
|
7fd77bdaef
|
2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-16 08:50:59 +02:00 |
|
Bernat Exposito Domenech
|
b33f42d05e
|
add restrictions in claim detail
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-16 07:47:46 +02:00 |
|
Bernat Exposito Domenech
|
9d80ec11af
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail
|
2020-06-15 09:54:46 +02:00 |
|
Joan Sanchez
|
279677bda9
|
Removed report from descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-15 09:07:13 +02:00 |
|
Joan Sanchez
|
ed83fd5f73
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2290-client_consumption
|
2020-06-15 09:00:24 +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 |
|
Joan Sanchez
|
cba5fb01a6
|
Removed onused styles
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 09:28:44 +02:00 |
|
Joan Sanchez
|
b3db5681fe
|
2290 - Added consumption section
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 09:18:19 +02:00 |
|
Bernat Exposito Domenech
|
12468afa3c
|
refactor claim detail
|
2020-06-11 12:31:52 +02:00 |
|
Joan Sanchez
|
8688c2899b
|
Merge pull request '2321-log_web_access' (#306) from 2321-log_web_access into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-11 09:41:35 +00:00 |
|
Bernat Exposito Domenech
|
f9025bef98
|
delete test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-11 10:37:40 +02:00 |
|
Bernat Exposito Domenech
|
5d426c490c
|
fix traductions
|
2020-06-11 09:04:17 +02:00 |
|
Bernat Exposito Domenech
|
061dceb2b0
|
test client hook
|
2020-06-11 08:46:03 +02:00 |
|
Bernat Exposito Domenech
|
2c5f44f94a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access
|
2020-06-11 08:45:16 +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
|
5fbcb5c439
|
2290 - Client consumption
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-10 13:35:41 +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 |
|
Bernat Exposito Domenech
|
d2aca11e16
|
log web access, create hook in client
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-10 12:09:27 +02:00 |
|
Bernat Exposito Domenech
|
704e27a657
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2321-log_web_access
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 12:08:54 +02:00 |
|
Bernat Exposito Domenech
|
ee58aebe16
|
first step, client hook
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-10 09:26:51 +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
|
1abe0addcb
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:43:40 +02:00 |
|
Joan Sanchez
|
1fed4c7913
|
Contextmenu fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-09 12:16:40 +02:00 |
|
Bernat Exposito Domenech
|
294021391d
|
fix travel descritor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-09 08:32:57 +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
|
cda6e37620
|
Removed console.log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 13:07:34 +02:00 |
|
Joan Sanchez
|
ba9a44dec1
|
Updated back unit test
|
2020-06-08 13:06:33 +02:00 |
|
Bernat Exposito Domenech
|
cc569769b0
|
fix client balance
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-08 12:48:23 +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 |
|
Bernat Exposito Domenech
|
90541a4c13
|
fix client descriptor in log section
|
2020-06-05 12:13:05 +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
|
49d4f881ad
|
Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev
gitea/salix/pipeline/head There was a failure building this commit
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-05 07:15:10 +00: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
|
81757fb9b5
|
fix test 2302
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 14:24:12 +02:00 |
|
Bernat Exposito Domenech
|
f340466daf
|
fix test 2296
|
2020-06-04 14:23:48 +02:00 |
|
Bernat Exposito Domenech
|
3a6efebfd9
|
skipp back test and create task 2304
|
2020-06-04 14:22:56 +02:00 |
|
Joan Sanchez
|
e2391e5595
|
Changes made
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 10:12:54 +02:00 |
|
Joan Sanchez
|
30c721b0e2
|
Added ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-04 08:21:08 +02:00 |
|
Joan Sanchez
|
0695ec01bc
|
Updated unit test
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-04 07:53:06 +02:00 |
|
Joan Sanchez
|
f39719cc46
|
2281 - Added claim pickup checkbox
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-06-03 14:46:58 +02:00 |
|
Joan Sanchez
|
696de03ad1
|
Changed translation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 13:42:36 +02:00 |
|
Joan Sanchez
|
ca19581a5d
|
Merge pull request 'item diary, fix ticket descriptor' (#290) from 2288-item_diary into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-06-03 11:09:19 +00: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 |
|
Bernat Exposito Domenech
|
1cd9c75468
|
fix item diary descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 12:37:01 +02:00 |
|
Bernat Exposito Domenech
|
34b6641e5c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2288-item_diary
|
2020-06-03 12:32:27 +02: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
|
f71a2a3665
|
Removed isOk param
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-03 11:58:53 +02:00 |