bookyt_salary 0.23.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f477bc47705bfdc14e876b3d51cdea9e35b625
-  data.tar.gz: dc9bb2024b0c4278e97a683d63652724e70b7efe
+  metadata.gz: 97609cf6b41e8e8b41c48d27f145b004951bb53a
+  data.tar.gz: 748bf97554b2b9fcc68e15826ac05b82d8249012
 SHA512:
-  metadata.gz: 3bb921fd4a879f74422b4bc4ec8389897a5e7ea987f27930e71d9171688ebe0734778e10f72bf9cfa0e1b0320ba65b4147d543c0d682b78ec1d5f6ed3c99bf8c
-  data.tar.gz: c5f93a1b0fb6f580f03e556da788b53b50e466484f04c52bb4651112fd79b74ffa7d05c2debfdb81421a7a1e065c23730fde8384871cd84e3452cf9c65ac0481
+  metadata.gz: f3feeda68bacf62355c6f51bd6ba256a482c4fa36efcb9dc1bec6d8963396f223ab0618c8195f0115dbf13d5c02143eeda000240f04316264744066cbd0c186c
+  data.tar.gz: 594921d94accd4194253a15e7c8f363b561b81fc41b21781c3b3a62f46e67f2c359f5ed278b89d32a571ba15ebb37ad7d2e0723a2d05d87d26f799904ab17b59

data/app/controllers/salaries_controller.rb

@@ -5,8 +5,7 @@ class SalariesController < InvoicesController
 
   # Filter/Search
   # =============
-  has_scope :invoice_state, :default => nil
-  has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
+  has_scope :by_date, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_employee
 
   # Actions

data/app/controllers/salary_reports_controller.rb

@@ -1,9 +1,11 @@
 class SalaryReportsController < ApplicationController
   respond_to :html, :pdf
 
+  # Filter/Search
+  # =============
   before_filter do
-    @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
+    @by_date = Date.parse(params[:by_date][:from] || Date.today.beginning_of_year)..Date.parse(params[:by_date][:to] || Date.today.end_of_year) if params[:by_date]
+    @by_date ||= Date.today.beginning_of_year..Date.today.end_of_year
 
     if employee_id = params[:by_employee]
       @employee = Employee.find(employee_id)
@@ -11,11 +13,11 @@ class SalaryReportsController < ApplicationController
   end
 
   def yearly_ahv_statement
-    @employments = Employment.valid_during(@value_period).all
+    @employments = Employment.valid_during(@by_date).all
   end
 
   def salary_declaration
-    @salaries = @employee.salaries.where(:value_date => @value_period)
+    @salaries = @employee.salaries.where(:value_date => @by_date)
     @line_items = @salaries.collect{|salary| salary.line_items}.flatten
 
     # TODO: better sorting
@@ -23,7 +25,7 @@ class SalaryReportsController < ApplicationController
   end
 
   def statistics
-    @year = @value_period.first.year
+    @year = @by_date.first.year
 
     @salary_booking_templates = SalaryBookingTemplate.all
   end

data/app/models/salary.rb

@@ -128,7 +128,7 @@ class Salary < Invoice
 
   # Filter/Search
   # =============
-  scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
+  scope :by_date, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
   scope :by_employee, lambda {|value| where(:company_id => value)}
 
   # Accounts
@@ -141,7 +141,7 @@ class Salary < Invoice
     Account.all
   end
 
-  def self.default_credit_account
+  def self.credit_account
     Account.find_by_code('5000')
   end
 
@@ -149,7 +149,7 @@ class Salary < Invoice
     Account.all
   end
 
-  def self.default_debit_account
+  def self.debit_account
     self.direct_account
   end
 

data/app/models/salary_booking_template.rb

@@ -1,4 +1,7 @@
 class SalaryBookingTemplate < BookingTemplate
+  # Access restrictions
+  attr_accessible :include_in_saldo_list, :salary_declaration_code
+
   # Obligation flags
   def self.saldo_inclusion_flags
     # Fix: Using .pluck(:name) would be nice but gives non-deterministic behaviour (id instead of name, sometimes)

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

@@ -3,4 +3,4 @@
 = boot_page_title t_model SalaryTemplate
 
 - @salary_template = @employee.salary_templates.first
-= render 'salary_templates/form' if @salary_template
+= render 'salary_templates/form', :resource => @salary_template if @salary_template

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

@@ -1,4 +1,4 @@
-= simple_form_for @salary do |f|
+= simple_form_for resource do |f|
   = f.input :employee_id, :as => :hidden
   = f.input :employer_id, :as => :hidden
   = f.input :state, :as => :hidden
