schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflict

Browse Source
This commit is contained in:
rohitwaghchaure
2022-10-12 16:24:50 +05:30
committed by GitHub
parent acd64ba7c1
commit cb7aef505d
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/stock_ledger.py
View File

@@ -1473,16 +1473,7 @@ def _round_off_if_near_zero(number: float, precision: int = 6) -> float:
if abs(0.0 - flt(number)) < (1.0 / (10**precision)):
return 0.0
<<<<<<< HEAD
return flt(number)
=======
def is_negative_stock_allowed(*, item_code: Optional[str] = None) -> bool:
if cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock", cache=True)):
return True
if item_code and cint(frappe.db.get_value("Item", item_code, "allow_negative_stock", cache=True)):
return True
return False
def get_incoming_rate_for_inter_company_transfer(sle) -> float:
"""
@@ -1504,4 +1495,3 @@ def get_incoming_rate_for_inter_company_transfer(sle) -> float:
)
return rate
>>>>>>> 683a47f7a1 (fix: consider sales rate as incoming rate for transit warehouse in purchase flow)