nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source 
(cherry picked from commit 54a58e9205)

# Conflicts:
#	erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
This commit is contained in:
Gursheen Anand
2024-04-21 19:07:08 +05:30
committed by Mergify
parent 4c11f2bff2
commit 248e9cac71
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,9 +263,13 @@ class LandedCostVoucher(Document):
doc.make_gl_entries(via_landed_cost_voucher=True) doc.make_gl_entries(via_landed_cost_voucher=True)
else: else:
doc.make_gl_entries() doc.make_gl_entries()
<<<<<<< HEAD
>>>>>>> 8b3d46610e (fix: parameters for PI references) >>>>>>> 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)
=======
doc.repost_future_sle_and_gle(via_landed_cost_voucher=True)
>>>>>>> 54a58e9205 (chore: resolve conflicts)
def validate_asset_qty_and_status(self, receipt_document_type, receipt_document): def validate_asset_qty_and_status(self, receipt_document_type, receipt_document):
for item in self.get("items"): for item in self.get("items"):