diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc
index faaaa519..bd9d25ee 100644
Binary files a/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc b/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc
index 6a86c81a..1c101c58 100644
Binary files a/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc b/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc
index 6754a552..962e43a1 100644
Binary files a/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/models.cpython-310.pyc b/osinaweb/addressbook/__pycache__/models.cpython-310.pyc
index b0285def..b7adf566 100644
Binary files a/osinaweb/addressbook/__pycache__/models.cpython-310.pyc and b/osinaweb/addressbook/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc
index 78e5382d..6f0f6e0f 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc
index 8a3608a9..1e4f3217 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc
index 965a6546..4b52d2c9 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc
index e426d640..8740a071 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc
index e7f14771..97f42000 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-310.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc
index cf13ccc8..33fee86c 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/__init__.cpython-310.pyc b/osinaweb/billing/__pycache__/__init__.cpython-310.pyc
index 561effe0..a4904e70 100644
Binary files a/osinaweb/billing/__pycache__/__init__.cpython-310.pyc and b/osinaweb/billing/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/admin.cpython-310.pyc b/osinaweb/billing/__pycache__/admin.cpython-310.pyc
index 421a0ef4..a2c1db74 100644
Binary files a/osinaweb/billing/__pycache__/admin.cpython-310.pyc and b/osinaweb/billing/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/apps.cpython-310.pyc b/osinaweb/billing/__pycache__/apps.cpython-310.pyc
index f4dfbe86..a0076559 100644
Binary files a/osinaweb/billing/__pycache__/apps.cpython-310.pyc and b/osinaweb/billing/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc
index 747080e5..a5e583c3 100644
Binary files a/osinaweb/billing/__pycache__/models.cpython-310.pyc and b/osinaweb/billing/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/__pycache__/urls.cpython-310.pyc
index 284cf672..8369d8b3 100644
Binary files a/osinaweb/billing/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/__pycache__/views.cpython-310.pyc b/osinaweb/billing/__pycache__/views.cpython-310.pyc
index ad7fcc94..553adc48 100644
Binary files a/osinaweb/billing/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc
index 72e069af..895827a7 100644
Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc
index 1e22a89b..848a9640 100644
Binary files a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc
index 02351a64..90ce2e51 100644
Binary files a/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/delete/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc b/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc
index 22766744..69c843cb 100644
Binary files a/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/delete/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc
index 8f83279a..63f7ec89 100644
Binary files a/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc b/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc
index 4a21aa49..e7d5a2ee 100644
Binary files a/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/edit/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc
index 04411fff..d73c84c0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc
index 368475a8..083eae33 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc
index e5ba0646..3425d020 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc
index 43171b0d..e92d1753 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc
index 94e0bf4b..90781d12 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc
index 3c628d69..634c2591 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc
index a0153ee0..b7206cd0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc
index 8103ba90..9c6025d2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc
index 95e30564..1658728a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc
index 923569dd..70a42f53 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc
index 6e2ccd9c..14c2a992 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc
index bb54204e..22dc7716 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc
index 4b34b1c3..7d3160c2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc
index 13779054..1c7e3cd9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc
index 2135839f..86a67347 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc
index b9abe06c..074244ce 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc
index e8289bdd..92a6b667 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc
index e08bbd58..1bc8fb7f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc
index 8c023eb0..0c7c0313 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc
index ad6a7fd2..623f33fc 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc
index 917f2851..a45297a9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc
index 1aee6945..ced29d12 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc
index cbd8c671..f17d50ca 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc
index 6ada680b..43b68d8c 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc
index a93e0567..c1cecda2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc
index 53aaea15..f3b91d05 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc
index 502d5ebd..fd80e9f3 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc
index bfc28c9d..a0ece05a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc
index e7ce204c..ec6207e6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc
index 47203da2..e9eaa3d9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc
index d749af20..96341edb 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc
index 0cb27116..45f4eb22 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc
index ce321337..5c662e6b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc
index 4b1b30d1..f942916e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc
index de7fc261..e71e6ea2 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc
index 48575225..dc71537f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc
index 04d4a295..f34a1cda 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc
index 27bf4c15..ec27c1f6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc
index abe516f5..32f9af8f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc
index 448e581f..daf7585f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc
index 213ab6b8..0440e03f 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc
index ddd1a8a7..85278b7b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc
index bb4f7a6b..93509460 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc
index d610463b..eeb051d5 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc
index d8b34d66..82feaac1 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0045_orderpayment_date_due_alter_orderpayment_date_paid.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc
index a7da8bbd..be9b9900 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0046_remove_orderpayment_order_orderpayment_order.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc
index caa99420..7bffffd3 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0047_paymenttype_description_paymenttype_image.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc
index e761dd1b..f26b4b6b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0048_remove_order_status_orderstatus.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc
index 784799ce..b1cb3ad9 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0049_rename_due_date_order_date.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc
index 2d036dd9..dff6fa43 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0050_remove_orderpayment_type_orderpayment_type.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc
index 79132a06..dac0ae50 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/0051_alter_orderpayment_amount.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc
new file mode 100644
index 00000000..3b694976
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0052_alter_orderstatus_status.cpython-310.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc
index cc0f6a19..365d085d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/billing/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc
index 49f82b59..2b478517 100644
Binary files a/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc and b/osinaweb/customercore/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/admin.cpython-310.pyc b/osinaweb/customercore/__pycache__/admin.cpython-310.pyc
index cf27a1c0..5cedacf7 100644
Binary files a/osinaweb/customercore/__pycache__/admin.cpython-310.pyc and b/osinaweb/customercore/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/apps.cpython-310.pyc b/osinaweb/customercore/__pycache__/apps.cpython-310.pyc
index fcf09ac1..dc633f34 100644
Binary files a/osinaweb/customercore/__pycache__/apps.cpython-310.pyc and b/osinaweb/customercore/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc
index 48846556..be2e079d 100644
Binary files a/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/customercore/__pycache__/custom_context.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc
index bc6873e0..8c42edbf 100644
Binary files a/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc and b/osinaweb/customercore/__pycache__/decorators.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/models.cpython-310.pyc b/osinaweb/customercore/__pycache__/models.cpython-310.pyc
index c12ecab9..0574dcd1 100644
Binary files a/osinaweb/customercore/__pycache__/models.cpython-310.pyc and b/osinaweb/customercore/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc
index 7d67831e..71f075c1 100644
Binary files a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc and b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index 36e1ecda..5a22e0ff 100644
Binary files a/osinaweb/customercore/__pycache__/views.cpython-310.pyc and b/osinaweb/customercore/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/customercore/custom_context.py b/osinaweb/customercore/custom_context.py
index e0bb04b1..e51fcf80 100644
--- a/osinaweb/customercore/custom_context.py
+++ b/osinaweb/customercore/custom_context.py
@@ -14,7 +14,7 @@ def utilities(request):
         customer = request.user.customerprofile
         active_subscriptions = OrderItem.objects.filter(active=True, order__customer=customer)
 
-        customer_open_projects = Project.objects.filter(Q(status='Active') | Q(status='Pending'), customer=customer)
+        customer_open_projects = Project.objects.filter(active=True, customer=customer)
         customer_open_projects_count = customer_open_projects.count()
 
         orders_with_invoice = Order.objects.filter(customer=customer, invoice__isnull=False)
diff --git a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc
index 9fbf7b1c..09b26d81 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc
index 3ddb58f0..3e5c0ce7 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0002_alter_ticket_department.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc
index 56ebeda7..26f41d01 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0003_ticket_customer_ticket_status_and_more.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc
index 9cd06f1e..b6d264e8 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0004_ticket_ticket_number_and_more.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc
index 220f632a..b3f1e480 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0005_ticketstatusupdate.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc
index 226044a8..2b3105e3 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0006_ticketupdate_read.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc
index b394775e..6ce5b2e6 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0007_remove_ticketupdate_read_ticketupdatereadstatus.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc
index 0d163e82..8b2e6148 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0008_rename_ticketupdatereadstatus_ticketread.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc
index 455440c8..d7b37b7a 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0009_alter_ticketattachment_ticket.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc
index b3a0c656..d8b65106 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0010_rename_ticketreaction_ticketupdatereaction.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc
index b370c54e..cff6b035 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/0011_ticketupdatereaction_customer.cpython-310.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc
index e614a182..810d5420 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc
new file mode 100644
index 00000000..0fa6eead
Binary files /dev/null and b/osinaweb/customercore/payment/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc
new file mode 100644
index 00000000..1a6f16a3
Binary files /dev/null and b/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index e52caca6..e79970f5 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc
index d0124e3e..82bdaa9d 100644
Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc
index 1ebb9a44..543d2c11 100644
Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc
index f4300a59..4d51390d 100644
Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
index d2e743c5..72a63cd3 100644
Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc b/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc
index f94951cf..eb731c08 100644
Binary files a/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/decorators.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc
index 87790d73..a6924eba 100644
Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc
index 4e673357..9a3d5bd5 100644
Binary files a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc
index 81ee75c3..94d68600 100644
Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 7a853f94..f868ce81 100644
Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc
index c5a6944c..21f0bdf5 100644
Binary files a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc
index eb46fe6d..83e9b0f6 100644
Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/admin.py b/osinaweb/osinacore/admin.py
index 864921ae..948d21ae 100644
--- a/osinaweb/osinacore/admin.py
+++ b/osinaweb/osinacore/admin.py
@@ -36,7 +36,7 @@ admin.site.register(Department)
 admin.site.register(StaffProfile)
 admin.site.register(ProjectType)
 admin.site.register(Project, ProjectAdmin)
