Fixed finance module to work with bootstrap design.
This commit is contained in:
parent
16de9124fe
commit
0236fb5a60
55 changed files with 440 additions and 486 deletions
|
|
@ -371,6 +371,8 @@ de:
|
|||
paid_on: Bezahlt am
|
||||
deposit: Pfand berechnet
|
||||
deposit_credit: Pfand gutgeschrieben
|
||||
order_article:
|
||||
units_to_order: Menge
|
||||
|
||||
|
||||
hints:
|
||||
|
|
@ -386,3 +388,5 @@ de:
|
|||
supplier: ''
|
||||
message:
|
||||
private: Nachricht erscheint nicht im Foodsoft Posteingang
|
||||
order_article:
|
||||
units_to_order: Anzahl gelieferter Gebinde
|
||||
|
|
|
|||
|
|
@ -32,8 +32,9 @@ SimpleNavigation::Configuration.run do |navigation|
|
|||
end
|
||||
|
||||
primary.item :finance, 'Finanzen', '#', if: Proc.new { current_user.role_finance? } do |subnav|
|
||||
subnav.item :finance_home, 'Übersicht', finance_root_path
|
||||
subnav.item :accounts, 'Konten verwalten', finance_ordergroups_path, id: nil
|
||||
subnav.item :balancing, 'Bestellungen abrechnen', finance_balancing_path, id: nil
|
||||
subnav.item :balancing, 'Bestellungen abrechnen', finance_order_index_path, id: nil
|
||||
subnav.item :invoices, 'Rechnungen', finance_invoices_path, id: nil
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -125,8 +125,7 @@ Foodsoft::Application.routes.draw do
|
|||
########### Finance
|
||||
|
||||
namespace :finance do
|
||||
root :to => 'balancing#index'
|
||||
match 'balancing/list' => 'balancing#list', :as => 'balancing'
|
||||
root :to => 'base#index'
|
||||
|
||||
resources :order, controller: 'balancing', path: 'balancing' do
|
||||
member do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue