fix: parameters for PI references

(cherry picked from commit 8b3d466) # Conflicts: # erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py # erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
frappe · Jun 15, 2024 · 8618402 · 8618402
1 parent c7c9d33
commit 8618402
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -252,11 +252,18 @@ def update_landed_cost(self):
 			doc.docstatus = 1
 			doc.make_bundle_using_old_serial_batch_fields(via_landed_cost_voucher=True)
 			doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
+<<<<<<< HEAD
 <<<<<<< HEAD
 			doc.make_gl_entries()
 			doc.repost_future_sle_and_gle(via_landed_cost_voucher=True)
 =======
 			doc.make_gl_entries(via_landed_cost_voucher=True)
+=======
+			if d.receipt_document_type == "Purchase Receipt":
+				doc.make_gl_entries(via_landed_cost_voucher=True)
+			else:
+				doc.make_gl_entries()
+>>>>>>> 8b3d46610e (fix: parameters for PI references)
 			doc.repost_future_sle_and_gle()
 >>>>>>> baa3fee1bf (fix: add LCV flag to determine negative expenses)
 

diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -2956,7 +2956,11 @@ def test_valuation_taxes_lcv_repost_after_billing(self):
 			("Expenses Included In Valuation - _TC", 0, 2000, "Main - _TC"),
 		)
 		self.assertSequenceEqual(expected_gle, gl_entries)
+<<<<<<< HEAD
 >>>>>>> 53642e7417 (test: LCV entries after billing)
+=======
+		frappe.db.rollback()
+>>>>>>> 8b3d46610e (fix: parameters for PI references)
 
 
 def prepare_data_for_internal_transfer():