Matériels : modif du model (association d'un abonnement à un prêt)

hardware_provisioning/admin.py

@@ -60,8 +60,7 @@ class AvailabilityFilter(admin.SimpleListFilter):
 class ItemAdmin(admin.ModelAdmin):
     list_display = (
         'designation', 'mac_address', 'serial', 'owner',
-        'buy_date', 'deployed', 'is_available', 'storage', 
-        'offer_subscription')
+        'buy_date', 'deployed', 'is_available', 'storage')
     list_filter = (
         AvailabilityFilter, 'type', 'storage',
         'buy_date', OwnerFilter)
@@ -136,7 +135,8 @@ class ItemChoiceField(ModelChoiceField):
 
 @admin.register(Loan)
 class LoanAdmin(admin.ModelAdmin):
-    list_display = ('item', 'get_mac_and_serial', 'user', 'loan_date', 'loan_date_end')
+    list_display = ('item', 'get_mac_and_serial', 'user', 
+        'loan_date', 'loan_date_end', 'offer_subscription')
     list_filter = (StatusFilter, BorrowerFilter, 'item__designation')
     search_fields = (
         'item__designation',

hardware_provisioning/migrations/0020_auto_20190317_1655.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('offers', '0007_offersubscription_comments'),
+        ('hardware_provisioning', '0019_auto_20180818_1930'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='item',
+            name='offer_subscription',
+        ),
+        migrations.AddField(
+            model_name='loan',
+            name='offer_subscription',
+            field=models.ForeignKey(related_name='loans', verbose_name='Abonnement', blank=True, to='offers.OfferSubscription', null=True),
+        ),
+    ]

hardware_provisioning/models.py

@@ -71,8 +71,6 @@ class Item(models.Model):
                                    help_text='Cocher si le matériel est en production')
     comment = models.TextField(verbose_name='commentaire', blank=True,
                                null=True)
-    offer_subscription = models.ForeignKey(OfferSubscription, verbose_name='Abonnement',
-                             related_name='items', blank=True, null=True)
 
     objects = ItemQuerySet().as_manager()
 
@@ -148,6 +146,8 @@ class Loan(models.Model):
     loan_date_end = models.DateTimeField(verbose_name='date de fin de prêt',
                                      null=True, blank=True)
     notes = models.TextField(null=True, blank=True)
+    offer_subscription = models.ForeignKey(OfferSubscription, verbose_name='Abonnement',
+                             related_name='loans', blank=True, null=True)
 
     def __unicode__(self):
         return 'prêt de {item} à {user}'.format(