@@ -8,8 +8,8 @@
     .span6= f.input :duration_from, :as => :date_field
     .span6= f.input :duration_to, :as => :date_field
   .row-fluid
-    .span6= f.input :used_leave_days, :as => :string
-    .span6= f.input :leave_days_balance, :as => :string
+    .span6= f.input :used_leave_days, :as => :string, :input_html => {:class => 'span2'}
+    .span6= f.input :leave_days_balance, :as => :string, :input_html => {:class => 'span2'}
   .row-fluid
     .span12= f.input :text, :input_html => {:rows => 4}
   .row-fluid
@@ -17,4 +17,5 @@
 
   = render 'line_items/list_form', :f => f, :invoice => resource
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

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

@@ -1,6 +1,6 @@
 = boot_page_title
 
-= simple_form_for @salary, :url => new_salary_path, :method => :get do |f|
+= simple_form_for resource, :url => new_salary_path, :method => :get do |f|
   .row-fluid
     .span12
       =f.association :employee, :as => :combobox
@@ -8,4 +8,5 @@
     .span12
       = f.input :duration_from, :as => :date_field
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

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

@@ -1,5 +1,5 @@
 .contextual
-  = icon_link_to(:payslip, {:action => :payslip, :format => :pdf}, :target => '_blank')
+  = icon_link_to :payslip, {:action => :payslip, :format => :pdf}, :icon => :print
   = contextual_links_for
 
 =boot_page_title

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

@@ -1,4 +1,4 @@
-= simple_form_for @salary_booking_template do |f|
+= simple_form_for resource do |f|
   .row-fluid
     .span6= f.input :title, :input_html => {"data-autofocus" => true}
     .span6= f.input :code
@@ -17,4 +17,5 @@
   .row-fluid
     .span12= f.input :salary_declaration_code
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

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

@@ -5,4 +5,4 @@
   %td= salary_item.text_field :price, :required => true, :style => 'width: 5em', :autocomplete => "off"
   %td.action_links
     = salary_item.hidden_field :_destroy
-    = link_to t_action(:delete), '#', :class => 'icon-delete-text delete-nested-form-item'
+    = list_link_to :delete, '#', :class => 'delete-nested-form-item'

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

@@ -14,7 +14,7 @@
       %th.right= t_attr :amount, SalaryBookingTemplate
   %tbody
     - @salary_booking_templates.each do |template|
-      - line_items = template.line_items.where(:date => @value_period)
+      - line_items = template.line_items.where(:date => @by_date)
       - line_items = line_items.includes(:invoice).where(invoices: {company_id: @employee.id}) if @employee
       - total_amount = line_items.sum(&:accounted_amount)
       - next if total_amount == 0

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

@@ -1,4 +1,4 @@
-- title = [ t_title, @value_period.last.year ].presence.compact.join(' - ')
+- title = [ t_title, @by_date.last.year ].presence.compact.join(' - ')
 = boot_page_title title
 
 %table.table.table-striped.collection
@@ -17,19 +17,19 @@
   %tbody
     - ahv_total = 0
     - for employment in @employments
-      - ahv_amount = employment.employee.salaries.where(:value_date => @value_period).sum(&:ahv_amount)
+      - ahv_amount = employment.employee.salaries.where(:value_date => @by_date).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= duration_from(employment, @by_date)
+        %td= duration_to(employment, @by_date)
         %td.currency= currency_fmt(ahv_amount)
         %td.currency= currency_fmt(ahv_amount)
         %td.currency= currency_fmt(0)
         %td= employment.employee.sex_to_s
-        %td.action-links= link_to t_action(:salary_declaration), salary_declaration_path(:by_employee => employment.employee, :by_value_period => params[:by_value_period])
+        %td.action-links= link_to t_action(:salary_declaration), salary_declaration_path(:by_employee => employment.employee, :by_date => params[:by_date])
 
   %tfoot
     %tr

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

@@ -1,4 +1,4 @@
-= simple_form_for @salary_template do |f|
+= simple_form_for resource do |f|
   .row-fluid
     .span6= f.input :title, :input_html => {"data-autofocus" => true}
     .span6= f.association :person, :as => :combobox, :collection => Employee.all
@@ -7,4 +7,5 @@
 
   = render 'salary_items/list_form', :f => f
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.23.0'
+  VERSION = '0.23.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookyt_salary
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.2
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,48 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This plugin extends bookyt with Salary functionality.
 email: simon.huerlimann@cyt.ch
 executables: []
@@ -170,7 +128,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Salary plugin for bookyt
 test_files: []
 has_rdoc: