From dbb0bb4506892ff681fb4ef25fdc9ec353f4f534 Mon Sep 17 00:00:00 2001 From: Robert Waltemath Date: Wed, 18 Sep 2013 10:07:50 +0200 Subject: [PATCH 1/2] Added hint when changing total delivered amount. --- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index c0000036..a74f95b5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1525,7 +1525,7 @@ de: message: private: Nachricht erscheint nicht im Foodsoft Posteingang order_article: - units_to_order: Anzahl gelieferter Gebinde + units_to_order: Wenn Du die Gesamtanzahl gelieferter Gebinde änderst, musst Du auch die individuelle Anzahl der einzelnen Bestellgruppen anpassen, indem Du auf den Artikelnamen klickst. Sie werden nicht automatisch neuberechnet und andernfalls werden den Bestellgruppen Artikel in Rechnung gestellt, die nicht geliefert wurden! update_current_price: Ändert auch den Preis für aktuelle Bestellungen stock_article: copy_stock_article: diff --git a/config/locales/en.yml b/config/locales/en.yml index 2fa64013..d33f02cd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1530,7 +1530,7 @@ en: message: private: Message doesn’t show in Foodsoft mail inbox order_article: - units_to_order: Amount of delivered units + units_to_order: If you change the total amount of delivered units, you also have to change individual group amounts by clicking on the article name. They will not be automatically recalculated and otherwise ordergroups will be accounted for undelivered articles! update_current_price: Also update the price of the current order stock_article: copy_stock_article: From fa99a0a85244111a9583062a8a99ad36d230768e Mon Sep 17 00:00:00 2001 From: wvengen Date: Fri, 20 Sep 2013 18:24:40 +0200 Subject: [PATCH 2/2] add bitdeli badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ecf7099d..e7be634b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ FoodSoft [![Build Status](https://travis-ci.org/foodcoops/foodsoft.png)](https://travis-ci.org/foodcoops/foodsoft) [![Code Climate](https://codeclimate.com/github/foodcoops/foodsoft.png)](https://codeclimate.com/github/foodcoops/foodsoft) [![Dependency Status](https://gemnasium.com/foodcoops/foodsoft.png)](https://gemnasium.com/foodcoops/foodsoft) +[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/foodcoops/foodsoft/trend.png)](https://bitdeli.com/free "Bitdeli Badge") Web-based software to manage a non-profit food coop (product catalog, ordering, accounting, job scheduling).