mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
chore: resolve conflicts
This commit is contained in:
committed by
GitHub
parent
99d1f1d67b
commit
48992cd205
@@ -193,7 +193,6 @@ class PurchaseInvoice(BuyingController):
|
|||||||
supplied_items: DF.Table[PurchaseReceiptItemSupplied]
|
supplied_items: DF.Table[PurchaseReceiptItemSupplied]
|
||||||
supplier: DF.Link
|
supplier: DF.Link
|
||||||
supplier_address: DF.Link | None
|
supplier_address: DF.Link | None
|
||||||
supplier_group: DF.Link | None
|
|
||||||
supplier_name: DF.Data | None
|
supplier_name: DF.Data | None
|
||||||
supplier_warehouse: DF.Link | None
|
supplier_warehouse: DF.Link | None
|
||||||
tax_category: DF.Link | None
|
tax_category: DF.Link | None
|
||||||
|
|||||||
Reference in New Issue
Block a user