From: yomguy <yomguy@parisson.com>
Date: Fri, 18 May 2012 09:31:20 +0000 (+0200)
Subject: Merge branch 'new_branch_name' into develop
X-Git-Tag: 1.4.3-2^2~27
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5d72619611e5664f5369f3d45351f391f35610b4;p=telemeta.git

Merge branch 'new_branch_name' into develop

Conflicts:
	telemeta/models/format.py
---

5d72619611e5664f5369f3d45351f391f35610b4
diff --cc telemeta/models/media.py
index 3b1e386b,f093a7a0..45845791
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@@ -358,31 -358,7 +358,7 @@@ class MediaItem(MediaResource)
      # Technical data
      approx_duration       = DurationField(_('approximative duration'))
  
-     original_format       = WeakForeignKey(OriginalFormat, related_name="item",
-                                      verbose_name = _("original format"))
-     original_code         = CharField(_('original code'), required=True)
-     original_number       = CharField(_('original number'))
-     original_status       = CharField(_('status'))
-     original_state        = TextField(_('technical properties / conservation state'))
-     original_comments     = TextField(_('comments / notes'))
-     original_location     = WeakForeignKey(OriginalLocation, related_name="item",
-                                         verbose_name = _("original location"))
-     original_channels            = IntegerField(_("number of channels"))
-     audio_quality       = TextField(_('audio quality'))
-     recording_system    = CharField(_('recording system'))
- 
-     # Tapes
-     tape_wheel_diameter = WeakForeignKey(WheelDiameter, related_name="item",
-                                         verbose_name = _("tape wheel diameter (cm)"))
-     tape_thickness      = CharField(_('tape thickness (um)'))
-     tape_speed          = WeakForeignKey(TapeSpeed, related_name="item",
-                                         verbose_name = _("tape speed (m/s)"))
-     tape_vendor         = WeakForeignKey(TapeVendor, related_name="item",
-                                         verbose_name = _("tape vendor"))
-     tape_reference      = CharField(_('tape reference'))
-     sticker_presence    = BooleanField(_('sticker presence'))
- 
 -    # All
 +    # Manager
      objects               = MediaItemManager()
  
      def keywords(self):