-admin.site.register(Milestone)
+admin.site.register(ProjectStatus)
 admin.site.register(Epic)
 admin.site.register(Note)
 admin.site.register(Task)
diff --git a/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc
index c3da49ac..7ce8e885 100644
Binary files a/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/serializers.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc
index d0549264..889d81ec 100644
Binary files a/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc
index 3dafbb69..132af76d 100644
Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc
index ce1fab12..e0da06dd 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/delete/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc
index b8d8deae..d877a701 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/delete/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc
index 5760d0fd..19357acb 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc
index 13b32e5c..b63d1512 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/edit/urls.py b/osinaweb/osinacore/edit/urls.py
index c8ef0e2f..33bb189d 100644
--- a/osinaweb/osinacore/edit/urls.py
+++ b/osinaweb/osinacore/edit/urls.py
@@ -8,6 +8,7 @@ urlpatterns = [
     path('business/<str:business_id>/', views.edit_business, name='editbusiness'),
     path('staff/<str:staff_id>/', views.edit_staff, name='editstaff'),
     path('project/<str:project_id>/', views.edit_project, name='editproject'),
+    path('projectstatus/<str:project_id>/', views.edit_project_status_modal, name='editprojectstatusmodal'),
     path('task/<str:task_id>/', views.edit_task, name='edittask'),
     path('task-status/<str:task_id>/', views.edit_task_status_modal, name='edittaskstatusmodal'),
     path('epic/', views.edit_epic, name='editepic'),
diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py
index 4caac75e..a60ff363 100644
--- a/osinaweb/osinacore/edit/views.py
+++ b/osinaweb/osinacore/edit/views.py
@@ -205,6 +205,28 @@ def edit_project(request, project_id):
 
 
 
+@staff_login_required
+def edit_project_status_modal(request, project_id):
+    project = get_object_or_404(Project, id=project_id)
+    if request.method == 'POST':
+        project_status = ProjectStatus(
+            project = project,
+            status = request.POST.get('status'),
+            date = request.POST.get('date'),
+        )
+        project_status.save()
+
+        return redirect('detailed-project', project_id=project.project_id)
+
+    context = {
+        'project': project,
+
+    }
+
+    return render(request, 'edit_templates/edit-project-status-modal.html', context) 
+
+
+
 @staff_login_required
 def edit_task(request, task_id):
     task = get_object_or_404(Task, task_id=task_id)
diff --git a/osinaweb/osinacore/migrations/0077_remove_project_status_project_active_projectstatus.py b/osinaweb/osinacore/migrations/0077_remove_project_status_project_active_projectstatus.py
new file mode 100644
index 00000000..c5e2b5ca
--- /dev/null
+++ b/osinaweb/osinacore/migrations/0077_remove_project_status_project_active_projectstatus.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.5 on 2024-05-11 19:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0076_alter_reference_date'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='project',
+            name='status',
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='active',
+            field=models.BooleanField(default=True, null=True),
+        ),
+        migrations.CreateModel(
+            name='ProjectStatus',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('status', models.CharField(choices=[('Active', 'Active'), ('Completed', 'Completed'), ('Pending', 'Pending'), ('Cancelled', 'Cancelled')], max_length=200)),
+                ('date', models.DateTimeField()),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='osinacore.project')),
+            ],
+        ),
+    ]
diff --git a/osinaweb/osinacore/migrations/0078_alter_projectstatus_status.py b/osinaweb/osinacore/migrations/0078_alter_projectstatus_status.py
new file mode 100644
index 00000000..1680c92c
--- /dev/null
+++ b/osinaweb/osinacore/migrations/0078_alter_projectstatus_status.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2024-05-11 20:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0077_remove_project_status_project_active_projectstatus'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='projectstatus',
+            name='status',
+            field=models.CharField(choices=[('In Progress', 'In Progress'), ('Completed', 'Completed'), ('Pending', 'Pending'), ('Cancelled', 'Cancelled')], max_length=200),
+        ),
+    ]
diff --git a/osinaweb/osinacore/migrations/0079_alter_project_end_date_alter_project_start_date.py b/osinaweb/osinacore/migrations/0079_alter_project_end_date_alter_project_start_date.py
new file mode 100644
index 00000000..7c874e6a
--- /dev/null
+++ b/osinaweb/osinacore/migrations/0079_alter_project_end_date_alter_project_start_date.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.5 on 2024-05-11 20:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0078_alter_projectstatus_status'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='project',
+            name='end_date',
+            field=models.DateField(),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='start_date',
+            field=models.DateField(),
+        ),
+    ]
diff --git a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc
index d230e1e8..06badf77 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc
index 36557745..a0ca6799 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc
index 229998df..f0fd9b92 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc
index 1bfbc21c..72f61afe 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc
index 710280c5..c18d2ce0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc
index f783315e..fdc62828 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc
index 4e3e2d3f..dd5d9e9c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc
index 8dc9d6cd..08d33ce1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc
index 6c0b5470..d43675ea 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc
index 8256df63..65506d5a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc
index 390e95c0..3c9ebbd8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc
index 4dc5c33f..115b2216 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc
index 19227321..06ad8274 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc
index 7a44b3ee..f87cc290 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc
index 839cc7d6..6fe46c29 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc
index e8222c3f..59bf8fb7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc
index 1f2e6821..974c4c32 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc
index 4e83db31..0bee30ba 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc
index 798b212e..877d8e12 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc
index 16a276b2..909f2374 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc
index 17813852..9154626d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc
index 530a63c6..20005403 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc
index df947b96..1f5084cd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc
index 86846cb0..517441c4 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc
index 63088fc7..be6fd117 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc
index 30e7dc2f..91d20594 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc
index f8b2a120..71388e70 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc
index b5e71473..9a8dc1bd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc
index 6055cd57..df1ff0a6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc
index 897bc33e..0eea9f25 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc
index 03b525a7..54c51e5b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc
index a7833792..a5157e78 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc
index 951fea3d..1a4ce30e 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc
index d0baa93f..8b15c372 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc
index 78c93d3c..299d41d6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc
index e5296020..4e41addc 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc
index bf29e53b..078a888a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc
index 1eb2652f..5ebe7a6f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc
index a5335f4d..39b4331c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc
index 7af80728..be8c8764 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc
index 46fcd82c..c0a8ce96 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc
index 6aad526a..928e68ca 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc
index e949ab6d..4f85c47c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc
index 1c917dfe..a0e90908 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc
index 802b17e2..001070e2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc
index 9b194205..92339e08 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc
index 0142c2b0..d6c96bad 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc
index aa8bafc3..ba31a998 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc
index cd3a6f68..32ea3a1a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc
index c5b63777..c990c2da 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc
index 756c2d2f..e3e51333 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc
index 02b6575e..b35520ea 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc
index 530e3939..2192181f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc
index 40bbd9b0..13f0c4ac 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc
index 94043b1e..f6547187 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc
index 4159e16d..2f6ac883 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc
index 9b152251..c62ff1f8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc
index 73cefaeb..a4edd19f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc
index a5446541..5a914446 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc
index 23409027..3c5293fe 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc
index b325ce9f..2c060388 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc
index 15be7784..ae3cc905 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc
index b912f3df..c860aff8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc
index ab05e37f..51ca1bcb 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc
index 69217bfa..789e8a41 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc
index 962693d4..fd674ad6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc
index f5b4528f..bb6ad78b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc
index 2fd493e3..ad28448b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc
index 12c29149..64f93ac0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc
index 486bd2a7..a07a8ad6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc
index d18192d8..bcfa1742 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc
index 5aa935fd..098f7bd9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc
index 88e44b02..a6f039fd 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc
index 998f257a..f0a9f3a8 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc
index 893fc6fb..b0868d64 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc
index d618d0c5..1dfff110 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc
new file mode 100644
index 00000000..f96b1371
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc
new file mode 100644
index 00000000..4c5df59a
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc
new file mode 100644
index 00000000..17b8b79d
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc
index 2c3162a8..259994fa 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py
index 81949334..d7d61b75 100644
--- a/osinaweb/osinacore/models.py
+++ b/osinaweb/osinacore/models.py
@@ -144,15 +144,9 @@ class Project(models.Model):
     project_type = models.ManyToManyField('ProjectType', default='', related_name='manager_project')
     details = models.TextField()
     members = models.ManyToManyField('StaffProfile', default='', related_name='members_project')
-    STATUS_CHOICES = (
-        ('Active', 'Active'),
-        ('Completed', 'Completed'),
-        ('Pending', 'Pending'),
-        ('Cancelled', 'Cancelled'),
-    )
-    status = models.CharField(max_length=200, choices=STATUS_CHOICES)
-    start_date = models.CharField(max_length=200)
-    end_date = models.CharField(max_length=200)
+    start_date = models.DateField()
+    end_date = models.DateField()
+    active = models.BooleanField(default=True, null=True)
     project_id = models.CharField(max_length=20, null=True, blank=True)  
     def __str__(self):
         return self.name
@@ -167,6 +161,19 @@ class Project(models.Model):
         super(Project, self).save(*args, **kwargs)
 
 
+class ProjectStatus(models.Model):
+    STATUS_CHOICES = (
+        ('In Progress', 'In Progress'),
+        ('Completed', 'Completed'),
+        ('Pending', 'Pending'),
+        ('Cancelled', 'Cancelled'),
+    )
+    project = models.ForeignKey(Project, on_delete=models.CASCADE)
+    status = models.CharField(max_length=200, choices=STATUS_CHOICES)
+    date = models.DateTimeField()
+
+
+
 class Milestone(models.Model):
     title = models.CharField(max_length=150)
     description = models.TextField()
diff --git a/osinaweb/osinacore/templates/details_templates/project-details.html b/osinaweb/osinacore/templates/details_templates/project-details.html
index f277ffb7..15811782 100644
--- a/osinaweb/osinacore/templates/details_templates/project-details.html
+++ b/osinaweb/osinacore/templates/details_templates/project-details.html
@@ -6,30 +6,17 @@
 
 
 <div class="w-full xxlg1:w-[74.5%] bg-white h-fit rounded-md shadow-md p-5">
-    {% if project.status == 'Completed' %}
-    <div class="w-full bg-green-700 rounded-md flex flex-col justify-center items-center py-2">
-        <h1 class="text-xl md:text-3xl text-white font-semibold text-center">{{project.name}}</h1>
-        <p class="text-white text-center text-base">{{project.project_id}}</p>
-    </div>
-    {% endif %}
-    {% if project.status == 'Cancelled' %}
-    <div class="w-full  bg-red-500 rounded-md flex flex-col justify-center items-center py-2">
-        <h1 class="text-xl md:text-3xl text-white font-semibold text-center">{{project.name}}</h1>
-        <p class="text-white text-center text-base">{{project.project_id}}</p>
-    </div>
-    {% endif %}
-    {% if project.status == 'Active' %}
-    <div class="w-full  bg-orange-500 rounded-md flex flex-col justify-center items-center py-2">
-        <h1 class="text-xl md:text-3xl text-white font-semibold text-center">{{project.name}}</h1>
-        <p class="text-white text-center text-base">{{project.project_id}}</p>
-    </div>
-    {% endif %}
-    {% if project.status == 'Pending' %}
-    <div class="w-full bg-yellow-400 rounded-md flex flex-col justify-center items-center py-2">
+
+    <div class="w-full rounded-md flex flex-col justify-center items-center py-2
+    {% if project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %}
+    {% if project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %}
+    {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %}
+    {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %}">
         <h1 class="text-xl md:text-3xl text-white font-semibold text-center">{{project.name}}</h1>
         <p class="text-white text-center text-base">{{project.project_id}}</p>
     </div>
-    {% endif %}
+
+
     <div class="w-full rounded-b-md flex xll:hidden items-center">
         <button
             class="w-[50%] text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-bl-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 deleteProjectButton"
@@ -59,6 +46,11 @@
     <div
         class="w-full h-fit md:h-[70px] flex justify-between items-center bg-gray-100 shadow-md rounded-md px-3 py-3 md:py-1 mt-4">
         <div class="w-full md:w-fit flex flex-col md:flex-row justify-start items-center gap-3">
+            <button data-modal-url="{% url 'editprojectstatusmodal' project.id %}"
+            class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white editProjectStatusButton">
+            Update Status
+            </button>
+
             <a href="{% url 'addepic' project.project_id %}" class="w-full md:w-fit">
                 <button
                     class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create
@@ -72,9 +64,6 @@
             <button
                 class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create
                 Story</button>
-            <button
-                class="w-full md:w-fit text-base px-3 py-2 bg-transparent text-osiblue outline-none border border-osiblue duration-300 rounded-md cursor-pointer hover:bg-osiblue hover:text-white">Create
-                Milestone</button>
         </div>
         <div class="hidden xll:flex justify-end items-center gap-3">
             <button
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-project-status-modal.html b/osinaweb/osinacore/templates/edit_templates/edit-project-status-modal.html
new file mode 100644
index 00000000..14b6e49f
--- /dev/null
+++ b/osinaweb/osinacore/templates/edit_templates/edit-project-status-modal.html
@@ -0,0 +1,42 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form id="hiddenContent" method="POST" action="{% url 'editprojectstatusmodal' project.id %}">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Update Project Status</h1>
+
+        <select name="status" id="" class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
+            <option value="Completed">Completed</option>
+            <option value="In Progress">In Progress</option>
+            <option value="Pending">Pending</option>
+            <option value="Cancelled">Cancelled</option>
+        </select>
+
+
+        <div class="w-full">
+            <input required name="date" type="date" id="date" name="date"
+                class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
+        </div>
+
+
+        <div class="w-full flex justify-center items-center mt-4">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue">Save</button>
+        </div>
+    </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-project.html b/osinaweb/osinacore/templates/edit_templates/edit-project.html
index f2d238a7..18786bca 100644
--- a/osinaweb/osinacore/templates/edit_templates/edit-project.html
+++ b/osinaweb/osinacore/templates/edit_templates/edit-project.html
@@ -73,12 +73,8 @@
                 <select required name="types" id=""
                     class="w-full h-[100px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1"
                     multiple>
-                    {%for type in types %}
-                      {% if type in project.project_type.all %}
-                       <option value="{{type.id}}" selected>{{type.name}}</option>
-                      {%else%}
-                        <option value="{{type.id}}" >{{type.name}}</option>
-                      {% endif %}
+                    {% for type in types %}
+                        <option value="{{type.id}}"  {% if type in project.project_type.all %} selected {% endif %} >{{type.name}}</option>
                     {% endfor %}
                 </select>
             </div>
@@ -92,7 +88,7 @@
 
             <div class="w-full">
                 <label class="text-gray-500">Start Date:</label>
-                <input required name="start_date" type="date" id="date" name="date"
+                <input required name="start_date" type="date"  id="startDateDisplay" name="date"
                 value='{{project.start_date|date:"Y-m-d"}}'
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
             </div>
@@ -100,11 +96,32 @@
 
             <div class="w-full">
                 <label class="text-gray-500">End Date:</label>
-                <input required name="end_date" type="date" id="date" name="date"
+                <input required name="end_date" type="date" id="closingDateDisplay" name="date"
                 value='{{project.end_date|date:"Y-m-d"}}'
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-2">
             </div>
 
+
+            <script>
+                const startDatePicker = document.getElementById('startDate');
+                const startDateDisplay = document.getElementById('startDateDisplay');
+                const closingDatePicker = document.getElementById('closingDate');
+                const closingDateDisplay = document.getElementById('closingDateDisplay');
+                // Adding an input event listener to the starting date picker input
+                startDatePicker.addEventListener('input', () => {
+                    // When a date is selected, update the value of the starting date display input
+                    startDateDisplay.value = startDatePicker.value;
+                });
+
+                closingDatePicker.addEventListener('input', () => {
+                    closingDateDisplay.value = closingDatePicker.value;
+                });
+
+                drawDatePicker.addEventListener('input', () => {
+                    drawDateDisplay.value = drawDatePicker.value;
+                });
+            </script>
+
             <div class="w-full flex justify-center items-center mt-4">
                 <button type="submit"
                     class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue duration-300">Save</button>
diff --git a/osinaweb/osinacore/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html
index c5f7ca6b..edf67577 100644
--- a/osinaweb/osinacore/templates/listing_pages/projects.html
+++ b/osinaweb/osinacore/templates/listing_pages/projects.html
@@ -51,10 +51,10 @@
 
 
             <div class="w-full bg-white h-fit rounded-md border border-gray-200">
-                <div class="w-full px-5 py-5 {% if project.status == 'Completed' %}bg-green-700{% endif %}
-                {% if project.status == 'Cancelled' %}bg-red-500{% endif %}
-                {% if project.status == 'Active' %}bg-orange-500{% endif %}
-                {% if project.status == 'Pending' %}bg-yellow-500{% endif %}
+                <div class="w-full px-5 py-5 {% if project.projectstatus_set.all.last.status == 'Completed' %}bg-green-700{% endif %}
+                {% if project.projectstatus_set.all.last.status == 'Cancelled' %}bg-red-500{% endif %}
+                {% if project.projectstatus_set.all.last.status == 'In Progress' %}bg-orange-500{% endif %}
+                {% if project.projectstatus_set.all.last.status == 'Pending' %}bg-yellow-500{% endif %}
                 flex justify-center items-center text-center text-white rounded-t-md text-[17px] s:text-[20px]">
                     <p>{{project.name}}</p>
                 </div>
@@ -79,7 +79,7 @@
                                         d="M6 6.878V6a2.25 2.25 0 0 1 2.25-2.25h7.5A2.25 2.25 0 0 1 18 6v.878m-12 0c.235-.083.487-.128.75-.128h10.5c.263 0 .515.045.75.128m-12 0A2.25 2.25 0 0 0 4.5 9v.878m13.5-3A2.25 2.25 0 0 1 19.5 9v.878m0 0a2.246 2.246 0 0 0-.75-.128H5.25c-.263 0-.515.045-.75.128m15 0A2.25 2.25 0 0 1 21 12v6a2.25 2.25 0 0 1-2.25 2.25H5.25A2.25 2.25 0 0 1 3 18v-6c0-.98.626-1.813 1.5-2.122" />
                                 </svg>
 
-                                <p class="text-secondosiblue"><span class="font-poppinsBold">6</span> Open Tasks</p>
+                                <p class="text-secondosiblue"><span class="font-poppinsBold">{{project.open_user_tasks_count}}</span> Open {% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}</p>
                             </div>
 
 
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 6e0c3c68..0919004f 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -302,6 +302,15 @@ def my_projects(request, *args, **kwargs):
         project.total_time_worked_minutes = total_time_minutes
         project.total_time_worked_seconds = total_time_seconds
 
+        if user.is_superuser:
+            open_user_tasks_count = Task.objects.filter(project=project).exclude(status='Closed').count()
+        else:
+            open_user_tasks_count = Task.objects.filter(project=project, assigned_to=user.staffprofile).exclude(status='Closed').count()
+
+
+        project.open_user_tasks_count = open_user_tasks_count
+
+
     context = {
         'projects': projects,
     }
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc
index 35e269ea..16fc6180 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index fbf7cf00..e8f491a7 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc
index 6329ca7e..b551ca84 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc
index ac072b7e..a32a6e22 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-310.pyc differ
diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js
index 4cf461e4..c53968a5 100644
--- a/osinaweb/static/js/pop-modals.js
+++ b/osinaweb/static/js/pop-modals.js
@@ -72,6 +72,7 @@ document.addEventListener("DOMContentLoaded", function () {
 
     addButtonClickListener("addPaymentMethodButton", "500px", "400px");
     addButtonClickListener("updateOrderStatusButton", "400px", "160px");
+    addButtonClickListener("editProjectStatusButton", "400px", "220px");