Index: app/models/issue.rb
===================================================================
--- tmp/53FjSb_issue.rb
+++ app/models/issue.rb
@@ -1263,12 +1263,15 @@ class Issue < ActiveRecord::Base
     end
 
     # Move subtasks that were in the same project
-    children.each do |child|
-      next unless child.project_id == project_id_was
-      # Change project and keep project
-      child.send :project=, project, true
-      unless child.save
-        raise ActiveRecord::Rollback
+    if Setting.subtasks_follow_project_change_of_parent?
+      children.each do |child|
+        next unless child.project_id == project_id_was
+        # Change project and keep project
+        child.init_journal(User.current)
+        child.send :project=, project, true
+        unless child.save
+          raise ActiveRecord::Rollback
+        end
       end
     end
   end
Index: app/views/settings/_issues.html.erb
===================================================================
--- tmp/bToa8e__issues.html.erb
+++ app/views/settings/_issues.html.erb
@@ -11,6 +11,8 @@
 
 <p><%= setting_check_box :display_subprojects_issues %></p>
 
+<p><%= setting_check_box :subtasks_follow_project_change_of_parent %></p>
+
 <p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
 
 <p><%= setting_multiselect :non_working_week_days, (1..7).map {|d| [day_name(d), d.to_s]}, :inline => true %></p>
Index: config/locales/ca.yml
===================================================================
--- tmp/VwDJae_ca.yml
+++ config/locales/ca.yml
@@ -336,6 +336,7 @@ ca:
   setting_user_format: "Format de com mostrar l'usuari"
   setting_activity_days_default: "Dies a mostrar l'activitat del projecte"
   setting_display_subprojects_issues: "Mostra els assumptes d'un subprojecte en el projecte pare per defecte"
+  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
   setting_enabled_scm: "Habilita l'SCM"
   setting_mail_handler_body_delimiters: "Trunca els correus electrònics després d'una d'aquestes línies"
   setting_mail_handler_api_enabled: "Habilita el WS per correus electrònics d'entrada"
Index: config/locales/en-GB.yml
===================================================================
--- tmp/fT7PRh_en-GB.yml
+++ config/locales/en-GB.yml
@@ -346,6 +346,7 @@ en-GB:
   setting_user_format: Users display format
   setting_activity_days_default: Days displayed on project activity
   setting_display_subprojects_issues: Display subprojects issues on main projects by default
+  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
   setting_enabled_scm: Enabled SCM
   setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
   setting_mail_handler_api_enabled: Enable WS for incoming emails
Index: config/locales/en.yml
===================================================================
--- tmp/VsZR0h_en.yml
+++ config/locales/en.yml
@@ -372,6 +372,7 @@ en:
   setting_user_format: Users display format
   setting_activity_days_default: Days displayed on project activity
   setting_display_subprojects_issues: Display subprojects issues on main projects by default
+  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
   setting_enabled_scm: Enabled SCM
   setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
   setting_mail_handler_api_enabled: Enable WS for incoming emails
Index: config/locales/es.yml
===================================================================
--- tmp/RKTXXg_es.yml
+++ config/locales/es.yml
@@ -762,6 +762,7 @@ es:
   setting_default_projects_public: Los proyectos nuevos son públicos por defecto
   setting_diff_max_lines_displayed: Número máximo de diferencias mostradas
   setting_display_subprojects_issues: Mostrar por defecto peticiones de proy. secundarios en el principal
+  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
   setting_emails_footer: Pie de mensajes
   setting_enabled_scm: Activar SCM
   setting_feeds_limit: Límite de contenido para sindicación
Index: config/locales/fr.yml
===================================================================
--- tmp/PVnwzk_fr.yml
+++ config/locales/fr.yml
@@ -392,6 +392,7 @@ fr:
   setting_user_format: Format d'affichage des utilisateurs
   setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
   setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
+  setting_subtasks_follow_project_change_of_parent: Changer les sous-tâches de projet si le parent change de projet
   setting_enabled_scm: SCM activés
   setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes"
   setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
Index: config/locales/uk.yml
===================================================================
--- tmp/UqoTob_uk.yml
+++ config/locales/uk.yml
@@ -709,6 +709,7 @@ uk:
   label_reverse_chronological_order: In reverse chronological order
   label_preferences: Preferences
   setting_display_subprojects_issues: Display subprojects issues on main projects by default
+  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
   label_overall_activity: Overall activity
   setting_default_projects_public: New projects are public by default
   error_scm_annotate: "The entry does not exist or can not be annotated."
Index: config/settings.yml
===================================================================
--- tmp/wqAkja_settings.yml
+++ config/settings.yml
@@ -164,6 +164,8 @@ issue_list_default_columns:
   - updated_on
 display_subprojects_issues:
   default: 1
+subtasks_follow_project_change_of_parent:
+  default: 1
 issue_done_ratio:
   default: 'issue_field'
 default_projects_public: