Compare commits
5 Commits
1f7b466bb0
...
305f53c439
| Author | SHA1 | Date | |
|---|---|---|---|
| 305f53c439 | |||
| eb160d98e2 | |||
| 11f7da4410 | |||
| 8af19b62d4 | |||
| 3a0d50a4e1 |
@ -2717,8 +2717,7 @@ class Notification(models.Model):
|
||||
|
||||
class Vendor(models.Model, LocalizedNameMixin):
|
||||
dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE, related_name="vendors")
|
||||
crn = models.CharField(
|
||||
max_length=10, unique=True, verbose_name=_("Commercial Registration Number")
|
||||
crn = models.CharField(unique=True, verbose_name=_("Commercial Registration Number")
|
||||
)
|
||||
vrn = models.CharField(
|
||||
max_length=15, unique=True, verbose_name=_("VAT Registration Number")
|
||||
@ -2730,16 +2729,16 @@ class Vendor(models.Model, LocalizedNameMixin):
|
||||
null=True,
|
||||
blank=True,
|
||||
)
|
||||
arabic_name = models.CharField(max_length=255, verbose_name=_("Arabic Name"))
|
||||
name = models.CharField(max_length=255, verbose_name=_("English Name"))
|
||||
arabic_name = models.CharField(max_length=100, verbose_name=_("Arabic Name"))
|
||||
name = models.CharField(max_length=100, verbose_name=_("English Name"))
|
||||
contact_person = models.CharField(max_length=100, verbose_name=_("Contact Person"),null=True, blank=True)
|
||||
phone_number = models.CharField(
|
||||
max_length=255,
|
||||
max_length=20,
|
||||
verbose_name=_("Phone Number"),
|
||||
validators=[SaudiPhoneNumberValidator()],
|
||||
)
|
||||
email = models.EmailField(max_length=255, verbose_name=_("Email Address"))
|
||||
address = models.CharField(max_length=255, verbose_name=_("Address"),null=True, blank=True)
|
||||
address = models.CharField(max_length=70, verbose_name=_("Address"))
|
||||
logo = models.ImageField(
|
||||
upload_to="logos/vendors",
|
||||
blank=True,
|
||||
@ -2821,7 +2820,7 @@ class Vendor(models.Model, LocalizedNameMixin):
|
||||
self.vendor_model.save()
|
||||
|
||||
def create_vendor_account(self, role):
|
||||
entity = self.dealer.entity
|
||||
entity:EntityModel = self.dealer.entity
|
||||
coa = entity.get_default_coa()
|
||||
last_account = (
|
||||
entity.get_all_accounts().filter(role=role).order_by("-created").first()
|
||||
|
||||
@ -11810,7 +11810,7 @@ def purchase_report_view(request, dealer_slug):
|
||||
start_date_str = request.GET.get("start_date")
|
||||
end_date_str = request.GET.get("end_date")
|
||||
|
||||
pos = request.entity.get_purchase_orders()
|
||||
pos = request.entity.get_purchase_orders().filter(po_status__in=['approved','fulfilled'])
|
||||
|
||||
if start_date_str:
|
||||
try:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user