6 files changed, 15 insertions, 11 deletions
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index 53e412600..8d6dbee92 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -3,6 +3,8 @@ module Chouette
     include CompanyRestrictions
     include LineReferentialSupport
     include ObjectidSupport
+    include CustomFieldsSupport
+
     has_paper_trail class_name: 'PublicVersion'
 
     has_many :lines
diff --git a/app/models/chouette/for_alighting_enumerations.rb b/app/models/chouette/for_alighting_enumerations.rb
index ab07a670d..2e15fcb58 100644
--- a/app/models/chouette/for_alighting_enumerations.rb
+++ b/app/models/chouette/for_alighting_enumerations.rb
@@ -3,6 +3,6 @@ module Chouette
     extend Enumerize
     extend ActiveModel::Naming
 
-    enumerize :for_alighting, in: %w[normal forbidden request_stop is_flexible]
+    enumerize :for_alighting, in: %w[normal forbidden request_stop is_flexible], default: :normal
   end
 end
diff --git a/app/models/chouette/for_boarding_enumerations.rb b/app/models/chouette/for_boarding_enumerations.rb
index 48f8762c2..0190bf805 100644
--- a/app/models/chouette/for_boarding_enumerations.rb
+++ b/app/models/chouette/for_boarding_enumerations.rb
@@ -3,6 +3,6 @@ module Chouette
     extend Enumerize
     extend ActiveModel::Naming
 
-    enumerize :for_boarding, in: %w[normal forbidden request_stop is_flexible]
+    enumerize :for_boarding, in: %w[normal forbidden request_stop is_flexible], default: :normal
   end
 end
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index ae7c25377..c8a02da1f 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -51,6 +51,14 @@ module Chouette
         )
     }
 
+    scope :for_organisation, ->(organisation){
+      if objectids = organisation&.lines_scope
+        where(objectid: objectids)
+      else
+        all
+      end
+    }
+
     def self.nullable_attributes
       [:published_name, :number, :comment, :url, :color, :text_color, :stable_id]
     end
diff --git a/app/models/chouette/stop_area.rb b/app/models/chouette/stop_area.rb
index ccdff609f..c263fa987 100644
--- a/app/models/chouette/stop_area.rb
+++ b/app/models/chouette/stop_area.rb
@@ -7,6 +7,7 @@ module Chouette
     include StopAreaRestrictions
     include StopAreaReferentialSupport
     include ObjectidSupport
+    include CustomFieldsSupport
 
     extend Enumerize
     enumerize :area_type, in: Chouette::AreaType::ALL
@@ -49,7 +50,7 @@ module Chouette
     validate :registration_number_is_set
 
     before_validation do
-      self.registration_number ||= self.stop_area_referential.generate_registration_number
+      self.registration_number = self.stop_area_referential.generate_registration_number unless self.registration_number.present?
     end
 
     def self.nullable_attributes
@@ -90,7 +91,7 @@ module Chouette
       end
 
       unless self.stop_area_referential.validates_registration_number(self.registration_number)
-        errors.add(:registration_number, I18n.t('stop_areas.errors.registration_number.invalid'))
+        errors.add(:registration_number, I18n.t('stop_areas.errors.registration_number.invalid', mask: self.stop_area_referential.registration_number_format))
       end
     end
 
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 27407243b..da2da998a 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -30,13 +30,6 @@ module Chouette
 
     delegate :name, to: :stop_area
 
-    after_create :set_defaults
-    def set_defaults
-      value = stop_area.kind == 'commercial' ? 'normal' : 'forbidden'
-      update_attribute :for_boarding, value
-      update_attribute :for_alighting, value
-    end
-
     before_destroy :remove_dependent_journey_pattern_stop_points
     def remove_dependent_journey_pattern_stop_points
       route.journey_patterns.each do |jp|