nicolas/sadem_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: nicolas:d170cb31a3813524ee704556c6bf1a269ba8e9c2
Branches Tags
nicolas:master
..
compare: nicolas:085c1eba03a6f740f252044ce92875e211f93b1a
Branches Tags
nicolas:master

2 Commits
d170cb31a3 ... 085c1eba03

Author SHA1 Message Date
Nicolas Bally
085c1eba03 droits service client 2020-10-08 10:48:47 +02:00
Nicolas Bally
f16facd462 affichage numéros bons d'achats 2020-10-06 23:04:38 +02:00
3 changed files with 13 additions and 9 deletions
Show Stats Expand all files Collapse all files

5
app/models/m_odr_rep.rb
View File

@ -317,7 +317,10 @@ file_admin_ok remise particular_civilite particular_name particular_firstname pa
:cc_place_name => {:name => "Revendeur", :reorder => true}, :cc_place_name => {:name => "Revendeur", :reorder => true},
:reduc_code => {:name => "Code réduction", :reorder => true}, :reduc_code => {:name => "Code réduction", :reorder => true},
:ba_number => {:name => "N° bon de réduction", :reorder => true},
:ba_used => {:name => "Bon utilisé ?", :reorder => true, :as => :boolean},

13
app/views/admin/admin_spaces/_payments.html.haml
View File

@ -1,11 +1,12 @@
%li= link_to "Participations ODR", admin_m_odr_reps_path %li= link_to "Participations ODR", admin_m_odr_reps_path
%li= link_to "Virements", admin_m_odr_virements_path -if current_admin.has_permission?("virements.view")
=#%li= link_to "Remises", admin_p_remises_path %li= link_to "Virements", admin_m_odr_virements_path
=#%li= link_to "Relances", relances_admin_p_payments_path =#%li= link_to "Remises", admin_p_remises_path
=#%li= link_to "Relances", relances_admin_p_payments_path
%li= link_to "Remises", admin_m_odr_remises_path %li= link_to "Remises", admin_m_odr_remises_path
=#%li= link_to "Comptes bancaires", admin_p_bank_accounts_path =#%li= link_to "Comptes bancaires", admin_p_bank_accounts_path
=#%li= link_to "Banques", admin_p_banks_path =#%li= link_to "Banques", admin_p_banks_path

4
app/views/layouts/admin.html.haml
View File

@ -38,7 +38,7 @@
=ic :"address-book-o" =ic :"address-book-o"
Clients Clients
-if current_admin.has_permission?("odr_rep.view_for_my") or current_admin.has_permission?("odr_rep.view") -if current_admin.has_permission?("odr_rep.view")
.element .element
=link_to admin_m_odrs_path do =link_to admin_m_odrs_path do
.cat#big_cat_stocks .cat#big_cat_stocks
@ -60,7 +60,7 @@
=ic :"file-text-o" =ic :"file-text-o"
Documents Documents
-if current_admin.has_permission?("virements.view") -if current_admin.has_permission?("odr_rep.view_for_my") or current_admin.has_permission?("virements.view")
.element .element
=link_to admin_m_odr_reps_path do =link_to admin_m_odr_reps_path do
.cat#big_cat_payments .cat#big_cat_payments