Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: backport asset value through landed cost voucher #43039

Merged
merged 7 commits into from
Sep 5, 2024
Merged

fix: backport asset value through landed cost voucher #43039

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1121c66
fix: link Purchase Invoice and Receipt Items to Asset
khushi8112 Aug 26, 2024
3bb1867
fix: improve asset item matching logic
khushi8112 Aug 29, 2024
957eabf
chore: resolved linter warnings with #nosemgrep
khushi8112 Aug 29, 2024
193d798
chore: linters/semgrep check
khushi8112 Aug 29, 2024
e185a06
refactor: rename to in SLE query functions
khushi8112 Sep 2, 2024
f5a4ec1
chore: patch correction
khushi8112 Sep 2, 2024
5d5ec2a
chore: resolve test failing
khushi8112 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: resolved linter warnings with #nosemgrep
  • Loading branch information
@khushi8112
khushi8112 committed Sep 5, 2024
commit 957eabf53edc962393fa6c03acfebd1bcd587ff7
3 changes: 2 additions & 1 deletion erpnext/stock/stock_ledger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1532,7 +1532,7 @@ def get_previous_sle_of_current_voucher(args, operator="<", exclude_current_vouc
operator = "<="
voucher_condition = f"and creation < '{creation}'"

sle = frappe.db.sql(
sle = frappe.db.sql( # nosemgrep
f"""
select *, posting_datetime as "timestamp"
from `tabStock Ledger Entry`
Expand Down Expand Up @@ -1629,6 +1629,7 @@ def get_stock_ledger_entries(
if extra_cond:
conditions += f"{extra_cond}"

# nosemgrep
return frappe.db.sql(
"""
select *, posting_datetime as "timestamp"
Expand Down