Merge branch '106012880-pricelists' into staging

This commit is contained in:
Stas 2015-11-09 16:18:20 +02:00
commit 5a97503c17

View file

@ -3,7 +3,7 @@ class Pricelist < ActiveRecord::Base
scope :valid, lambda {
where(
"valid_from <= ? AND valid_to >= ? OR valid_to IS NULL",
"valid_from <= ? AND (valid_to >= ? OR valid_to IS NULL)",
Time.zone.now.end_of_day, Time.zone.now.beginning_of_day
)
}