CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 13:12:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts

Browse Source
This commit is contained in:
Kavin
2026-03-03 21:28:34 +05:30
committed by GitHub
parent 9b0d4ab4da
commit 6846f02cea
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
View File

@@ -1124,18 +1124,6 @@ def make_landed_cost_voucher(**args):
],
)
<<<<<<< HEAD
lcv.set(
"taxes",
[
{
"description": "Shipping Charges",
"expense_account": args.expense_account or "Expenses Included In Valuation - TCP1",
"amount": args.charges,
}
],
)
=======
if args.charges:
lcv.set(
"taxes",
@@ -1147,7 +1135,6 @@ def make_landed_cost_voucher(**args):
}
],
)
>>>>>>> d54d0c25a2 (fix: set company based expense account)
if not args.do_not_save:
lcv.insert()