diff --git a/requisition/admin.py b/requisition/admin.py index 9520933..06d6fc6 100644 --- a/requisition/admin.py +++ b/requisition/admin.py @@ -3,7 +3,7 @@ @admin.register(Requisition) class RequisitionAdmin(admin.ModelAdmin): - list_display = ('requisition_type', 'status', 'created') - list_filter = ('requisition_type', 'status', 'created') - search_fields = ('requisition_type', 'status', 'created') + list_display = ('site','requisition_type', 'status', 'created') + list_filter = ('site','requisition_type', 'status', 'created') + search_fields = ('site','requisition_type', 'status', 'created') \ No newline at end of file diff --git a/stock/admin.py b/stock/admin.py index 6d40c1c..27af060 100644 --- a/stock/admin.py +++ b/stock/admin.py @@ -3,18 +3,18 @@ @admin.register(Gas) class GasAdmin(admin.ModelAdmin): - list_display = ('name', 'quantity', 'price', 'supplier', 'created', 'updated') - list_filter = ('supplier', 'created', 'updated') - search_fields = ('name', 'supplier') + list_display = ('site','name', 'quantity', 'price', 'supplier', 'created', 'updated') + list_filter = ('site','supplier', 'created', 'updated') + search_fields = ('site','name', 'supplier') date_hierarchy = 'created' ordering = ('-created',) - fields = ('name', 'quantity', 'price', 'supplier') + fields = ('site','name', 'quantity', 'price', 'supplier') readonly_fields = ('created', 'updated') @admin.register(Reciept) class RecieptAdmin(admin.ModelAdmin): - list_display = ('quantity', 'stock', 'created') - list_filter = ('quantity', 'created') - search_fields = ('quantity', 'created') + list_display = ('site','quantity', 'stock', 'created') + list_filter = ('site','quantity', 'created') + search_fields = ('site','quantity', 'created') \ No newline at end of file diff --git a/templates/reciept/detail.html b/templates/reciept/detail.html index 31e3d7d..21a7c17 100644 --- a/templates/reciept/detail.html +++ b/templates/reciept/detail.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/reciept/index.html b/templates/reciept/index.html index b10cbe1..a2a3110 100644 --- a/templates/reciept/index.html +++ b/templates/reciept/index.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/requisition/details.html b/templates/requisition/details.html index c457c29..417c03f 100644 --- a/templates/requisition/details.html +++ b/templates/requisition/details.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/requisition/index.html b/templates/requisition/index.html index 453c7ed..5065b16 100644 --- a/templates/requisition/index.html +++ b/templates/requisition/index.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/requisition/search.html b/templates/requisition/search.html index cdbed20..a92e481 100644 --- a/templates/requisition/search.html +++ b/templates/requisition/search.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/stock/create.html b/templates/stock/create.html index e43d471..5526efe 100644 --- a/templates/stock/create.html +++ b/templates/stock/create.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/transactions/details.html b/templates/transactions/details.html index 071ce18..edb24aa 100644 --- a/templates/transactions/details.html +++ b/templates/transactions/details.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/transactions/index.html b/templates/transactions/index.html index 287d7ae..26e5cfe 100644 --- a/templates/transactions/index.html +++ b/templates/transactions/index.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/transactions/search.html b/templates/transactions/search.html index dfd8499..fbf4baa 100644 --- a/templates/transactions/search.html +++ b/templates/transactions/search.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/templates/transactions/update.html b/templates/transactions/update.html index 543f4f0..591122c 100644 --- a/templates/transactions/update.html +++ b/templates/transactions/update.html @@ -6,7 +6,7 @@ {% load static %} {% block body %} -
+
diff --git a/transactions/admin.py b/transactions/admin.py index 194a885..17dac03 100644 --- a/transactions/admin.py +++ b/transactions/admin.py @@ -3,9 +3,9 @@ @admin.register(Transaction) class TransactionAdmin(admin.ModelAdmin): - list_display = ('customer', 'quantity', 'product', 'created', 'status', 'get_total_cost') - list_filter = ('product', 'created', 'updated') - search_fields = ('customer', 'product__name') + list_display = ('site','customer', 'quantity', 'product', 'created', 'status', 'get_total_cost') + list_filter = ('site','product', 'created', 'updated') + search_fields = ('site','customer', 'product__name') readonly_fields = ('total_cost',) def get_total_cost(self, obj):