ismail/haikal
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ismail:1f7b466bb0498b78418bd5bd78040c667bd6eb1d
Branches Tags
ismail:main
ismail:frontend
...
compare: ismail:305f53c43961b7ceaacdf85fa1c35ece4cf3149f
Branches Tags
ismail:main
ismail:frontend

5 Commits
1f7b466bb0 ... 305f53c439

Author SHA1 Message Date
ismail
305f53c439 update 2025-09-25 12:37:12 +03:00
Faheed
eb160d98e2 update vendor name 2025-09-25 12:18:18 +03:00
Faheed
11f7da4410 Merge branch 'main' of http://10.10.1.136:3000/ismail/haikal into frontend 2025-09-25 12:05:27 +03:00
Faheed
8af19b62d4 fix the vendor address field not matching with ledger address length 2025-09-25 12:04:09 +03:00
Faheed
3a0d50a4e1 car purchase report po filter query based on po_satus fulfilled nad aproved 2025-09-24 19:32:03 +03:00
2 changed files with 7 additions and 8 deletions
Show Stats Expand all files Collapse all files

13
inventory/models.py
View File

@ -2717,8 +2717,7 @@ class Notification(models.Model):
class Vendor(models.Model, LocalizedNameMixin): class Vendor(models.Model, LocalizedNameMixin):
dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE, related_name="vendors") dealer = models.ForeignKey(Dealer, on_delete=models.CASCADE, related_name="vendors")
crn = models.CharField( crn = models.CharField(unique=True, verbose_name=_("Commercial Registration Number")
max_length=10, unique=True, verbose_name=_("Commercial Registration Number")
) )
vrn = models.CharField( vrn = models.CharField(
max_length=15, unique=True, verbose_name=_("VAT Registration Number") max_length=15, unique=True, verbose_name=_("VAT Registration Number")
@ -2730,16 +2729,16 @@ class Vendor(models.Model, LocalizedNameMixin):
null=True, null=True,
blank=True, blank=True,
) )
arabic_name = models.CharField(max_length=255, verbose_name=_("Arabic Name")) arabic_name = models.CharField(max_length=100, verbose_name=_("Arabic Name"))
name = models.CharField(max_length=255, verbose_name=_("English 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) contact_person = models.CharField(max_length=100, verbose_name=_("Contact Person"),null=True, blank=True)
phone_number = models.CharField( phone_number = models.CharField(
max_length=255, max_length=20,
verbose_name=_("Phone Number"), verbose_name=_("Phone Number"),
validators=[SaudiPhoneNumberValidator()], validators=[SaudiPhoneNumberValidator()],
) )
email = models.EmailField(max_length=255, verbose_name=_("Email Address")) 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( logo = models.ImageField(
upload_to="logos/vendors", upload_to="logos/vendors",
blank=True, blank=True,
@ -2821,7 +2820,7 @@ class Vendor(models.Model, LocalizedNameMixin):
self.vendor_model.save() self.vendor_model.save()
def create_vendor_account(self, role): def create_vendor_account(self, role):
entity = self.dealer.entity entity:EntityModel = self.dealer.entity
coa = entity.get_default_coa() coa = entity.get_default_coa()
last_account = ( last_account = (
entity.get_all_accounts().filter(role=role).order_by("-created").first() entity.get_all_accounts().filter(role=role).order_by("-created").first()

2
inventory/views.py
View File

@ -11810,7 +11810,7 @@ def purchase_report_view(request, dealer_slug):
start_date_str = request.GET.get("start_date") start_date_str = request.GET.get("start_date")
end_date_str = request.GET.get("end_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: if start_date_str:
try: try: