 Carlos Jimenez Ruiz
|
afb8df1429
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2842-npm_maintenance
|
2021-03-15 11:32:57 +01:00 |
 Joan Sanchez
|
92aa9eb933
|
Removed ticket total temporary table
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-15 06:52:15 +01:00 |
|
Joan Sanchez
|
c3bb099b85
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2021-03-15 06:50:42 +01:00 |
|
Joan Sanchez
|
6cb620a41d
|
Ticket filter fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:20:42 +01:00 |
|
Joan Sanchez
|
7b94cc2942
|
Ticket filter test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-14 17:12:31 +01:00 |
|
Carlos Jimenez Ruiz
|
2b8286eb28
|
deprecated dependencies, replaced babel/polyfill
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 17:15:26 +01:00 |
|
Carlos Jimenez Ruiz
|
7c34555afd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 12:30:55 +01:00 |
|
Joan Sanchez
|
f92db8c5a0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 08:52:07 +01:00 |
|
Joan Sanchez
|
4c7d95f001
|
Requested changes + e2e updated
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-12 08:45:41 +01:00 |
|
Joan Sanchez
|
be37334f49
|
Requested changes
|
2021-03-12 08:17:56 +01:00 |
|
Carlos Jimenez Ruiz
|
674b959bbc
|
minor refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 15:14:08 +01:00 |
|
Carlos Jimenez Ruiz
|
05ee2ee2d3
|
ticket.sale front unit test fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-11 10:44:34 +01:00 |
|
Carlos Jimenez Ruiz
|
4c0d583556
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2824-ticket_totalWith_and_without_VAT
|
2021-03-10 19:25:43 +01:00 |
|
Carlos Jimenez Ruiz
|
0cb7ddd9ce
|
ticket.total with and witout VAT refactor
|
2021-03-10 19:25:26 +01:00 |
|
Joan Sanchez
|
e29dd4db42
|
Updated it description
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:14:50 +01:00 |
|
Joan Sanchez
|
a0358044a1
|
Acl fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:11:04 +01:00 |
|
Joan Sanchez
|
a7c2e08f8f
|
ACl fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 11:04:56 +01:00 |
|
Joan Sanchez
|
b39ec70a2c
|
Merge branch 'dev' into 2752-entry_import_buys
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 09:54:14 +00:00 |
|
Joan Sanchez
|
c144d9ed47
|
Unit test changed query path
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 10:53:22 +01:00 |
|
Joan Sanchez
|
a4d2c531a3
|
Changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2021-03-10 10:29:58 +01:00 |
|
Joan Sanchez
|
2a2e276c6b
|
Added back unit test plus fixes
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-10 09:01:32 +01:00 |
|
Joan Sanchez
|
ab755e29c7
|
Merge branch 'dev' into 2787-change_css_date_time
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 14:01:04 +00:00 |
|
Joan Sanchez
|
31205f4556
|
Added front unit test
|
2021-03-09 13:39:22 +01:00 |
|
Joan Sanchez
|
5cbd8d632d
|
Changes
|
2021-03-09 10:01:40 +01:00 |
|
Joan Sanchez
|
9da59949fd
|
Merge branch 'dev' into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 08:31:03 +00:00 |
jorgebl
|
59882cca77
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2733-supplier_descriptor_icon
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 09:26:02 +01:00 |
|
jorgebl
|
2d36d4e610
|
Added line break in vn-icon
|
2021-03-09 09:25:10 +01:00 |
|
Joan Sanchez
|
ff6c80aa7e
|
Merge branch 'dev' into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-09 08:24:10 +00:00 |
|
jorgebl
|
1922280c61
|
QA rename some descriptions in test and reworked the test
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 17:49:04 +01:00 |
|
jorgebl
|
1379691576
|
Added icon for supplier descriptor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:52:11 +01:00 |
|
jorgebl
|
43dc158d7c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:17:38 +01:00 |
|
jorgebl
|
5cb959f5b8
|
removed controller.data from submit
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:12:13 +01:00 |
|
jorgebl
|
27816b29e7
|
Removed ids on controller.data
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 13:06:35 +01:00 |
|
jorgebl
|
134365dd9c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2831-item_botanical_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 12:55:44 +01:00 |
|
jorgebl
|
d09e47835e
|
Rename the statements for correctly description the action
|
2021-03-08 12:40:13 +01:00 |
|
jorgebl
|
6e08a66343
|
Added acl action for logistic boss and show the recent data added on species and genus in their fields in item botanical
|
2021-03-08 12:38:54 +01:00 |
|
jorgebl
|
32ea2dbda6
|
Added permisions from models in table salix ACL
|
2021-03-08 12:32:35 +01:00 |
|
Carlos Jimenez Ruiz
|
5c776c0f11
|
Merge branch 'dev' into 2703-ticket_step_one
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 09:48:38 +00:00 |
|
Joan Sanchez
|
2aff48c42d
|
2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 09:34:58 +01:00 |
|
jorgebl
|
192d7627b0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2832-summary_validate_h4
|
2021-03-08 09:12:34 +01:00 |
|
jorgebl
|
28b9da82ed
|
change conditional
|
2021-03-08 09:12:10 +01:00 |
|
Joan Sanchez
|
d7651ba4ac
|
2837 - Updated fonts
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-08 07:53:00 +01:00 |
|
jorgebl
|
1fd18cae5a
|
QA
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 11:40:01 +01:00 |
|
jorgebl
|
4ae418698b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2788-add-ellipsize_log-component
|
2021-03-05 11:39:25 +01:00 |
|
Joan Sanchez
|
7ec9ddb6d9
|
Translation fix
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 09:23:31 +01:00 |
|
jorgebl
|
b6bf61f410
|
description put correctly
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 09:09:09 +01:00 |
|
jorgebl
|
63ac492845
|
Added message for duplicated names
gitea/salix/pipeline/head This commit looks good
Details
|
2021-03-05 08:45:14 +01:00 |
|
jorgebl
|
4cc3fc90c5
|
conditionals if name already exists
|
2021-03-04 21:30:56 +01:00 |
|
jorgebl
|
5ebd70a8f0
|
Fixed error filter on itemBotanical when item hasn't specie and genus data + front test
|
2021-03-04 20:11:10 +01:00 |
|
jorgebl
|
12ad71d0fe
|
translate some words
|
2021-03-04 20:08:07 +01:00 |