Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
This commit is contained in:
parent
5b9a7e05df
commit
9f8d0d28ac
121 changed files with 1197 additions and 15237 deletions
|
|
@ -20,7 +20,7 @@
|
|||
@ends = @order.ends.strftime('%d.%m.%Y').to_s
|
||||
@title = replace_UTF8(@order.name.to_s) + " | beendet am " + @ends
|
||||
|
||||
pdf.SetAuthor(FoodSoft.getFoodcoopName)
|
||||
pdf.SetAuthor(APP_CONFIG[:name])
|
||||
pdf.SetTitle(replace_UTF8("Artikelsortierung für #{@order.name}, #{format_date(@order.ends)}"))
|
||||
pdf.AliasNbPages()
|
||||
pdf.AddPage()
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
@order_articles = @order.order_article_results
|
||||
|
||||
pdf.SetAuthor(replace_UTF8(FoodSoft.getFoodcoopName))
|
||||
pdf.SetAuthor(replace_UTF8(APP_CONFIG[:name]))
|
||||
pdf.SetTitle(replace_UTF8("BestellFAX für #{@order.supplier.name}"))
|
||||
pdf.AliasNbPages()
|
||||
pdf.AddPage()
|
||||
|
|
@ -19,15 +19,15 @@
|
|||
#the main informations
|
||||
pdf.SetY(15)
|
||||
pdf.SetFont('Arial','',10)
|
||||
pdf.Cell(0,5,replace_UTF8(FoodSoft.getFoodcoopName),0,0,'R')
|
||||
pdf.Cell(0,5,replace_UTF8(APP_CONFIG[:name]),0,0,'R')
|
||||
pdf.Ln()
|
||||
pdf.Cell(0,5,replace_UTF8(FoodSoft.getFoodcoopContact[:street]),0,0,'R')
|
||||
pdf.Cell(0,5,replace_UTF8(APP_CONFIG[:contact].symbolize_keys[:street]),0,0,'R')
|
||||
pdf.Ln()
|
||||
pdf.Cell(0,5,FoodSoft.getFoodcoopContact[:zip_code] + " " + replace_UTF8(FoodSoft.getFoodcoopContact[:city]),0,0,'R')
|
||||
pdf.Cell(0,5,APP_CONFIG[:contact].symbolize_keys[:zip_code] + " " + replace_UTF8(APP_CONFIG[:contact].symbolize_keys[:city]),0,0,'R')
|
||||
pdf.Ln()
|
||||
pdf.Cell(0,5,replace_UTF8(FoodSoft.getFoodcoopName[:phone]),0,0,'R')
|
||||
pdf.Cell(0,5,replace_UTF8(APP_CONFIG[:name][:phone]),0,0,'R')
|
||||
pdf.Ln()
|
||||
pdf.Cell(0,5,replace_UTF8(FoodSoft.getFoodcoopName[:email]),0,0,'R')
|
||||
pdf.Cell(0,5,replace_UTF8(APP_CONFIG[:name][:email]),0,0,'R')
|
||||
pdf.Ln()
|
||||
pdf.Cell(0,5,Date.today.strftime('%d.%m.%Y').to_s,0,0,'R')
|
||||
pdf.Ln()
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
@ends = @order.ends.strftime('%d.%m.%Y').to_s
|
||||
@title = replace_UTF8(@order.name.to_s) + " | beendet am " + @ends
|
||||
|
||||
pdf.SetAuthor(FoodSoft.getFoodcoopName)
|
||||
pdf.SetAuthor(APP_CONFIG[:name])
|
||||
pdf.SetTitle(replace_UTF8("GruppenSortierung für #{@order.name}, #{format_date(@order.ends)}"))
|
||||
pdf.SetFillColor(235)
|
||||
pdf.AliasNbPages()
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
MAX_ARTICLES_PER_PAGE = 15 #how many articles shoud written on a page
|
||||
|
||||
pdf=PDF.new
|
||||
pdf.SetAuthor(FoodSoft.getFoodcoopName)
|
||||
pdf.SetAuthor(APP_CONFIG[:name])
|
||||
@starts = @order.starts.strftime('%d.%m.%Y').to_s
|
||||
@ends = @order.ends.strftime('%d.%m.%Y').to_s
|
||||
@title = replace_UTF8(@order.name.to_s) + " | beendet am " + @ends
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue