diff --git a/inventory/migrations/0022_merge_20241225_1754.py b/inventory/migrations/0022_merge_20241225_1754.py new file mode 100644 index 00000000..b69fff19 --- /dev/null +++ b/inventory/migrations/0022_merge_20241225_1754.py @@ -0,0 +1,14 @@ +# Generated by Django 4.2.17 on 2024-12-25 14:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0017_dealer_email'), + ('inventory', '0021_remove_additionalservices_vatable_and_more'), + ] + + operations = [ + ] diff --git a/inventory/migrations/0023_remove_dealer_email.py b/inventory/migrations/0023_remove_dealer_email.py new file mode 100644 index 00000000..42c5ffd4 --- /dev/null +++ b/inventory/migrations/0023_remove_dealer_email.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.17 on 2024-12-25 15:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0022_merge_20241225_1754'), + ] + + operations = [ + migrations.RemoveField( + model_name='dealer', + name='email', + ), + ] diff --git a/inventory/migrations/0024_dealer_email.py b/inventory/migrations/0024_dealer_email.py new file mode 100644 index 00000000..524efd73 --- /dev/null +++ b/inventory/migrations/0024_dealer_email.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.17 on 2024-12-25 15:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventory', '0023_remove_dealer_email'), + ] + + operations = [ + migrations.AddField( + model_name='dealer', + name='email', + field=models.EmailField(default='ismail@tenhal.com', max_length=254, unique=True, verbose_name='Email'), + preserve_default=False, + ), + ] diff --git a/inventory/models.py b/inventory/models.py index ed06a68f..cbba93d3 100644 --- a/inventory/models.py +++ b/inventory/models.py @@ -499,6 +499,7 @@ class Dealer(models.Model, LocalizedNameMixin): upload_to="logos/users", blank=True, null=True, verbose_name=_("Logo") ) joined_at = models.DateTimeField(auto_now_add=True, verbose_name=_("Joined At")) + # entity = models.ForeignKey(EntityModel,on_delete=models.CASCADE,null=True,blank=True) email = models.EmailField(unique=True, verbose_name=_("Email")) parent_dealer = models.ForeignKey( "self", @@ -535,8 +536,6 @@ class Dealer(models.Model, LocalizedNameMixin): return None - - class Meta: verbose_name = _("Dealer") verbose_name_plural = _("Dealers") diff --git a/inventory/signals.py b/inventory/signals.py index f5adbeed..437e9510 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -66,8 +66,7 @@ def create_ledger_entity(sender, instance, created, **kwargs): if created: entity, created = EntityModel.objects.get_or_create( name=instance.get_root_dealer.name, - admin=instance.get_root_dealer.user, - # address_1=instance.address, + admin=instance.get_root_dealer.user, accrual_method=False, fy_start_month=1, depth=0, diff --git a/templates/base.html b/templates/base.html index 3e595344..db0b2cbc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -418,8 +418,9 @@ {% if user.is_authenticated and user.dealer or user.subdealer%}