Merge remote-tracking branch 'origin/v2' into v2

RoutesApp/forms.py

@@ -58,6 +58,7 @@ class RouteForm(forms.ModelForm):
         try:
 
             if 'type_transport' in self.errors:
+                if self.instance and self.instance.owner_type == 'customer':
                     self.errors.pop('type_transport')
 
             if 'phone' in cleaned_data and 'phone' in cleaned_data:

RoutesApp/js_views.py

@@ -410,7 +410,7 @@ def create_or_change_route_ajax(request, route_id=None):
 
         if 'route_id' in data and data['route_id']:
             route_id = data['route_id']
-            del data['route_id']
+            # del data['route_id']
 
         route = None
         if route_id: