bookyt_projects 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
@@ -90,7 +90,7 @@ class WorkDay < ActiveRecord::Base
90
90
 
91
91
  # Calculate accumulated overtime
92
92
  def overall_overtime
93
- if employment.hourly_paid?
93
+ if employment.nil? || employment.hourly_paid?
94
94
  person.work_days.where('date BETWEEN ? AND ?', date.beginning_of_month, date).sum('hours_worked - hours_due')
95
95
  else
96
96
  person.work_days.where('date <= ?', date).sum('hours_worked - hours_due')
@@ -1,3 +1,3 @@
1
1
  module BookytPos
2
- VERSION = '1.0.0'
2
+ VERSION = '1.0.1'
3
3
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bookyt_projects
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 0
10
- version: 1.0.0
9
+ - 1
10
+ version: 1.0.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2012-04-17 00:00:00 Z
19
+ date: 2012-04-24 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: rails