bookyt_salary 0.13.1 → 0.13.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/app/models/salary_booking_template.rb +0 -2
  2. data/app/views/salary_booking_templates/_list.html.haml +2 -1
  3. data/app/views/salary_booking_templates/_salary_booking_template.html.haml +2 -1
  4. data/lib/bookyt_salary/version.rb +1 -1
  5. metadata +5 -5
data/app/models/salary_booking_template.rb CHANGED
@@ -1,6 +1,4 @@
1
1
  class SalaryBookingTemplate < BookingTemplate
2
- default_scope order(:code)
3
-
4
2
  # Obligation flags
5
3
  def self.saldo_inclusion_flags
6
4
  ['gross_income', 'ahv', 'uvg', 'uvgz', 'ktg', 'deduction_at_source']
data/app/views/salary_booking_templates/_list.html.haml CHANGED
@@ -1,5 +1,6 @@
1
1
  %table.list.salary_booking_template_list
2
2
  %tr
3
+ %th= t_attr :code, SalaryBookingTemplate
3
4
  %th= t_attr :title, SalaryBookingTemplate
4
5
  %th= t_attr :credit_account, SalaryBookingTemplate
5
6
  %th= t_attr :debit_account, SalaryBookingTemplate
@@ -7,6 +8,6 @@
7
8
  %th= t_attr :amount_relates_to, SalaryBookingTemplate
8
9
  - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
9
10
  %th= t_attr('saldo_inclusion_flags.' + flag, SalaryBookingTemplate)
10
- %th= t_attr :salary_declaration_code, SalaryBookingTemplate
11
+ %th.right= t_attr :salary_declaration_code, SalaryBookingTemplate
11
12
 
12
13
  = render @salary_booking_templates
data/app/views/salary_booking_templates/_salary_booking_template.html.haml CHANGED
@@ -1,4 +1,5 @@
1
1
  %tr[salary_booking_template]
2
+ %td.code= salary_booking_template.code
2
3
  %td
3
4
  = link_to salary_booking_template.title, salary_booking_template, 'data-href-container' => 'tr'
4
5
  - if salary_booking_template.comments.present?
@@ -10,4 +11,4 @@
10
11
  %td= t_attr('saldo_inclusion_flags.' + salary_booking_template.amount_relates_to) if salary_booking_template.amount_relates_to.present?
11
12
  - SalaryBookingTemplate.saldo_inclusion_flags.each do |flag|
12
13
  %td= salary_booking_template.include_in_saldo_list.include?(flag) ? '<span class="label success">Ja</span>'.html_safe : ""
13
- %td.number= salary_booking_template.salary_declaration_code
14
+ %td.right= salary_booking_template.salary_declaration_code
data/lib/bookyt_salary/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module BookytSalary
2
- VERSION = '0.13.1'
2
+ VERSION = '0.13.2'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bookyt_salary
3
3
  version: !ruby/object:Gem::Version
4
- hash: 41
4
+ hash: 47
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 13
9
- - 1
10
- version: 0.13.1
9
+ - 2
10
+ version: 0.13.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-01-25 00:00:00 Z
18
+ date: 2012-01-26 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
21
  name: rails
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
180
180
  requirements: []
181
181
 
182
182
  rubyforge_project:
183
- rubygems_version: 1.8.15
183
+ rubygems_version: 1.8.10
184
184
  signing_key:
185
185
  specification_version: 3
186
186
  summary: Salary plugin for bookyt