bookyt_salary 0.5.0 → 0.5.1

data/app/controllers/salaries_controller.rb

@@ -31,10 +31,16 @@ class SalariesController < InvoicesController
     @salary = Salary.new(params[:salary])
     @employee = @salary.employee
 
+    unless @employee
+      @salary.valid?
+
+      render :action => 'select_employee' and return
+    end
+
     # Deduced defaults
     @salary.employer_id = current_tenant.company.id
     month_name          = t('date.month_names')[@salary.duration_from.month]
-    @salary.title       = "Lohn #{month_name} - #{@salary.employee.vcard.full_name}"
+    @salary.title       = "Lohn #{month_name} #{@salary.duration_from.year} - #{@salary.employee.vcard.full_name}"
     @salary.duration_to = @salary.duration_from.end_of_month
 
     # Prebuild an empty attachment instance

data/app/controllers/salary_booking_templates_controller.rb

@@ -0,0 +1,13 @@
+class SalaryBookingTemplatesController < BookingTemplatesController
+  defaults :resource_class => SalaryBookingTemplate
+
+  def copy
+    # Duplicate original record
+    template = resource.dup
+
+    # Rebuild positions
+    set_resource_ivar template
+
+    render 'edit'
+  end
+end

data/app/models/salary.rb

@@ -29,7 +29,12 @@ class Salary < Invoice
 
   # String
   def to_s(format = :default)
-    "%s (%s / %s - %s)" % [title, company, duration_from ? I18n::localize(duration_from) : '', duration_to ? I18n::localize(duration_to) : '']
+    case format
+    when :long
+      "%s (%s / %s - %s)" % [title, employee, duration_from ? I18n::localize(duration_from) : '', duration_to ? I18n::localize(duration_to) : '']
+    else
+      title
+    end
   end
 
   # Calculations
@@ -75,12 +80,30 @@ class Salary < Invoice
   scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
   scope :by_employee_id, lambda {|value| where(:company_id => value)}
 
-  # Bookings
+  # Accounts
   # ========
   def self.direct_account
-    Account.find_by_code("5000")
+    Account.find_by_code("2050")
+  end
+
+  def self.available_credit_accounts
+    Account.by_type(['costs', 'current_assets'])
   end
 
+  def self.default_credit_account
+    Account.find_by_code('5000')
+  end
+
+  def self.available_debit_accounts
+    Account.by_type(['outside_capital'])
+  end
+
+  def self.default_debit_account
+    self.direct_account
+  end
+
+  # Bookings
+  # ========
   def amount
     employment.salary_amount if employment
   end
@@ -102,9 +125,9 @@ class Salary < Invoice
     super(params, 'salary:employer:vkb')
 
     super(params, 'salary:employee:ktg')
-    super(params.merge(:person_id => employee.id), "salary:bvg")
+    super(params.merge(:person_id => employee.id), "salary:employee:bvg")
 
-    super(params.merge(:person_id => employee.id), "salary:kz")
+    super(params.merge(:person_id => employee.id), "salary:employee:kz")
     super(params.merge(:person_id => employee.id), "salary:social:kz")
   end
 end

data/app/models/salary_booking_template.rb

@@ -0,0 +1,3 @@
+class SalaryBookingTemplate < BookingTemplate
+  default_scope order(:code)
+end

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

@@ -8,7 +8,15 @@
     = f.input :duration_to, :as => :date_field
     = f.input :remarks, :input_html => {:rows => 4}
 
-  = render 'employees/show_charge_rates'
+  = f.inputs t('title.line_items') do
+    %table#line_items
+      %thead
+        = render 'line_items/list_header', :invoice => resource
+      %tbody
+        = f.fields_for :line_items do |line_item|
+          = render 'line_items/form', :line_item => line_item
+      %tfoot
+        = render 'line_items/list_footer', :total_amount => resource.amount
 
   = f.buttons do
     = f.commit_button

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

@@ -1,4 +1,4 @@
-prawn_document(:renderer => Prawn::LetterDocument) do |pdf|
+prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => Prawn::LetterDocument) do |pdf|
   employer = resource.employer
   employee = resource.employee
   direct_account = Account.find_by_code("5000")

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

@@ -20,6 +20,11 @@
       %th= t_attr(:duration_to, Invoice)
       %td= l(resource.duration_to) if resource.duration_to
 
+%h3= t('title.line_items')
+%table.list
+  = render resource.line_items
+  = render 'line_items/list_footer', :total_amount => resource.amount
+
 .contextual
   = form_tag new_direct_booking_path(:direct_booking => {:reference_id => resource.id, :reference_type => resource_class.base_class}), :method => :get, :remote => true do
     = collection_select :direct_booking, :booking_template_id, BookingTemplate.by_type(resource_class.name.underscore), :id, :title

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

