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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-02-15 17:32:34 +05:30
committed by GitHub
parent 1cca51afc6
commit ca8fb17ee8
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.py
View File

@@ -6,27 +6,4 @@ from frappe.model.document import Document
class BlanketOrderItem(Document):
<<<<<<< HEAD
=======
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from frappe.types import DF
item_code: DF.Link
item_name: DF.Data | None
ordered_qty: DF.Float
parent: DF.Data
parentfield: DF.Data
parenttype: DF.Data
party_item_code: DF.Data | None
qty: DF.Float
rate: DF.Currency
terms_and_conditions: DF.Text | None
# end: auto-generated types
>>>>>>> 1a8f7f9403 (fix: party item code in Blanket Order)
pass