CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 10:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: parameters for PI references

Browse Source 
(cherry picked from commit 8b3d46610e)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
This commit is contained in:
Gursheen Anand
2024-02-29 11:58:14 +05:30
committed by Mergify
parent c7c9d33954
commit 8618402829
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
View File

@@ -252,11 +252,18 @@ class LandedCostVoucher(Document):
doc.docstatus = 1 doc.docstatus = 1
doc.make_bundle_using_old_serial_batch_fields(via_landed_cost_voucher=True) 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) doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
doc.make_gl_entries() doc.make_gl_entries()
doc.repost_future_sle_and_gle(via_landed_cost_voucher=True) doc.repost_future_sle_and_gle(via_landed_cost_voucher=True)
======= =======
doc.make_gl_entries(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() doc.repost_future_sle_and_gle()
>>>>>>> baa3fee1bf (fix: add LCV flag to determine negative expenses) >>>>>>> baa3fee1bf (fix: add LCV flag to determine negative expenses)

4
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@@ -2956,7 +2956,11 @@ class TestPurchaseReceipt(FrappeTestCase):
("Expenses Included In Valuation - _TC", 0, 2000, "Main - _TC"), ("Expenses Included In Valuation - _TC", 0, 2000, "Main - _TC"),
) )
self.assertSequenceEqual(expected_gle, gl_entries) self.assertSequenceEqual(expected_gle, gl_entries)
<<<<<<< HEAD
>>>>>>> 53642e7417 (test: LCV entries after billing) >>>>>>> 53642e7417 (test: LCV entries after billing)
=======
frappe.db.rollback()
>>>>>>> 8b3d46610e (fix: parameters for PI references)
def prepare_data_for_internal_transfer(): def prepare_data_for_internal_transfer():