bookyt_salary 0.14.0 → 0.14.1

data/app/prawn/payslip_document.rb

@@ -1,14 +1,30 @@
 class PayslipDocument < LetterDocument
-  def salary_table(direct_balance, direct_account, direct_bookings)
-    content = direct_bookings.inject([]) do |out, item|
-      title = item.title if item
-      out << [title, nil, nil, nil, currency_fmt(item.accounted_amount(direct_account))] if item.contra_account(direct_account)
-
-      out
+  def salary_table(salary)
+    head = [
+      t_attr(:code, LineItem),
+      t_attr(:title, LineItem),
+      t_attr(:price, LineItem),
+      t_attr(:times, LineItem),
+      t_attr(:accounted_amount, LineItem)
+    ]
+    content = salary.line_items.collect do |item|
+      [item.code, item.title, currency_fmt(item.price), item.times, currency_fmt(item.accounted_amount)]
     end
 
-    rows = content + [total_row(currency_fmt(direct_balance))]
+    rows = [head] + content
+
+    table(rows, :width => bounds.width) do
+      # General cell styling
+      cells.valign  = :top
+      cells.borders = []
+      cells.padding_bottom = 2
+      cells.padding_top = 2
 
-    items_table(rows)
+      # Columns
+      columns(2..4).align = :right
+
+      # Footer styling
+      row(-1).font_style = :bold
+    end
   end
 end

data/app/views/salaries/payslip.pdf.prawn

@@ -1,9 +1,6 @@
 prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument) do |pdf|
   employer = resource.employer
   employee = resource.employee
-  direct_account = Account.find_by_code("5000")
-  direct_bookings = Booking.by_reference(resource)
-  direct_balance = direct_bookings.empty? ? 0.0 : direct_bookings.direct_balance(direct_account)
   
   # Letter header
   pdf.letter_header(employer, employee, resource.to_s)
@@ -12,7 +9,7 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
   pdf.free_text "#{t_attr(:social_security_nr, Employee)}: #{employee.social_security_nr}"
   
   # Line Items
-  pdf.salary_table(direct_balance, direct_account, direct_bookings)
+  pdf.salary_table(resource)
   
   # Closing
   pdf.common_closing(employer) 

data/config/locales/bookyt_salary.de.yml

@@ -38,6 +38,8 @@ de:
       title: Arbeitnehmer auswählen
     new:
       title: Lohn erfassen
+    index:
+      title: Löhne
   salary_booking_templates:
     index:
       title: Lohnarten

data/lib/bookyt_salary/navigation.rb

@@ -1,9 +1,9 @@
 module BookytSalary
   module Navigation
     def setup_bookyt_salary(navigation)
-      navigation.item :salaries, t('bookyt.main_navigation.salaries'), salaries_path,
+      navigation.item :salaries, t_title(:index, Salary), salaries_path,
                    :if => Proc.new { user_signed_in? } do |salaries|
-        salaries.item :salaries, t('bookyt.main_navigation.salaries'), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
+        salaries.item :salaries, t_title(:index, Salary), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
         salaries.item :new_salary, t_title(:new, Salary), select_employee_salaries_path
         salaries.item :divider, "", :class => 'divider'
         salaries.item :salary_statistics, t_title(:statistics, Salary), statistics_salaries_path

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.14.0'
+  VERSION = '0.14.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 0
   - 14
-  - 0
-  version: 0.14.0
+  - 1
+  version: 0.14.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 Z
+date: 2012-01-28 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -151,6 +152,7 @@ files:
 - lib/bookyt_salary/navigation.rb
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
+has_rdoc: true
 homepage: https://github.com/huerlisi/bookyt_salary
 licenses: 
 - MIT
@@ -180,10 +182,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
-has_rdoc: