update on the po and bill
This commit is contained in:
parent
a9b4186df7
commit
7b3fc15efd
@ -449,6 +449,10 @@ def po_item_table1(context, queryset):
|
|||||||
"purchase_orders/includes/po_item_formset.html", takes_context=True
|
"purchase_orders/includes/po_item_formset.html", takes_context=True
|
||||||
)
|
)
|
||||||
def po_item_formset_table(context, po_model, itemtxs_formset):
|
def po_item_formset_table(context, po_model, itemtxs_formset):
|
||||||
|
# print(len(itemtxs_formset.forms))
|
||||||
|
|
||||||
|
for form in itemtxs_formset.forms:
|
||||||
|
form.fields['item_model'].queryset = form.fields['item_model'].queryset.filter(item_role="inventory")
|
||||||
return {
|
return {
|
||||||
"entity_slug": context["view"].kwargs["entity_slug"],
|
"entity_slug": context["view"].kwargs["entity_slug"],
|
||||||
"po_model": po_model,
|
"po_model": po_model,
|
||||||
|
|||||||
@ -9100,14 +9100,31 @@ class PurchaseOrderUpdateView(PurchaseOrderModelUpdateViewBase):
|
|||||||
template_name = "purchase_orders/po_update.html"
|
template_name = "purchase_orders/po_update.html"
|
||||||
context_object_name = "po_model"
|
context_object_name = "po_model"
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, itemtxs_formset=None, **kwargs):
|
||||||
dealer = get_user_type(self.request)
|
dealer = get_user_type(self.request)
|
||||||
context = super().get_context_data(**kwargs)
|
context = super().get_context_data(**kwargs)
|
||||||
context["entity_slug"] = dealer.entity.slug
|
context["entity_slug"] = dealer.entity.slug
|
||||||
context["make_data"] = models.CarMake.objects.all()
|
po_model: PurchaseOrderModel = self.object
|
||||||
context["model_data"] = models.CarModel.objects.none()
|
# context["make_data"] = models.CarMake.objects.all()
|
||||||
context["serie_data"] = models.CarSerie.objects.none()
|
# context["model_data"] = models.CarModel.objects.none()
|
||||||
context["trim_data"] = models.CarTrim.objects.none()
|
# context["serie_data"] = models.CarSerie.objects.none()
|
||||||
|
# context["trim_data"] = models.CarTrim.objects.none()
|
||||||
|
# itemtxs_qs = dealer.entity.get_items_inventory().filter(item_role="inventory")
|
||||||
|
if not itemtxs_formset:
|
||||||
|
itemtxs_qs = self.get_po_itemtxs_qs(po_model)
|
||||||
|
itemtxs_qs, itemtxs_agg = po_model.get_itemtxs_data(queryset=itemtxs_qs)
|
||||||
|
po_itemtxs_formset_class = get_po_itemtxs_formset_class(po_model)
|
||||||
|
itemtxs_formset = po_itemtxs_formset_class(
|
||||||
|
entity_slug=dealer.entity.slug,
|
||||||
|
user_model=dealer.entity.admin,
|
||||||
|
po_model=po_model,
|
||||||
|
queryset=itemtxs_qs,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
itemtxs_qs, itemtxs_agg = po_model.get_itemtxs_data()
|
||||||
|
|
||||||
|
context['itemtxs_qs'] = itemtxs_qs
|
||||||
|
context['itemtxs_formset'] = itemtxs_formset
|
||||||
return context
|
return context
|
||||||
|
|
||||||
def get_success_url(self):
|
def get_success_url(self):
|
||||||
@ -9127,7 +9144,7 @@ class PurchaseOrderUpdateView(PurchaseOrderModelUpdateViewBase):
|
|||||||
kwargs={"entity_slug": entity_slug, "po_pk": po_pk},
|
kwargs={"entity_slug": entity_slug, "po_pk": po_pk},
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
return super(PurchaseOrderModelUpdateViewBase, self).get(
|
return super(PurchaseOrderUpdateView, self).get(
|
||||||
request, entity_slug, po_pk, *args, **kwargs
|
request, entity_slug, po_pk, *args, **kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -9227,7 +9244,9 @@ class BasePurchaseOrderActionActionView(BasePurchaseOrderActionActionViewBase):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
kwargs["user_model"] = self.request.user
|
# kwargs["user_model"] = self.request.user
|
||||||
|
dealer = get_user_type(request)
|
||||||
|
kwargs["user_model"] = dealer.entity.admin
|
||||||
if not self.action_name:
|
if not self.action_name:
|
||||||
raise ImproperlyConfigured("View attribute action_name is required.")
|
raise ImproperlyConfigured("View attribute action_name is required.")
|
||||||
response = super(BasePurchaseOrderActionActionView, self).get(
|
response = super(BasePurchaseOrderActionActionView, self).get(
|
||||||
@ -9236,13 +9255,19 @@ class BasePurchaseOrderActionActionView(BasePurchaseOrderActionActionViewBase):
|
|||||||
po_model: PurchaseOrderModel = self.get_object()
|
po_model: PurchaseOrderModel = self.get_object()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
getattr(po_model, self.action_name)(commit=self.commit, **kwargs)
|
getattr(po_model, self.action_name)(commit=self.commit,**kwargs)
|
||||||
except ValidationError as e:
|
|
||||||
messages.add_message(
|
messages.add_message(
|
||||||
request,
|
request,
|
||||||
message=e.message,
|
message="PO updated successfully.",
|
||||||
level=messages.ERROR,
|
level=messages.SUCCESS,
|
||||||
)
|
)
|
||||||
|
except ValidationError as e:
|
||||||
|
print(e)
|
||||||
|
# messages.add_message(
|
||||||
|
# request,
|
||||||
|
# message=e.message,
|
||||||
|
# level=messages.ERROR,
|
||||||
|
# )
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
{% load trans from i18n %}
|
{% load trans from i18n %}
|
||||||
{% load django_ledger %}
|
{% load currency_symbol from django_ledger %}
|
||||||
|
{% load icon from django_ledger %}
|
||||||
|
{% load custom_filters %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
|
|
||||||
<form action="{% url 'purchase_order_update_items' entity_slug=entity_slug po_pk=po_model.uuid %}"
|
<form action="{% url 'purchase_order_update_items' entity_slug=entity_slug po_pk=po_model.uuid %}"
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% load static %}
|
{% load static %}
|
||||||
{% load django_ledger %}
|
{% load currency_symbol from django_ledger %}
|
||||||
{% load custom_filters %}
|
{% load custom_filters %}
|
||||||
{% load widget_tweaks %}
|
{% load widget_tweaks %}
|
||||||
{% load crispy_forms_tags %}
|
{% load crispy_forms_tags %}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user