bookyt_salary 0.14.6 → 0.15.0

data/app/helpers/salary_booking_template_helper.rb

@@ -1,6 +1,6 @@
 module SalaryBookingTemplateHelper
   def saldo_inclusion_flag_collection
-    SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + flag), flag]}
+    SalaryBookingTemplate.saldo_inclusion_flags.map{|flag| [flag, flag]}
   end
 
   def amount_relates_to_collection

data/app/models/salary_booking_template.rb

@@ -1,7 +1,7 @@
 class SalaryBookingTemplate < BookingTemplate
   # Obligation flags
   def self.saldo_inclusion_flags
-    ['gross_income', 'net_income', 'payment', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
+    SalaryBookingTemplate.tag_counts_on(:include_in_saldo).pluck(:name)
   end
 
   def to_s

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

@@ -14,7 +14,7 @@
       .span16= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
 
     .row
-      .span8= f.input :include_in_saldo_list, :as => :check_boxes, :collection => saldo_inclusion_flag_collection
+      .span16= f.input :include_in_saldo_list, :input_html => {:class => 'span12'}
 
     .row
       .span8= f.input :salary_declaration_code

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

@@ -7,7 +7,7 @@
     %th.currency= t_attr 'amount', SalaryBookingTemplate
     %th= t_attr :amount_relates_to, SalaryBookingTemplate
     - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
-      %th= t('activerecord.attributes.salary_booking_template.saldo_inclusion_flags.' + flag)
+      %th= flag
     %th.right= t_attr :salary_declaration_code, SalaryBookingTemplate
 
   = render @salary_booking_templates

data/config/locales/bookyt_salary.de.yml

@@ -12,15 +12,6 @@ de:
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
       salary_booking_template:
-        saldo_inclusion_flags:
-          ahv:                 AHV
-          ktg:                 KTG
-          gross_income:        Bruttolohn
-          net_income:          Nettolohn
-          payment:             Auszahlung
-          uvg:                 UVG
-          uvgz:                UVGZ
-          deduction_at_source: Quellensteuer
         include_in_saldo_list:   Pflichtigkeit
         salary_declaration_code: Lohnausweis
       salary_template:

data/db/migrate/20120201104444_switch_to_translated_saldo_inclusion_flags.rb

@@ -0,0 +1,21 @@
+class SwitchToTranslatedSaldoInclusionFlags < ActiveRecord::Migration
+  def up
+    ActsAsTaggableOn::Tag.where(:name => 'ahv').update_all(:name => 'AHV')
+    ActsAsTaggableOn::Tag.where(:name => 'ktg').update_all(:name => 'KTG')
+    ActsAsTaggableOn::Tag.where(:name => 'gross_income').update_all(:name => 'Bruttolohn')
+    ActsAsTaggableOn::Tag.where(:name => 'net_income').update_all(:name => 'Nettolohn')
+    ActsAsTaggableOn::Tag.where(:name => 'payment').update_all(:name => 'Auszahlung')
+    ActsAsTaggableOn::Tag.where(:name => 'uvg').update_all(:name => 'UVG')
+    ActsAsTaggableOn::Tag.where(:name => 'uvgz').update_all(:name => 'UVGZ')
+    ActsAsTaggableOn::Tag.where(:name => 'deduction_at_source').update_all(:name => 'Quellensteuer')
+
+    SalaryBookingTemplate.where(:amount_relates_to => 'ahv').update_all(:amount_relates_to => 'AHV')
+    SalaryBookingTemplate.where(:amount_relates_to => 'ktg').update_all(:amount_relates_to => 'KTG')
+    SalaryBookingTemplate.where(:amount_relates_to => 'gross_income').update_all(:amount_relates_to => 'Bruttolohn')
+    SalaryBookingTemplate.where(:amount_relates_to => 'net_income').update_all(:amount_relates_to => 'Nettolohn')
+    SalaryBookingTemplate.where(:amount_relates_to => 'payment').update_all(:amount_relates_to => 'Auszahlung')
+    SalaryBookingTemplate.where(:amount_relates_to => 'uvg').update_all(:amount_relates_to => 'UVG')
+    SalaryBookingTemplate.where(:amount_relates_to => 'uvgz').update_all(:amount_relates_to => 'UVGZ')
+    SalaryBookingTemplate.where(:amount_relates_to => 'deduction_at_source').update_all(:amount_relates_to => 'Quellensteuer')
+  end
+end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.14.6'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
-  - 6
-  version: 0.14.6
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -147,6 +147,7 @@ files:
 - 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/migrate/20120201104444_switch_to_translated_saldo_inclusion_flags.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb