bookyt_salary 0.15.1 → 0.16.0

data/app/controllers/salaries_controller.rb

@@ -11,10 +11,6 @@ class SalariesController < InvoicesController
 
   # Actions
   # =======
-  def statistics
-    index!
-  end
-
   def select_employee
     # Allow pre-seeding some parameters
     salary_params = {

data/app/controllers/salary_reports_controller.rb

@@ -0,0 +1,12 @@
+class SalaryReportsController < ApplicationController
+  respond_to :html, :pdf
+  
+  # Actions
+  # =======
+  def yearly_ahv_statement
+    @value_period = Date.parse(params[:by_value_period][:from] || Date.today.beginning_of_year)..Date.parse(params[:by_value_period][:to] || Date.today.end_of_year) if params[:by_value_period]
+    @value_period ||= Date.today.beginning_of_year..Date.today.end_of_year
+
+    @employments = Employment.valid_during(@value_period).all
+  end
+end

data/app/helpers/salary_report_helper.rb

@@ -0,0 +1,13 @@
+module SalaryReportHelper
+  def duration_from(employment, value_period)
+    return value_period.first if employment.duration_from.nil?
+
+    [value_period.first, employment.duration_from].max
+  end
+
+  def duration_to(employment, value_period)
+    return value_period.last if employment.duration_to.nil?
+
+    [value_period.last, employment.duration_to].min
+  end
+end

data/app/models/salary.rb

@@ -38,22 +38,18 @@ class Salary < Invoice
   end
 
   # Calculations
+  def ahv_amount
+    amount_of('AHV')
+  end
+
   def net_amount
     # TODO: hardcoded salary_booking_template
-    line_item = line_items.where(:code => '6500').first
-
-    return 0.0 unless line_item
-
-    line_item.accounted_amount
+    amount_of('6500')
   end
 
   def gross_amount
     # TODO: hardcoded salary_booking_template
-    line_item = line_items.where(:code => '5000').first
-
-    return 0.0 unless line_item
-
-    line_item.accounted_amount
+    amount_of('5000')
   end
 
   # Assignment proxies

data/app/views/salary_booking_templates/statistics.html.haml

@@ -10,10 +10,12 @@
       %th.right= t_attr :amount
 
     - for template in @salary_booking_templates
+      - amount = template.line_items.where(:date => @duration).sum(&:accounted_amount)
+      - next if amount == 0
       %tr
         %td= template.code
         %td= template.title
-        %td.currency= currency_fmt(template.line_items.where(:date => @duration).sum(&:total_amount))
+        %td.currency= currency_fmt(amount)
 
 - content_for :sidebar do
   .sub-tabs

data/app/views/salary_reports/yearly_ahv_statement.html.haml

@@ -0,0 +1,44 @@
+%h3= t('salary_certificate')
+
+%table.list
+  %tr
+    %th= t_attr :ssn, Employee
+    %th= t_attr :date_of_birth, Employee
+    %th= t_attr :full_name, Employee
+    %th= t_attr :duration_from, Employment
+    %th= t_attr :duration_to, Employment
+    %th.currency AHV-Lohn
+    %th.currency ALV-Lohn
+    %th.currency ALVZ-Lohn
+    %th M/F
+
+  - ahv_total = 0
+  - for employment in @employments
+    - ahv_amount = employment.employee.salaries.where(:value_date => @value_period).sum(&:ahv_amount)
+    - ahv_total += ahv_amount
+    %tr
+      %td= employment.employee.ssn
+      %td= employment.employee.date_of_birth
+      %td= employment.employee.vcard.full_name
+      %td= duration_from(employment, @value_period)
+      %td= duration_to(employment, @value_period)
+      %td.currency= currency_fmt(ahv_amount)
+      %td.currency= currency_fmt(ahv_amount)
+      %td.currency= currency_fmt(0)
+      %td= employment.employee.sex_to_s
+
+  %tr
+    %th= t('bookyt.total')
+    %th{:colspan => 4}
+    %th.currency= currency_fmt(ahv_total)
+    %th.currency= currency_fmt(ahv_total)
+    %th.currency= currency_fmt(0)
+    %th
+
+- content_for :sidebar do
+  .sub-tabs
+    %h3 Filter
+    %ul
+      - years = current_tenant.incorporated_on.year..Date.today.year
+      - for year in years
+        %li= link_to year, url_for(params.merge({:by_value_period => {:from => Date.new(year, 1, 1).to_s(:db), :to => Date.new(year, 12, 31).to_s(:db)}}))

data/config/locales/bookyt_salary.de.yml

@@ -33,7 +33,8 @@ de:
       title: Löhne
   salary_booking_templates:
     index:
-      title: Lohnarten
+      title:      Lohnarten
+      statistics: Rekapitulation
   salary_templates:
     index:
       title: Lohnvorlagen

data/config/routes.rb

@@ -22,7 +22,6 @@ Rails.application.routes.draw do
   resources :salaries do
     collection do
       get :select_employee
-      get :statistics
     end
 
     member do
@@ -37,4 +36,6 @@ Rails.application.routes.draw do
       get :new_line_item
     end
   end
+
+   get 'salary_reports/:action', :controller => :salary_reports
 end

data/lib/bookyt_salary/navigation.rb

@@ -6,7 +6,8 @@ module BookytSalary
         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_booking_template_statistics, t_title(:statistics, Salary), statistics_salary_booking_templates_path
+        salaries.item :salary_booking_template_statistics, t_title(:statistics, SalaryBookingTemplate), statistics_salary_booking_templates_path
+        salaries.item :yearly_ahv_statement, "AHV Lohnbescheinigung", url_for("/salary_reports/yearly_ahv_statement")
         salaries.item :divider, "", :class => 'divider'
         salaries.item :salary_booking_templates, t_title(:index, SalaryBookingTemplate), salary_booking_templates_path
         salaries.item :salary_templates, t_title(:index, SalaryTemplate), salary_templates_path

data/lib/bookyt_salary/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 95
   prerelease: 
   segments: 
   - 0
-  - 15
-  - 1
-  version: 0.15.1
+  - 16
+  - 0
+  version: 0.16.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -100,8 +100,10 @@ files:
 - app/assets/stylesheets/bookyt_salary.sass
 - app/controllers/salaries_controller.rb
 - app/controllers/salary_booking_templates_controller.rb
+- app/controllers/salary_reports_controller.rb
 - app/controllers/salary_templates_controller.rb
 - app/helpers/salary_booking_template_helper.rb
+- app/helpers/salary_report_helper.rb
 - app/models/bookyt_salary/employee.rb
 - app/models/salary.rb
 - app/models/salary_booking_template.rb
@@ -112,13 +114,11 @@ files:
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
-- app/views/salaries/_salary_certificate.html.haml
 - app/views/salaries/_sidebar.html.haml
 - app/views/salaries/index.html.haml
 - app/views/salaries/payslip.pdf.prawn
 - app/views/salaries/select_employee.html.haml
 - app/views/salaries/show.html.haml
-- app/views/salaries/statistics.html.haml
 - app/views/salary_booking_templates/_form.html.haml
 - app/views/salary_booking_templates/_list.html.haml
 - app/views/salary_booking_templates/_salary_booking_template.html.haml
@@ -127,6 +127,7 @@ files:
 - app/views/salary_items/_line_item.html.haml
 - app/views/salary_items/_list_form.html.haml
 - app/views/salary_items/_list_header.html.haml
+- app/views/salary_reports/yearly_ahv_statement.html.haml
 - app/views/salary_templates/_form.html.haml
 - app/views/salary_templates/_list.html.haml
 - app/views/salary_templates/_salary_item_form.html.haml

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

@@ -1,25 +0,0 @@
-%h3= t('salary_certificate')
-
-= paginated_section collection do
-  %table.list
-    %tr
-      %th= t_attr :company, Invoice
-      %th.currency= t_attr :gross_amount, Salary
-      %th.currency= t_attr :social_amount, Salary
-      %th.currency= t_attr :bvg_amount, Salary
-      %th.currency= t_attr :net_amount, Salary
-
-    - for salary in @salaries
-      %tr
-        %td= salary.company
-        %td.currency= link_to currency_fmt(salary.ahv_amount), salary, "data-href-container" => 'tr'
-        %td.currency= currency_fmt(salary.social_amount)
-        %td.currency= currency_fmt(salary.bvg_amount)
-        %td.currency= currency_fmt(salary.net_amount)
-
-    %tr
-      %th= t('bookyt.total')
-      %th.currency= currency_fmt(@salaries.sum(&:ahv_amount))
-      %th.currency= currency_fmt(@salaries.sum(&:social_amount))
-      %th.currency= currency_fmt(@salaries.sum(&:bvg_amount))
-      %th.currency= currency_fmt(@salaries.sum(&:net_amount))

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

@@ -1,6 +0,0 @@
-.contextual
-  = icon_link_to :index
-
-%h2= t_title
-
-= render 'salary_certificate'