Commit 9474b854 by Solo Group

VSI

1 parent c36f2f48
...@@ -92,7 +92,7 @@ class Vendor(VendorClass): ...@@ -92,7 +92,7 @@ class Vendor(VendorClass):
elif resp.status_code == 400: elif resp.status_code == 400:
self.status = -1 self.status = -1
message = "data" in result and result["data"] or "" message = "data" in result and result["data"] or {}
message = message and "errors" in message and message["errors"] or message message = message and "errors" in message and message["errors"] or message
message = type(message) is list and ", ".join(message) or message message = type(message) is list and ", ".join(message) or message
...@@ -404,7 +404,11 @@ class Vendor(VendorClass): ...@@ -404,7 +404,11 @@ class Vendor(VendorClass):
self.amt_buy = result["total"] self.amt_buy = result["total"]
adm_jual = self.vendor_produk.produk.harga*i adm_jual = self.vendor_produk.produk.harga*i
product_id = self.invoice_det.produk.id product_id = self.invoice_det.produk.id
if hasattr(self.invoice_det, "customer_id"):
partner_id = self.invoice_det.customer_id
else:
partner_id = self.invoice_det.h2h_ar_invoice.customer_id partner_id = self.invoice_det.h2h_ar_invoice.customer_id
discount = PartnerProduk.get_discount(partner_id, product_id) discount = PartnerProduk.get_discount(partner_id, product_id)
self.discount = discount * i self.discount = discount * i
harga_pokok = self.amt_buy - rincian["admin"] harga_pokok = self.amt_buy - rincian["admin"]
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!