Removed the lettering during generation of opening_and_closing_entry …

…on non-lettered items.
ekylibre · May 11, 2017 · a31a67a · a31a67a
1 parent 5a41638
commit a31a67a
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/app/models/financial_year.rb b/app/models/financial_year.rb
@@ -592,17 +592,21 @@ def generate_closing_and_opening_entry!(items, result, to_close_on, opening_jour
     return unless result.nonzero?
 
     account = Account.find(items.first[:account_id])
-    new_letter = account.new_letter
-    lettered_later = account.journal_entry_items.where('printed_on > ?', to_close_on).where(letter: letter)
-    lettered_later.update_all(letter: new_letter)
-    lettered_later.each do |item|
-      affair = item.entry.resource && item.entry.resource.affair
-      next unless affair 
-
-      affair.update(letter: new_letter)
+
+    if letter
+      new_letter = account.new_letter
+      lettered_later = account.journal_entry_items.where('printed_on > ?', to_close_on).where(letter: letter)
+      lettered_later.update_all(letter: new_letter)
+      lettered_later.each do |item|
+        affair = item.entry.resource && item.entry.resource.affair
+        next unless affair
+
+        affair.update(letter: new_letter)
+      end
+
+      items = items.map { |item| item[:letter] = new_letter; item }
     end
 
-    items = items.map { |item| item[:letter] = new_letter; item }
     generate_closing_or_opening_entry!(opening_journal,
                                        { number: '891', name: 'Bilan de clôture' },
                                        items,
@@ -613,7 +617,7 @@ def generate_closing_and_opening_entry!(items, result, to_close_on, opening_jour
       swap = item[:real_debit]
       item[:real_debit] = item[:real_credit]
       item[:real_credit] = swap
-      item[:letter] = letter
+      item[:letter] = letter if letter
       item
     end