Merge pull request #256 from wvengen/feature-partial_shared_sync

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

View file

@ -227,6 +227,7 @@ class ArticlesController < ApplicationController
if @updated_articles.empty? && @outlisted_articles.empty?
redirect_to supplier_articles_path(@supplier), :notice => I18n.t('articles.controller.sync.notice')
end
@ignored_article_count = @supplier.articles.where(order_number: [nil, '']).count
end
# Updates, deletes articles when sync form is submitted