bookyt_salary 0.13.3 → 0.14.0

data/app/models/salary_booking_template.rb

@@ -1,7 +1,7 @@
 class SalaryBookingTemplate < BookingTemplate
   # Obligation flags
   def self.saldo_inclusion_flags
-    ['gross_income', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
+    ['gross_income', 'net_income', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
   end
 
   def to_s

data/app/models/salary_template.rb

@@ -3,7 +3,7 @@ class SalaryTemplate < ActiveRecord::Base
 
   # Salary Items
   has_many :salary_items
-  accepts_nested_attributes_for :salary_items, :allow_destroy => true
+  accepts_nested_attributes_for :salary_items, :allow_destroy => true, :reject_if => :all_blank
 
   def to_s
     title

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]}, :include_blank => true, :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}, :class => 'combobox'
   %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/app/views/salary_items/_list_form.html.haml

@@ -2,6 +2,6 @@
   %table#salary_items
     %thead
       = render 'salary_items/list_header', :template => f.object
-    %tbody
+    %tbody.sortable
       = f.fields_for :salary_items do |salary_item|
         = render 'salary_items/form', :salary_item => salary_item, :template => f.object

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

@@ -3,5 +3,4 @@
   %th{:style => 'padding: 2px'}= t_attr(:salary_booking_template, SalaryItem)
   %th{:style => 'padding: 2px; width: 3em'}= t_attr(:times, SalaryItem)
   %th{:style => 'padding: 2px; width: 3em'}= t_attr(:price, SalaryItem)
-  %th
   %th.action_links= link_to t_action(:more), [:new_salary_item, template.persisted? ? template : template.class.name.underscore.pluralize.to_sym], :remote => true, :class => 'icon-add-text'

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

@@ -3,7 +3,7 @@
   = f.inputs do
     .row
       .span8= f.input :title, :input_html => {"data-autofocus" => true}
-      .span8= f.input :person, :collection => Employee.all
+      .span8= f.input :person, :as => :combobox, :collection => Employee.all
     .row
       .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
 

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.13.3'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
-  - 3
-  version: 0.13.3
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt