bookyt_salary 0.16.0 → 0.16.1

data/app/models/salary.rb

@@ -78,15 +78,10 @@ class Salary < Invoice
   # Line Items
   def build_line_items
     salary_template.salary_items.each do |salary_item|
-      line_item = line_items.build(:date => self.value_date)
+      line_item = salary_item.build_line_item
 
-      # Defaults from booking_template
-      line_item.set_booking_template(salary_item.salary_booking_template)
-
-      # Overrides from salary_item
-      line_item.times    = salary_item.times if salary_item.times.present?
-      line_item.price    = salary_item.price if salary_item.price.present?
-      line_item.position = salary_item.position if salary_item.position.present?
+      line_item.date    = self.value_date
+      self.line_items << line_item
     end
   end
 

data/app/models/salary_item.rb

@@ -5,4 +5,16 @@ class SalaryItem < ActiveRecord::Base
   # Associations
   belongs_to :salary_template
   belongs_to :salary_booking_template
+
+  def build_line_item
+    # Defaults from booking_template
+    line_item = salary_booking_template.build_line_item
+
+    # Overrides from salary_item
+    line_item.times    = self.times if self.times.present?
+    line_item.price    = self.price if self.price.present?
+    line_item.position = self.position if self.position.present?
+
+    line_item
+  end
 end

data/app/views/salaries/_form.html.haml

@@ -10,6 +10,7 @@
       .span8= f.input :duration_from, :as => :date_field
       .span8= f.input :duration_to, :as => :date_field
     .row
+      .span16= f.input :text, :input_html => {:rows => 4, :class => 'span12'}
       .span16= f.input :remarks, :input_html => {:rows => 4, :class => 'span12'}
 
   = render 'line_items/list_form', :f => f, :invoice => resource

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

@@ -6,7 +6,8 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
   pdf.letter_header(employer, employee, resource.to_s)
   
   # Free text with the socical security number
-  
+  pdf.free_text(resource.text)
+
   # Line Items
   pdf.salary_table(resource)
 

data/config/locales/bookyt_salary.de.yml

@@ -11,6 +11,8 @@ de:
         net_amount:    Nettolohn
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
+        text:          Text auf Lohnabrechnung
+
       salary_booking_template:
         include_in_saldo_list:   Pflichtigkeit
         salary_declaration_code: Lohnausweis

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 16
-  - 0
-  version: 0.16.0
+  - 1
+  version: 0.16.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails