From 192fbd4662785329d680f2f1d8f1ad8bc65b1711 Mon Sep 17 00:00:00 2001 From: sandoz Date: Fri, 20 Mar 2009 16:00:42 +0100 Subject: [PATCH 01/20] Removed auto-created fixtures in stock_takings.yml --- test/fixtures/stock_takings.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/fixtures/stock_takings.yml b/test/fixtures/stock_takings.yml index e966ff1c..1d32b4b5 100644 --- a/test/fixtures/stock_takings.yml +++ b/test/fixtures/stock_takings.yml @@ -11,14 +11,3 @@ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html -one: - date: 2009-02-12 - note: MyText - created_by: 1 - created_at: 2009-02-12 14:53:06 - -two: - date: 2009-02-12 - note: MyText - created_by: 1 - created_at: 2009-02-12 14:53:06 From 2c5294495625003490b05b21f9fdb4a643fcfcf2 Mon Sep 17 00:00:00 2001 From: sandoz Date: Fri, 20 Mar 2009 16:32:47 +0100 Subject: [PATCH 02/20] Fixed buggy link in finance/balancing/new.html.haml * Link to "Rechnung anlegen" did not send supplier id. --- app/views/finance/balancing/new.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/finance/balancing/new.html.haml b/app/views/finance/balancing/new.html.haml index 71b4e9e8..da9af99d 100644 --- a/app/views/finance/balancing/new.html.haml +++ b/app/views/finance/balancing/new.html.haml @@ -22,7 +22,7 @@ .column_content %ul - unless @order.invoice - %li= link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order) + %li= link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier) - unless @order.closed? %li= link_to "Bestellung abschließen", :action => "confirm", :id => @order From 8fbce954e3fa50d64f326cab7833e2fd75180e0f Mon Sep 17 00:00:00 2001 From: sandoz Date: Fri, 20 Mar 2009 18:54:05 +0100 Subject: [PATCH 03/20] Correct 'brutto'-price to be price.gross not fc_price. * We want to be more consistent in the use of diffrent price types: * netto, brutto, fc_price --- app/views/finance/balancing/_order_article.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/finance/balancing/_order_article.html.haml b/app/views/finance/balancing/_order_article.html.haml index 9ca7f5ab..7b55307e 100644 --- a/app/views/finance/balancing/_order_article.html.haml +++ b/app/views/finance/balancing/_order_article.html.haml @@ -9,7 +9,7 @@ %span{:style => "color:red;font-weight: bold"} ! %td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s %td= number_to_currency(order_article.price.price, :unit => "") -%td= number_to_currency(order_article.price.fc_price, :unit => "") +%td= number_to_currency(order_article.price.gross_price, :unit => "") %td= order_article.price.tax %td= order_article.price.deposit %td From 6da9190b03d55f4c5ae3b03f7b68b68d767406f3 Mon Sep 17 00:00:00 2001 From: sandoz Date: Fri, 20 Mar 2009 18:56:17 +0100 Subject: [PATCH 04/20] Added buttons to in/decrease group order article results. --- .../finance/balancing_controller.rb | 22 +++++++++++++++++++ app/models/group_order_article.rb | 1 + .../balancing/_group_order_articles.html.haml | 4 +++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/controllers/finance/balancing_controller.rb b/app/controllers/finance/balancing_controller.rb index 6ccde68b..570bce98 100644 --- a/app/controllers/finance/balancing_controller.rb +++ b/app/controllers/finance/balancing_controller.rb @@ -196,6 +196,28 @@ class Finance::BalancingController < ApplicationController end end + def update_group_order_article_result + goa = GroupOrderArticle.find(params[:id]) + + if params[:modifier] == '-' + goa.update_attributes({:result => goa.result - 1}) + elsif params[:modifier] == '+' + goa.update_attributes({:result => goa.result + 1}) + end + + render :update do |page| + goa.group_order.update_price! # Update the price attribute of new GroupOrder + goa.order_article.update_results! if goa.order_article.article.is_a?(StockArticle) # Update units_to_order of order_article + + page["order_article_#{goa.order_article.id}"].replace_html :partial => 'order_article', :locals => {:order_article => goa.order_article} + page["group_order_articles_#{goa.order_article.id}"].replace_html :partial => 'group_order_articles', + :locals => {:order_article => goa.order_article} + page["summary"].replace_html :partial => 'summary', :locals => {:order => goa.order_article.order} + page["order_profit"].visual_effect :highlight, :duration => 2 + end + + end + def destroy_group_order_article goa = GroupOrderArticle.find(params[:id]) goa.destroy diff --git a/app/models/group_order_article.rb b/app/models/group_order_article.rb index 3635b689..89d41407 100644 --- a/app/models/group_order_article.rb +++ b/app/models/group_order_article.rb @@ -24,6 +24,7 @@ class GroupOrderArticle < ActiveRecord::Base validates_presence_of :group_order_id, :order_article_id validates_inclusion_of :quantity, :in => 0..99 + validates_inclusion_of :result, :in => 0..99, :allow_nil => true validates_inclusion_of :tolerance, :in => 0..99 validates_uniqueness_of :order_article_id, :scope => :group_order_id # just once an article per group order diff --git a/app/views/finance/balancing/_group_order_articles.html.haml b/app/views/finance/balancing/_group_order_articles.html.haml index af3c283b..f6db6c8c 100644 --- a/app/views/finance/balancing/_group_order_articles.html.haml +++ b/app/views/finance/balancing/_group_order_articles.html.haml @@ -14,8 +14,10 @@ %td %td{:style=>"width:50%"} = group_order_article.group_order.ordergroup.name - %td{:id => "group_order_article_#{group_order_article.id}_quantity"} + %td{:id => "group_order_article_#{group_order_article.id}_quantity", :style => "white-space:nowrap"} = group_order_article.result + = button_to_remote( "+", :url => {:action => "update_group_order_article_result", :id => group_order_article, :modifier => '+'}, :html => {:style => "float:left"}, :success => "Element.hide('loader');", :before => "Element.show('loader');") + = button_to_remote( "-", :url => {:action => "update_group_order_article_result", :id => group_order_article, :modifier => '-'}, :success => "Element.hide('loader');", :before => "Element.show('loader');") %td.currency = number_to_currency(group_order_article.order_article.price.fc_price * group_order_article.result, :unit => "") %td.actions{:style=>"width:1em"} From b189bc31d06ed82077174db53ecfe673b54240a4 Mon Sep 17 00:00:00 2001 From: sandoz Date: Fri, 20 Mar 2009 20:33:06 +0100 Subject: [PATCH 05/20] Small hack to make button "+" and "-" to be same size. * It would be better to put a specific class for de/increase buttons. * Right now just adding min-width to input globally in SASS. --- public/stylesheets/main.css | 3 ++- public/stylesheets/print.css | 3 ++- public/stylesheets/sass/main.sass | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index e9c3183e..f8578c84 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -67,7 +67,8 @@ input[type="button"], input[type="submit"], input[type="reset"] { color: #222222; padding: 0.1em 0.5em; font-size: 1em; - font-weight: bold; } + font-weight: bold; + min-width: 34px; } select { max-width: 15em; } diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index b1fdb322..97279937 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -67,7 +67,8 @@ input[type="button"], input[type="submit"], input[type="reset"] { color: #222222; padding: 0.1em 0.5em; font-size: 1em; - font-weight: bold; } + font-weight: bold; + min-width: 34px; } select { max-width: 15em; } diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index af001af7..85dd773c 100644 --- a/public/stylesheets/sass/main.sass +++ b/public/stylesheets/sass/main.sass @@ -78,6 +78,7 @@ input[type="button"], input[type="submit"], input[type="reset"] padding: 0.1em 0.5em font-size: 1em font-weight: bold + min-width: 34px select max-width: 15em From 2e490d1a529d2df349418fe75cc154f8fc3fccc1 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 11:22:57 +0100 Subject: [PATCH 06/20] Capitalized first letter of 'netto' and 'brutto' in Captions. --- .../finance/balancing/_edit_results_by_articles.html.haml | 4 ++-- app/views/finance/balancing/_order_article_form.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/finance/balancing/_edit_results_by_articles.html.haml b/app/views/finance/balancing/_edit_results_by_articles.html.haml index 431997d1..fe05c804 100644 --- a/app/views/finance/balancing/_edit_results_by_articles.html.haml +++ b/app/views/finance/balancing/_edit_results_by_articles.html.haml @@ -10,8 +10,8 @@ %th Nr. %th Menge %th GebGr * Einheit - %th netto - %th brutto + %th Netto + %th Brutto %th MwSt %th Pfand %th{:colspan => "2"} diff --git a/app/views/finance/balancing/_order_article_form.html.haml b/app/views/finance/balancing/_order_article_form.html.haml index 716bdd0d..d85e894a 100644 --- a/app/views/finance/balancing/_order_article_form.html.haml +++ b/app/views/finance/balancing/_order_article_form.html.haml @@ -8,7 +8,7 @@ %abbr{:title=>"Anzahl gelieferter Gebinde"} Menge %th Einheit %th GebGr - %th netto + %th Netto %th MwSt. %th Pfand %tr From cde1fb35255bad6e1c3a12bbf059e9529d88985e Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 11:58:01 +0100 Subject: [PATCH 07/20] Show total price of ordered units per article in finance/balancing * Implement functions total_price and total_gross_price on model order_article * Show total_price and total_gross_price in view finance/balancing _order_article (Closed #108) --- app/models/order_article.rb | 10 ++++++++++ app/views/finance/balancing/_order_article.html.haml | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/models/order_article.rb b/app/models/order_article.rb index 4a09265e..0d6e9feb 100644 --- a/app/models/order_article.rb +++ b/app/models/order_article.rb @@ -77,6 +77,16 @@ class OrderArticle < ActiveRecord::Base units += ((remainder > 0) && (remainder + tolerance >= unit_size) ? 1 : 0) end + # Calculate price for ordered quantity. + def total_price + units_to_order * price.price + end + + # Calculate gross price for ordered qunatity. + def total_gross_price + units_to_order * price.gross_price + end + def ordered_quantities_equal_to_group_orders? (units_to_order * price.unit_quantity) == group_orders_sum[:quantity] end diff --git a/app/views/finance/balancing/_order_article.html.haml b/app/views/finance/balancing/_order_article.html.haml index 7b55307e..ea43eae6 100644 --- a/app/views/finance/balancing/_order_article.html.haml +++ b/app/views/finance/balancing/_order_article.html.haml @@ -8,8 +8,14 @@ - unless order_article.ordered_quantities_equal_to_group_orders? %span{:style => "color:red;font-weight: bold"} ! %td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s -%td= number_to_currency(order_article.price.price, :unit => "") -%td= number_to_currency(order_article.price.gross_price, :unit => "") +%td + = number_to_currency(order_article.price.price, :unit => ""), | + "/ ", | + number_to_currency(order_article.total_price, :unit => "") | +%td + = number_to_currency(order_article.price.gross_price, :unit => ""), | + "/ ", | + number_to_currency(order_article.total_gross_price, :unit => "") | %td= order_article.price.tax %td= order_article.price.deposit %td From 54715e50fcda4e8ccfabf93afd2cc79273a4b694 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 12:08:42 +0100 Subject: [PATCH 08/20] Changed caption of group orders sum price * Changed caption of order_article.group_orders_sum[:price] to be "Summe (FC-Preis)" in _group_order_articles.html * Trying to improve clarification of diffrent prices. --- app/views/finance/balancing/_group_order_articles.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/finance/balancing/_group_order_articles.html.haml b/app/views/finance/balancing/_group_order_articles.html.haml index f6db6c8c..c9441fec 100644 --- a/app/views/finance/balancing/_group_order_articles.html.haml +++ b/app/views/finance/balancing/_group_order_articles.html.haml @@ -32,7 +32,7 @@ %tfoot %tr{:class => cycle('even', 'odd', :name => 'results')} %td - %td{:style => "width:8em"} Summe + %td{:style => "width:8em"} Summe (FC-Preis) %td{:id => "group_orders_sum_quantity_#{order_article.id}"} = order_article.group_orders_sum[:quantity] %td{:id => "group_orders_sum_price_#{order_article.id}", :class => "currency"} From 92e2bdd18707627784b580e1e8415faf98e600ef Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 12:42:54 +0100 Subject: [PATCH 09/20] Renamed 'Help' to 'Hilfe' in top loginInfo bar --- app/views/shared/_loginInfo.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_loginInfo.haml b/app/views/shared/_loginInfo.haml index f599785a..ad2db31f 100644 --- a/app/views/shared/_loginInfo.haml +++ b/app/views/shared/_loginInfo.haml @@ -4,5 +4,5 @@ = link_to h(@current_user.nick), my_profile_path, { :title => _("User Settings") } - if APP_CONFIG[:homepage] %li= link_to APP_CONFIG[:name], APP_CONFIG[:homepage], { :title => _("Go to your FoodCoop-Hompage") } - %li= link_to _("Help"), 'http://dev.foodcoops.net/wiki/FoodsoftDoku' + %li= link_to _("Hilfe"), 'http://dev.foodcoops.net/wiki/FoodsoftDoku' %li= link_to _("Logout"), :controller => '/login', :action => 'logout' \ No newline at end of file From ceec784e621c79536cccfebf719cb46b5e67e3c1 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 12:47:14 +0100 Subject: [PATCH 10/20] Translation in profile.html.erb * Renamed "Nickname" to "Benutzername" * Removed also '#' in end of line. --- app/views/home/profile.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/profile.html.erb b/app/views/home/profile.html.erb index 9875528e..6d39ab1b 100644 --- a/app/views/home/profile.html.erb +++ b/app/views/home/profile.html.erb @@ -7,8 +7,8 @@

- Nickname: <%= h @user.nick %> - (Mitglied seit: <%= distance_of_time_in_words(Time.now, @user.created_on) -%>)# + Benutzername: <%= h @user.nick %> + (Mitglied seit: <%= distance_of_time_in_words(Time.now, @user.created_on) -%>)

From 584431d00a7b42ffee41836210416e7568104216 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:00:56 +0100 Subject: [PATCH 11/20] Translations in shared/_user_form.rhtml * Added German text in order not to user default text. --- app/views/shared/_user_form.rhtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/shared/_user_form.rhtml b/app/views/shared/_user_form.rhtml index cd357cc7..b265f464 100644 --- a/app/views/shared/_user_form.rhtml +++ b/app/views/shared/_user_form.rhtml @@ -2,34 +2,34 @@ - + - + - + - + - + - + - +
<%= @form.label :nick %><%= @form.label :nick, "Benutzername" %> <%= @form.text_field :nick %>
<%= @form.label :first_name %><%= @form.label :first_name, "Vorname" %> <%= @form.text_field :first_name %>
<%= @form.label :last_name %><%= @form.label :last_name, "Nachname" %> <%= @form.text_field :last_name %>
<%= @form.label :email %><%= @form.label :email, "E-Mail" %> <%= @form.text_field :email %>
<%= @form.label :phone %><%= @form.label :phone, "Telefon" %> <%= @form.text_field :phone %>
<%= @form.label :password, "Password" %><%= @form.label :password, "Passwort" %> <%= @form.password_field :password %>
<%= @form.label :password_confirmation, "Password confirmation" %><%= @form.label :password_confirmation, "Passwort-Wiederholung" %> <%= @form.password_field :password_confirmation %>
From 8d4acac081e63010b62dcdba85dab38fbb54b589 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:01:56 +0100 Subject: [PATCH 12/20] Removed string "Benutzername: in home/profile.html.erb * I think it doubles it self to have the same string again on the next line. Hope you find it more beautiful too :-) --- app/views/home/profile.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/home/profile.html.erb b/app/views/home/profile.html.erb index 6d39ab1b..f20fe9b7 100644 --- a/app/views/home/profile.html.erb +++ b/app/views/home/profile.html.erb @@ -7,7 +7,7 @@

- Benutzername: <%= h @user.nick %> + <%= h @user.nick %> (Mitglied seit: <%= distance_of_time_in_words(Time.now, @user.created_on) -%>)

From fea8c0993be4ed997c7b980d175e80239eccd7f5 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:05:16 +0100 Subject: [PATCH 13/20] Translation in profile.html.erb * Translated "cancal membership" and warning. --- app/views/home/profile.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/home/profile.html.erb b/app/views/home/profile.html.erb index f20fe9b7..1812765c 100644 --- a/app/views/home/profile.html.erb +++ b/app/views/home/profile.html.erb @@ -29,8 +29,8 @@

<%= membership.group.name %> <% if membership.group.type != 'Ordergroup' %> - (<%= link_to _("Cancel membership"), { :action => 'cancel_membership', :membership_id => membership }, - :confirm => _("Are you sure to cancel this membership?"), :method => :post %>) + (<%= link_to _("Mitgliedschaft beenden"), { :action => 'cancel_membership', :membership_id => membership }, + :confirm => _("Bist Du sicher, dass Du Deine Mitgliedschaft beenden willst?"), :method => :post %>) <% end %>

<% end %> From 8171d3d1734e3b4b7a1f31c1a486ccc6f27f8e6d Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:25:32 +0100 Subject: [PATCH 14/20] Translation in foodcoop/_users.html.haml * Transalated 'Nick' to 'Benutzername' --- app/views/foodcoop/_users.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/foodcoop/_users.html.haml b/app/views/foodcoop/_users.html.haml index 60a762ba..6d477310 100644 --- a/app/views/foodcoop/_users.html.haml +++ b/app/views/foodcoop/_users.html.haml @@ -10,7 +10,7 @@ %table.list %thead %tr - %th Nick + %th Benutzername %th Name %th Email %th Telefon From 8cdcb10c69bac03a8f28678db53ca7f38fed018d Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:26:21 +0100 Subject: [PATCH 15/20] Translation in foodcoop/members.html.haml * Renamed "Sort by Ordergroups :" * Removed whitespace before ':' * Improved German Grammar. Hope you agree :-) --- app/views/foodcoop/members.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/foodcoop/members.html.haml b/app/views/foodcoop/members.html.haml index 5ba99a09..f24cd53e 100644 --- a/app/views/foodcoop/members.html.haml +++ b/app/views/foodcoop/members.html.haml @@ -14,7 +14,7 @@ - unless params[:sort_by_ordergroups] #user_filter{:style => "float:left; margin-right:2em;"} %form{:name=>"sform", :action=>"", :style=>"display:inline;"} - %label{:for => 'article_name'} Suche in Name : + %label{:for => 'article_name'} Suche nach Name: = text_field_tag("query", params['query'], :size => 10 ) = observe_field 'query', :frequency => 2, | @@ -25,7 +25,7 @@ :with => 'query', | :method => :get | - =_ "Sort by Ordergroups :" + =_ "Nach Bestellgruppen sortieren:" - form_tag({:action => "members"}, :method => "get", :style=>"display:inline;") do = check_box_tag :sort_by_ordergroups, 1, params[:sort_by_ordergroups], :onclick => "submit();" #users From de105bea706cc700940fe383c4a1601105590437 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:28:16 +0100 Subject: [PATCH 16/20] SASS: Changed padding of input, textacrea, select * At membership list, the layout was slightly broken by the top-padding * of an input-element after a div with a float:left. --- public/stylesheets/main.css | 3 ++- public/stylesheets/print.css | 3 ++- public/stylesheets/sass/main.sass | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index f8578c84..56e98bb1 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -56,7 +56,8 @@ input, textarea, select { border: 1px solid #D7D7D7; font-family: verdana, arial, helvetica, sans-serif; font-size: 0.9em; - padding: .2em; } + padding-left: .2em; + padding-right: .2em; } input:focus, textarea:focus, select:focus { border-color: #000; } diff --git a/public/stylesheets/print.css b/public/stylesheets/print.css index 97279937..9c02ca49 100644 --- a/public/stylesheets/print.css +++ b/public/stylesheets/print.css @@ -56,7 +56,8 @@ input, textarea, select { border: 1px solid #D7D7D7; font-family: verdana, arial, helvetica, sans-serif; font-size: 0.9em; - padding: .2em; } + padding-left: .2em; + padding-right: .2em; } input:focus, textarea:focus, select:focus { border-color: #000; } diff --git a/public/stylesheets/sass/main.sass b/public/stylesheets/sass/main.sass index 85dd773c..739b0abd 100644 --- a/public/stylesheets/sass/main.sass +++ b/public/stylesheets/sass/main.sass @@ -66,7 +66,8 @@ input, textarea, select border: 1px solid #D7D7D7 font-family: verdana, arial, helvetica, sans-serif font-size: 0.9em - padding: .2em + padding-left: .2em + padding-right: .2em input:focus, textarea:focus, select:focus border-color: #000 From a4900bf8e023faca4c6167ed8cff9826a53f3adf Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:42:37 +0100 Subject: [PATCH 17/20] Translation/Genderneutralization in admin/index.html.haml * Translated 'Nick' to 'Benutzername' * Genderneutralized 'Neueste Benutzer' * Genderneutralized '...Gruppen und Benutzer...' * Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen' --- app/views/admin/index.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/index.html.haml b/app/views/admin/index.html.haml index f3b9fa47..a26518fb 100644 --- a/app/views/admin/index.html.haml +++ b/app/views/admin/index.html.haml @@ -1,14 +1,14 @@ - title "Administration" %p - %i Hier kannst Du die Gruppen und Benutzer der Foodsoft verwalten. + %i Hier kannst Du die Gruppen und Benutzerinnen der Foodsoft verwalten. .left_column{:style => "width:48%"} .box_title - %h2 Neuste Benutzer + %h2 Neuste Benutzerinnen .column_content %table %tr - %th Nick + %th Benutzername %th Name %th Erstellt am - for user in @users @@ -27,7 +27,7 @@ .column_content %table %tr - %th Name + %th Gruppenname %th Typ %th Mitglieder - for group in @groups From 1c62bf8786a42581b8c18dd98f9e37a0f567a22a Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:47:31 +0100 Subject: [PATCH 18/20] Genderneutralized/Fixed strings in suppliers/index.haml * Genderneutralized 'Lieferanten' * Fixed string 'ArtikelDatenbank' * Fixed string 'KundenNr' --- app/views/suppliers/index.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/suppliers/index.haml b/app/views/suppliers/index.haml index 201cf3d9..ad6f7e69 100644 --- a/app/views/suppliers/index.haml +++ b/app/views/suppliers/index.haml @@ -2,7 +2,7 @@ .left_column{:style => "width:60%"} .box_title - %h2 Lieferanten + %h2 Lieferantinnen .column_content %p %i @@ -10,13 +10,13 @@ = link_to 'neue Lieferantin', new_supplier_path oder = link_to 'importiere', shared_suppliers_suppliers_path - aus der externen ArtikelDatenbank. + aus der externen Artikeldatenbank. %table.list %thead %tr %th Name %th Telefon - %th KundenNr + %th Kunden-Nr %th %th %th From 7c6a01b0fc0e7d9d488d082f1474d1fd5f462604 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:49:16 +0100 Subject: [PATCH 19/20] Genderneutralization in stockit/index.html.haml * Genderneutralized string 'Lieferant' --- app/views/stockit/index.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/stockit/index.html.haml b/app/views/stockit/index.html.haml index 79a125a2..ba47f5e3 100644 --- a/app/views/stockit/index.html.haml +++ b/app/views/stockit/index.html.haml @@ -30,7 +30,7 @@ %th davon bestellt %th Einheit %th Preis - %th Lieferant + %th Lieferantin %th Kategorie %th %tbody From 48b6515c086bf2ed66721114be21b4728d3b6549 Mon Sep 17 00:00:00 2001 From: sandoz Date: Sun, 22 Mar 2009 13:56:54 +0100 Subject: [PATCH 20/20] Genderchanged string 'Lieferant' * Since s.b. started this already. I changed every string 'Lieferant' to 'Lieferantin' to give note on female existance in this world :-) --- app/views/articles/index.haml | 2 +- app/views/deliveries/edit.html.haml | 2 +- app/views/deliveries/show.html.haml | 2 +- app/views/finance/balancing/index.haml | 4 ++-- app/views/finance/invoices/_form.html.haml | 2 +- app/views/finance/invoices/index.html.erb | 2 +- app/views/finance/invoices/show.html.haml | 2 +- app/views/ordering/_order_head.haml | 2 +- app/views/ordering/_orders.html.haml | 2 +- app/views/ordering/my_order_result.haml | 2 +- app/views/orders/_form.html.haml | 2 +- app/views/orders/_orders.html.haml | 2 +- app/views/orders/index.haml | 4 ++-- app/views/orders/show.haml | 2 +- app/views/shared/_open_orders.html.haml | 2 +- app/views/stock_takings/_stock_article_form.html.haml | 2 +- app/views/stock_takings/show.html.haml | 2 +- app/views/stockit/_form.html.haml | 2 +- app/views/suppliers/index.haml | 2 +- app/views/suppliers/show.haml | 2 +- 20 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/articles/index.haml b/app/views/articles/index.haml index a7b1b3bc..b368cd82 100644 --- a/app/views/articles/index.haml +++ b/app/views/articles/index.haml @@ -13,7 +13,7 @@ #change_supplier{:style => "padding:0 0 0.5em 0.7em;"} %span{:style => "float:left"} - Lieferant wechseln: + Lieferantin wechseln: - form_tag do = select_tag :switch_supplier, | options_for_select( Supplier.all(:order => 'name').collect {|s| [s.name, url_for(supplier_articles_path(s))] }, | diff --git a/app/views/deliveries/edit.html.haml b/app/views/deliveries/edit.html.haml index 03e6977a..788f5a92 100644 --- a/app/views/deliveries/edit.html.haml +++ b/app/views/deliveries/edit.html.haml @@ -1,7 +1,7 @@ - title "Lieferung bearbeiten" %p - %b Lieferant: + %b Lieferantin: = @supplier.name %p %b Rechnungsbetrag: diff --git a/app/views/deliveries/show.html.haml b/app/views/deliveries/show.html.haml index f8087956..1de0015f 100644 --- a/app/views/deliveries/show.html.haml +++ b/app/views/deliveries/show.html.haml @@ -1,7 +1,7 @@ - title "Lieferung anzeigen" %p - %b Lieferant: + %b Lieferantin: =h @delivery.supplier.name %p %b Geliefert am: diff --git a/app/views/finance/balancing/index.haml b/app/views/finance/balancing/index.haml index 1f64135a..46e0020d 100644 --- a/app/views/finance/balancing/index.haml +++ b/app/views/finance/balancing/index.haml @@ -9,7 +9,7 @@ %tr %th Datum %th Betrag - %th Lieferant + %th Lieferantin %th %tbody - for invoice in @unpaid_invoices @@ -48,7 +48,7 @@ %table.list %thead %tr - %th Lieferant + %th Lieferantin %th Ende %th Betrag(FC) %th diff --git a/app/views/finance/invoices/_form.html.haml b/app/views/finance/invoices/_form.html.haml index d4a7ea5e..95967f37 100644 --- a/app/views/finance/invoices/_form.html.haml +++ b/app/views/finance/invoices/_form.html.haml @@ -8,7 +8,7 @@ - if @invoice.order %p= "Diese Rechnung ist mit einer #{link_to "Bestellung", @invoice.order} verknüpft." %p - Lieferant + Lieferantin %br/ = f.select :supplier_id, Supplier.all.collect { |s| [s.name, s.id] } %p diff --git a/app/views/finance/invoices/index.html.erb b/app/views/finance/invoices/index.html.erb index 317f332a..b5bf8931 100644 --- a/app/views/finance/invoices/index.html.erb +++ b/app/views/finance/invoices/index.html.erb @@ -4,7 +4,7 @@ Nummer - Lieferant + Lieferantin Datum Bezahlt am Betrag diff --git a/app/views/finance/invoices/show.html.haml b/app/views/finance/invoices/show.html.haml index 1afc4980..aca0c527 100644 --- a/app/views/finance/invoices/show.html.haml +++ b/app/views/finance/invoices/show.html.haml @@ -1,7 +1,7 @@ - title "Rechnung #{@invoice.number}" %p - %b Lieferant: + %b Lieferantin: =h @invoice.supplier.name - if @invoice.delivery %p diff --git a/app/views/ordering/_order_head.haml b/app/views/ordering/_order_head.haml index 83463f2a..126fe200 100644 --- a/app/views/ordering/_order_head.haml +++ b/app/views/ordering/_order_head.haml @@ -8,7 +8,7 @@ %tr{:valign => "top"} %td{:width => "60%"} %p - %b Lieferant: + %b Lieferantin: =h @order.name %p %b Ende: diff --git a/app/views/ordering/_orders.html.haml b/app/views/ordering/_orders.html.haml index 235e560e..ba6c3d06 100644 --- a/app/views/ordering/_orders.html.haml +++ b/app/views/ordering/_orders.html.haml @@ -3,7 +3,7 @@ %table.list %thead %tr - %th Lieferant + %th Lieferantin %th Ende %th Summe %tbody diff --git a/app/views/ordering/my_order_result.haml b/app/views/ordering/my_order_result.haml index 5b31c818..ecd7a736 100644 --- a/app/views/ordering/my_order_result.haml +++ b/app/views/ordering/my_order_result.haml @@ -15,7 +15,7 @@ %tr{:valign => "top"} %td{:style => "width:50%"} %p - Lieferant: + Lieferantin: %b=h @order.name - unless @order.note.blank? %p diff --git a/app/views/orders/_form.html.haml b/app/views/orders/_form.html.haml index 4eb25ea9..c5ba0856 100644 --- a/app/views/orders/_form.html.haml +++ b/app/views/orders/_form.html.haml @@ -6,7 +6,7 @@ .column_content = form.hidden_field :supplier_id %p - Lieferant: + Lieferantin: = @order.name %p Notiz diff --git a/app/views/orders/_orders.html.haml b/app/views/orders/_orders.html.haml index 555e628b..fae435e2 100644 --- a/app/views/orders/_orders.html.haml +++ b/app/views/orders/_orders.html.haml @@ -3,7 +3,7 @@ %thead %tr %th[sort_td_class_helper "supplier"] - = sort_link_helper "Lieferant", "supplier" + = sort_link_helper "Lieferantin", "supplier" %th Start %th[sort_td_class_helper "ends"] = sort_link_helper "Ende", "ends" diff --git a/app/views/orders/index.haml b/app/views/orders/index.haml index e1c875a6..388e4171 100644 --- a/app/views/orders/index.haml +++ b/app/views/orders/index.haml @@ -5,7 +5,7 @@ - form_tag do Neue Bestellung anlegen für %select{:onchange => "redirectTo(this)", :style => "font-size: 0.9em;margin-left:1em;"} - %option{:selected => 'selected'} Lieferant auswählen... + %option{:selected => 'selected'} Lieferantin auswählen... = options_for_suppliers_to_select %br/ .left_column{:style => "width:55em"} @@ -16,7 +16,7 @@ %table.list %thead %tr - %th Lieferant + %th Lieferantin %th Ende %th Notiz %th{:colspan => "2"} diff --git a/app/views/orders/show.haml b/app/views/orders/show.haml index 31e1c840..7d16b185 100644 --- a/app/views/orders/show.haml +++ b/app/views/orders/show.haml @@ -15,7 +15,7 @@ %p %b{:style => "color:red"} Bestellung wurde noch nicht abgerechnet. %p - Lieferant: + Lieferantin: %b=h @order.name - unless @order.note.empty? %p diff --git a/app/views/shared/_open_orders.html.haml b/app/views/shared/_open_orders.html.haml index 9a5db2bf..618bd1fc 100644 --- a/app/views/shared/_open_orders.html.haml +++ b/app/views/shared/_open_orders.html.haml @@ -5,7 +5,7 @@ %table.list %thead %tr - %th Lieferant + %th Lieferantin %th Ende %th Wer hat bestellt? %th Summe diff --git a/app/views/stock_takings/_stock_article_form.html.haml b/app/views/stock_takings/_stock_article_form.html.haml index 2a5998ed..a1f05557 100644 --- a/app/views/stock_takings/_stock_article_form.html.haml +++ b/app/views/stock_takings/_stock_article_form.html.haml @@ -1,7 +1,7 @@ - remote_form_for stock_article, :url => add_stock_article_stock_takings_path do |form| = form.error_messages %p - Lieferant + Lieferantin %br/ = form.select :supplier_id, Supplier.without_deleted(:order => 'name').collect{ |s| [s.name, s.id] } %p diff --git a/app/views/stock_takings/show.html.haml b/app/views/stock_takings/show.html.haml index d0bec18c..ca17db78 100644 --- a/app/views/stock_takings/show.html.haml +++ b/app/views/stock_takings/show.html.haml @@ -11,7 +11,7 @@ %table.list{:style => "width:30em"} %tr %th Artikel - %th Lieferant + %th Lieferantin %th Einheit %th Menge - for stock_change in @stock_taking.stock_changes.all :include => :stock_article diff --git a/app/views/stockit/_form.html.haml b/app/views/stockit/_form.html.haml index 2487a9cb..62cf2e9d 100644 --- a/app/views/stockit/_form.html.haml +++ b/app/views/stockit/_form.html.haml @@ -1,7 +1,7 @@ - form_for stock_article do |form| = form.error_messages %p - Lieferant + Lieferantin %br/ = form.select :supplier_id, Supplier.without_deleted(:order => 'name').collect{ |s| [s.name, s.id] } %p diff --git a/app/views/suppliers/index.haml b/app/views/suppliers/index.haml index ad6f7e69..369dd445 100644 --- a/app/views/suppliers/index.haml +++ b/app/views/suppliers/index.haml @@ -38,7 +38,7 @@ %tr %th Datum %th Betrag - %th Lieferant + %th Lieferantin - for delivery in @deliveries %tr %td= link_to delivery.delivered_on, [delivery.supplier, delivery] diff --git a/app/views/suppliers/show.haml b/app/views/suppliers/show.haml index e160ca98..efd63c92 100644 --- a/app/views/suppliers/show.haml +++ b/app/views/suppliers/show.haml @@ -6,7 +6,7 @@ .column_content - if shared_supplier = @supplier.shared_supplier %p - %strong Der Lieferant ist mit der externen ArtikleDatenbank verknüpft. + %strong Die Lieferantin ist mit der externen Artikledatenbank verknüpft. %table{:style => "width:40em"} %tr