Cleanup

5 files changed, 17 insertions, 85 deletions

diff --git a/servo/lib/ucsv.py b/servo/lib/ucsv.py
index 91b2acf..accf7d1 100644
--- a/servo/lib/ucsv.py
+++ b/servo/lib/ucsv.py
@@ -1,5 +1,5 @@
 """
-Borrwed from
+Borrowed from
 http://stackoverflow.com/questions/1846135/python-csv-library-with-unicode-utf-8-support-that-just-works
 """
 
diff --git a/servo/management/commands/updatecomponents.py b/servo/management/commands/updatecomponents.py
deleted file mode 100644
index 75b6de5..0000000
--- a/servo/management/commands/updatecomponents.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2013, First Party Software
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without modification, 
-# are permitted provided that the following conditions are met:
-
-# 1. Redistributions of source code must retain the above copyright notice, 
-# this list of conditions and the following disclaimer.
-
-# 2. Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
-# and/or other materials provided with the distribution.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
-# SUCH DAMAGE.
-
-from django.core.management.base import BaseCommand
-
-from servo.models import User, GsxAccount, Product, ServicePart
-
-
-class Command(BaseCommand):
-    help = "Update missing component codes"
-
-    def handle(self, *args, **options):
-        u = User.objects.get(username='filipp')
-        GsxAccount.default(u)
-        for p in Product.objects.filter(component_code='').exclude(labour_tier=''):
-            try:
-                info = ServicePart(part_number=p.code).lookup()
-                p.component_code = info.componentCode.strip()
-                p.save()
-            except Exception, e:
-                print e
diff --git a/servo/management/commands/updaterepairs.py b/servo/management/commands/updaterepairs.py
index 4eb1b58..b055f1c 100644
--- a/servo/management/commands/updaterepairs.py
+++ b/servo/management/commands/updaterepairs.py
@@ -1,28 +1,4 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2013, First Party Software
-# All rights reserved.
-
-# Redistribution and use in source and binary forms, with or without modification, 
-# are permitted provided that the following conditions are met:
-
-# 1. Redistributions of source code must retain the above copyright notice, 
-# this list of conditions and the following disclaimer.
-
-# 2. Redistributions in binary form must reproduce the above copyright notice, 
-# this list of conditions and the following disclaimer in the documentation 
-# and/or other materials provided with the distribution.
-
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
-# SUCH DAMAGE.
 
 from django.core.management.base import BaseCommand
 
diff --git a/servo/models/common.py b/servo/models/common.py
index 768e78b..622c017 100644
--- a/servo/models/common.py
+++ b/servo/models/common.py
@@ -305,10 +305,10 @@ class Tag(MPTTModel):
     )
 
     TYPES = (
-        ('device', _('Device')),
-        ('order', _('Order')),
-        ('note', _('Note')),
-        ('other', _('Other')),
+        ('device',  _('Device')),
+        ('order',   _('Order')),
+        ('note',    _('Note')),
+        ('other',   _('Other')),
     )
 
     type = models.CharField(
@@ -327,11 +327,11 @@ class Tag(MPTTModel):
     times_used = models.IntegerField(default=0, editable=False)
 
     COLORS = (
-        ('default', _('Default')),
-        ('success', _('Green')),
-        ('warning', _('Orange')),
-        ('important', _('Red')),
-        ('info', _('Blue')),
+        ('default',     _('Default')),
+        ('success',     _('Green')),
+        ('warning',     _('Orange')),
+        ('important',   _('Red')),
+        ('info',        _('Blue')),
     )
 
     color = models.CharField(
@@ -375,25 +375,25 @@ class Location(models.Model):
 
     title = models.CharField(
         max_length=255,
-        verbose_name=_(u'name'),
+        verbose_name=_(u'Name'),
         default=_('New Location'),
     )
     phone = models.CharField(
         blank=True,
         default='',
         max_length=32,
-        verbose_name=_('phone')
+        verbose_name=_('Phone')
     )
     email = models.EmailField(
         blank=True,
         default='',
-        verbose_name=_('email')
+        verbose_name=_('Email')
     )
     address = models.CharField(
         blank=True,
         default='',
         max_length=32,
-        verbose_name=_(u'address')
+        verbose_name=_(u'Address')
     )
     zip_code = models.CharField(
         blank=True,
@@ -405,7 +405,7 @@ class Location(models.Model):
         blank=True,
         default='',
         max_length=16,
-        verbose_name=_(u'city')
+        verbose_name=_(u'City')
     )
 
     TIMEZONES = tuple((t, t) for t in common_timezones)
diff --git a/servo/templates/snippets/error_modal.html b/servo/templates/snippets/error_modal.html
index c63010a..acd04ac 100755
--- a/servo/templates/snippets/error_modal.html
+++ b/servo/templates/snippets/error_modal.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 
 {% block header %}
-    {% trans "An error occured..." %}
+  {% trans "An error occured..." %}
 {% endblock header %}
 
 {% block body %}
-    {{ error }}
+  {{ error }}
 {% endblock body %}