new

osinaweb/customercore/templates/add_templates/customer-add-ticket.html

@@ -34,7 +34,7 @@
                     <option value="" selected disabled>Select Project</option>
                     {% else %}
                     {% for customer_project in customer_projects %}
-                    <option value="{{customer_project.id}}">{{customer_project.title}}</option>
+                    <option value="{{customer_project.id}}">{{customer_project.name}}</option>
                     {% endfor %}
                     {% endif %}
                 </select>

osinaweb/osinacore/add/views.py

@@ -634,16 +634,18 @@ def add_ticket(request, customer_id):
     if request.method == 'POST':
         project = None
         product = None
-        department_id = request.POST.get('department')
-        department = get_object_or_404(Department, id=department_id)
+        if request.POST.get('department'):
+            department = get_object_or_404(Department, id=request.POST.get('department'))
         regarding = 'General/Account/Billing'
         if request.POST.get('project'):
             project = get_object_or_404(Project, id=request.POST.get('project'))
+            if not department:
                 department = project.project_type.department
             regarding = 'Project/Product'
         elif request.POST.get('product'):
             product = get_object_or_404(Item, id=request.POST.get('product'))
-            department = product.item_type.department
+            if not department:
+                department = project.project_type.department
             regarding = 'Project/Product'
         ticket = Ticket(
             status = 'Open',

osinaweb/osinacore/templates/add_templates/add-ticket.html

@@ -35,7 +35,7 @@
                     <option value="" selected disabled>Select Project</option>
                     {% else %}
                     {% for customer_project in customer_projects %}
-                    <option value="{{customer_project.id}}">{{customer_project.title}}</option>
+                    <option value="{{customer_project.id}}">{{customer_project.name}}</option>
                     {% endfor %}
                     {% endif %}
                 </select>