 Juan Ferrer
|
fc6a19b60d
|
Merge branch 'dev' into 2177-userModule
|
2020-09-21 14:10:15 +02:00 |
Carlos Jimenez Ruiz
|
ea077e8d4a
|
added auto-load to some combos
|
2020-09-17 20:12:52 +02:00 |
|
Carlos Jimenez Ruiz
|
bde6c4495d
|
e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-16 16:10:43 +02:00 |
|
Carlos Jimenez Ruiz
|
5b69ce983c
|
salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-15 19:43:07 +02:00 |
|
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
gitea/salix/pipeline/head There was a failure building this commit
Details
LDAP test
RC1
SQL version changed
Tests fixes
Back & front tests fixed
All tests passed
Front and back tests plus some fixes
|
2020-09-11 14:36:16 +02:00 |
 Joan Sanchez
|
b848fa52f2
|
2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good
Details
|
2020-09-03 15:11:16 +02:00 |
|
Carlos Jimenez Ruiz
|
0e4fc7e2bd
|
removed unused code.
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-14 18:43:57 +02:00 |
|
Carlos Jimenez Ruiz
|
69cc18be12
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing
|
2020-08-14 18:42:51 +02:00 |
|
Carlos Jimenez Ruiz
|
a679ebfce8
|
quick fix for updateClaim from other branch
|
2020-08-14 18:42:45 +02:00 |
|
Carlos Jimenez Ruiz
|
b711728999
|
ultimate edition deluxe
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-14 17:47:13 +02:00 |
|
Carlos Jimenez Ruiz
|
3df9ae2946
|
section no longer nukes salesPerson-user relation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-08-14 17:10:59 +02:00 |
|
Carlos Jimenez Ruiz
|
c62801e741
|
modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-24 14:22:30 +02:00 |
|
Carlos Jimenez Ruiz
|
6913f2db72
|
$httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-23 17:10:07 +02:00 |
|
Carlos Jimenez Ruiz
|
4ca004f833
|
angular.mock.injet shorten to inject
|
2020-07-23 16:46:16 +02:00 |
|
Carlos Jimenez Ruiz
|
7d5dc776c1
|
replaced most of the translate.instant for $t
|
2020-07-23 16:07:08 +02:00 |
|
Joan Sanchez
|
171deeb82c
|
Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-16 11:12:34 +00:00 |
|
Joan Sanchez
|
7b61e129ff
|
HOTFIX: Change claim claimed quantity
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-07-09 13:24:56 +02:00 |
Bernat Exposito Domenech
|
122dacffb5
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-06 10:20:59 +02:00 |
|
Bernat Exposito Domenech
|
ee704b302c
|
update order filter
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-06 10:20:45 +02:00 |
|
Joan Sanchez
|
b40e09a6cb
|
Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-07-01 14:28:05 +02:00 |
|
Joan Sanchez
|
2c23f3417a
|
Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-06-29 11:43:53 +02:00 |
|
Carlos Jimenez Ruiz
|
ec6a3e00f7
|
removed unused argument in test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-23 13:26:21 +02:00 |
|
Bernat Exposito Domenech
|
2275541bb1
|
change on-response for on-accept
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-23 12:46:24 +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 |
|
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
|
930e167a8e
|
fix test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-17 07:25:05 +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 |
|
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
|
25b1c6bd8f
|
2239 - Added services
gitea/salix/pipeline/head This commit looks good
Details
|
2020-06-12 14:28:29 +02:00 |
|
Bernat Exposito Domenech
|
12468afa3c
|
refactor claim detail
|
2020-06-11 12:31:52 +02:00 |
|
Bernat Exposito Domenech
|
5d426c490c
|
fix traductions
|
2020-06-11 09:04:17 +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
|
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
|
2af39d4b67
|
Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-25 07:43: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
|
245827e8d5
|
corrected a typo
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-21 09:28:50 +02:00 |
|
Joan Sanchez
|
f6efa7160e
|
2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-20 16:23:53 +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
|
e7cf060e12
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-19 10:51:50 +02: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 |
|
Joan Sanchez
|
309b4dafe9
|
Requested changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 14:03:15 +02:00 |
|
Joan Sanchez
|
4aea769797
|
2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-18 13:46:45 +02:00 |
|
Joan Sanchez
|
42bec3a944
|
1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-15 14:47:19 +02:00 |
|
Joan Sanchez
|
9b085d13e1
|
Updated back unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-14 17:32:52 +02:00 |
|
Joan Sanchez
|
2bb17f4a00
|
Requested changes
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-14 17:15:54 +02:00 |
|
Joan Sanchez
|
e51341102b
|
Updated e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-14 14:30:43 +02:00 |
|
Joan Sanchez
|
62d27e45e2
|
Updated unit tests
gitea/salix/pipeline/head This commit has test failures
Details
|
2020-05-14 14:01:34 +02:00 |
|
Joan Sanchez
|
94a219760c
|
2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-05-13 15:04:57 +02:00 |
|
Juan Ferrer
|
07cbac7fcd
|
Merge fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-05-08 19:56:39 +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 |
|
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 |
|
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
|
40df1018e4
|
Fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-18 15:47:38 +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
|
381f2a08ef
|
Client refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-17 11:17:50 +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 |
|
Joan Sanchez
|
a601a615e2
|
Claim refactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-03-16 11:58:14 +01:00 |
|
Juan Ferrer
|
9d1bc8eb54
|
First functional version (No tests)
|
2020-03-13 20:33:12 +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 |
|
Joan Sanchez
|
fddc8e7ed1
|
Updated unit test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-03-05 14:49:41 +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 |
|
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
|
794b20fc83
|
#2131 jest.spyOn
|
2020-02-26 13:22:52 +01:00 |
|
Joan Sanchez
|
fd45c41210
|
removed focus
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 15:01:24 +01:00 |
|
Joan Sanchez
|
5360c407d5
|
updated unit test
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 14:46:18 +01:00 |
|
Joan Sanchez
|
be07e33e5f
|
updated unit test
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 14:39:33 +01:00 |
|
Joan Sanchez
|
39470e837b
|
2094 Regularize claim send chat even if doesn't have destination
gitea/salix/2094-claim_send_chat This commit looks good
Details
|
2020-02-13 13:20:31 +01:00 |
|
Joan Sanchez
|
b192cb15c0
|
Show data save snackbar on auto-save
gitea/salix/2036-claim_action_show_snackbar This commit looks good
Details
|
2020-02-07 07:47:11 +01:00 |
|
Bernat Exposito
|
f6ad5696b4
|
Merge branch '2018-deprecate_message_send' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2020-01-23 13:14:21 +00: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 |
|
Joan Sanchez
|
c36e62a97b
|
added front unit tests
gitea/salix/1982-travel_add_thermograph This commit looks good
Details
|
2020-01-22 09:04:26 +01:00 |
|
Joan Sanchez
|
e235bf94a6
|
removed syntax error
gitea/salix/1975-delivery_note_tags This commit looks good
Details
|
2020-01-10 11:31:12 +01:00 |
|
Joan Sanchez
|
16a9a1f5f8
|
updated styles
gitea/salix/1975-delivery_note_tags This commit looks good
Details
|
2020-01-10 11:29:11 +01:00 |
|
Joan Sanchez
|
e637f32aaa
|
removed opacity effects
gitea/salix/1986-claim_draggable_pictures This commit looks good
Details
|
2020-01-09 08:18:13 +01:00 |
|
Joan Sanchez
|
df7493ff14
|
Updated styles
gitea/salix/1986-claim_draggable_pictures This commit looks good
Details
|
2020-01-08 17:03:08 +01:00 |
|
Bernat Exposito Domenech
|
0ef2d92df7
|
claim.details
gitea/salix/1575-claim_details_discountError This commit looks good
Details
|
2020-01-08 10:08:27 +01:00 |
|
Bernat Exposito Domenech
|
8b0fd79f15
|
claim.details isEditable
gitea/salix/1575-claim_details_discountError This commit looks good
Details
|
2020-01-07 13:03:45 +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
|
472352e24c
|
Merge branch '1915-claim_regularize_fk' of verdnatura/salix into dev
gitea/salix/dev This commit looks good
Details
|
2019-12-20 10:05:38 +00:00 |
|
Joan Sanchez
|
b9415c0335
|
updated sql
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 10:40:12 +01:00 |
|
Joan Sanchez
|
61408bdfd5
|
updated tests
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-20 09:30:35 +01:00 |
|
Joan Sanchez
|
a1c6c0ab39
|
claim regularize refactor
gitea/salix/1915-claim_regularize_fk This commit looks good
Details
|
2019-12-19 11:37:53 +01:00 |