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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-02-26 13:06:26 +05:30
committed by Rohit Waghchaure
parent 717442c01f
commit c147ec168f
1 changed files with 0 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
View File

@@ -28,50 +28,6 @@ exclude_from_linked_with = True
class StockLedgerEntry(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
actual_qty: DF.Float
auto_created_serial_and_batch_bundle: DF.Check
batch_no: DF.Data | None
company: DF.Link | None
dependant_sle_voucher_detail_no: DF.Data | None
fiscal_year: DF.Data | None
has_batch_no: DF.Check
has_serial_no: DF.Check
incoming_rate: DF.Currency
is_adjustment_entry: DF.Check
is_cancelled: DF.Check
item_code: DF.Link | None
outgoing_rate: DF.Currency
posting_date: DF.Date | None
posting_datetime: DF.Datetime | None
posting_time: DF.Time | None
project: DF.Link | None
qty_after_transaction: DF.Float
recalculate_rate: DF.Check
serial_and_batch_bundle: DF.Link | None
serial_no: DF.LongText | None
stock_queue: DF.Text | None
stock_uom: DF.Link | None
stock_value: DF.Currency
stock_value_difference: DF.Currency
to_rename: DF.Check
valuation_rate: DF.Currency
voucher_detail_no: DF.Data | None
voucher_no: DF.DynamicLink | None
voucher_type: DF.Link | None
warehouse: DF.Link | None
# end: auto-generated types
>>>>>>> d80ca523a4 (perf: new column posting datetime in SLE to optimize stock ledger related queries)
def autoname(self):
"""
Temporarily name doc for fast insertion