Skip to content

Commit

Permalink
Added messages in case of closure obstruction on a year.
Browse files Browse the repository at this point in the history
  • Loading branch information
Aquaj committed Jun 7, 2017
1 parent 3b77ca2 commit 8c9f8df
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/controllers/backend/financial_years_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def close
end

@financial_year.closure_obstructions.each do |obstruction|
notify_warning obstruction.tl
notify_error obstruction.tn
end

journal = Journal.where(currency: @financial_year.currency, nature: :result).first
Expand Down
4 changes: 2 additions & 2 deletions app/models/financial_year.rb
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,10 @@ def default_code
def closure_obstructions(noticed_on = nil)
noticed_on ||= Time.zone.today
list = []
list << :already_closed if closed
list << :financial_year_already_closed if closed
list << :draft_journal_entries_are_present if journal_entries.where(state: :draft).any?
list << :previous_financial_year_is_not_closed if previous && !previous.closed
list << :unbalanced_journal_entries_are_present unless journal_entries.where('debit != credit').empty?
list << :unbalanced_journal_entries_are_present_in_year unless journal_entries.where('debit != credit').empty?
list << :financial_year_is_not_past if stopped_on >= noticed_on
list
end
Expand Down
7 changes: 6 additions & 1 deletion config/locales/eng/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2128,6 +2128,7 @@ eng:
density_is_not_computable_in_counting: "Could not compute the density for this counting. The missing values should be completed in the counting's properties or the sower's indicators."
depreciation_failed: "Assets could not be depreciated."
depreciation_successful: "Assets have been successfully depreciated."
draft_journal_entries_are_present: "Draft journal entries are present."
draft_journal_entries_have_been_validated:
one: "%{count} entry has been validated"
other: "%{count} entries have been validated"
Expand All @@ -2140,6 +2141,8 @@ eng:
fails_to_extract_listing: "The listing can't be made: %{message}"
financial_year_x_could_not_be_closed: "Financial Year %{name} could not be closed."
financial_year_x_successfully_closed: "Financial Year %{name} successfully closed !"
financial_year_already_closed: "The financial year has already been closed."
financial_year_is_not_past: "The financial year hasn't passed yet."
financial_years_missing: "You must create every missing financial years since the first registered"
financial_years_missing_tax_declarations: "You must create every declarations for the following financial years: %{codes}"
implemented_with_dummy_data: "Implemented with dummy data"
Expand Down Expand Up @@ -2183,6 +2186,7 @@ eng:
no_reopenable_journal: "You can not re-open this journal."
no_replacements_since_beginning: "No replacements since beginning"
# no_worker_associated_with_user_account: "No worker associated with user account"
previouos_financial_year_is_not_closed: "The previous financial year hasn't been closed."
purchases_invalid_for_sepa: "Purchases selected invalid for SEPA transfer (invalid disbursement mode or wrong currency or missing payee's IBAN or bank account holder name)"
record_already_imported: "Record already imported"
record_cannot_be_removed: "The record can not be deleted"
Expand All @@ -2207,6 +2211,7 @@ eng:
the_sales_invoice_is_not_cancellable: "The sales invoice is not cancellable"
this_service_is_not_activated: "This service is not activated" #?
unavailable_resource: "Nonexistent %{type} #%{id}"
unbalanced_journal_entries_are_present_in_year: "Some unbalanced journal entries are present in the financial year."
unexpected_resource_type: "Unexpected resource type: %{type}"
update_is_done: "The update has been made"
x_unpointed_journal_entry_items:
Expand Down Expand Up @@ -2400,4 +2405,4 @@ eng:
backend/product_natures: "%{name}"
backend/products: "%{work_number} %{name} (%{number})"
backend/trackings: "%{serial} ‒ %{name} ‒ %{producer_full_name}"
backend/users: "%{first_name} %{last_name}"
backend/users: "%{first_name} %{last_name}"
7 changes: 6 additions & 1 deletion config/locales/fra/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2499,6 +2499,7 @@ fra:
density_is_not_computable_in_counting: "La densité de semis n’a pas pu être calculée pour ce comptage. Veuillez compléter les informations manquantes dans le comptage ou dans les indicateurs du semoir."
depreciation_failed: "Les immobilisations n’ont pas pu être dépréciées."
depreciation_successful: "Les immobilisations ont correctement été dépréciées."
draft_journal_entries_are_present: "Des écritures sont encore présentes dans le brouillard."
draft_journal_entries_have_been_validated:
one: "%{count} écriture du brouillard validée"
other: "%{count} écritures du brouillard validées"
Expand All @@ -2511,6 +2512,8 @@ fra:
fails_to_extract_listing: "L’extraction n’a pas pu s’effectuer\_: %{message}"
financial_year_x_could_not_be_closed: "L'exercice %{name} n'a pas pu être clos."
financial_year_x_successfully_closed: "L'exercice %{name} est clos !"
financial_year_already_closed: "L'exercice a déjà été clôturé."
financial_year_is_not_past: "L'exercice est encore en cours."
financial_years_missing: "Vous devez créer tous les exercices comptables manquant depuis le premier exercice enregistré"
financial_years_missing_tax_declarations: "Vous devez créer toutes les déclarations des exercices suivants\_: %{codes}"
implemented_with_dummy_data: "Charger des données de test"
Expand Down Expand Up @@ -2576,6 +2579,7 @@ fra:
no_unconfirmed_stock_transfers: "Aucun transfert de stocks non-confirmé" #?
no_unvalidated_operations: "Aucun travail à réaliser" #?
password_successfully_changed: "Votre mot de passe a été mis à jour avec succès" #?
previous_financial_year_is_not_closed: "L'exercice précédent n'a pas encore été clôturé."
prices_import_succeeded: "Vos données ont été correctement importées" #?
print_failure: "Impossible d’imprimer. Essayer de recharger les modèles de documents pour corriger le problème. %{error} (%{class})." #?
purchase_already_invoiced: "Achat déjà facturé" #?
Expand Down Expand Up @@ -2609,6 +2613,7 @@ fra:
the_sales_invoice_is_not_cancellable: "La facture ne peut pas être passée en avoir"
this_service_is_not_activated: "Ce service n’est pas activé"
unavailable_resource: "%{type} indisponible ou inexistant(e) #%{id}"
unbalanced_journal_entries_are_present_in_year: "L'exercice comporte des écritures non-équilibrées."
unexpected_resource_type: "Type de ressource inattendue\_: %{type}"
unknown_action: "La page demandée est indisponible (%{url})" #?
unknown_company: "Société inconnue" #?
Expand Down Expand Up @@ -2781,4 +2786,4 @@ fra:
backend/product_natures: "%{name}"
backend/products: "%{work_number} %{name} (%{number}) - %{container_name}"
backend/trackings: "%{serial} ‒ %{name} ‒ %{producer_full_name}"
backend/users: "%{first_name} %{last_name}"
backend/users: "%{first_name} %{last_name}"

0 comments on commit 8c9f8df

Please sign in to comment.