Compare commits

..

No commits in common. "085c1eba03a6f740f252044ce92875e211f93b1a" and "d170cb31a3813524ee704556c6bf1a269ba8e9c2" have entirely different histories.

3 changed files with 9 additions and 13 deletions

View File

@ -317,10 +317,7 @@ 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},

View File

@ -1,12 +1,11 @@
%li= link_to "Participations ODR", admin_m_odr_reps_path %li= link_to "Participations ODR", admin_m_odr_reps_path
-if current_admin.has_permission?("virements.view") %li= link_to "Virements", admin_m_odr_virements_path
%li= link_to "Virements", admin_m_odr_virements_path =#%li= link_to "Remises", admin_p_remises_path
=#%li= link_to "Remises", admin_p_remises_path =#%li= link_to "Relances", relances_admin_p_payments_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

View File

@ -38,7 +38,7 @@
=ic :"address-book-o" =ic :"address-book-o"
Clients Clients
-if current_admin.has_permission?("odr_rep.view") -if current_admin.has_permission?("odr_rep.view_for_my") or 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?("odr_rep.view_for_my") or current_admin.has_permission?("virements.view") -if 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