@@ -0,0 +1,22 @@
+= semantic_form_for @salary_booking_template do |f|
+  = f.semantic_errors
+  = f.inputs do
+    = f.input :title, :input_html => {"data-autofocus" => true}
+    = f.input :code, :input_html => {:style => 'width: 6em'}
+    = f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
+    = f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
+    = f.input :amount, :input_html => {:style => 'width: 6em'}
+    = f.input :amount_relates_to, :collection => amount_relations_as_collection
+    = f.input :comments, :input_html => {:rows => 5}
+
+  = f.inputs do
+    = f.input :for_ahv, :wrapper_html => {:class => 'col1'}
+    = f.input :for_ktg, :wrapper_html => {:class => 'col2'}
+    = f.input :for_uvg, :wrapper_html => {:class => 'col1'}
+    = f.input :for_uvgz, :wrapper_html => {:class => 'col2'}
+    = f.input :for_gross_income, :wrapper_html => {:class => 'col1'}
+    = f.input :for_deduction_at_source, :wrapper_html => {:class => 'col2'}
+    = f.input :salary_declaration_code, :wrapper_html => {:class => 'col1'}
+
+  = f.buttons do
+    = f.commit_button

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

@@ -0,0 +1,17 @@
+%table.list.salary_booking_template_list
+  %tr
+    %th= t_attr :title, SalaryBookingTemplate
+    %th= t_attr :credit_account, SalaryBookingTemplate
+    %th= t_attr :debit_account, SalaryBookingTemplate
+    %th.currency= t_attr 'amount', SalaryBookingTemplate
+    %th= t_attr :amount_relates_to, SalaryBookingTemplate
+    %th= t_attr :for_gross_income, SalaryBookingTemplate
+    %th= t_attr :for_ahv, SalaryBookingTemplate
+    %th= t_attr :for_ktg, SalaryBookingTemplate
+    %th= t_attr :for_uvg, SalaryBookingTemplate
+    %th= t_attr :for_uvgz, SalaryBookingTemplate
+    %th= t_attr :for_deduction_at_source, SalaryBookingTemplate
+    %th= t_attr :salary_declaration_code, SalaryBookingTemplate
+    %th.action-links
+
+  = render @salary_booking_templates

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

@@ -0,0 +1,21 @@
+%tr[salary_booking_template]
+  %td
+    = link_to "%s (%s)" % [salary_booking_template.title, salary_booking_template.code], salary_booking_template
+    - if salary_booking_template.comments.present?
+      %hr{:style => "height: 1px; margin: 0"}/
+      %i= salary_booking_template.comments
+  %td= link_to salary_booking_template.credit_account.code, account_path(salary_booking_template.credit_account), :title => salary_booking_template.credit_account.title unless salary_booking_template.credit_account.nil?
+  %td= link_to salary_booking_template.debit_account.code, account_path(salary_booking_template.debit_account), :title => salary_booking_template.debit_account.title unless salary_booking_template.debit_account.nil?
+  %td.currency= amount_to_s(salary_booking_template)
+  %td= t(salary_booking_template.amount_relates_to, :scope => 'salary_booking_template.relation') if salary_booking_template.amount_relates_to.present?
+  %td= salary_booking_template.for_gross_income
+  %td= salary_booking_template.for_ahv
+  %td= salary_booking_template.for_ktg
+  %td= salary_booking_template.for_uvg
+  %td= salary_booking_template.for_uvgz
+  %td= salary_booking_template.for_deduction_at_source
+  %td= salary_booking_template.salary_declaration_code
+  %td.action-links
+    = list_link_for(:edit, salary_booking_template)
+    = list_link_for(:delete, salary_booking_template)
+    = link_to image_tag('16x16/copy.png', :title => 'Copy'), copy_salary_booking_template_path(salary_booking_template)

data/config/locales/{de.yml → bookyt_salary.de.yml}

@@ -1,7 +1,8 @@
 de:
   activerecord:
     models:
-      salary: Lohn
+      salary:                  Lohn
+      salary_booking_template: Lohnart
 
     attributes:
       salary:
@@ -11,6 +12,14 @@ de:
         social_amount: AHV/IV/EO/ALV/NBU
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
+      salary_booking_template:
+        for_ahv:                 AHV/ALV
+        for_ktg:                 KTG
+        for_gross_income:        Bruttolohn
+        for_uvg:                 UVG
+        for_uvgz:                UVGZ
+        salary_declaration_code: Lohnausweis
+        for_deduction_at_source: Quellensteuer
 
   salaries:
     select_employee:

data/config/routes.rb

@@ -1,5 +1,11 @@
 Rails.application.routes.draw do
   # Salaries
+  resources :salary_booking_templates do
+    member do
+      get :copy
+    end
+  end
+
   resources :salaries do
     collection do
       get :select_employee

data/db/migrate/20111223162759_add_salary_specific_flags_to_booking_templates.rb

