Commit 1431ba15 by Solo Group

VSI

1 parent 5bf44aae
...@@ -402,18 +402,23 @@ class Vendor(VendorClass): ...@@ -402,18 +402,23 @@ class Vendor(VendorClass):
i += 1 i += 1
self.amt_buy = result["total"] self.amt_buy = result["total"]
adm_jual = self.vendor_produk.produk.harga*i harga_pokok = result["subtotal"] - rincian["admin"]
admin = self.vendor_produk.produk.harga*i
rincian["admin"] = admin
result["subtotal"] = int(harga_pokok) + admin
product_id = self.invoice_det.produk.id product_id = self.invoice_det.produk.id
if hasattr(self.invoice_det, "customer_id"): if hasattr(self.invoice_det, "customer_id"):
partner_id = self.invoice_det.customer_id partner_id = self.invoice_det.customer_id
else: else:
partner_id = self.invoice_det.h2h_ar_invoice.customer_id partner_id = self.invoice_det.h2h_ar_invoice.customer_id
# hitung discount jika discount awal negatif discount + discount awal
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"] if result["discount"] < 0:
self.amt_sell = int(harga_pokok) + adm_jual self.discount += result["discount"]
result["discount"] = self.discount result["discount"] = self.discount
self.amt_sell = int(harga_pokok) + admin - self.discount
result["total"] = self.amt_sell result["total"] = self.amt_sell
result['jml_data'] = i result['jml_data'] = i
result['rincian'] = rincian result['rincian'] = rincian
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!