nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-11-01 21:30:36 +05:30
committed by GitHub
parent 8888957952
commit 4a10454d89
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -1376,12 +1376,7 @@ class PurchaseInvoice(BuyingController):
"GL Entry", "GL Entry",
"Stock Ledger Entry", "Stock Ledger Entry",
"Repost Item Valuation", "Repost Item Valuation",
<<<<<<< HEAD
"Purchase Invoice",
=======
"Payment Ledger Entry",
"Tax Withheld Vouchers", "Tax Withheld Vouchers",
>>>>>>> f7c9258770 (fix: Issues while cancel/amending Purchase Invoice with TDS enabled)
) )
self.update_advance_tax_references(cancel=1) self.update_advance_tax_references(cancel=1)