@@ -0,0 +1,11 @@
+class AddSalarySpecificFlagsToBookingTemplates < ActiveRecord::Migration
+  def change
+    add_column :booking_templates, :for_gross_income, :boolean
+    add_column :booking_templates, :for_ahv, :boolean
+    add_column :booking_templates, :for_uvg, :boolean
+    add_column :booking_templates, :for_uvgz, :boolean
+    add_column :booking_templates, :for_ktg, :boolean
+    add_column :booking_templates, :for_deduction_at_source, :boolean
+    add_column :booking_templates, :salary_declaration_code, :integer
+  end
+end

data/db/migrate/20111227093619_use_string_for_salary_declaration_code.rb

@@ -0,0 +1,9 @@
+class UseStringForSalaryDeclarationCode < ActiveRecord::Migration
+  def up
+    change_column :booking_templates, :salary_declaration_code, :string
+  end
+
+  def down
+    change_column :booking_templates, :salary_declaration_code, :integer
+  end
+end

data/db/seeds.rb

@@ -13,7 +13,7 @@ Account.create!([
 
 # Booking Templates
 BookingTemplate.create!([
-  {:code => "salary:invoice", :title => "Lohn", :debit_account => Account.find_by_code("2050"), :credit_account => Account.find_by_code("5000"), :amount => 1, :amount_relates_to => 'reference_amount'},
+  {:code => "salary:invoice", :title => "Monatslohn", :debit_account => Account.find_by_code("2050"), :credit_account => Account.find_by_code("5000"), :amount => 1, :amount_relates_to => 'reference_amount'},
   {:code => "salary:cancel", :title => "Storno", :debit_account => Account.find_by_code("5000"), :credit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_amount'},
 
   {:code => "salary:cash_payment", :title => "Barzahlung Lohn", :debit_account => Account.find_by_code("1000"), :credit_account => Account.find_by_code("2050"), :amount => 1, :amount_relates_to => 'reference_balance'},
@@ -43,15 +43,15 @@ ChargeRate.create!([
 ])
 
 ChargeBookingTemplate.create!([
-  {:code => "salary:employee:ahv_iv_eo", :charge_rate_code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5000"), :amount_relates_to => 'reference_amount'},
+  {:code => "salary:employee:ahv_iv_eo", :charge_rate_code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
   {:code => "salary:employer:ahv_iv_eo", :charge_rate_code => 'salary:both:ahv_iv_eo', :title => "AHV/IV/EO Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
 
-  {:code => "salary:employee:alv", :charge_rate_code => 'salary:both:alv', :title => "ALV Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5000"), :amount_relates_to => 'reference_amount'},
+  {:code => "salary:employee:alv", :charge_rate_code => 'salary:both:alv', :title => "ALV Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
   {:code => "salary:employer:alv", :charge_rate_code => 'salary:both:alv', :title => "ALV Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
 
   {:code => "salary:employer:bu", :charge_rate_code => 'salary:employer:bu', :title => "BU Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
 
-  {:code => "salary:employee:nbu", :charge_rate_code => 'salary:employee:nbu', :title => "NBU Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5000"), :amount_relates_to => 'reference_amount'},
+  {:code => "salary:employee:nbu", :charge_rate_code => 'salary:employee:nbu', :title => "NBU Arbeitnehmer", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("2050"), :amount_relates_to => 'reference_amount'},
   {:code => "salary:employer:nbu", :charge_rate_code => 'salary:employer:nbu', :title => "NBU Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},
 
   {:code => "salary:employer:fak", :charge_rate_code => 'salary:employer:fak', :title => "FAK Arbeitgeber", :debit_account => Account.find_by_code("2020"), :credit_account => Account.find_by_code("5700"), :amount_relates_to => 'reference_amount'},

data/lib/bookyt_salary/navigation.rb

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

data/lib/bookyt_salary/railtie.rb

@@ -3,5 +3,6 @@ require 'rails'
 
 module BookytSalary
   class Railtie < Rails::Engine
+    engine_name "bookyt_salary"
   end
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: []
 
 description: This plugin extends bookyt with Salary functionality.
@@ -29,7 +29,9 @@ extra_rdoc_files: []
 files: 
 - app/assets/stylesheets/bookyt_salary.sass
 - app/controllers/salaries_controller.rb
+- app/controllers/salary_booking_templates_controller.rb
 - app/models/salary.rb
+- app/models/salary_booking_template.rb
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
@@ -40,8 +42,13 @@ files:
 - app/views/salaries/select_employee.html.haml
 - app/views/salaries/show.html.haml
 - app/views/salaries/statistics.html.haml
-- config/locales/de.yml
+- 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
+- config/locales/bookyt_salary.de.yml
 - config/routes.rb
+- db/migrate/20111223162759_add_salary_specific_flags_to_booking_templates.rb
+- db/migrate/20111227093619_use_string_for_salary_declaration_code.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb
@@ -76,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt