Jorge Padawan
|
f2742b88a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2689-add_id_in_typeTransaction_client_and_supplier
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-30 10:49:58 +01:00 |
|
Jorge Padawan
|
c9ae5989f9
|
Add id on description of typeTransiction on client and supplier
|
2020-12-30 10:49:02 +01:00 |
 Joan Sanchez
|
c2d50c6044
|
Dup entry error handler
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 14:02:26 +01:00 |
|
Joan Sanchez
|
a3f17ae302
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2661-travel_cloneWithEntries
|
2020-12-29 13:55:06 +01:00 |
|
Joan Sanchez
|
2886e02328
|
Enabled loggable for locations
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 08:50:12 +01:00 |
|
Joan Sanchez
|
f4ff31a294
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2657-zone_log
|
2020-12-29 08:09:49 +01:00 |
|
Joan Sanchez
|
f29840b37b
|
Buyer ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-29 07:52:36 +01:00 |
 Carlos Jimenez Ruiz
|
4a60e1da1e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2685-create_test_e2e_entryObservation
|
2020-12-28 15:36:35 +01:00 |
|
Joan Sanchez
|
910caf5689
|
2661 - Added clone options
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 14:53:26 +01:00 |
|
Jorge Padawan
|
5af51763d6
|
Created back test field for entryObservation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-28 12:55:28 +01:00 |
|
Carlos Jimenez Ruiz
|
e6106b1aa9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2665-route_index_multi_clone
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-24 11:31:27 +01:00 |
|
Carlos Jimenez Ruiz
|
8ede30398b
|
clone feature for routes index
|
2020-12-24 11:31:20 +01:00 |
|
Joan Sanchez
|
c192a0e125
|
Merge pull request '2667-create_entryObservation' (#490) from 2667-create_entryObservation into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #490
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-24 08:59:33 +00:00 |
|
Jorge Padawan
|
259842c22d
|
Retirado el parametro required por no utilizarse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 13:32:58 +01:00 |
|
Joan Sanchez
|
87f9a39e50
|
Merge branch 'dev' into 2666-closure_invalid_email
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:29:36 +00:00 |
 Bernat Exposito
|
a21476e3df
|
fix searchbar index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:42:41 +01:00 |
|
Jorge Padawan
|
2948747da3
|
Seccion nueva, "Note" mas campo entryObservation
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 12:25:12 +01:00 |
 Juan Ferrer
|
d064bc0417
|
Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-23 00:00:38 +01:00 |
|
Joan Sanchez
|
6416b0ad79
|
2666 - Closure invalid email notification
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-22 14:56:21 +01:00 |
|
Carlos Jimenez Ruiz
|
be1a317df8
|
Merge branch 'dev' into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:02:05 +00:00 |
|
Joan Sanchez
|
35dc2a533b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2663-route_dragdrop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:52:08 +01:00 |
|
Joan Sanchez
|
1419acb8a7
|
2663 - Drag & drop ticket to route index
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 14:48:47 +01:00 |
|
Carlos Jimenez Ruiz
|
ec0ae8f07c
|
years previous to contrar error corrected
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 13:52:37 +01:00 |
|
Carlos Jimenez Ruiz
|
482cbd7195
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2622-route_tickets_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:39:26 +01:00 |
|
Carlos Jimenez Ruiz
|
369a79b79f
|
route.tickets refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-21 12:37:36 +01:00 |
|
Carlos Jimenez Ruiz
|
ffc9b8dba9
|
Merge pull request '2576 - Photo upload component' (#470) from 2576-photo_uploader into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #470
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-12-21 09:55:45 +00:00 |
|
Bernat Exposito
|
d4ab25f974
|
Merge pull request '2616-supplier_consumption' (#480) from 2616-supplier_consumption into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #480
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
|
2020-12-21 07:08:12 +00:00 |
|
Bernat Exposito
|
1a641d1d4b
|
cr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 22:31:46 +01:00 |
|
Joan Sanchez
|
6717853efb
|
Updated front tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 18:02:41 +01:00 |
|
Joan Sanchez
|
d8a2184695
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-18 17:24:30 +01:00 |
|
Joan Sanchez
|
42cd2356a2
|
Refactor v2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-18 17:23:04 +01:00 |
|
Jorge Padawan
|
2fe22efe36
|
filter vehicles by worehouse
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 15:12:52 +01:00 |
|
Bernat Exposito
|
ac6d97c026
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2616-supplier_consumption
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-18 10:10:09 +01:00 |
|
Bernat Exposito
|
b9344832d6
|
cr changes
|
2020-12-18 10:08:51 +01:00 |
|
Jorge Benedito
|
29ec268113
|
Merge pull request '2682-supplier_billingData_e2e + fixes' (#482) from 2682-supplier_billingData_e2e into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #482
Reviewed-by: Jorge Benedito <jorgebl@verdnatura.es>
|
2020-12-18 08:34:00 +00:00 |
|
Jorge Padawan
|
33237dad86
|
Add acl to supplier billing data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 12:29:37 +01:00 |
Jorge Benedito Llopis
|
7b3128d646
|
Remove manager restriction to edit client credits
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-17 10:07:17 +01:00 |
|
Carlos Jimenez Ruiz
|
9df29b8be3
|
supplier.billingData buttons css update
|
2020-12-16 15:44:35 +01:00 |
|
Carlos Jimenez Ruiz
|
c13e9383ba
|
css refactor + watcher from credit insurance
|
2020-12-16 13:46:04 +01:00 |
|
Carlos Jimenez Ruiz
|
ec7ad986ac
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2279-save_button_if_new_data
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-16 11:36:21 +01:00 |
|
Carlos Jimenez Ruiz
|
6261f10576
|
last account module refactors
|
2020-12-16 11:36:11 +01:00 |
|
Carlos Jimenez Ruiz
|
57a6df762a
|
zone module refactors
|
2020-12-16 11:22:13 +01:00 |
|
Carlos Jimenez Ruiz
|
2a63a3b0a4
|
account or user module refactors
|
2020-12-16 11:07:06 +01:00 |
|
Carlos Jimenez Ruiz
|
e9f73c3299
|
worker module refactors
|
2020-12-16 10:32:32 +01:00 |
|
Carlos Jimenez Ruiz
|
2e9267a25e
|
route module refactors
|
2020-12-16 10:21:35 +01:00 |
|
Carlos Jimenez Ruiz
|
0258c4a276
|
ticket module refactors
|
2020-12-16 10:21:20 +01:00 |
|
Bernat Exposito
|
e1ac64a8d9
|
supplier consumption
|
2020-12-16 08:05:41 +01:00 |
|
Carlos Jimenez Ruiz
|
116730a3b2
|
claim module refactors
|
2020-12-15 17:24:13 +01:00 |
|
Carlos Jimenez Ruiz
|
5295d3ed06
|
supplier module refactors
|
2020-12-15 17:09:05 +01:00 |
|
Carlos Jimenez Ruiz
|
975e5c3b00
|
travel module refactors
|
2020-12-15 17:05:15 +01:00 |
|
Carlos Jimenez Ruiz
|
b071bfd229
|
entry module refactors
|
2020-12-15 16:53:56 +01:00 |
|
Carlos Jimenez Ruiz
|
eb19bce1ba
|
client module refactors + dialog css
|
2020-12-15 16:51:36 +01:00 |
|
Carlos Jimenez Ruiz
|
6f29dabec4
|
order module refactor
|
2020-12-15 16:16:02 +01:00 |
|
Carlos Jimenez Ruiz
|
1ba83e7741
|
cancel button css + item module refactor
|
2020-12-15 16:07:34 +01:00 |
|
Jorge Benedito Llopis
|
8e11cef8eb
|
Code review refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-15 09:59:53 +01:00 |
|
Carlos Jimenez Ruiz
|
8e13fa7852
|
entry module refactors
|
2020-12-14 17:35:32 +01:00 |
|
Jorge Benedito Llopis
|
f62d3139bb
|
Supplier.billingData section
|
2020-12-14 16:09:17 +01:00 |
|
Carlos Jimenez Ruiz
|
3ad6534160
|
client module refactors
|
2020-12-13 14:57:42 +01:00 |
|
Carlos Jimenez Ruiz
|
c0289f87e9
|
order module refactors
|
2020-12-13 13:55:54 +01:00 |
|
Carlos Jimenez Ruiz
|
cbaa95ebda
|
item module refactors
|
2020-12-13 13:54:17 +01:00 |
|
Joan Sanchez
|
0a4016be41
|
Updated unit tests & changed ACL
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-11 15:04:55 +01:00 |
|
Joan Sanchez
|
59c622481f
|
Updated image fixtures
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-12-10 13:21:11 +01:00 |
|
Joan Sanchez
|
260b502cd6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader
|
2020-12-10 07:30:31 +01:00 |
|
Bernat Exposito
|
a1d8b3175e
|
ticket descriptor translate
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-09 15:26:57 +01:00 |
|
Juan Ferrer
|
6f6f23bec4
|
LDAP user sync only syncs changed attributes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-09 12:28:18 +01:00 |
|
Bernat Exposito
|
96f603a44b
|
refactor descriptors
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-04 13:40:58 +01:00 |
|
Joan Sanchez
|
4f40075c2e
|
Merge branch 'dev' into 2657-zone_log
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-03 11:16:18 +00:00 |
|
Bernat Exposito
|
aaee855da3
|
fix ticket component
gitea/salix/pipeline/head Build started...
Details
|
2020-12-03 10:26:49 +01:00 |
|
Bernat Exposito
|
6eeecc553b
|
zoneLog calendar
gitea/salix/pipeline/head This commit looks good
Details
|
2020-12-02 12:49:50 +01:00 |
|
Bernat Exposito
|
6605e5ae4c
|
zoneLog
|
2020-12-02 12:05:47 +01:00 |
|
Juan Ferrer
|
b2a3adc96f
|
LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-30 18:50:04 +01:00 |
|
Juan Ferrer
|
61bb2f14ba
|
LDAP sync hotfix
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-30 18:45:50 +01:00 |
|
Joan Sanchez
|
1ba1d27ba0
|
2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-27 13:10:39 +01:00 |
|
Bernat Exposito
|
06e7583f2b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2645-export_production
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-25 12:47:17 +01:00 |
|
Bernat Exposito
|
78f25e0b46
|
export production
|
2020-11-25 12:37:44 +01:00 |
|
Joan Sanchez
|
5ff364dcf0
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2588-summaries_refactor
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-25 08:01:47 +01:00 |
|
Joan Sanchez
|
8eb14a8bdc
|
2588 - No ellipsize on summary notes or address
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 14:56:10 +01:00 |
|
Joan Sanchez
|
561991f18c
|
2628 - Remove item name from search on tag removal
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 13:54:31 +01:00 |
|
Joan Sanchez
|
d9e14a0c3a
|
2629 - Open ticket lines on new window
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 12:10:02 +01:00 |
|
Joan Sanchez
|
b2794dc413
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 10:52:35 +01:00 |
|
Carlos Jimenez Ruiz
|
fbb2fc3bdd
|
Merge pull request '2607-preview_icon' (#464) from 2607-preview_icon into dev
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #464
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
|
2020-11-24 09:33:44 +00:00 |
|
Joan Sanchez
|
3329d33ec9
|
Merge branch 'dev' into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 09:27:14 +00:00 |
|
Bernat Exposito
|
6a7568eb29
|
Merge branch 'dev' into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 07:36:52 +00:00 |
|
Joan Sanchez
|
80bae4de0a
|
2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-24 08:22:54 +01:00 |
|
Carlos Jimenez Ruiz
|
4172d0bb9b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 18:51:16 +01:00 |
|
Carlos Jimenez Ruiz
|
1b46359574
|
removed focus on describe
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 18:42:11 +01:00 |
|
Joan Sanchez
|
52eb39ccda
|
Removed autoload from crud-model
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 14:12:43 +01:00 |
|
Joan Sanchez
|
2469ce827e
|
Removed commented code
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 14:02:07 +01:00 |
|
Joan Sanchez
|
c654e14cfe
|
2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 13:41:51 +01:00 |
|
Bernat Exposito
|
37ac312bd5
|
pr changes
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 13:05:24 +01:00 |
|
Bernat Exposito
|
b07ae3f60c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop
|
2020-11-23 13:04:38 +01:00 |
|
Bernat Exposito
|
82a7dd0f92
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2579-worker_time_control
|
2020-11-23 11:49:07 +01:00 |
|
Joan Sanchez
|
93ca804573
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 11:25:15 +01:00 |
|
Joan Sanchez
|
3acc943d85
|
2639 - Permisos para añadir greuge con rol claimManager
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 11:10:16 +01:00 |
|
Joan Sanchez
|
03158f04ae
|
Updated front unit tests
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-23 08:12:33 +01:00 |
|
Joan Sanchez
|
d40ea52560
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2569-travel_extra_community
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:06:34 +01:00 |
|
Joan Sanchez
|
7693a1c449
|
2569 - Section changes
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2020-11-20 15:05:57 +01:00 |
|
Bernat Exposito
|
4d91b26537
|
checkinbox moved to worker
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 13:35:01 +01:00 |
|
Bernat Exposito
|
4b40038200
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2493-route_ticket_drag_and_drop
gitea/salix/pipeline/head This commit looks good
Details
|
2020-11-20 12:12:11 +01:00 |
|
Bernat Exposito
|
f64a566447
|
route.ticket drag and drop validation
|
2020-11-20 12:12:06 +01:00 |