bookyt_salary 0.11.0 → 0.12.0

data/app/helpers/salary_booking_template_helper.rb

@@ -1,5 +1,5 @@
 module SalaryBookingTemplateHelper
-  def obligation_collection
-    obligations = SalaryBookingTemplate::OBLIGATION_FLAGS.map{|obligation| [t_attr(obligation), obligation.to_s]}
+  def saldo_inclusion_flag_collection
+    SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [t_attr('saldo_inclusion_flags.' + flag), flag]}
   end
 end

data/app/models/salary_booking_template.rb

@@ -2,19 +2,11 @@ class SalaryBookingTemplate < BookingTemplate
   default_scope order(:code)
 
   # Obligation flags
-  OBLIGATION_FLAGS = [:for_gross_income, :for_ahv, :for_uvg, :for_uvgz, :for_ktg, :for_deduction_at_source]
-  def obligation=(value)
-    OBLIGATION_FLAGS.each do |flag|
-      self[flag] = value.include?(flag.to_s)
-    end
+  def self.saldo_inclusion_flags
+    ['gross_income', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
   end
 
-  def obligation
-    result = []
-    OBLIGATION_FLAGS.each do |flag|
-      result << flag.to_s if self[flag]
-    end
-
-    result
+  def to_s
+    title
   end
 end

data/app/views/employees/_show_salaries.html.haml

@@ -3,4 +3,4 @@
 %h2= t_model SalaryTemplate
 
 - @salary_template = @employee.salary_templates.first
-= render 'salary_templates/form'
+= render 'salary_templates/form' if @salary_template

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

@@ -9,12 +9,12 @@
       .span8= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
     .row
       .span8= f.input :amount
-      .span8= f.input :amount_relates_to, :collection => amount_relations_as_collection
+      .span8= f.input :amount_relates_to, :collection => saldo_inclusion_flag_collection
     .row
       .span16= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
 
     .row
-      .span8= f.input :obligation, :as => :check_boxes, :collection => obligation_collection
+      .span8= f.input :include_in_saldo_list, :as => :check_boxes, :collection => saldo_inclusion_flag_collection
 
     .row
       .span8= f.input :salary_declaration_code

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

@@ -5,12 +5,8 @@
     %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
+    - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
+      %th= t_attr('saldo_inclusion_flags.' + flag, SalaryBookingTemplate)
     %th= t_attr :salary_declaration_code, SalaryBookingTemplate
 
   = render @salary_booking_templates

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

@@ -6,12 +6,8 @@
       %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.currency= salary_booking_template.amount
+  %td= t_attr('saldo_inclusion_flags.' + salary_booking_template.amount_relates_to) if salary_booking_template.amount_relates_to.present?
+  - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
+    %td= salary_booking_template.include_in_saldo_list.include? flag
   %td.number= salary_booking_template.salary_declaration_code

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

@@ -1,6 +1,6 @@
 %tr.salary_item.nested-form-item
   %td= salary_item.text_field :position, :required => true, :style => 'width: 3em', :autocomplete => "off"
-  %td= salary_item.select :salary_booking_template_id, SalaryBookingTemplate.all.map{|template| [template.title, template.id]}, :required => true, :style => 'width: 30em'
+  %td= salary_item.select :salary_booking_template_id, SalaryBookingTemplate.all.map{|template| [template.title, template.id]}, :include_blank => true, :required => true, :style => 'width: 30em'
   %td= salary_item.text_field :times, :required => true, :style => 'width: 3em', :autocomplete => "off"
   %td= salary_item.text_field :price, :required => true, :style => 'width: 5em', :autocomplete => "off"
   %td.action_links

data/config/locales/bookyt_salary.de.yml

@@ -14,14 +14,15 @@ de:
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
       salary_booking_template:
-        for_ahv:                 AHV/ALV/IV/EO
-        for_ktg:                 Krankentaggeld-Versicherung (KTG)
-        for_gross_income:        Bruttolohn
-        for_uvg:                 Unfall-Versicherung (UVG)
-        for_uvgz:                Unfallzusatz-Versicherung (UVGZ)
-        obligation:              Pflichtigkeit
+        saldo_inclusion_flags:
+          ahv:                 AHV/ALV/IV/EO
+          ktg:                 Krankentaggeld-Versicherung (KTG)
+          gross_income:        Bruttolohn
+          uvg:                 Unfall-Versicherung (UVG)
+          uvgz:                Unfallzusatz-Versicherung (UVGZ)
+          deduction_at_source: Quellensteuer
+        include_in_saldo_list:   Pflichtigkeit
         salary_declaration_code: Lohnausweis
-        for_deduction_at_source: Quellensteuer
       salary_template:
         person:                   Person
         salary_booking_templates: Lohnarten

data/db/migrate/20120119223948_port_obligation_flags_to_tags.rb

@@ -0,0 +1,19 @@
+class PortObligationFlagsToTags < ActiveRecord::Migration
+  def up
+    # Setup tags based on db flags
+    SalaryBookingTemplate.find_each do |template|
+      template.include_in_saldo_list = SalaryBookingTemplate.saldo_inclusion_flags.collect do |flag|
+        flag if template["for_#{flag}"]
+      end
+
+      template.save
+    end
+
+    remove_column :booking_templates, :for_gross_income
+    remove_column :booking_templates, :for_ahv
+    remove_column :booking_templates, :for_uvg
+    remove_column :booking_templates, :for_uvgz
+    remove_column :booking_templates, :for_ktg
+    remove_column :booking_templates, :for_deduction_at_source
+  end
+end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
+  - 12
   - 0
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -145,6 +145,7 @@ files:
 - db/migrate/20120118121223_create_salary_items.rb
 - db/migrate/20120118155137_add_position_to_salary_item.rb
 - db/migrate/20120119081622_add_missing_salary_indices.rb
+- db/migrate/20120119223948_port_obligation_flags_to_tags.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt