Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #256 from wvengen/feature-partial_shared_sync

Browse source 
Small change to allow non-shared articles with shared suppliers
This commit is contained in:
wvengen 2014-02-07 11:24:33 +01:00
commit 2de4a2a3a0
6 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/article.rb
View file

@ -61,7 +61,7 @@ class Article < ActiveRecord::Base
# false will returned and self.shared_updated_on will be updated
def shared_article_changed?
# skip early if the timestamp hasn't changed
unless self.shared_updated_on == self.shared_article.updated_on
unless self.shared_article.nil? or self.shared_updated_on == self.shared_article.updated_on
# try to convert units
# convert supplier's price and unit_quantity into fc-size
@ -106,6 +106,7 @@ class Article < ActiveRecord::Base
# to get the correspondent shared article
def shared_article
self.order_number.blank? and return nil
@shared_article ||= self.supplier.shared_supplier.shared_articles.find_by_number(self.order_number) rescue nil
end