Merge branch 'master' into article-dialog
Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less
This commit is contained in:
wvengen
commit
923b579bd1
30 changed files with 451 additions and 677 deletions
|
|
@ -11,4 +11,6 @@ before_script:
|
|||
- "mysql -e 'create database foodsoft_test;'"
|
||||
- 'printf "test:\n adapter: mysql2\n database: foodsoft_test\n username: travis\n encoding: utf8\n" >config/database.yml'
|
||||
- 'bundle exec rake db:schema:load RAILS_ENV=test'
|
||||
script: bundle exec rake spec
|
||||
# add format to get output with rspec-rerun https://github.com/dblock/rspec-rerun/issues/2
|
||||
- 'echo "--color --format progress" >.rspec'
|
||||
script: bundle exec rake rspec-rerun:spec
|
||||
|
|
|
|||
1
Gemfile
1
Gemfile
|
|
@ -88,5 +88,6 @@ group :test do
|
|||
# need to include rspec components before i18n-spec or rake fails in test environment
|
||||
gem 'rspec-core'
|
||||
gem 'rspec-expectations'
|
||||
gem 'rspec-rerun'
|
||||
gem 'i18n-spec'
|
||||
end
|
||||
|
|
|
|||
79
Gemfile.lock
79
Gemfile.lock
|
|
@ -30,12 +30,12 @@ GEM
|
|||
remote: https://rubygems.org/
|
||||
specs:
|
||||
Ascii85 (1.0.2)
|
||||
actionmailer (3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
actionmailer (3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
mail (~> 2.5.4)
|
||||
actionpack (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
actionpack (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 1.0.4)
|
||||
|
|
@ -43,18 +43,18 @@ GEM
|
|||
rack-cache (~> 1.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.2.1)
|
||||
activemodel (3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
activemodel (3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
builder (~> 3.0.0)
|
||||
activerecord (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
activerecord (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
arel (~> 3.0.2)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.2.15)
|
||||
activemodel (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
activesupport (3.2.15)
|
||||
activeresource (3.2.16)
|
||||
activemodel (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
activesupport (3.2.16)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
acts_as_tree (1.4.0)
|
||||
|
|
@ -66,7 +66,7 @@ GEM
|
|||
erubis (>= 2.6.6)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bootstrap-datepicker-rails (1.1.1.9)
|
||||
bootstrap-datepicker-rails (1.1.1.10)
|
||||
railties (>= 3.0)
|
||||
builder (3.0.4)
|
||||
bullet (4.7.1)
|
||||
|
|
@ -80,7 +80,7 @@ GEM
|
|||
net-ssh-gateway (>= 1.1.0)
|
||||
capistrano-ext (1.2.1)
|
||||
capistrano (>= 1.0.0)
|
||||
capybara (2.1.0)
|
||||
capybara (2.2.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
|
|
@ -106,7 +106,7 @@ GEM
|
|||
database_cleaner (1.2.0)
|
||||
debug_inspector (0.0.2)
|
||||
diff-lcs (1.2.5)
|
||||
docile (1.1.0)
|
||||
docile (1.1.1)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
exception_notification (4.0.1)
|
||||
|
|
@ -135,7 +135,7 @@ GEM
|
|||
hashery (2.1.1)
|
||||
highline (1.6.20)
|
||||
hike (1.2.3)
|
||||
i18n (0.6.5)
|
||||
i18n (0.6.9)
|
||||
i18n-spec (0.4.0)
|
||||
iso
|
||||
inherited_resources (1.4.1)
|
||||
|
|
@ -148,7 +148,7 @@ GEM
|
|||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (1.8.1)
|
||||
kaminari (0.14.1)
|
||||
kaminari (0.15.0)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
less (2.4.0)
|
||||
|
|
@ -157,7 +157,6 @@ GEM
|
|||
actionpack (>= 3.1)
|
||||
less (~> 2.4.0)
|
||||
libv8 (3.16.14.3)
|
||||
lockfile (2.1.0)
|
||||
mail (2.5.4)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
|
|
@ -175,7 +174,7 @@ GEM
|
|||
activerecord (~> 3.1)
|
||||
activesupport (~> 3.1)
|
||||
polyamorous (~> 0.5.0)
|
||||
mime-types (1.25)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.2)
|
||||
mono_logger (1.1.0)
|
||||
multi_json (1.8.2)
|
||||
|
|
@ -212,14 +211,14 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.15)
|
||||
actionmailer (= 3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
activerecord (= 3.2.15)
|
||||
activeresource (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
rails (3.2.16)
|
||||
actionmailer (= 3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
activerecord (= 3.2.16)
|
||||
activeresource (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.15)
|
||||
railties (= 3.2.16)
|
||||
rails-assets-listjs (0.2.0.beta.4)
|
||||
railties (>= 3.1)
|
||||
rails-i18n (3.0.0)
|
||||
|
|
@ -227,9 +226,9 @@ GEM
|
|||
rails (>= 3.0.0, < 4.0.0)
|
||||
rails-settings-cached (0.2.4)
|
||||
rails (>= 3.0.0)
|
||||
railties (3.2.15)
|
||||
actionpack (= 3.2.15)
|
||||
activesupport (= 3.2.15)
|
||||
railties (3.2.16)
|
||||
actionpack (= 3.2.16)
|
||||
activesupport (= 3.2.16)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
|
|
@ -238,7 +237,7 @@ GEM
|
|||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
redis (3.0.6)
|
||||
redis-namespace (1.3.2)
|
||||
redis-namespace (1.4.1)
|
||||
redis (~> 3.0.4)
|
||||
ref (1.0.5)
|
||||
responders (1.0.0)
|
||||
|
|
@ -249,6 +248,10 @@ GEM
|
|||
redis-namespace (~> 1.2)
|
||||
sinatra (>= 0.9.2)
|
||||
vegas (~> 0.1.2)
|
||||
rspec (2.14.1)
|
||||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
rspec-mocks (~> 2.14.0)
|
||||
rspec-core (2.14.7)
|
||||
rspec-expectations (2.14.4)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
|
|
@ -260,6 +263,8 @@ GEM
|
|||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
rspec-mocks (~> 2.14.0)
|
||||
rspec-rerun (0.1.3)
|
||||
rspec (>= 2.11.0)
|
||||
ruby-prof (0.13.0)
|
||||
ruby-rc4 (0.1.5)
|
||||
rubyzip (1.0.0)
|
||||
|
|
@ -268,7 +273,7 @@ GEM
|
|||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
select2-rails (3.5.1)
|
||||
select2-rails (3.5.2)
|
||||
thor (~> 0.14)
|
||||
selenium-webdriver (2.37.0)
|
||||
childprocess (>= 0.2.5)
|
||||
|
|
@ -280,12 +285,11 @@ GEM
|
|||
simple-navigation-bootstrap (1.0.0)
|
||||
railties (>= 3.1)
|
||||
simple-navigation (>= 3.7.0)
|
||||
simple_form (2.1.0)
|
||||
simple_form (2.1.1)
|
||||
actionpack (~> 3.0)
|
||||
activemodel (~> 3.0)
|
||||
simplecov (0.8.1)
|
||||
simplecov (0.8.2)
|
||||
docile (~> 1.1.0)
|
||||
lockfile (>= 2.1.0)
|
||||
multi_json
|
||||
simplecov-html (~> 0.8.0)
|
||||
simplecov-html (0.8.0)
|
||||
|
|
@ -321,7 +325,7 @@ GEM
|
|||
rails (>= 3.1)
|
||||
railties (>= 3.1)
|
||||
tzinfo (0.3.38)
|
||||
uglifier (2.3.1)
|
||||
uglifier (2.3.2)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
uniform_notifier (1.4.0)
|
||||
|
|
@ -380,6 +384,7 @@ DEPENDENCIES
|
|||
rspec-core
|
||||
rspec-expectations
|
||||
rspec-rails
|
||||
rspec-rerun
|
||||
ruby-prof
|
||||
sass-rails (~> 3.2.3)
|
||||
select2-rails
|
||||
|
|
|
|||
|
|
@ -243,6 +243,11 @@ tr.unavailable {
|
|||
height: inherit;
|
||||
}
|
||||
|
||||
// get rid of extra space on bottom of dialog with form
|
||||
.modal form {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
// inputs that are "in the background" - less visible
|
||||
.less-visible {
|
||||
color: #ddd;
|
||||
|
|
@ -261,4 +266,3 @@ tr.unavailable {
|
|||
border-color: @inputBorder;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ module ApplicationHelper
|
|||
i18nopts = options.select {|a| !['short'].include?(a) }
|
||||
s = model.human_attribute_name(attribute, i18nopts)
|
||||
if options[:short]
|
||||
sshort = model.human_attribute_name("#{attribute}_short".to_sym, options.merge({defaults: ''}))
|
||||
s = raw "<abbr title='#{s}'>#{sshort}</abbr>" unless sshort.empty?
|
||||
sshort = model.human_attribute_name("#{attribute}_short".to_sym, options.merge({fallback: true, default: ''}))
|
||||
s = raw "<abbr title='#{s}'>#{sshort}</abbr>" unless sshort.blank?
|
||||
end
|
||||
s
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ class User < ActiveRecord::Base
|
|||
validates_presence_of :password, :on => :create
|
||||
validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
|
||||
validates_uniqueness_of :email, :case_sensitive => false
|
||||
validates_presence_of :first_name # for simple_form validations
|
||||
validates_length_of :first_name, :in => 2..50
|
||||
validates_confirmation_of :password
|
||||
validates_length_of :password, :in => 5..25, :allow_blank => true
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
= f.hidden_field :supplier_id
|
||||
.modal-header
|
||||
= link_to t('ui.marks.close').html_safe, '#', class: 'close', data: {dismiss: 'modal'}
|
||||
%h3= t '.title'
|
||||
%h3= @article.new_record? ? t('.title_new') : t('.title_edit')
|
||||
.modal-body
|
||||
/= f.input :availability
|
||||
= f.input :name
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%td= sort_link_helper t('.date'), "date"
|
||||
%td= t('.who')
|
||||
%td= sort_link_helper t('.note'), "note"
|
||||
%td= sort_link_helper t('.amount'), "amount"
|
||||
%th= sort_link_helper heading_helper(FinancialTransaction, :created_on), "date"
|
||||
%th= heading_helper FinancialTransaction, :user
|
||||
%th= sort_link_helper heading_helper(FinancialTransaction, :note), "note"
|
||||
%th= sort_link_helper heading_helper(FinancialTransaction, :amount), "amount"
|
||||
%tbody
|
||||
- @financial_transactions.each do |t|
|
||||
%tr
|
||||
|
|
|
|||
|
|
@ -21,13 +21,13 @@
|
|||
|
||||
= form_tag finance_create_transaction_collection_path do
|
||||
%p
|
||||
%b= t('.note')
|
||||
%b= heading_helper FinancialTransaction, :note
|
||||
= text_field_tag :note, params[:note], class: 'input-xlarge', required: 'required'
|
||||
%p
|
||||
%table#ordergroups{:style => "width:20em"}
|
||||
%tr
|
||||
%th= t('.ordergroup')
|
||||
%th= t('.amount')
|
||||
%th= heading_helper FinancialTransaction, :ordergroup
|
||||
%th= heading_helper FinancialTransaction, :amount
|
||||
= render :partial => 'ordergroup', :collection => [1, 2, 3]
|
||||
%p
|
||||
= link_to t('.new_ordergroup'), '#', 'data-add-transaction' => true, class: 'btn'
|
||||
|
|
|
|||
|
|
@ -27,22 +27,23 @@
|
|||
%h2= @order.name
|
||||
%dl.dl-horizontal
|
||||
- unless @order.note.blank?
|
||||
%dt= t '.note'
|
||||
%dt= heading_helper Order, :note
|
||||
%dd= @order.note
|
||||
%dt= t '.created_by'
|
||||
%dt= heading_helper Order, :created_by
|
||||
%dd= show_user_link(@order.created_by)
|
||||
%dt= t '.ending'
|
||||
%dt= heading_helper Order, :ends
|
||||
%dd= format_time(@order.ends)
|
||||
- unless @order.stockit? or @order.supplier.min_order_quantity.blank?
|
||||
%dt= t '.min_quantity'
|
||||
%dt= heading_helper Supplier, :min_order_quantity, short: true
|
||||
%dd= @order.supplier.min_order_quantity
|
||||
%dt= t '.sum_amount'
|
||||
%dd= number_to_currency @order.sum
|
||||
%dt= t '.last_update'
|
||||
%dd
|
||||
= show_user(@group_order.updated_by) if @group_order.updated_by
|
||||
(#{format_time(@group_order.updated_on)})
|
||||
%dt= t '.funds'
|
||||
- unless @group_order.new_record?
|
||||
%dt= heading_helper GroupOrder, :updated_by
|
||||
%dd
|
||||
= show_user(@group_order.updated_by)
|
||||
(#{format_time(@group_order.updated_on)})
|
||||
%dt= heading_helper Ordergroup, :available_funds
|
||||
%dd= number_to_currency(@ordering_data[:available_funds])
|
||||
|
||||
.well.pull-right
|
||||
|
|
@ -65,20 +66,20 @@
|
|||
%table.table.table-hover
|
||||
%thead
|
||||
%tr
|
||||
%th= t '.name'
|
||||
%th= heading_helper Article, :name
|
||||
- if @order.stockit?
|
||||
%th{style: 'width:120px'}= t '.supplier'
|
||||
%th{style: 'width:120px'}= heading_helper StockArticle, :supplier
|
||||
%th{style: "width:13px;"}
|
||||
%th{style: "width:4.5em;"}= t '.price'
|
||||
%th{style: "width:4.5em;"}= t '.unit'
|
||||
%th{style: "width:4.5em;"}= heading_helper Article, :unit
|
||||
- unless @order.stockit?
|
||||
%th{style: "width:70px;"}= t '.unit_missing'
|
||||
%th#col_required= t '.amount'
|
||||
%th#col_tolerance= t '.tolerance'
|
||||
%th{style: "width:70px;"}= heading_helper OrderArticle, :missing_units, short: true
|
||||
%th#col_required= heading_helper GroupOrderArticle, :quantity
|
||||
%th#col_tolerance= heading_helper GroupOrderArticle, :tolerance
|
||||
- else
|
||||
%th(style="width:20px")= t '.available'
|
||||
%th#col_required= t '.amount'
|
||||
%th{style: "width:15px;"}= t '.sum'
|
||||
%th(style="width:20px")= heading_helper StockArticle, :available
|
||||
%th#col_required= heading_helper GroupOrderArticle, :quantity
|
||||
%th{style: "width:15px;"}= heading_helper GroupOrderArticle, :total_price
|
||||
%tbody.list
|
||||
- @order.articles_grouped_by_category.each do |category, order_articles|
|
||||
%tr.list-heading.article-category
|
||||
|
|
@ -132,11 +133,11 @@
|
|||
%span{id: "t_total_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:tolerance] + @ordering_data[:order_articles][order_article.id][:others_tolerance]
|
||||
%br/
|
||||
.pull-left
|
||||
#{t '.manufacturer'}: #{order_article.article.manufacturer}
|
||||
#{heading_helper Article, :manufacturer}: #{order_article.article.manufacturer}
|
||||
%br/
|
||||
#{t '.units'}: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit}
|
||||
#{heading_helper Article, :units}: #{@order.stockit? ? order_article.article.quantity_available : @ordering_data[:order_articles][order_article.id][:unit]} * #{h order_article.article.unit}
|
||||
%br/
|
||||
#{t '.note'}: #{order_article.article.note}
|
||||
#{heading_helper Article, :note}: #{order_article.article.note}
|
||||
%br/
|
||||
#order-footer
|
||||
#info-box
|
||||
|
|
@ -147,7 +148,7 @@
|
|||
%td.currency
|
||||
%span#total_price= number_to_currency(@group_order.price)
|
||||
%tr
|
||||
%td= t('.available_funds') + ':'
|
||||
%td= heading_helper(Ordergroup, :available_funds) + ':'
|
||||
%td.currency= number_to_currency(@ordering_data[:available_funds])
|
||||
%tr
|
||||
%td= t('.new_funds') + ':'
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th= t '.supplier'
|
||||
%th= t '.ending'
|
||||
%th= t '.sum'
|
||||
%th= heading_helper Order, :name
|
||||
%th= heading_helper Order, :ends
|
||||
%th= heading_helper GroupOrder, :price
|
||||
%tbody
|
||||
- for order in orders
|
||||
- group_order = order.group_order(@ordergroup) # Get GroupOrder if possible
|
||||
|
|
|
|||
|
|
@ -6,22 +6,22 @@
|
|||
%h2= t '.funds.title'
|
||||
%table.table.table-striped
|
||||
%tr
|
||||
%td= t('.funds.account_balance') + ':'
|
||||
%td= heading_helper Ordergroup, :account_balance
|
||||
%td.numeric{:style => "width:5em"}= number_to_currency(@ordergroup.account_balance)
|
||||
%tr
|
||||
%td= '- ' + t('.funds.open_orders') + ':'
|
||||
%td= '- ' + t('.funds.open_orders')
|
||||
%td.numeric= number_to_currency(@ordergroup.value_of_open_orders)
|
||||
%tr
|
||||
%td= '- ' + t('.funds.finished_orders') + ':'
|
||||
%td= '- ' + t('.funds.finished_orders')
|
||||
%td.numeric= number_to_currency(@ordergroup.value_of_finished_orders)
|
||||
%tr
|
||||
%th= t('.funds.available_funds') + ':'
|
||||
%th= heading_helper Ordergroup, :available_funds
|
||||
%th.numeric= number_to_currency(@ordergroup.get_available_funds)
|
||||
|
||||
= render :partial => "shared/open_orders", :locals => {:ordergroup => @ordergroup}
|
||||
|
||||
// finished orders
|
||||
- unless Order.finished.empty?
|
||||
- unless Order.finished_not_closed.empty?
|
||||
%section
|
||||
%h2= t '.finished_orders.title'
|
||||
= render :partial => "orders", :locals => {:orders => Order.finished_not_closed, :pagination => false}
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
- content_for :head do
|
||||
= render 'data'
|
||||
|
||||
= render :partial => 'order_head'
|
||||
|
||||
- form_tag(:action => 'saveOrder', :id => @order) do
|
||||
.single_column{:style => "clear:both;margin-bottom:7em;"}
|
||||
.box_title
|
||||
%h2= t '.title'
|
||||
.column_content
|
||||
%table#order.list
|
||||
%thead
|
||||
%tr
|
||||
%th= t 'group_orders.form.name'
|
||||
%th{:style => "width:13px;"}
|
||||
%th{:style => "width:4.5em;"}= t 'group_orders.form.price'
|
||||
%th{:style => "width:4.5em;"}= t 'group_orders.form.unit'
|
||||
%th{:style => "width:70px;"}= t 'group_orders.form.unit_missing'
|
||||
%th#col_required= t 'group_orders.form.amount'
|
||||
- if not @order.stockit?
|
||||
%th#col_tolerance= t 'group_orders.form.tolerance'
|
||||
%th{:style => "width:15px;"}= t 'group_orders.form.sum'
|
||||
%tbody
|
||||
- total = 0
|
||||
- i = 0
|
||||
- @articles_grouped_by_category.each do |category, order_articles|
|
||||
%tr{:style => "background-color:#EFEFEF"}
|
||||
%td{:style => "text-align:left"}
|
||||
%b= h category
|
||||
%td{:colspan => "9"}
|
||||
- order_articles.each do |order_article|
|
||||
- if FoodsoftConfig[:tolerance_is_costly]
|
||||
- article_total = @price[i] * (@tolerance[i] + @quantity[i])
|
||||
- else
|
||||
- article_total = @price[i] * @quantity[i]
|
||||
- total += article_total
|
||||
%tr{:class => "#{cycle('even', 'odd', :name => 'articles')} order-article", :valign => "top"}
|
||||
%td.name= order_article.article.name
|
||||
%td= h order_article.article.origin
|
||||
%td= number_to_currency(@price[i])
|
||||
%td= order_article.article.unit
|
||||
%td
|
||||
%span{:id => "missing_units_#{i}"}
|
||||
- if @order.stockit?
|
||||
- order_article.article.quantity_available
|
||||
- else
|
||||
- missing_units = @unit[i] - (((@quantity[i] + @others_quantity[i]) % @unit[i]) + @tolerance[i] + @others_tolerance[i])
|
||||
- missing_units < 0 ? 0 : missing_units
|
||||
%td.quantity
|
||||
%input{:id => "q_#{i}", :name => "ordered[#{order_article.id}][quantity]", :size => "2", :type => "hidden", :value => @quantity[i]}/
|
||||
%span.used{:id => "q_used_#{i}"}= @used_quantity[i]
|
||||
+
|
||||
%span.unused{:id => "q_unused_#{i}"}= @quantity[i] - @used_quantity[i]
|
||||
= button_to_function('+', "increaseQuantity(#{i})")
|
||||
= button_to_function('-', "decreaseQuantity(#{i})")
|
||||
- unless @order.stockit?
|
||||
%td.tolerance
|
||||
%input{:id => "t_#{i}", :name => "ordered[#{order_article.id}][tolerance]", :size => "2", :type => "hidden", :value => @tolerance[i]}/
|
||||
- if (@unit[i] > 1)
|
||||
%span.used{:id => "t_used_#{i}"}= @used_tolerance[i]
|
||||
+
|
||||
%span.unused{:id => "t_unused_#{i}"}= @tolerance[i] - @used_tolerance[i]
|
||||
= button_to_function('+', "increaseTolerance(#{i})")
|
||||
= button_to_function('-', "decreaseTolerance(#{i})")
|
||||
%td{:id => "td_price_#{i}", :style => "text-align:right; padding-right:10px; width:4em"}
|
||||
%span{:id => "price_#{i}_display"}= number_to_currency(article_total, :unit => "")
|
||||
€
|
||||
.article-info
|
||||
%h3= order_article.article.name
|
||||
.right
|
||||
= t('group_orders.form.units_full') + ':'
|
||||
%span{:id => "units_#{i}"}= order_article.units_to_order
|
||||
%br/
|
||||
= t('group_orders.form.total_units') + ':'
|
||||
%span{:id => "q_total_#{i}"}= @quantity[i] + @others_quantity[i]
|
||||
%br/
|
||||
= t('group_orders.form.total_tolerance') + ':'
|
||||
%span{:id => "t_total_#{i}"}= @tolerance[i] + @others_tolerance[i]
|
||||
%br/
|
||||
.left
|
||||
#{t 'group_orders.form.manufacturer'}: #{order_article.article.manufacturer}
|
||||
%br/
|
||||
#{t 'group_orders.form.units'}: #{@order.stockit? ? order_article.article.quantity_available : @unit[i]} * #{h order_article.article.unit}
|
||||
%br/
|
||||
#{t 'group_orders.form.note'}: #{order_article.article.note}
|
||||
%br/
|
||||
- i = i + 1
|
||||
= render "order_footer", :total => total
|
||||
|
|
@ -9,21 +9,22 @@
|
|||
.well
|
||||
// Order summary
|
||||
%dl.dl-horizontal
|
||||
%dt= t '.supplier'
|
||||
%dt= heading_helper Order, :name
|
||||
%dd= @order.name
|
||||
%dt= t '.note'
|
||||
%dt= heading_helper Order, :note
|
||||
%dd= @order.note
|
||||
%dt= t '.ending'
|
||||
%dt= heading_helper Order, :ends
|
||||
%dd= format_time(@order.ends)
|
||||
%dt= t '.order_sum'
|
||||
%dt= heading_helper GroupOrder, :price
|
||||
%dd
|
||||
- if @group_order
|
||||
= number_to_currency(@group_order.price)
|
||||
- else
|
||||
= t '.not_ordered'
|
||||
- if @order.closed?
|
||||
%p= t '.closed_by', user: show_user(@order.updated_by)
|
||||
= link_to t('.comment'), "#comments"
|
||||
%dt= heading_helper Order, :closed_by
|
||||
%dd= show_user_link @order.updated_by
|
||||
%p= link_to t('.comment'), "#comments"
|
||||
|
||||
// Article box
|
||||
%section
|
||||
|
|
@ -35,8 +36,8 @@
|
|||
%table.table.table-hover
|
||||
%thead
|
||||
%tr
|
||||
%th{style: "width:40%"}= t '.articles.name'
|
||||
%th= t '.articles.units'
|
||||
%th{style: "width:40%"}= heading_helper Article, :name
|
||||
%th= heading_helper Article, :units
|
||||
%th= t '.articles.unit_price'
|
||||
%th
|
||||
%abbr{title: t('.articles.ordered_title')}= t '.articles.ordered'
|
||||
|
|
@ -46,7 +47,7 @@
|
|||
= t '.articles.order_open'
|
||||
- else
|
||||
= t '.articles.order_not_open'
|
||||
%th= t '.articles.total_price'
|
||||
%th= heading_helper GroupOrderArticle, :total_price
|
||||
%tbody
|
||||
- for category_name, order_articles in @order.articles_grouped_by_category
|
||||
%tr.article-category
|
||||
|
|
@ -61,7 +62,7 @@
|
|||
%td{style: "width:40%"}
|
||||
= oa.article.name
|
||||
- unless oa.article.note.blank?
|
||||
= image_tag("lamp_grey.png", {alt: "Notiz anzeigen", size: "15x16", border: "0", onmouseover: "$('note_#{oa.id}').show();", onmouseout: "$('note_#{oa.id}').hide();"})
|
||||
= image_tag("lamp_grey.png", {alt: t('.articles.show_note'), size: "15x16", border: "0", onmouseover: "$('#note_#{oa.id}').show();", onmouseout: "$('#note_#{oa.id}').hide();"})
|
||||
%td= "#{oa.price.unit_quantity} x #{oa.article.unit}"
|
||||
%td= number_to_currency(oa.price.fc_price)
|
||||
%td
|
||||
|
|
@ -73,7 +74,7 @@
|
|||
%tr{id: "note_#{oa.id}", class: "note even", style: "display:none"}
|
||||
%td{colspan: "6"}=h oa.article.note
|
||||
%tr{class: cycle('even', 'odd', name: 'articles')}
|
||||
%th{colspan: "5"}= t '.articles.sum'
|
||||
%th{colspan: "5"}= heading_helper GroupOrder, :price
|
||||
%th= number_to_currency(@group_order.price)
|
||||
%br/
|
||||
= link_to_top
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
%h3= t '.my_ordergroup.transactions.title'
|
||||
%table.table.table-striped
|
||||
%tr
|
||||
%th= t '.my_ordergroup.transactions.when'
|
||||
%th= t '.my_ordergroup.transactions.where'
|
||||
%th= t '.my_ordergroup.transactions.note'
|
||||
%th= t '.my_ordergroup.transactions.amount'
|
||||
%th= heading_helper FinancialTransaction, :created_on
|
||||
%th= heading_helper FinancialTransaction, :user
|
||||
%th= heading_helper FinancialTransaction, :note
|
||||
%th= heading_helper FinancialTransaction, :amount
|
||||
- for ft in current_user.ordergroup.financial_transactions.limit(5).order('created_on DESC')
|
||||
%tr
|
||||
%td= format_time(ft.created_on)
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
- unless @ordergroup.description.blank?
|
||||
%p= @ordergroup.description
|
||||
%p
|
||||
%b= Ordergroup.human_attribute_name(:available_funds) + ':'
|
||||
%b= heading_helper(Ordergroup, :available_funds) + ':'
|
||||
= number_to_currency(@ordergroup.get_available_funds())
|
||||
%p
|
||||
%b= Ordergroup.human_attribute_name(:user_tokens) + ':'
|
||||
%b= heading_helper(Ordergroup, :user_tokens) + ':'
|
||||
= @ordergroup.memberships.map{|m| show_user m.user}.join(', ')
|
||||
= link_to t('.invite'), new_invite_path(:id => @ordergroup), :remote => true, class: 'btn btn-primary'
|
||||
.span8
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
%title= [t('layouts.foodsoft'), yield(:title)].join(" - ")
|
||||
= csrf_meta_tags
|
||||
= stylesheet_link_tag "application", :media => "all"
|
||||
%link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
|
||||
%link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
|
||||
%link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
|
||||
%link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
|
||||
//%link(href="images/favicon.ico" rel="shortcut icon")
|
||||
|
||||
= yield(:head)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
%table.table.table-hover
|
||||
%thead
|
||||
%tr
|
||||
%th= t '.name'
|
||||
%th= t '.unit_quantity'
|
||||
%th= heading_helper Article, :name
|
||||
%th= heading_helper Article, :unit_quantity
|
||||
%th= t '.prices'
|
||||
%th= t '.units_ordered'
|
||||
- unless order.stockit?
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
%table.table.table-hover#articleList
|
||||
%tr
|
||||
%th= check_box_tag 'checkall', "1", false, { 'data-check-all' => '#articleList' }
|
||||
%th= t '.name'
|
||||
%th= t '.note'
|
||||
%th= heading_helper Article, :name
|
||||
%th= heading_helper Article, :note
|
||||
- if @order.stockit?
|
||||
%th= t '.stockit'
|
||||
- else
|
||||
%th= t '.origin'
|
||||
%th= t '.supplier'
|
||||
%th= t '.unit_quantity'
|
||||
%th= heading_helper Article, :origin
|
||||
%th= heading_helper Article, :manufacturer
|
||||
%th= heading_helper Article, :unit_quantity
|
||||
%th= t '.prices'
|
||||
- for category_name, articles in @order.articles_for_ordering
|
||||
%tr.article-category
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th= sort_link_helper t('.supplier'), "supplier"
|
||||
%th= t '.start'
|
||||
%th= sort_link_helper t('.ending'), "ends"
|
||||
%th= t '.status'
|
||||
%th= sort_link_helper heading_helper(Order, :supplier), "supplier"
|
||||
%th= heading_helper Order, :starts
|
||||
%th= sort_link_helper heading_helper(Order, :ends), "ends"
|
||||
%th= heading_helper Order, :status
|
||||
%th{:colspan => "2"}
|
||||
%tbody
|
||||
- @orders.each do |order|
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@
|
|||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th= t '.supplier'
|
||||
%th= t '.ending'
|
||||
%th= t '.note'
|
||||
%th= heading_helper Order, :name
|
||||
%th= heading_helper Order, :ends
|
||||
%th= heading_helper Order, :note
|
||||
%th{colspan: "2"}
|
||||
%tbody
|
||||
- for order in @open_orders
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
// Order summary
|
||||
.well
|
||||
%dl.dl-horizontal
|
||||
%dt= t '.supplier'
|
||||
%dt= heading_helper(Order, :name) + ':'
|
||||
%dd= @order.name
|
||||
- if @note.present?
|
||||
%dt= t '.note'
|
||||
%dt= heading_helper(Order, :note) + ':'
|
||||
%dd= @order.note
|
||||
%dt= t '.created_by'
|
||||
%dt= heading_helper(Order, :created_by) + ':'
|
||||
%dd= show_user_link(@order.created_by)
|
||||
%dt= t '.begin'
|
||||
%dt= heading_helper(Order, :starts) + ':'
|
||||
%dd= format_time(@order.starts)
|
||||
%dt= t '.ending'
|
||||
%dt= heading_helper(Order, :ends) + ':'
|
||||
%dd= format_time(@order.ends)
|
||||
%dt= t '.group_orders'
|
||||
%dd #{@order.group_orders.count} (#{@order.group_orders.includes(:ordergroup).all.map {|g| g.ordergroup.name}.join(', ')})
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
%table.table.table-striped
|
||||
%thead
|
||||
%tr
|
||||
%th= t '.supplier'
|
||||
%th= t '.ending'
|
||||
%th= heading_helper Order, :name
|
||||
%th= heading_helper Order, :ends
|
||||
%th= t '.who_ordered'
|
||||
%th= t '.total'
|
||||
%th= heading_helper GroupOrder, :price
|
||||
%tbody
|
||||
- total = 0
|
||||
- Order.open.each do |order|
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ de:
|
|||
availability_short: verf.
|
||||
deposit: Pfand
|
||||
fc_price: Endpreis
|
||||
fc_price_short:
|
||||
fc_price_short: FC-Preis
|
||||
fc_share: FoodCoop-Aufschlag
|
||||
fc_share_short: FC-Aufschlag
|
||||
gross_price: Bruttopreis
|
||||
|
|
@ -22,6 +22,7 @@ de:
|
|||
unit: Einheit
|
||||
unit_quantity: Gebindegröße
|
||||
unit_quantity_short: GebGr
|
||||
units: Gebinde
|
||||
article_category:
|
||||
description: Beschreibung
|
||||
name: Name
|
||||
|
|
@ -31,10 +32,19 @@ de:
|
|||
supplier: Lieferantin
|
||||
financial_transaction:
|
||||
amount: Betrag
|
||||
created_on: Datum
|
||||
note: Notiz
|
||||
ordergroup: Bestellgruppe
|
||||
user:
|
||||
group_order:
|
||||
price: Bestellsumme
|
||||
updated_by: Zuletzt bestellt
|
||||
group_order_article:
|
||||
ordergroup_id: Bestellgruppe
|
||||
quantity: Menge
|
||||
result: Menge
|
||||
tolerance: Toleranz
|
||||
total_price: Summe
|
||||
invoice:
|
||||
amount: Betrag
|
||||
date: Rechnungsdatum
|
||||
|
|
@ -54,15 +64,23 @@ de:
|
|||
sent_to_all: An alle Mitglieder schicken
|
||||
subject: Betreff
|
||||
order:
|
||||
closed_by: Abgerechnet von
|
||||
created_by: Erstellt von
|
||||
ends: Endet am
|
||||
name: Lieferant
|
||||
note: Notiz
|
||||
starts: Läuft vom
|
||||
status:
|
||||
order_article:
|
||||
missing_units: Fehlende Einheiten
|
||||
missing_units_short:
|
||||
units_to_order: Menge
|
||||
update_current_price: Globalen Preis aktualisieren
|
||||
order_comment:
|
||||
text: Kommentiere diese Bestellung ...
|
||||
ordergroup:
|
||||
account_balance: Kontostand
|
||||
available_funds: Verfügbares Guthaben
|
||||
contact_address: Adresse
|
||||
contact_person: Kontaktperson
|
||||
contact_phone: Telefon
|
||||
|
|
@ -75,10 +93,10 @@ de:
|
|||
parent_id: Oberseite
|
||||
title: Titel
|
||||
stock_article:
|
||||
available: Verfügbar
|
||||
price: Nettopreis
|
||||
quantity: Lagerbestand
|
||||
quantity_available: Verfügbarer Bestand
|
||||
supplier: Lieferant
|
||||
quantity_available_short: Verf.
|
||||
stock_taking:
|
||||
date: Datum
|
||||
note: Notiz
|
||||
|
|
@ -92,6 +110,7 @@ de:
|
|||
fax: FAX
|
||||
is_subscribed: abonniert?
|
||||
min_order_quantity: Mindestbestellmenge
|
||||
min_order_quantity_short:
|
||||
name: Name
|
||||
note: Notiz
|
||||
order_howto: Howto Bestellen
|
||||
|
|
@ -258,7 +277,7 @@ de:
|
|||
name: Name
|
||||
application:
|
||||
controller:
|
||||
error_authn:
|
||||
error_authn: Anmeldung erforderlich!
|
||||
error_denied:
|
||||
error_members_only: Diese Aktion ist nur für Mitglieder der Gruppe erlaubt!
|
||||
article_categories:
|
||||
|
|
@ -328,7 +347,8 @@ de:
|
|||
unit_quantity_desc: Gebindegröße
|
||||
unit_quantity_short: GebGr
|
||||
form:
|
||||
title: Neuen Artikel einfügen
|
||||
title_edit: Artikel bearbeiten
|
||||
title_new: Neuen Artikel einfügen
|
||||
import_search_results:
|
||||
action_import: importieren
|
||||
already_imported: schon importiert
|
||||
|
|
@ -354,7 +374,7 @@ de:
|
|||
error_nosel: Du hast keine Artikel ausgewählt
|
||||
parse_upload:
|
||||
body: <p><i>Bitte überprufe die engelesenen Artikel.</i></p> <p><i>Achtung, momentan gibt es keine Überprüfung auf doppelte Artikel.</i></p>
|
||||
title:
|
||||
title: Artikel hochladen
|
||||
sync:
|
||||
outlist:
|
||||
alert_used: Achtung, %{article} wird gerade in einer laufenden Bestellung verwendet. Bitte erst Bestellung anpassen.
|
||||
|
|
@ -494,11 +514,11 @@ de:
|
|||
alert: ! 'Ein Fehler ist beim Abrechnen aufgetreten: %{message}'
|
||||
notice: Bestellung wurde erfolgreich abgerechnet, die Kontostände aktualisiert.
|
||||
close_direct:
|
||||
alert: ! 'Bestellung kann nicht geschlossen werden: %{message}'
|
||||
notice: Bestellung wurde geschlossen.
|
||||
alert: ! 'Bestellung kann nicht abgerechnet werden: %{message}'
|
||||
notice: Bestellung wurde abgerechnet.
|
||||
confirm:
|
||||
clear: Abschließen
|
||||
first_paragraph: ! 'Wenn die Bestellung abgeschlossen wird, werden ebenfalls alle Gruppenkonten aktualisiert.<br />Die Konten werden wie folgt belastet:'
|
||||
clear: Abrechnen
|
||||
first_paragraph: ! 'Wenn die Bestellung abgerechnet wird, werden ebenfalls alle Gruppenkonten aktualisiert.<br />Die Konten werden wie folgt belastet:'
|
||||
or_cancel: oder zurück zur Abrechnung
|
||||
title: Bestellung abrechnen
|
||||
edit_results_by_articles:
|
||||
|
|
@ -534,7 +554,7 @@ de:
|
|||
articles_overview: Artikelübersicht
|
||||
comment_on_transaction: Hier kannst Du deine Abrechnung kommentieren
|
||||
comments: Kommentare
|
||||
confirm_order: Bestellung abschließen
|
||||
confirm_order: Bestellung abrechnen
|
||||
create_invoice: Rechnung anlegen
|
||||
edit_note: Notiz bearbeiten
|
||||
edit_order: Bestellung bearbeiten
|
||||
|
|
@ -549,8 +569,8 @@ de:
|
|||
orders:
|
||||
clear: abrechnen
|
||||
cleared: abgerechnet (%{amount})
|
||||
close: direkt schließen
|
||||
confirm: Wirklich die Bestellung schließen setzen?
|
||||
close: direkt abrechnen
|
||||
confirm: Wirklich die Bestellung abrechnen?
|
||||
end: Ende
|
||||
ended: beendet
|
||||
last_edited_by: Zuletzt bearbeitet von
|
||||
|
|
@ -588,21 +608,13 @@ de:
|
|||
paragraph: Hier kannst du der Bestellgruppe <b>%{name}</b> Geld gutschreiben/abziehen.
|
||||
title: Neue Transaktion
|
||||
new_collection:
|
||||
amount: Betrag
|
||||
new_ordergroup: Weitere Bestellgruppe hinzufügen
|
||||
note: Notiz
|
||||
ordergroup: Bestellgruppe
|
||||
save: Transaktionen speichern
|
||||
sidebar: Hier kannst Du mehrere Konten gleichzeitig aktualsieren. Z.B. alle Überweisungen der Bestellgruppen aus einem Kontoauszug.
|
||||
title: Mehrere Konten aktualisieren
|
||||
ordergroup:
|
||||
remove: Entfernen
|
||||
remove_group: Gruppe enfernen
|
||||
transactions:
|
||||
amount: Betrag
|
||||
date: Datum
|
||||
note: Notiz
|
||||
who: Wer
|
||||
group_order_articles:
|
||||
form:
|
||||
amount_change_for: Mengenänderung für %{article}
|
||||
|
|
@ -705,30 +717,14 @@ de:
|
|||
notfound: Fehlerhafte URL, das ist nicht Deine Bestellung.
|
||||
form:
|
||||
action_save: Bestellung speichern
|
||||
amount: Menge
|
||||
available: Verfügbar
|
||||
available_funds: Verfügbares Guthaben
|
||||
created_by: Erstellt von
|
||||
ending: Ende
|
||||
funds: Guthaben
|
||||
last_update: Zuletzt bestellt
|
||||
manufacturer: Hersteller
|
||||
min_quantity: Mindestbestellmenge
|
||||
name: Name
|
||||
new_funds: Neuer Kontostand
|
||||
note: Notiz
|
||||
price: Preis
|
||||
reset_article_search: Suche zurücksetzen
|
||||
search_article: Artikel suchen...
|
||||
sum: Summe
|
||||
sum_amount: ! 'Gesamtbestellmenge bisher:'
|
||||
supplier: Lieferant
|
||||
sum_amount: Gesamtbestellmenge bisher
|
||||
title: Bestellen
|
||||
tolerance: Toleranz
|
||||
total_sum_amount: Gesamtbetrag
|
||||
total_tolerance: Gesamt-Toleranz
|
||||
unit: Einheit
|
||||
unit_missing: Fehlende Einheiten
|
||||
units: Gebinde
|
||||
units_full: Volle Gebinde
|
||||
units_total: Gesamt-Einheiten
|
||||
|
|
@ -740,8 +736,6 @@ de:
|
|||
title: Nicht abgerechnete Bestellungen
|
||||
total_sum: Gesamtsumme
|
||||
funds:
|
||||
account_balance: Kontostand
|
||||
available_funds: verfügbares Guthaben
|
||||
finished_orders: nicht abgerechnete Bestellungen
|
||||
open_orders: Laufende Bestellungen
|
||||
title: Guthaben
|
||||
|
|
@ -750,14 +744,9 @@ de:
|
|||
not_enough_apples: Um zu Bestellen brauchst Du mindestends %{stop_ordering_under} Äpfel. Momentan hat Deine Bestellgruppe aber nur %{apples} Äpfel.
|
||||
order:
|
||||
title: Artikel
|
||||
orders:
|
||||
ending: Ende
|
||||
sum: Summe
|
||||
supplier: Lieferantin
|
||||
show:
|
||||
articles:
|
||||
edit_order: Bestellung anpassen
|
||||
name: Name
|
||||
not_ordered_msg: Du hast noch nicht bestellt
|
||||
order_closed_msg: Die Bestellung is leider schon zu Ende. Beim nächsten mal früher aufstehen...
|
||||
order_nopen_title: Unter Berücksichtigung der derzeitigen Bestellungen aller Gruppen
|
||||
|
|
@ -767,21 +756,14 @@ de:
|
|||
ordered: Bestellt
|
||||
ordered_title: Menge + Toleranz
|
||||
show_hide: Zeige/Verstecke nicht bestellte Artikel
|
||||
sum: Summe
|
||||
show_note:
|
||||
title: Artikelübersicht
|
||||
total_price: Gesamtpreis
|
||||
unit_price: Einzelpreis
|
||||
units: Gebinde
|
||||
closed_by: Abgerechnet von %{user}
|
||||
comment: Kommentare lesen/schreiben
|
||||
comments:
|
||||
title: Kommentare
|
||||
ending: Ende
|
||||
not_ordered: Du hast nicht bestellt.
|
||||
note: Notiz
|
||||
order_sum: Bestellsumme
|
||||
sum: Summe
|
||||
supplier: Lieferantin
|
||||
title: Dein Bestellergebnis für %{order}
|
||||
switch_order:
|
||||
remaining: noch %{remaining}
|
||||
|
|
@ -1155,10 +1137,8 @@ de:
|
|||
orders:
|
||||
articles:
|
||||
article_count: ! 'Bestellte Artikel:'
|
||||
name: Name
|
||||
prices: Netto-/Bruttopreis
|
||||
prices_sum: ! 'Summe (Netto/Brutto-Preise):'
|
||||
unit_quantity: Gebinde
|
||||
units_full: Volle Gebinde
|
||||
units_ordered: Bestellte Einheiten
|
||||
create:
|
||||
|
|
@ -1177,26 +1157,18 @@ de:
|
|||
notice: Die Bestellung wurde beendet.
|
||||
form:
|
||||
ignore_warnings: Warnungen ignorieren
|
||||
name: Name
|
||||
note: Notiz
|
||||
origin: Herkunft
|
||||
prices: Price (netto/FC)
|
||||
select_all: Alle auswählen
|
||||
stockit: Verfügbar
|
||||
supplier: Hersteller
|
||||
title: Artikel
|
||||
unit_quantity: Gebinde
|
||||
index:
|
||||
action_end: Beenden
|
||||
confirm_delete: Willst Du wirklich die Bestellung löschen?
|
||||
confirm_end: Willst Du wirklich die Bestellung %{order} beenden? Es gibt kein zurück.
|
||||
ended_orders: Beendete Bestellungen
|
||||
ending: Ende
|
||||
new_order: Neue Bestellung anlegen
|
||||
no_open_orders: Derzeit gibt es keine laufende Bestellungen.
|
||||
note: Notiz
|
||||
open_orders: Laufende Bestellungen
|
||||
supplier: Lieferantin
|
||||
title: Bestellungen verwalten
|
||||
model:
|
||||
error_closed: Bestellung wurde schon abgerechnet
|
||||
|
|
@ -1208,17 +1180,11 @@ de:
|
|||
warning_ordered_stock: ! 'Warnung: Die rot markierten Artikel wurden in der laufenden Lagerbestellung bereits bestellt bzw. gekauft. Wenn Du sie hier abwählst, werden alle bestehenden Bestellungen bzw. Käufe dieses Artikels gelöscht und nicht abgerechnet!'
|
||||
new:
|
||||
title: Neue Bestellung anlegen
|
||||
orders:
|
||||
ending: Ende
|
||||
start: Start
|
||||
status: Status
|
||||
supplier: Lieferantin
|
||||
show:
|
||||
action_end: Beenden!
|
||||
amounts: ! 'Netto/Bruttosumme:'
|
||||
articles: Artikelübersicht
|
||||
articles_ordered: ! 'Bestellte Artikel:'
|
||||
begin: ! 'Beginn:'
|
||||
comments:
|
||||
title: Kommentare
|
||||
comments_link: Kommentare
|
||||
|
|
@ -1226,7 +1192,6 @@ de:
|
|||
confirm_end: ! 'Willst Du wirklich die Bestellung %{order} beenden?
|
||||
|
||||
Es gibt kein zurück.'
|
||||
created_by: ! 'Erstellt von:'
|
||||
download:
|
||||
article_pdf: Artikel PDF
|
||||
download_file: Download file
|
||||
|
|
@ -1235,12 +1200,9 @@ de:
|
|||
group_pdf: Gruppen PDF
|
||||
matrix_pdf: Matrix PDF
|
||||
title: Download
|
||||
ending: ! 'Ende:'
|
||||
group_orders: ! 'Gruppenbestellungen:'
|
||||
note: ! 'Notiz:'
|
||||
sort_article: Sortiert nach Artikeln
|
||||
sort_group: Sortiert nach Gruppen
|
||||
supplier: ! 'Lieferantin:'
|
||||
title: ! 'Bestellung: %{name}'
|
||||
warn_not_closed: Achtung, Bestellung wurde noch nicht abgerechnet.
|
||||
state:
|
||||
|
|
@ -1363,12 +1325,9 @@ de:
|
|||
title: Wöchentliche Jobs
|
||||
user_not_found: Keine Nutzerin gefunden
|
||||
open_orders:
|
||||
ending: Ende
|
||||
no_open_orders: Derzeit gibt es keine laufenden Bestellungen
|
||||
not_enough_apples: Achtung, Deine Bestellgruppe hat zu wenig Äpfel um Bestellen zu können!
|
||||
supplier: Lieferantin
|
||||
title: Laufende Bestellungen
|
||||
total: Summe
|
||||
total_sum: Gesamtsumme
|
||||
who_ordered: Wer hat bestellt?
|
||||
workgroup_members:
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ en:
|
|||
unit: Unit
|
||||
unit_quantity: Unit quantity
|
||||
unit_quantity_short: U.Q.
|
||||
units: Units
|
||||
article_category:
|
||||
description: Description
|
||||
name: Name
|
||||
|
|
@ -30,11 +31,20 @@ en:
|
|||
note: Note
|
||||
supplier: Supplier
|
||||
financial_transaction:
|
||||
amount: amount
|
||||
note: note
|
||||
amount: Amount
|
||||
created_on: Date
|
||||
note: Note
|
||||
ordergroup: Ordergroup
|
||||
user: Entered by
|
||||
group_order:
|
||||
price: Order sum
|
||||
updated_by: Last ordered by
|
||||
group_order_article:
|
||||
ordergroup_id: Ordergroup
|
||||
quantity: Amount
|
||||
result: Amount
|
||||
tolerance: Tolerance
|
||||
total_price: Sum
|
||||
invoice:
|
||||
amount: Amount
|
||||
date: Billing date
|
||||
|
|
@ -54,15 +64,23 @@ en:
|
|||
sent_to_all: Send to all members
|
||||
subject: Subject
|
||||
order:
|
||||
closed_by: Settled by
|
||||
created_by: Created by
|
||||
ends: Ends at
|
||||
name: Supplier
|
||||
note: Note
|
||||
starts: Starts at
|
||||
status: Status
|
||||
order_article:
|
||||
missing_units: Missing units
|
||||
missing_units_short: Missing
|
||||
units_to_order: Amount of units
|
||||
update_current_price: Globally update current price
|
||||
order_comment:
|
||||
text: Add comment to this order ...
|
||||
ordergroup:
|
||||
account_balance: Account balance
|
||||
available_funds: Available credit
|
||||
contact_address: Address
|
||||
contact_person: Contact person
|
||||
contact_phone: Phone
|
||||
|
|
@ -75,10 +93,10 @@ en:
|
|||
parent_id: Parent page
|
||||
title: Title
|
||||
stock_article:
|
||||
available: Available
|
||||
price: Price
|
||||
quantity: Quantity
|
||||
quantity_available: Available quantity
|
||||
supplier: Supplier
|
||||
quantity_available_short: Avail.
|
||||
stock_taking:
|
||||
date: Date
|
||||
note: Note
|
||||
|
|
@ -92,6 +110,7 @@ en:
|
|||
fax: Fax
|
||||
is_subscribed: subscribed?
|
||||
min_order_quantity: Minimum order quantity
|
||||
min_order_quantity_short: Min. quantity
|
||||
name: Name
|
||||
note: Note
|
||||
order_howto: How to order
|
||||
|
|
@ -328,7 +347,8 @@ en:
|
|||
unit_quantity_desc: Unit quantity
|
||||
unit_quantity_short: Quantity
|
||||
form:
|
||||
title: Add new article
|
||||
title_edit: Edit article
|
||||
title_new: Add new article
|
||||
import_search_results:
|
||||
action_import: import
|
||||
already_imported: already imported
|
||||
|
|
@ -416,7 +436,7 @@ en:
|
|||
article: Article
|
||||
price: Netprice
|
||||
sum: Sum
|
||||
sum_diff: Gross - adjusted invoice ammount
|
||||
sum_diff: Gross - adjusted invoice amount
|
||||
sum_gross: Gross sum
|
||||
sum_net: Net sum
|
||||
title: Show delivery
|
||||
|
|
@ -451,7 +471,7 @@ en:
|
|||
- Ordered
|
||||
- Received
|
||||
- Price
|
||||
- Unit quantity
|
||||
- Unit Q.
|
||||
- Unit
|
||||
- Sum
|
||||
sum: Sum
|
||||
|
|
@ -496,13 +516,13 @@ en:
|
|||
balancing:
|
||||
close:
|
||||
alert: ! 'An error occured while accounting: %{message}'
|
||||
notice: Order was accounted succesfully, the balance of the account was updated.
|
||||
notice: Order was settled succesfully, the balance of the account was updated.
|
||||
close_direct:
|
||||
alert: ! 'Order can not be closed: %{message}'
|
||||
notice: Order was closed.
|
||||
alert: ! 'Order can not be settled: %{message}'
|
||||
notice: Order was settled.
|
||||
confirm:
|
||||
clear: Close
|
||||
first_paragraph: ! 'When the order is closed, all group accounts will be updated.<br />The accounts will be charged as follows:'
|
||||
clear: Settle
|
||||
first_paragraph: ! 'When the order is settled, all group accounts will be updated.<br />The accounts will be charged as follows:'
|
||||
or_cancel: or back to accounting
|
||||
title: Settle order
|
||||
edit_results_by_articles:
|
||||
|
|
@ -538,7 +558,7 @@ en:
|
|||
articles_overview: Overview of articles
|
||||
comment_on_transaction: Here you can add a comment to your accounting.
|
||||
comments: Comments
|
||||
confirm_order: Close order
|
||||
confirm_order: Settle order
|
||||
create_invoice: Create invoice
|
||||
edit_note: Edit note
|
||||
edit_order: Edit order
|
||||
|
|
@ -553,8 +573,8 @@ en:
|
|||
orders:
|
||||
clear: accounting
|
||||
cleared: accounted (%{amount})
|
||||
close: close directly
|
||||
confirm: Do you really want to fully close the order?
|
||||
close: settle directly
|
||||
confirm: Do you really want to settle the order?
|
||||
end: End
|
||||
ended: closed
|
||||
last_edited_by: Last edited by
|
||||
|
|
@ -592,21 +612,13 @@ en:
|
|||
paragraph: Here you can credit and debit money for the order group <b>%{name}</b>.
|
||||
title: New transaction
|
||||
new_collection:
|
||||
amount: Amount
|
||||
new_ordergroup: Add new order group
|
||||
note: Note
|
||||
ordergroup: Order group
|
||||
save: Save transaction
|
||||
sidebar: Here you can update more accounts at the same time. For example all transfers of the order group from one account statement
|
||||
sidebar: Here you can update more accounts at the same time. For example all transfers of the order group from one account statement.
|
||||
title: Updating more accounts
|
||||
ordergroup:
|
||||
remove: Remove
|
||||
remove_group: Remove group
|
||||
transactions:
|
||||
amount: Amount
|
||||
date: Date
|
||||
note: Note
|
||||
who: Who
|
||||
group_order_articles:
|
||||
form:
|
||||
amount_change_for: Change amount for %{article}
|
||||
|
|
@ -709,30 +721,14 @@ en:
|
|||
notfound: Incorrect URL, this is not your order.
|
||||
form:
|
||||
action_save: Save order
|
||||
amount: Amount
|
||||
available: Available
|
||||
available_funds: Available credits
|
||||
created_by: Created by
|
||||
ending: End
|
||||
funds: Credit
|
||||
last_update: Last ordered
|
||||
manufacturer: Manufacturer
|
||||
min_quantity: Minimum quantity
|
||||
name: Name
|
||||
new_funds: New account balance
|
||||
note: Note
|
||||
price: Price
|
||||
reset_article_search: Reset search
|
||||
search_article: Search for article...
|
||||
sum: Sum
|
||||
search_article: Search for articles...
|
||||
sum_amount: Current amount
|
||||
supplier: Supplier
|
||||
title: Orders
|
||||
tolerance: Tolerance
|
||||
total_sum_amount: Total amount
|
||||
total_tolerance: Total tolerance
|
||||
unit: Unit
|
||||
unit_missing: Missing units
|
||||
units: Units
|
||||
units_full: Filled units
|
||||
units_total: Total units
|
||||
|
|
@ -744,9 +740,7 @@ en:
|
|||
title: Unsettled orders
|
||||
total_sum: Total sum
|
||||
funds:
|
||||
account_balance: Account balance
|
||||
available_funds: Available credit
|
||||
finished_orders: unsettled orders
|
||||
finished_orders: Unsettled orders
|
||||
open_orders: Current orders
|
||||
title: Credit
|
||||
title: Orders overview
|
||||
|
|
@ -754,14 +748,9 @@ en:
|
|||
not_enough_apples: You need at least %{stop_ordering_under} apples to order. Currently your order group has only %{apples} apples.
|
||||
order:
|
||||
title: Articles
|
||||
orders:
|
||||
ending: End
|
||||
sum: Sum
|
||||
supplier: Suppliers
|
||||
show:
|
||||
articles:
|
||||
edit_order: Edit order
|
||||
name: Name
|
||||
not_ordered_msg: You didn’t place an order yet
|
||||
order_closed_msg: Sorry, this order is closed.
|
||||
order_nopen_title: Considering current orders of all groups
|
||||
|
|
@ -771,21 +760,14 @@ en:
|
|||
ordered: Ordered
|
||||
ordered_title: Amount + tolerance
|
||||
show_hide: Show/hide articles not ordered
|
||||
sum: Sum
|
||||
show_note: Show note
|
||||
title: Article overview
|
||||
total_price: Total price
|
||||
unit_price: Unit price
|
||||
units: Units
|
||||
closed_by: Settled by %{user}
|
||||
comment: Comment
|
||||
comments:
|
||||
title: Comments
|
||||
ending: End
|
||||
not_ordered: You didn’t order.
|
||||
note: Note
|
||||
order_sum: Order sum
|
||||
sum: Sum
|
||||
supplier: Suppliers
|
||||
title: Your order result for %{order}
|
||||
switch_order:
|
||||
remaining: ! '%{remaining} remaining'
|
||||
|
|
@ -833,7 +815,7 @@ en:
|
|||
view_all: See all messages
|
||||
my_ordergroup:
|
||||
funds: ! '| Available Credit:'
|
||||
last_update: Last Update was %{when} ago
|
||||
last_update: Last update was %{when} ago
|
||||
title: My ordergroup
|
||||
transactions:
|
||||
amount: Amount
|
||||
|
|
@ -875,7 +857,7 @@ en:
|
|||
admin: Administration
|
||||
finances:
|
||||
accounts: Update accounts
|
||||
settle: To account orders
|
||||
settle: Account orders
|
||||
title: Finances
|
||||
foodcoop: Foodcoop
|
||||
members: Members
|
||||
|
|
@ -1159,10 +1141,8 @@ en:
|
|||
orders:
|
||||
articles:
|
||||
article_count: ! 'Ordered articles:'
|
||||
name: Name
|
||||
prices: Net/gross price
|
||||
prices_sum: ! 'Sum (net/gross price):'
|
||||
unit_quantity: Unit quantity
|
||||
units_full: Full units
|
||||
units_ordered: Units ordered
|
||||
create:
|
||||
|
|
@ -1181,26 +1161,18 @@ en:
|
|||
notice: The order has been closed.
|
||||
form:
|
||||
ignore_warnings: Ignore warnings
|
||||
name: Name
|
||||
note: Note
|
||||
origin: Origin
|
||||
prices: Prices (net/FC)
|
||||
select_all: Select all
|
||||
stockit: In stock
|
||||
supplier: Producer
|
||||
title: Article
|
||||
unit_quantity: Unit quantity
|
||||
index:
|
||||
action_end: Close
|
||||
confirm_delete: Do you really want to delete the order?
|
||||
confirm_end: Do you really want to close the order %{order}? There is no going back.
|
||||
ended_orders: Closed orders
|
||||
ending: End
|
||||
new_order: Create new order
|
||||
no_open_orders: There are currently no open orders.
|
||||
note: Note
|
||||
open_orders: Current orders
|
||||
supplier: Supplier
|
||||
title: Manage orders
|
||||
model:
|
||||
error_closed: Order was already settled
|
||||
|
|
@ -1208,21 +1180,15 @@ en:
|
|||
error_starts_before_ends: must be after the start date (or remain empty)
|
||||
notice_close: ! 'Order: %{name}, until %{ends}'
|
||||
stock: Stock
|
||||
warning_ordered: ! 'Warning: Articles marked red have already been ordered within this open order. If you uncheck them here, all existing orders of these articles will be deleted.'
|
||||
warning_ordered_stock: ! 'Warning: Articles marked red have already been ordered/ purchased within this open stock order. If you uncheck them here, all existing orders/ purchases of these articles will be deleted and it will not be accounted for them.'
|
||||
warning_ordered: ! 'Warning: articles marked red have already been ordered within this open order. If you uncheck them here, all existing orders of these articles will be deleted.'
|
||||
warning_ordered_stock: ! 'Warning: Articles marked red have already been ordered/purchased within this open stock order. If you uncheck them here, all existing orders/purchases of these articles will be deleted and it will not be accounted for them.'
|
||||
new:
|
||||
title: Create new order
|
||||
orders:
|
||||
ending: End
|
||||
start: Start
|
||||
status: Status
|
||||
supplier: Supplier
|
||||
show:
|
||||
action_end: Close!
|
||||
amounts: ! 'Net/gross sum:'
|
||||
articles: Article overview
|
||||
articles_ordered: ! 'Ordered articles:'
|
||||
begin: ! 'Begin:'
|
||||
comments:
|
||||
title: Comments
|
||||
comments_link: Comments
|
||||
|
|
@ -1230,7 +1196,6 @@ en:
|
|||
confirm_end: ! 'Do you really want to close the order %{order}?
|
||||
|
||||
There is no going back.'
|
||||
created_by: ! 'Created by:'
|
||||
download:
|
||||
article_pdf: Article PDF
|
||||
download_file: Download file
|
||||
|
|
@ -1239,12 +1204,9 @@ en:
|
|||
group_pdf: Group PDF
|
||||
matrix_pdf: Matrix PDF
|
||||
title: Download
|
||||
ending: ! 'End:'
|
||||
group_orders: ! 'Group orders:'
|
||||
note: ! 'Note:'
|
||||
sort_article: Sorted in articles
|
||||
sort_group: Sorted in groups
|
||||
supplier: ! 'Supplier:'
|
||||
title: ! 'Order: %{name}'
|
||||
warn_not_closed: Warning, order is not yet settled.
|
||||
state:
|
||||
|
|
@ -1259,7 +1221,7 @@ en:
|
|||
recent_changes: Recent changes
|
||||
search:
|
||||
action: Search
|
||||
placeholder: Page title ..
|
||||
placeholder: Page title ...
|
||||
site_map: Sitemap
|
||||
title: All Wiki pages
|
||||
title_list: List of pages
|
||||
|
|
@ -1367,12 +1329,9 @@ en:
|
|||
title: Weekly jobs
|
||||
user_not_found: No user found
|
||||
open_orders:
|
||||
ending: Ending
|
||||
no_open_orders: There are no current orders
|
||||
not_enough_apples: Attention your order group has too few apple points to place an order!
|
||||
supplier: Supplier
|
||||
title: Current orders
|
||||
total: Sum
|
||||
total_sum: Total sum
|
||||
who_ordered: Who ordered?
|
||||
workgroup_members:
|
||||
|
|
@ -1394,7 +1353,7 @@ en:
|
|||
edit_stock_article:
|
||||
price: <ul><li>Price changes are forbidden.</li><li>If necessary, %{stock_article_copy_link}.</li></ul>
|
||||
supplier:
|
||||
min_order_quantity: The minimum amount which has to be orderd will be shown during the order process and should motivate ordering
|
||||
min_order_quantity: The minimum amount which has to be ordered will be shown during the order process and should motivate ordering
|
||||
task:
|
||||
duration: How long will the task take, 1-3 hours
|
||||
required_users: How many users will be needed in total?
|
||||
|
|
@ -1480,7 +1439,7 @@ en:
|
|||
unit: Unit
|
||||
vat: VAT
|
||||
confirm_delete: Are you sure you want to delete?
|
||||
new_delivery: New delivery ..
|
||||
new_delivery: New delivery ...
|
||||
new_stock_article: Add new stock article
|
||||
new_stock_taking: Add inventory
|
||||
order_online: Put stock order online
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ fr:
|
|||
unit: Unité
|
||||
unit_quantity: Unités par lot
|
||||
unit_quantity_short:
|
||||
units: Lots
|
||||
article_category:
|
||||
description: Description
|
||||
name: Nom
|
||||
|
|
@ -30,11 +31,20 @@ fr:
|
|||
note:
|
||||
supplier: Fournisseuse_r
|
||||
financial_transaction:
|
||||
amount: montant
|
||||
note: note
|
||||
amount: Montant
|
||||
created_on: Date
|
||||
note: Note
|
||||
ordergroup: Cellule
|
||||
user:
|
||||
group_order:
|
||||
price: Total de la commande
|
||||
updated_by: Dernière commande
|
||||
group_order_article:
|
||||
ordergroup_id: Cellul
|
||||
quantity: Quantité
|
||||
result: Quantité
|
||||
tolerance:
|
||||
total_price: Total
|
||||
invoice:
|
||||
amount: Montant
|
||||
date: Date de facturation
|
||||
|
|
@ -54,15 +64,23 @@ fr:
|
|||
sent_to_all: Envoyer à tous les membres
|
||||
subject: Sujet
|
||||
order:
|
||||
closed_by: Décompté par
|
||||
created_by: Établi par
|
||||
ends: Clôture le
|
||||
name: FournisseurE
|
||||
note:
|
||||
starts: Ouverture le
|
||||
status:
|
||||
order_article:
|
||||
missing_units: Unités manquantes
|
||||
missing_units_short:
|
||||
units_to_order: Quantité
|
||||
update_current_price: Mettre à jour le prix global
|
||||
order_comment:
|
||||
text: Commenter cette commande...
|
||||
ordergroup:
|
||||
account_balance: Crédit initial
|
||||
available_funds: Crédit disponible
|
||||
contact_address: Adresse
|
||||
contact_person: Personne à contacter
|
||||
contact_phone: Téléphone
|
||||
|
|
@ -75,10 +93,10 @@ fr:
|
|||
parent_id: Page parente
|
||||
title: Titre
|
||||
stock_article:
|
||||
available: Disponible
|
||||
price: Prix net
|
||||
quantity:
|
||||
quantity_available:
|
||||
supplier: FournisseurE
|
||||
quantity_available_short:
|
||||
stock_taking:
|
||||
date:
|
||||
note:
|
||||
|
|
@ -92,6 +110,7 @@ fr:
|
|||
fax: Fa
|
||||
is_subscribed: abonné?
|
||||
min_order_quantity: Quantité minimale à commander
|
||||
min_order_quantity_short:
|
||||
name: Nom
|
||||
note: Note
|
||||
order_howto: Comment commander
|
||||
|
|
@ -328,7 +347,8 @@ fr:
|
|||
unit_quantity_desc: Unités par lot
|
||||
unit_quantity_short: U/L
|
||||
form:
|
||||
title: Ajouter un nouvel article
|
||||
title_edit:
|
||||
title_new: Ajouter un nouvel article
|
||||
import_search_results:
|
||||
action_import: importer
|
||||
already_imported: déjà importé
|
||||
|
|
@ -602,21 +622,13 @@ fr:
|
|||
paragraph: Cet espace permet de rajouter ou d'enlever du crédit à la cellule <b>%{name}</b>.
|
||||
title: Nouvelle transaction
|
||||
new_collection:
|
||||
amount: Montant
|
||||
new_ordergroup: Créer d'autres cellules
|
||||
note: Note
|
||||
ordergroup: Cellule
|
||||
save: Sauvegarder les transactions
|
||||
sidebar: ! "Cet espace permet de mettre à jour plusieurs comptes simultanément, \npar exemple pour saisir les versements des cellules sur leurs comptes à partir d'un relevé."
|
||||
title: Mettre à jour plusieurs comptes
|
||||
ordergroup:
|
||||
remove: Supprimer
|
||||
remove_group: Supprimer cette cellule
|
||||
transactions:
|
||||
amount: Montant
|
||||
date: Date
|
||||
note: Note
|
||||
who: Qui?
|
||||
group_order_articles:
|
||||
form:
|
||||
amount_change_for: Modification de la quantité de %{article}
|
||||
|
|
@ -723,30 +735,14 @@ fr:
|
|||
notfound: ! ' Mauvaise adresse, ce n''est pas ta commande.'
|
||||
form:
|
||||
action_save: Enregistrer ta commande
|
||||
amount: Quantité
|
||||
available: Disponible
|
||||
available_funds: Crédit disponible
|
||||
created_by: Établi par
|
||||
ending: Clôture le
|
||||
funds: Crédit
|
||||
last_update: Dernière commande
|
||||
manufacturer: Produit par
|
||||
min_quantity: Quantité minimale
|
||||
name: Nom
|
||||
new_funds: Nouveau solde
|
||||
note: Note
|
||||
price: Prix
|
||||
reset_article_search:
|
||||
search_article:
|
||||
sum: Prix total
|
||||
sum_amount: ! 'Quantité déjà commandée:'
|
||||
supplier: Fourni par
|
||||
sum_amount: Quantité déjà commandée
|
||||
title: Commander
|
||||
tolerance: Tolérance
|
||||
total_sum_amount: Montant total
|
||||
total_tolerance: Tolérance totale
|
||||
unit: Unité
|
||||
unit_missing: Unités manquantes
|
||||
units: Lots
|
||||
units_full: Lots complet
|
||||
units_total: Unités déjà commandées
|
||||
|
|
@ -758,8 +754,6 @@ fr:
|
|||
title: Commandes par encore décomptées
|
||||
total_sum: Total
|
||||
funds:
|
||||
account_balance: Crédit initial
|
||||
available_funds: Crédit disponible
|
||||
finished_orders: montant prévu des commandes non décomptées
|
||||
open_orders: montant des commandes en cours
|
||||
title: Crédit
|
||||
|
|
@ -770,14 +764,9 @@ fr:
|
|||
alors que vous n''en avez que %{apples} pour le moment.'
|
||||
order:
|
||||
title: Article
|
||||
orders:
|
||||
ending: Clôture le
|
||||
sum: Total
|
||||
supplier: FournisseusE_r
|
||||
show:
|
||||
articles:
|
||||
edit_order: Modifier ta commande
|
||||
name: Nom
|
||||
not_ordered_msg: Tu n'as pas encore commandé
|
||||
order_closed_msg: Désolé, cette commande a déjà été fermée. Il faudra te réveiller plus tôt la prochaine fois
|
||||
order_nopen_title: En tenant compte des commandes en cours de toutes les cellules
|
||||
|
|
@ -787,21 +776,14 @@ fr:
|
|||
ordered: Quantité souhaitée
|
||||
ordered_title: Quantité + tolérance
|
||||
show_hide: Montrer/cacher les articles non commandés
|
||||
sum: Total
|
||||
show_note:
|
||||
title: Aperçu des articles
|
||||
total_price: Prix
|
||||
unit_price: Prix unitaire
|
||||
units: Lots
|
||||
closed_by: Décompté par %{user}
|
||||
comment: Lire/écrire des commentaire
|
||||
comments:
|
||||
title: Commentaire
|
||||
ending: Clôture le
|
||||
not_ordered: Tu n'as pas commandé.
|
||||
note: Note
|
||||
order_sum: Total de la commande
|
||||
sum: Total
|
||||
supplier: Fourni par
|
||||
title: Ta part de la commande %{order}
|
||||
switch_order:
|
||||
remaining: encore %{remaining}
|
||||
|
|
@ -1164,10 +1146,8 @@ fr:
|
|||
orders:
|
||||
articles:
|
||||
article_count: ! 'Articles commandés:'
|
||||
name: Nom
|
||||
prices: Prix brut/net
|
||||
prices_sum: ! 'Totaux (des prix bruts/nets):'
|
||||
unit_quantity: Unités par lots x Lots
|
||||
units_full: Lots complet
|
||||
units_ordered: Unités commandées
|
||||
create:
|
||||
|
|
@ -1186,26 +1166,18 @@ fr:
|
|||
notice: La commande a été close.
|
||||
form:
|
||||
ignore_warnings:
|
||||
name: Nom
|
||||
note: Note
|
||||
origin: Origine
|
||||
prices: Prix (net/coop)
|
||||
select_all: Tout sélectionner
|
||||
stockit: Disponible
|
||||
supplier: Productrice_teur
|
||||
title: Article
|
||||
unit_quantity: Lots
|
||||
index:
|
||||
action_end: Terminer
|
||||
confirm_delete: Vraiment supprimer la commande?
|
||||
confirm_end: Veux tu vraiment mettre fin à la commande %{order}? Attention, il n'y aura pas d'annulation possible.
|
||||
ended_orders: Commandes closes
|
||||
ending: Clôture le
|
||||
new_order: Définir une nouvelle commande
|
||||
no_open_orders: Il n'y a aucune commande en cours en ce moment.
|
||||
note: Note
|
||||
open_orders: Commandes en cours
|
||||
supplier: FournisseusE_r
|
||||
title: Gestion des commandes
|
||||
model:
|
||||
error_closed: Cette commande a déjà été décomptée
|
||||
|
|
@ -1217,23 +1189,16 @@ fr:
|
|||
warning_ordered_stock:
|
||||
new:
|
||||
title: Définir une nouvelle commande
|
||||
orders:
|
||||
ending: Clôture le
|
||||
start: Début
|
||||
status: Statut
|
||||
supplier: FournisseurE
|
||||
show:
|
||||
action_end: Clore!
|
||||
amounts: ! 'Total net/brut:'
|
||||
articles: Aperçu des articles
|
||||
articles_ordered: ! 'Articles commandés:'
|
||||
begin: ! 'Début:'
|
||||
comments:
|
||||
title: Commentaire
|
||||
comments_link: Commenaire
|
||||
confirm_delete: Veux-tu vraiment supprimer la commande?
|
||||
confirm_end: Veux tu vraiment terminer la commande %{order}? Pas d'annulation possible.
|
||||
created_by: ! 'Créée par:'
|
||||
download:
|
||||
article_pdf: Liste des articles en PDF
|
||||
download_file: Télécharger
|
||||
|
|
@ -1242,12 +1207,9 @@ fr:
|
|||
group_pdf: Liste des cellules en PDF
|
||||
matrix_pdf: Matrice de distribution en PDF
|
||||
title: Télécharger
|
||||
ending: ! 'Clôture le:'
|
||||
group_orders: ! 'Commandes des cellules:'
|
||||
note: ! 'Note:'
|
||||
sort_article: Trié par article
|
||||
sort_group: Trié par cellules
|
||||
supplier: FournisseurE
|
||||
title: ! 'Commande: %{name}'
|
||||
warn_not_closed: Attention, cette commande n'a pas encore été décomptée!
|
||||
state:
|
||||
|
|
@ -1370,12 +1332,9 @@ fr:
|
|||
title: Boulots hebdomadaires
|
||||
user_not_found: Aucune utilisatrice n'a été trouvée.
|
||||
open_orders:
|
||||
ending: Clôture le
|
||||
no_open_orders: Il n'y a aucune commande en cours en ce moment
|
||||
not_enough_apples: Désolé, ta cellule n'a pas assez de glands pour pouvoir commander!
|
||||
supplier: FournisseusE_r
|
||||
title: Commandes en cours
|
||||
total: Total
|
||||
total_sum: Total
|
||||
who_ordered: Qui a commandé?
|
||||
workgroup_members:
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ nl:
|
|||
unit: Eenheid
|
||||
unit_quantity: Groothandelseenheid
|
||||
unit_quantity_short: Gr.Eenh.
|
||||
units: Eenheden
|
||||
article_category:
|
||||
description: Omschrijving
|
||||
name: Naam
|
||||
|
|
@ -30,11 +31,20 @@ nl:
|
|||
note: Notitie
|
||||
supplier: Leverancier
|
||||
financial_transaction:
|
||||
amount: bedrag
|
||||
note: notitie
|
||||
amount: Bedrag
|
||||
created_on: Datum
|
||||
note: Notitie
|
||||
ordergroup: Huishouden
|
||||
user: Ingevuld door
|
||||
group_order:
|
||||
price: Totaal bestelling
|
||||
updated_by: Laatst besteld door
|
||||
group_order_article:
|
||||
ordergroup_id: Huishouden
|
||||
quantity: Hoeveelheid
|
||||
result: Hoeveelheid
|
||||
tolerance: Tolerantie
|
||||
total_price: Som
|
||||
invoice:
|
||||
amount: Bedrag
|
||||
date: Factuurdatum
|
||||
|
|
@ -54,15 +64,23 @@ nl:
|
|||
sent_to_all: Aan alle leden sturen
|
||||
subject: Onderwerp
|
||||
order:
|
||||
closed_by: Afgerekend door
|
||||
created_by: Geopend door
|
||||
ends: Eindigt op
|
||||
name: Leverancier
|
||||
note: Notitie
|
||||
starts: Start op
|
||||
status: Status
|
||||
order_article:
|
||||
missing_units: Missende eenheden
|
||||
missing_units_short: Nodig
|
||||
units_to_order: Aantal eenheden
|
||||
update_current_price: Huidige prijs overal bijwerken
|
||||
order_comment:
|
||||
text: Commentaar voor deze bestelling toevoegen ...
|
||||
ordergroup:
|
||||
account_balance: Tegoed
|
||||
available_funds: Beschikbaar tegoed
|
||||
contact_address: Adres
|
||||
contact_person: Contactpersoon
|
||||
contact_phone: Telefoon
|
||||
|
|
@ -71,14 +89,14 @@ nl:
|
|||
name: Naam
|
||||
user_tokens: Leden
|
||||
page:
|
||||
body: Bericht
|
||||
body: Inhoud
|
||||
parent_id: Ouderpagina
|
||||
title: Titel
|
||||
stock_article:
|
||||
available: Beschikbaar
|
||||
price: Prijs
|
||||
quantity: Aantal
|
||||
quantity_available: Beschikbaar
|
||||
supplier: Leverancier
|
||||
quantity_available_short: Besch.
|
||||
stock_taking:
|
||||
date: Datum
|
||||
note: Notitie
|
||||
|
|
@ -92,6 +110,7 @@ nl:
|
|||
fax: Fax
|
||||
is_subscribed: geabonneerd?
|
||||
min_order_quantity: Minimale bestelhoeveelheid
|
||||
min_order_quantity_short: Min. bestelling
|
||||
name: Naam
|
||||
note: Notitie
|
||||
order_howto: Hoe te bestellen
|
||||
|
|
@ -216,7 +235,7 @@ nl:
|
|||
new:
|
||||
title: Nieuwe gebruiker toevoegen
|
||||
show:
|
||||
confirm: Wil je %{user} daadwerkelijk eruit zetten?
|
||||
confirm: Wil je %{user} daadwerkelijk verwijderen?
|
||||
email: E-mail
|
||||
groupabos: Groepslidmaatschappen
|
||||
member_since: Lid sinds %{time}
|
||||
|
|
@ -328,7 +347,8 @@ nl:
|
|||
unit_quantity_desc: Groothandelsverpakkingsgrootte
|
||||
unit_quantity_short: Gr.Eenh.
|
||||
form:
|
||||
title: Nieuw artikel toevoegen
|
||||
title_edit: Artikel bewerken
|
||||
title_new: Nieuw artikel toevoegen
|
||||
import_search_results:
|
||||
action_import: importeren
|
||||
already_imported: reeds geïmporteerd
|
||||
|
|
@ -395,10 +415,10 @@ nl:
|
|||
actions: Taken
|
||||
article: Artikel
|
||||
category: Categorie
|
||||
create_from_blank: Nieuwe artikel invoeren
|
||||
create_stock_article: Voorraadartikel maken
|
||||
create_from_blank: Nieuw voorraadartikel invoeren
|
||||
create_stock_article: Voorraadartikel invoeren
|
||||
price: Netto prijs
|
||||
quantity: Hoeveelheid
|
||||
quantity: Aantal
|
||||
title_fill_quantities: 2. Hoeveel mag er geleverd worden
|
||||
title_finish_delivery: 3. Levering afmaken
|
||||
title_select_stock_articles: 1. Kies voorraadartikelen
|
||||
|
|
@ -406,28 +426,28 @@ nl:
|
|||
index:
|
||||
confirm_delete: Zeker weten?
|
||||
new_delivery: Nieuwe levering maken voor %{supplier}
|
||||
title:
|
||||
invoice_amount:
|
||||
invoice_net_amount:
|
||||
title: ! '%{supplier} leveringen'
|
||||
invoice_amount: Factuurbedrag
|
||||
invoice_net_amount: Netto factuurbedrag
|
||||
new:
|
||||
title:
|
||||
title: Nieuwe levering van %{supplier}
|
||||
show:
|
||||
amount:
|
||||
article:
|
||||
price:
|
||||
sum:
|
||||
sum_diff:
|
||||
sum_gross:
|
||||
sum_net:
|
||||
title:
|
||||
title_articles:
|
||||
unit:
|
||||
amount: Aantal
|
||||
article: Artikel
|
||||
price: Netto prijs
|
||||
sum: Som
|
||||
sum_diff: Bruto - aangepast factuurbedrag
|
||||
sum_gross: Brutosom
|
||||
sum_net: Nettosom
|
||||
title: Levering tonen
|
||||
title_articles: Artikel
|
||||
unit: Eenheid
|
||||
stock_article_for_adding:
|
||||
action_add_to_delivery:
|
||||
action_edit:
|
||||
action_other_price:
|
||||
action_add_to_delivery: Voeg toe aan levering
|
||||
action_edit: Bewerk
|
||||
action_other_price: Kopieer
|
||||
stock_article_form:
|
||||
copy_stock_article:
|
||||
copy_stock_article: kopieer het voorraadartikel
|
||||
stock_change_fields:
|
||||
remove_article: Artikel uit levering halen
|
||||
suppliers_overview: Leverancieroverzicht
|
||||
|
|
@ -449,7 +469,7 @@ nl:
|
|||
rows:
|
||||
- Artikel
|
||||
- Besteld
|
||||
- Hoeveelheid
|
||||
- Gekregen
|
||||
- Prijs
|
||||
- Gr.Eenh.
|
||||
- Eenheid
|
||||
|
|
@ -458,7 +478,14 @@ nl:
|
|||
title: ! 'Huishoudenslijst van bestelling: %{name}, gesloten op %{date}'
|
||||
order_fax:
|
||||
filename: Bestelling %{name}-%{date} - Fax
|
||||
rows:
|
||||
rows:
|
||||
- Nummer
|
||||
- Aantal
|
||||
- Naam
|
||||
- Gr.Eenh.
|
||||
- Eenheid
|
||||
- Prijs/eenh.
|
||||
- Subtotaal
|
||||
total: Totaal
|
||||
order_matrix:
|
||||
filename: Bestelling %{name}-%{date} - Sorteermatrix
|
||||
|
|
@ -482,7 +509,7 @@ nl:
|
|||
notice: Bericht verstuurd. Vriendelijk bedankt!
|
||||
new:
|
||||
first_paragraph: Probleem gevonden? Voorstel? Idee? Verbeterpunt? We horen graag je feedback.
|
||||
second_paragraph:
|
||||
second_paragraph: Dit bericht wordt verstuurd naar de ontwikkelaars van de bestelsoftware. Voor vragen over de organisatie van je foodcoop kun je je tot de lokale organisatie wenden.
|
||||
send: Verzenden
|
||||
title: Feedback geven
|
||||
finance:
|
||||
|
|
@ -491,13 +518,13 @@ nl:
|
|||
alert: ! 'Er trad een fout op bij het afrekenen: %{message}'
|
||||
notice: Bestelling is succesvol afgerekend, de tegoeden van de leden zijn bijgewerkt.
|
||||
close_direct:
|
||||
alert: ! 'Bestelling kan niet gesloten worden: %{message}'
|
||||
notice: Bestelling is gesloten
|
||||
alert: ! 'Bestelling kan niet afgerekend worden: %{message}'
|
||||
notice: Bestelling is afgerekend.
|
||||
confirm:
|
||||
clear: Sluiten
|
||||
first_paragraph: ! 'Wanneer de bestelling gesloten wordt, worden alle tegoeden van huishoudens bijgewerkt.<br />De tegoeden worden als volgt belast:'
|
||||
or_cancel: of terug naar afrekenen
|
||||
title: Order afrekenen
|
||||
clear: Afrekenen
|
||||
first_paragraph: ! 'Wanneer de bestelling afgerekend wordt, worden alle tegoeden van huishoudens bijgewerkt.<br />De tegoeden worden als volgt belast:'
|
||||
or_cancel: of terug naar balans
|
||||
title: Bestelling afrekenen
|
||||
edit_results_by_articles:
|
||||
add_article: Artikel toevoegen
|
||||
amount: Aantal
|
||||
|
|
@ -531,7 +558,7 @@ nl:
|
|||
articles_overview: Artikeloverzicht
|
||||
comment_on_transaction: Hier kun je een notitie aan de afrekening toevoegen.
|
||||
comments: Notities
|
||||
confirm_order: Bestelling afsluiten
|
||||
confirm_order: Afrekenen
|
||||
create_invoice: Rekening toevoegen
|
||||
edit_note: Notitie bewerken
|
||||
edit_order: Bestelling bewerken
|
||||
|
|
@ -539,12 +566,12 @@ nl:
|
|||
invoice: Factuur
|
||||
notes_and_journal: Notities/Protocol
|
||||
summary: Samenvatting
|
||||
title: ! '%{name} afrekenen'
|
||||
title: Balans van %{name}
|
||||
view_options: Weergaveopties
|
||||
order_article:
|
||||
confirm: Weet je het zeker?
|
||||
orders:
|
||||
clear: afrekenen
|
||||
clear: balans
|
||||
cleared: afgerekend (%{amount})
|
||||
close: direct afrekenen
|
||||
confirm: Weet je zeker dat de je bestelling wilt afrekenen?
|
||||
|
|
@ -563,8 +590,8 @@ nl:
|
|||
groups_amount: ! 'Bedrag van huishoudens:'
|
||||
net_amount: ! 'Netto bedrag:'
|
||||
reload: Samenvatting verversen
|
||||
with_extra_charge:
|
||||
without_extra_charge:
|
||||
with_extra_charge: ! 'inclusief marge:'
|
||||
without_extra_charge: ! 'zonder marge:'
|
||||
create:
|
||||
notice: Rekening is gemaakt
|
||||
financial_transactions:
|
||||
|
|
@ -572,7 +599,7 @@ nl:
|
|||
create:
|
||||
notice: De transactie is opgeslagen.
|
||||
create_collection:
|
||||
alert:
|
||||
alert: ! 'Er is een fout opgetreden: %{error}'
|
||||
error_note_required: Notitie ontbreekt.
|
||||
notice: Alle transacties zijn opgeslagen.
|
||||
index:
|
||||
|
|
@ -582,27 +609,19 @@ nl:
|
|||
search_placeholder: Zoeken ...
|
||||
title: Rekeningoverzicht voor %{name}
|
||||
new:
|
||||
paragraph:
|
||||
paragraph: Hier kun je het tegoed van huishouden <b>%{name}</b> ophogen en verlagen.
|
||||
title: Nieuwe transactie
|
||||
new_collection:
|
||||
amount: Bedrag
|
||||
new_ordergroup: Nog een huishouden toevoegen
|
||||
note: Notitie
|
||||
ordergroup: Huishouden
|
||||
save: Transactie opslaan
|
||||
sidebar:
|
||||
title:
|
||||
sidebar: Hier kun je meerdere tegoeden tegelijk bijwerken. Bijvoorbeeld alle overschrijvingen van leden van een bankafschrift.
|
||||
title: Meerdere tegoeden bijwerken
|
||||
ordergroup:
|
||||
remove: Verwijderen
|
||||
remove_group: Huishouden verwijderen
|
||||
transactions:
|
||||
amount: Bedrag
|
||||
date: Datum
|
||||
note: Notitie
|
||||
who: Wie
|
||||
group_order_articles:
|
||||
form:
|
||||
amount_change_for:
|
||||
amount_change_for: Hoeveelheid %{article}
|
||||
result_hint: ! 'Eenheid: %{unit}'
|
||||
index:
|
||||
amount: Bedrag
|
||||
|
|
@ -651,7 +670,7 @@ nl:
|
|||
ordergroups:
|
||||
account_balance: Tegoed
|
||||
account_statement: Rekeningafschrift
|
||||
contact:
|
||||
contact: Contactpersoon
|
||||
name: Naam
|
||||
new_transaction: Nieuwe transactie
|
||||
update:
|
||||
|
|
@ -702,30 +721,14 @@ nl:
|
|||
notfound: Foute URL, dit is niet jouw bestelling.
|
||||
form:
|
||||
action_save: Bestelling opslaan
|
||||
amount: Hoeveelheid
|
||||
available: Beschikbaar
|
||||
available_funds: Beschikbaar tegoed
|
||||
created_by: Aangemaakt door
|
||||
ending: Einde
|
||||
funds: Krediet
|
||||
last_update: Laatst bestelt
|
||||
manufacturer: Producent
|
||||
min_quantity: Min. bestelhoeveelheid
|
||||
name: Naam
|
||||
new_funds: Nieuw tegoed
|
||||
note: Notitie
|
||||
price: Prijs
|
||||
reset_article_search:
|
||||
search_article: Artikel zoeken...
|
||||
sum: Som
|
||||
sum_amount: ! 'Huidig totaalbedrag:'
|
||||
supplier: Leverancier
|
||||
reset_article_search: Alles tonen
|
||||
search_article: Artikelen zoeken...
|
||||
sum_amount: Huidig totaalbedrag
|
||||
title: Bestellen
|
||||
tolerance: Tolerantie
|
||||
total_sum_amount: Totalbedrag
|
||||
total_tolerance: Totale tolerantie
|
||||
unit: Eenheid
|
||||
unit_missing: Missende eenheden
|
||||
units: Eenheden
|
||||
units_full: Volle eenheden
|
||||
units_total: Totaal aantal
|
||||
|
|
@ -737,8 +740,6 @@ nl:
|
|||
title: Niet afgerekende bestellingen
|
||||
total_sum: Totaal
|
||||
funds:
|
||||
account_balance: Tegoed
|
||||
available_funds:
|
||||
finished_orders: niet afgerekende bestellingen
|
||||
open_orders: Lopende bestellingen
|
||||
title: Credit
|
||||
|
|
@ -747,14 +748,9 @@ nl:
|
|||
not_enough_apples: Om te bestellen heb je minimaal %{stop_ordering_under} appels nodig. Momenteel heeft je huishouden slechts %{apples} appels.
|
||||
order:
|
||||
title: Artikelen
|
||||
orders:
|
||||
ending: Einde
|
||||
sum: Som
|
||||
supplier: Leveranciers
|
||||
show:
|
||||
articles:
|
||||
edit_order: Order aanpassen
|
||||
name: Naam
|
||||
edit_order: Bestelling aanpassen
|
||||
not_ordered_msg: Je hebt nog niets bestelt
|
||||
order_closed_msg: Sorry, deze bestelling is gesloten.
|
||||
order_nopen_title: Waarbij rekening gehouden is met bestellingen van anderen
|
||||
|
|
@ -764,21 +760,14 @@ nl:
|
|||
ordered: Besteld
|
||||
ordered_title: Hoeveelheid + tolerantie
|
||||
show_hide: Niet bestelde artikelen tonen/verbergen
|
||||
sum: Som
|
||||
show_note: Opmerking
|
||||
title: Artikeloverzicht
|
||||
total_price: Totaalprijs
|
||||
unit_price: Stuksprijs
|
||||
units: Eenheden
|
||||
closed_by: Afgerekend door %{user}
|
||||
comment: Notitie
|
||||
comments:
|
||||
title:
|
||||
ending: Einde
|
||||
title: Commentaar
|
||||
not_ordered: Je hebt niets bestelt.
|
||||
note: Notitie
|
||||
order_sum:
|
||||
sum: Som
|
||||
supplier: Leveranciers
|
||||
title: Jouw bestelling voor %{order}
|
||||
switch_order:
|
||||
remaining: nog %{remaining}
|
||||
|
|
@ -814,10 +803,12 @@ nl:
|
|||
required_users: Nog %{count} leden nodig!
|
||||
home:
|
||||
apple_bar:
|
||||
desc:
|
||||
desc: ! 'Deze balk laat zien hoeveel taken je gedaan hebt per bestelhoeveelheid, vergeleken met het gemiddelde van de foodcoop.
|
||||
|
||||
Praktisch: voor iedere %{amount} aan totale bestellingen moet je een taak te doen!'
|
||||
more_info: Meer informatie
|
||||
points:
|
||||
warning:
|
||||
points: ! 'Appelpuntenstand: %{points}'
|
||||
warning: Opgelet, als je minder dan %{threshold} appelpunten hebt, kun je geen bestelling plaatsen!
|
||||
changes_saved: Wijzigingen opgeslagen.
|
||||
index:
|
||||
due_date_format: ! '%A %d %B'
|
||||
|
|
@ -836,7 +827,7 @@ nl:
|
|||
when: Wanneer
|
||||
where: Wie
|
||||
ordergroup:
|
||||
title:
|
||||
title: Betrokkenheid van je huishouden
|
||||
tasks_move:
|
||||
action: Taken op je nemen/annuleren
|
||||
desc: Je bent voor de volgende taken verantwoordelijk.
|
||||
|
|
@ -845,7 +836,7 @@ nl:
|
|||
action: open taken
|
||||
desc: Er zijn %{size}
|
||||
title: open taken
|
||||
title: Beginpagina
|
||||
title: Hoofdpagina
|
||||
your_tasks: Jouw taken
|
||||
no_ordergroups: Jammergenoeg ben je niet aangesloten bij een huishouden.
|
||||
ordergroup:
|
||||
|
|
@ -865,10 +856,10 @@ nl:
|
|||
since: ! '(gebruiker sinds: %{when})'
|
||||
title: ! '%{user}'
|
||||
start_nav:
|
||||
admin:
|
||||
admin: Administratie
|
||||
finances:
|
||||
accounts: Tegoeden bijwerken
|
||||
settle: Bestelling afrekenen
|
||||
settle: Bestellingen afrekenen
|
||||
title: Financiën
|
||||
foodcoop: Foodcoop
|
||||
members: Leden
|
||||
|
|
@ -898,7 +889,7 @@ nl:
|
|||
success: Persoon is uitgenodigd.
|
||||
js:
|
||||
ordering:
|
||||
confirm_change:
|
||||
confirm_change: Als je naar een andere bestelling gaat, gaan je aanpassingen in deze bestelling verloren. Wijzigingen vergeten en naar de andere bestelling gaan?
|
||||
layouts:
|
||||
email:
|
||||
footer: ! '--
|
||||
|
|
@ -1077,7 +1068,7 @@ nl:
|
|||
tasks: Taken
|
||||
wiki:
|
||||
all_pages: Alle Pagina's
|
||||
home: Begin
|
||||
home: Hoofdpagina
|
||||
title: Wiki
|
||||
workgroups: Werkgroepen
|
||||
ordergroups:
|
||||
|
|
@ -1091,10 +1082,8 @@ nl:
|
|||
orders:
|
||||
articles:
|
||||
article_count: ! 'Bestelde artikelen:'
|
||||
name: Naam
|
||||
prices: Netto/bruto prijs
|
||||
prices_sum: ! 'Totaal (netto/bruto prijs):'
|
||||
unit_quantity: Groothandelseenheid
|
||||
units_full: Volle eenheden
|
||||
units_ordered: Bestelde eenheden
|
||||
create:
|
||||
|
|
@ -1113,56 +1102,41 @@ nl:
|
|||
notice: De bestelling is gesloten.
|
||||
form:
|
||||
ignore_warnings: Waarschuwingen negeren
|
||||
name: Naam
|
||||
note: Notitie
|
||||
origin: Herkomst
|
||||
prices: Prijs (netto/FC)
|
||||
select_all: Alles selecteren
|
||||
stockit: Beschikbaar
|
||||
supplier: Producent
|
||||
title: Artikel
|
||||
unit_quantity:
|
||||
index:
|
||||
action_end: Sluiten
|
||||
confirm_delete: Wil je de bestelling werkelijk verwijderen?
|
||||
confirm_end: Wil je de bestelling %{order} werkelijk sluiten? Dit kun je niet ongedaan maken.
|
||||
ended_orders: Gesloten bestellingen
|
||||
ending:
|
||||
new_order:
|
||||
new_order: Nieuwe bestelling openen
|
||||
no_open_orders: Er zijn momenteel geen lopende bestellingen.
|
||||
note:
|
||||
open_orders: Lopende bestellingen
|
||||
supplier:
|
||||
title:
|
||||
title: Bestellingen beheren
|
||||
model:
|
||||
error_closed: Bestelling was al afgerekend
|
||||
error_nosel:
|
||||
error_starts_before_ends:
|
||||
error_nosel: Er moet minstens één artikel geselecteerd zijn
|
||||
error_starts_before_ends: moet na de startdatum zijn (of niet ingevuld worden)
|
||||
notice_close: ! 'Bestelling: %{name}, tot %{ends}'
|
||||
stock: Voorraad
|
||||
warning_ordered:
|
||||
warning_ordered_stock:
|
||||
warning_ordered: ! 'Opgelet: rood gemarkeerde artikelen zijn al besteld door leden. Als je ze hier deselecteert, worden alle bestaande ledenbestellingen van deze artikelen verwijderd.'
|
||||
warning_ordered_stock: ! 'Opgelet: rood gemarkeerde artikelen zijn al besteld of gekocht door leden. Als je ze hier deselecteert, worden alle bestaande ledenbestellingen/-aankopen van deze artikelen verwijderd, en worden ze niet afgerekend.'
|
||||
new:
|
||||
title:
|
||||
orders:
|
||||
ending:
|
||||
start: Start
|
||||
status:
|
||||
supplier: Leverancier
|
||||
title: Nieuwe bestelling maken
|
||||
show:
|
||||
action_end: Sluiten!
|
||||
amounts:
|
||||
amounts: ! 'Totaal netto/bruto:'
|
||||
articles: Artikeloverzicht
|
||||
articles_ordered: ! 'Bestelde artikelen:'
|
||||
begin: ! 'Begin:'
|
||||
comments:
|
||||
title: Commentaar
|
||||
comments_link: Commentaar
|
||||
confirm_delete:
|
||||
confirm_delete: Wil je deze bestelling echt verwijderen?
|
||||
confirm_end: ! 'Wil je de bestelling %{order} echt sluiten?
|
||||
|
||||
Hierna kan zij niet opnieuw geopend worden.'
|
||||
created_by: ! 'Geopend door:'
|
||||
download:
|
||||
article_pdf: Artikelen PDF
|
||||
download_file: Bestand downloaden
|
||||
|
|
@ -1171,13 +1145,10 @@ nl:
|
|||
group_pdf: Huishoudens PDF
|
||||
matrix_pdf: Matrix PDF
|
||||
title: Downloaden
|
||||
ending: ! 'Einde:'
|
||||
group_orders: ! 'Ledenbestellingen:'
|
||||
note: ! 'Notitie:'
|
||||
sort_article: Gesorteerd naar artikel
|
||||
sort_group: Gesorteerd naar huishouden
|
||||
supplier:
|
||||
title:
|
||||
title: ! 'Bestelling: %{name}'
|
||||
warn_not_closed: Opgelet, bestelling is nog niet afgerekend.
|
||||
state:
|
||||
closed: afgerekend
|
||||
|
|
@ -1187,34 +1158,34 @@ nl:
|
|||
notice: De bestelling is bijgewerkt.
|
||||
pages:
|
||||
all:
|
||||
new_page:
|
||||
recent_changes:
|
||||
new_page: Nieuwe pagina maken
|
||||
recent_changes: Recente wijzigingen
|
||||
search:
|
||||
action:
|
||||
placeholder:
|
||||
site_map:
|
||||
title:
|
||||
title_list:
|
||||
action: Zoeken
|
||||
placeholder: Pagina titel ...
|
||||
site_map: Sitemap
|
||||
title: Alle wikipagina's
|
||||
title_list: Paginalijst
|
||||
body:
|
||||
title_toc:
|
||||
title_toc: Inhoud
|
||||
create:
|
||||
notice: Pagina is gemaakt.
|
||||
cshow:
|
||||
error_noexist:
|
||||
error_noexist: Pagina bestaat niet!
|
||||
redirect_notice: Doorverwezen van %{page} ...
|
||||
destroy:
|
||||
notice: De pagina '%{page}' en alle subpagina's zijn verwijderd.
|
||||
edit:
|
||||
title:
|
||||
error_stale_object:
|
||||
title: Pagina bewerken
|
||||
error_stale_object: Opgelet, de pagina is net veranderd door een ander. Probeer het alsjeblieft opnieuw.
|
||||
form:
|
||||
help:
|
||||
bold:
|
||||
external_link_ex:
|
||||
external_links:
|
||||
heading:
|
||||
headings:
|
||||
italic:
|
||||
bold: vet
|
||||
external_link_ex: Externe pagina
|
||||
external_links: Links naar pagina's op andere websites
|
||||
heading: niveau %{level}
|
||||
headings: Kop
|
||||
italic: italic
|
||||
list_item_1: Eerste in de lijst
|
||||
list_item_2: Tweede in de lijst
|
||||
noformat: Zonder wiki-opmaak
|
||||
|
|
@ -1226,35 +1197,35 @@ nl:
|
|||
see_tables: zie %{tables_link}
|
||||
tables_link: Tabellen
|
||||
text: tekst
|
||||
title:
|
||||
unordered_list:
|
||||
wiki_link_ex:
|
||||
wiki_links:
|
||||
preview:
|
||||
last_updated:
|
||||
title: Korte opmaakhulp
|
||||
unordered_list: Itemlijst
|
||||
wiki_link_ex: Foodsoft wiki pagina
|
||||
wiki_links: Wiki-links
|
||||
preview: Voorbeeld
|
||||
last_updated: Laatst bijgewerkt
|
||||
new:
|
||||
title:
|
||||
title: Nieuwe wiki pagina
|
||||
page_list_item:
|
||||
date_format:
|
||||
date_format: ! '%a, %d %B %Y %H:%M:%S'
|
||||
show:
|
||||
date_format:
|
||||
delete:
|
||||
delete_confirm:
|
||||
edit:
|
||||
last_updated:
|
||||
subpages:
|
||||
title_versions:
|
||||
versions:
|
||||
title:
|
||||
date_format: ! '%d-%m-%y %H:%M'
|
||||
delete: Pagina verwijderen
|
||||
delete_confirm: ! 'Opgelet: alle onderliggende pagina''s worden ook verwijderd. Zeker weten?'
|
||||
edit: Pagina bewerken
|
||||
last_updated: Laatst bijgewerkt door <b>%{user}</b> op %{when}
|
||||
subpages: kindpagina's
|
||||
title_versions: Versies
|
||||
versions: Versies (%{count})
|
||||
title: Titel
|
||||
update:
|
||||
notice: Pagina is bijgewerkt.
|
||||
version:
|
||||
author:
|
||||
date_format:
|
||||
revert:
|
||||
title:
|
||||
title_version:
|
||||
view_current:
|
||||
author: ! 'Auteur: %{user}'
|
||||
date_format: ! '%a, %d-%m-%Y, %H:%M'
|
||||
revert: Deze versie terugzetten
|
||||
title: ! '%{title} - versie %{version}'
|
||||
title_version: Versie
|
||||
view_current: Huidige versie bekijken
|
||||
sessions:
|
||||
logged_in: Ingelogd!
|
||||
logged_out: Uitgelogd!
|
||||
|
|
@ -1299,38 +1270,35 @@ nl:
|
|||
title: Wekelijkse taken
|
||||
user_not_found: Geen gebruiker gevonden
|
||||
open_orders:
|
||||
ending: Einde
|
||||
no_open_orders: Er zijn momenteel geen lopende bestellingen.
|
||||
not_enough_apples:
|
||||
supplier: Leverancier
|
||||
not_enough_apples: Opgelet, je huishouden heeft niet genoeg appelpunten om te kunnen bestellen!
|
||||
title: Lopende bestellingen
|
||||
total: Som
|
||||
total_sum: Totaalsom
|
||||
who_ordered: Wie heeft besteld?
|
||||
workgroup_members:
|
||||
title: Groepsleden
|
||||
simple_form:
|
||||
error_notification:
|
||||
default_message:
|
||||
default_message: Problemen gevonden, controleer alsjeblieft de invoer.
|
||||
hints:
|
||||
article:
|
||||
unit: ! 'Bijvoorbeeld: KG of 1L of 500g'
|
||||
message:
|
||||
private:
|
||||
private: Bericht wordt niet getoond in de Foodsoft inbox.
|
||||
order_article:
|
||||
units_to_order:
|
||||
update_current_price:
|
||||
units_to_order: Als je het aantal geleverde eenheden wijzigt, moet je daarna de hoeveelheden voor huishoudens aanpassen. Klik daarvoor op de artikelnaam. Als je dit vergeet, kunnen huishoudens belast worden voor artikelen die ze niet hebben gekregen!
|
||||
update_current_price: Ook prijs in huidige besteling aanpassen
|
||||
stock_article:
|
||||
copy_stock_article:
|
||||
name:
|
||||
name: Wijzigen alsjeblieft
|
||||
edit_stock_article:
|
||||
price:
|
||||
price: <ul><li>De prijs mag niet aangepast worden.</li><li>Indien nodig, %{stock_article_copy_link}.</li></ul>
|
||||
supplier:
|
||||
min_order_quantity:
|
||||
min_order_quantity: De minimum bestelhoeveelheid wordt getoond bij het bestellen en is bedoeld om leden te motiveren genoeg te bestellen.
|
||||
task:
|
||||
duration:
|
||||
required_users:
|
||||
tax:
|
||||
duration: Hoe lang de taak duurt, 1-3 uur.
|
||||
required_users: Hoeveel mensen zijn in totaal nodig?
|
||||
tax: Percentage
|
||||
labels:
|
||||
settings:
|
||||
messages:
|
||||
|
|
@ -1370,8 +1338,8 @@ nl:
|
|||
title:
|
||||
new:
|
||||
create:
|
||||
stock_articles:
|
||||
temp_inventory:
|
||||
stock_articles: Voorraadartikelen
|
||||
temp_inventory: tijdelijke inventaris
|
||||
text_deviations:
|
||||
text_need_articles:
|
||||
title:
|
||||
|
|
@ -1393,29 +1361,29 @@ nl:
|
|||
notice: Inventarisatie is bijgewerkt.
|
||||
stockit:
|
||||
check:
|
||||
not_empty:
|
||||
not_empty: ! '%{name} kon niet worden verwijderd, de inventaris is niet leeg.'
|
||||
destroy:
|
||||
notice: Artikel %{name} is verwijdered.
|
||||
edit:
|
||||
title:
|
||||
title: Voorraadartikelen bewerken
|
||||
form:
|
||||
price_hint:
|
||||
price_hint: Om chaos te voorkomen, kun je de prijs van bestaande voorraadartikelen niet aanpassen.
|
||||
index:
|
||||
article:
|
||||
article:
|
||||
available:
|
||||
category:
|
||||
ordered:
|
||||
price:
|
||||
stock:
|
||||
supplier:
|
||||
unit:
|
||||
vat:
|
||||
confirm_delete:
|
||||
new_delivery:
|
||||
new_stock_article:
|
||||
new_stock_taking:
|
||||
order_online:
|
||||
article: Artikel
|
||||
available: beschikbaar
|
||||
category: Categorie
|
||||
ordered: besteld
|
||||
price: Prijs
|
||||
stock: Op voorraad
|
||||
supplier: Leverancier
|
||||
unit: Eenheid
|
||||
vat: BTW
|
||||
confirm_delete: Weet je zeker dat je dit wilt verwijderen?
|
||||
new_delivery: Nieuwe levering ...
|
||||
new_stock_article: Nieuw voorraadartikel
|
||||
new_stock_taking: Inventaris aanleggen
|
||||
order_online: Voorraadbestelling openen
|
||||
show_stock_takings:
|
||||
stock_count:
|
||||
stock_worth:
|
||||
|
|
@ -1444,29 +1412,29 @@ nl:
|
|||
destroy:
|
||||
notice: Leverancier is verwijderd
|
||||
edit:
|
||||
title:
|
||||
title: Leverancier bewerken
|
||||
index:
|
||||
action_import:
|
||||
action_new:
|
||||
articles:
|
||||
confirm_del:
|
||||
deliveries:
|
||||
stock:
|
||||
title:
|
||||
action_import: Leverancier uit externe database importeren
|
||||
action_new: Leverancier toevoegen
|
||||
articles: artikelen (%{count})
|
||||
confirm_del: Leverancier %{name} echt verwijderen?
|
||||
deliveries: leveringen (%{count})
|
||||
stock: op voorraad (%{count})
|
||||
title: Leveranciers
|
||||
new:
|
||||
title:
|
||||
shared_supplier_note:
|
||||
title: Nieuwe leverancier
|
||||
shared_supplier_note: Leverancier is verbonden met de externe database.
|
||||
shared_suppliers:
|
||||
body:
|
||||
subscribe:
|
||||
subscribe_again:
|
||||
supplier:
|
||||
title:
|
||||
body: <p>Hier kun je leveranciers in de externe database zien.</p> <p>Als je een externe leverancier importeert, wordt er een nieuwe leverancier aangemaakt die verbonden is met de externe database.</p>
|
||||
subscribe: Importeren
|
||||
subscribe_again: Nogmaals importeren
|
||||
supplier: Leverancier
|
||||
title: Externe lijsten
|
||||
show:
|
||||
confirm_delete:
|
||||
last_deliveries:
|
||||
new_delivery:
|
||||
show_deliveries:
|
||||
confirm_delete: Zeker weten?
|
||||
last_deliveries: Laatste leveringen
|
||||
new_delivery: Levering aanmaken
|
||||
show_deliveries: Alle leveringen tonen
|
||||
update:
|
||||
notice: Leverancier is bijgewerkt
|
||||
tasks:
|
||||
|
|
@ -1489,9 +1457,9 @@ nl:
|
|||
error_not_found:
|
||||
form:
|
||||
search:
|
||||
hint:
|
||||
noresult:
|
||||
placeholder:
|
||||
hint: Gebruiker zoeken
|
||||
noresult: Geen gebruiker gevonden
|
||||
placeholder: Zoeken ...
|
||||
submit:
|
||||
periodic:
|
||||
index:
|
||||
|
|
@ -1563,8 +1531,8 @@ nl:
|
|||
workgroups:
|
||||
edit:
|
||||
title: Werkgroep bewerken
|
||||
error_last_admin_group:
|
||||
error_last_admin_role:
|
||||
error_last_admin_group: De laatste groep met admin-rechten mag niet verwijderd worden (anders kun je er niet meer in).
|
||||
error_last_admin_role: Je kunt admin-privileges voor de laatste groep met admin-rechten niet weghalen (anders kun je er niet meer in).
|
||||
index:
|
||||
title: Werkgroepen
|
||||
update:
|
||||
|
|
|
|||
|
|
@ -4,20 +4,23 @@ Deployment
|
|||
Setup
|
||||
--------
|
||||
|
||||
cp config/deploy.rb.SAMPLE config/deploy.rb
|
||||
touch config/deploy/staging.rb
|
||||
touch config/deploy/production.rb
|
||||
cp config/deploy.rb.SAMPLE config/deploy.rb
|
||||
touch config/deploy/staging.rb
|
||||
touch config/deploy/production.rb
|
||||
|
||||
|
||||
Deploy
|
||||
--------
|
||||
|
||||
On your first deploy you should run
|
||||
bundle exec cap deploy:setup
|
||||
bundle exec cap deploy:check
|
||||
|
||||
bundle exec cap deploy:setup
|
||||
bundle exec cap deploy:check
|
||||
|
||||
Deploy to staging
|
||||
bundle exec cap deploy
|
||||
|
||||
bundle exec cap deploy
|
||||
|
||||
Deploy to production
|
||||
bundle exec cap production deploy
|
||||
|
||||
bundle exec cap production deploy
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class PagesController < ApplicationController
|
|||
end
|
||||
|
||||
def create
|
||||
@page = current_user.pages.build(params[:page])
|
||||
@page = Page.new(params[:page].merge({:user => current_user}))
|
||||
|
||||
if params[:preview]
|
||||
render :action => 'new'
|
||||
|
|
|
|||
|
|
@ -108,6 +108,9 @@ gem 'localeapp'" >>Gemfile
|
|||
fi
|
||||
# TODO add more extensive database seed
|
||||
|
||||
# XXX don't use redis for now
|
||||
echo "Resque.inline = true" >config/initializers/resque.rb
|
||||
|
||||
# and push = deploy
|
||||
git add -A
|
||||
git commit -q -m "heroku changes for environment ${RAILS_ENV}" -a
|
||||
|
|
|
|||
Loading…
Reference in a new issue