bookyt_salary 0.18.0 → 0.19.0

data/app/controllers/salaries_controller.rb

@@ -40,6 +40,9 @@ class SalariesController < InvoicesController
     @salary.title       = "Lohn #{month_name} #{@salary.duration_from.year} - #{@salary.employee.vcard.full_name}"
     @salary.duration_to = @salary.duration_from.end_of_month
 
+    @salary.leave_days_balance = @salary.previous.leave_days_balance || 0
+    @salary.used_leave_days = 0
+
     # Prebuild line items
     @salary.build_line_items
 

data/app/models/salary.rb

@@ -37,6 +37,11 @@ class Salary < Invoice
     end
   end
 
+  # Helpers
+  def previous
+    employee.salaries.order("duration_to DESC").where("duration_to < ?", duration_to).first
+  end
+
   # Calculations
   def ahv_amount
     amount_of('AHV')

data/app/views/filters/_salary_state.html.haml

@@ -0,0 +1,4 @@
+- filter_name = :invoice_state
+- define_filter filter_name do
+  - params[filter_name] ||= 'all'
+  = boot_nav_filter(filter_name, ['all'] + Salary::STATES)

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

@@ -7,6 +7,9 @@
   .row-fluid
     .span6= f.input :duration_from, :as => :date_field
     .span6= f.input :duration_to, :as => :date_field
+  .row-fluid
+    .span6= f.input :used_leave_days, :as => :string
+    .span6= f.input :leave_days_balance, :as => :string
   .row-fluid
     .span12= f.input :text, :input_html => {:rows => 4}
   .row-fluid

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

@@ -1,4 +1 @@
-- filter_name = :invoice_state
-- params[filter_name] ||= 'all'
-- content_for :sidebar do
-  = boot_nav_filter(filter_name, ['all'] + Salary::STATES)
+= render 'filters/salary_state'

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

@@ -25,6 +25,8 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
 
   unless resource.employment.hourly_paid
     pdf.move_down 20
+
+    top_y = pdf.y
     pdf.text "Stundenabrechnung", :style => :bold
 
     month_name          = t('date.month_names')[@salary.duration_from.month]
@@ -35,7 +37,7 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
       ["Aktueller Stundensaldo", "%0.2f" % @hours_saldo],
     ]
 
-    pdf.table rows, :width => (pdf.bounds.width * 0.4) do
+    pdf.table rows, :width => 8.cm do
       cells.valign  = :top
       cells.borders = []
       cells.padding_bottom = 2
@@ -47,6 +49,33 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
 
       rows(3).font_style = :bold
     end
+    bottom_y = pdf.y
+
+    pdf.y = top_y
+    pdf.indent 10.cm do
+      pdf.text "Ferienabrechnung", :style => :bold
+
+      month_name          = t('date.month_names')[@salary.duration_from.month]
+      rows = [
+        ["#{t_attr(:used_leave_days)} #{month_name}", "%0.1f" % resource.used_leave_days],
+        [t_attr(:leave_days_balance), "%0.1f" % resource.leave_days_balance],
+      ]
+
+      pdf.table rows, :width => 8.cm do
+        cells.valign  = :top
+        cells.borders = []
+        cells.padding_bottom = 2
+        cells.padding_top = 2
+
+        columns(0).padding_left = 0
+        columns(0).width = 5.cm
+        columns(1).align = :right
+
+        rows(3).font_style = :bold
+      end
+    end
+
+    pdf.y = bottom_y
   end
 
   # Free text with the socical security number

data/config/locales/bookyt_salary.de.yml

@@ -12,6 +12,8 @@ de:
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
         text:          Text auf Lohnabrechnung
+        leave_days_balance: Restliche Ferientage
+        used_leave_days:    Bezogene Ferientage
 
       salary_booking_template:
         include_in_saldo_list:   Pflichtigkeit

data/db/migrate/20120503120833_add_unused_leave_days_to_debit_invoices.rb

@@ -0,0 +1,5 @@
+class AddLeaveDayColumnsToSalaries < ActiveRecord::Migration
+  def change
+    add_column :invoices, :unused_leave_days, :decimal
+  end
+end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.18.0'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 83
   prerelease: 
   segments: 
   - 0
-  - 18
+  - 19
   - 0
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -111,6 +111,7 @@ files:
 - app/models/salary_template.rb
 - app/prawn/payslip_document.rb
 - app/views/employees/_show_salaries.html.haml
+- app/views/filters/_salary_state.html.haml
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
@@ -150,6 +151,7 @@ files:
 - db/migrate/20120119223948_port_obligation_flags_to_tags.rb
 - db/migrate/20120201104444_switch_to_translated_saldo_inclusion_flags.rb
 - db/migrate/20120201125113_switch_line_items_to_translated_saldo_inclusion_flags.rb
+- db/migrate/20120503120833_add_unused_leave_days_to_debit_invoices.rb
 - db/seeds.rb
 - db/seeds/locales/de-CH.rb
 - lib/bookyt_salary.rb