bookyt_salary 0.19.1 → 0.19.2

data/app/controllers/salaries_controller.rb

@@ -40,7 +40,7 @@ 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.leave_days_balance = @salary.previous.try(:leave_days_balance) || 0
     @salary.used_leave_days = 0
 
     # Prebuild line items

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

@@ -52,26 +52,28 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
     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
+    if resource.used_leave_days and resource.leave_days_balance
+      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
     end
 

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.19.1'
+  VERSION = '0.19.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: 
   segments: 
   - 0
   - 19
-  - 1
-  version: 0.19.1
+  - 2
+  version: 0.19.2
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"