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

chore: release v15 #46132

Merged
merged 15 commits into from
Feb 26, 2025
Merged

chore: release v15 #46132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
96d44e3
fix: incorrect stock value difference for adjustment entry
rohitwaghchaure Feb 19, 2025
9318e4f
Merge pull request #46028 from frappe/mergify/bp/version-15-hotfix/pr…
rohitwaghchaure Feb 19, 2025
ec3b281
fix: inventory dimension for maintence visit
rohitwaghchaure Feb 20, 2025
b00fa1d
Merge pull request #46041 from frappe/mergify/bp/version-15-hotfix/pr…
rohitwaghchaure Feb 20, 2025
0ae2d61
fix: pos opening entry dialog not saving on change data (backport #46…
mergify[bot] Feb 21, 2025
b3c1df8
fix(project settings): add checkbox to auto fetch timesheet in sales …
venkat102 Feb 13, 2025
b1095bb
fix(sales invoice): check fetch_timesheet_in_sales_invoice enabled be…
venkat102 Feb 13, 2025
97d3e86
fix: check value as int
venkat102 Feb 13, 2025
feb64cb
fix: enable fetch_timesheet_in_sales_invoice in test
venkat102 Feb 17, 2025
feec16b
chore: resolve conflicts
ruthra-kumar Feb 25, 2025
c72dab4
fix: valuation rate for batch
rohitwaghchaure Feb 23, 2025
8bb085a
Merge pull request #46142 from frappe/mergify/bp/version-15-hotfix/pr…
ruthra-kumar Feb 26, 2025
81ff162
Merge pull request #46143 from frappe/mergify/bp/version-15-hotfix/pr…
rohitwaghchaure Feb 26, 2025
b8281c3
fix: no permission to get project settings in sales invoice
venkat102 Feb 26, 2025
bc53365
Merge pull request #46159 from frappe/mergify/bp/version-15-hotfix/pr…
ruthra-kumar Feb 26, 2025
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
12 changes: 10 additions & 2 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,8 +897,16 @@ frappe.ui.form.on("Sales Invoice", {

project: function (frm) {
if (frm.doc.project) {
frm.events.add_timesheet_data(frm, {
project: frm.doc.project,
frappe.call({
method: "is_auto_fetch_timesheet_enabled",
doc: frm.doc,
callback: function (r) {
if (cint(r.message)) {
frm.events.add_timesheet_data(frm, {
project: frm.doc.project,
});
}
},
});
}
},
Expand Down
6 changes: 5 additions & 1 deletion erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,11 +1090,15 @@ def set_billing_hours_and_amount(self):
timesheet.billing_amount = ts_doc.total_billable_amount

def update_timesheet_billing_for_project(self):
if not self.timesheets and self.project:
if not self.timesheets and self.project and self.is_auto_fetch_timesheet_enabled():
self.add_timesheet_data()
else:
self.calculate_billing_amount_for_timesheet()

@frappe.whitelist()
def is_auto_fetch_timesheet_enabled(self):
return frappe.db.get_single_value("Projects Settings", "fetch_timesheet_in_sales_invoice")

@frappe.whitelist()
def add_timesheet_data(self):
self.set("timesheets", [])
Expand Down
234 changes: 57 additions & 177 deletions erpnext/projects/doctype/projects_settings/projects_settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,189 +1,69 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 0,
"beta": 0,
"creation": "2018-02-21 16:42:13.882879",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
"actions": [],
"creation": "2018-02-21 16:42:13.882879",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"timesheet_sb",
"ignore_workstation_time_overlap",
"ignore_user_time_overlap",
"ignore_employee_time_overlap",
"fetch_timesheet_in_sales_invoice"
],
"fields": [
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "timesheet_sb",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Timesheets",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
"fieldname": "timesheet_sb",
"fieldtype": "Section Break",
"label": "Timesheets"
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"fieldname": "ignore_workstation_time_overlap",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore Workstation Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
"default": "0",
"fieldname": "ignore_workstation_time_overlap",
"fieldtype": "Check",
"label": "Ignore Workstation Time Overlap"
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"fieldname": "ignore_user_time_overlap",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore User Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
"default": "0",
"fieldname": "ignore_user_time_overlap",
"fieldtype": "Check",
"label": "Ignore User Time Overlap"
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"default": "0",
"fieldname": "ignore_employee_time_overlap",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Ignore Employee Time Overlap",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
"default": "0",
"fieldname": "ignore_employee_time_overlap",
"fieldtype": "Check",
"label": "Ignore Employee Time Overlap"
},
{
"default": "0",
"fieldname": "fetch_timesheet_in_sales_invoice",
"fieldtype": "Check",
"label": "Fetch Timesheet in Sales Invoice"
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_view": 0,
"in_create": 0,
"is_submittable": 0,
"issingle": 1,
"istable": 0,
"max_attachments": 0,
"modified": "2018-02-21 16:42:42.357209",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects Settings",
"name_case": "",
"owner": "Administrator",
],
"issingle": 1,
"links": [],
"modified": "2025-02-25 22:48:03.164862",
"modified_by": "Administrator",
"module": "Projects",
"name": "Projects Settings",
"owner": "Administrator",
"permissions": [
{
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 0,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"create": 1,
"delete": 1,
"email": 1,
"print": 1,
"read": 1,
"role": "System Manager",
"share": 1,
"write": 1
}
],
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}
1 change: 1 addition & 0 deletions erpnext/projects/doctype/projects_settings/projects_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class ProjectsSettings(Document):
if TYPE_CHECKING:
from frappe.types import DF

fetch_timesheet_in_sales_invoice: DF.Check
ignore_employee_time_overlap: DF.Check
ignore_user_time_overlap: DF.Check
ignore_workstation_time_overlap: DF.Check
Expand Down
3 changes: 3 additions & 0 deletions erpnext/projects/doctype/timesheet/test_timesheet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import unittest

import frappe
from frappe.tests.utils import change_settings
from frappe.utils import add_to_date, now_datetime, nowdate

from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
Expand Down Expand Up @@ -53,6 +54,7 @@ def test_sales_invoice_from_timesheet(self):
self.assertEqual(item.qty, 2.00)
self.assertEqual(item.rate, 50.00)

@change_settings("Projects Settings", {"fetch_timesheet_in_sales_invoice": 1})
def test_timesheet_billing_based_on_project(self):
emp = make_employee("test_employee_6@salary.com")
project = frappe.get_value("Project", {"project_name": "_Test Project"})
Expand All @@ -62,6 +64,7 @@ def test_timesheet_billing_based_on_project(self):
)
sales_invoice = create_sales_invoice(do_not_save=True)
sales_invoice.project = project
sales_invoice.add_timesheet_data()
sales_invoice.submit()

ts = frappe.get_doc("Timesheet", timesheet.name)
Expand Down
2 changes: 1 addition & 1 deletion erpnext/selling/page/point_of_sale/pos_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ erpnext.PointOfSale.Controller = class {
in_list_view: 1,
label: __("Opening Amount"),
options: "company:company_currency",
change: function () {
onchange: function () {
dialog.fields_dict.balance_details.df.data.some((d) => {
if (d.idx == this.doc.idx) {
d.opening_amount = this.value;
Expand Down
2 changes: 2 additions & 0 deletions erpnext/stock/deprecated_serial_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,8 @@ def get_last_sle_for_sabb_no_batchwise_valuation(self):
if self.sle.voucher_detail_no:
query = query.where(sabb.voucher_detail_no != self.sle.voucher_detail_no)

query = query.where(sabb.voucher_type != "Pick List")

data = query.run(as_dict=True)
if not data:
return {}
Expand Down
2 changes: 1 addition & 1 deletion erpnext/stock/doctype/bin/bin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def update_qty(bin_name, args):
& (sle.warehouse == args.get("warehouse"))
& (sle.is_cancelled == 0)
)
.orderby(CombineDatetime(sle.posting_date, sle.posting_time), order=Order.desc)
.orderby(sle.posting_datetime, order=Order.desc)
.orderby(sle.creation, order=Order.desc)
.limit(1)
.run()
Expand Down
7 changes: 6 additions & 1 deletion erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,12 @@ def add_custom_fields(self):
custom_fields["Stock Ledger Entry"] = dimension_field

filter_custom_fields = {}
ignore_doctypes = ["Serial and Batch Bundle", "Serial and Batch Entry", "Pick List Item"]
ignore_doctypes = [
"Serial and Batch Bundle",
"Serial and Batch Entry",
"Pick List Item",
"Maintenance Visit Purpose",
]

if custom_fields:
for doctype, fields in custom_fields.items():
Expand Down
4 changes: 4 additions & 0 deletions erpnext/stock/stock_ledger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,6 +883,10 @@ def process_sle(self, sle):

if not sle.is_adjustment_entry:
sle.stock_value_difference = stock_value_difference
elif sle.is_adjustment_entry and not self.args.get("sle_id"):
sle.stock_value_difference = get_stock_value_difference(
sle.item_code, sle.warehouse, sle.posting_date, sle.posting_time, sle.voucher_no
)

sle.doctype = "Stock Ledger Entry"
frappe.get_doc(sle).db_update()
Expand Down
Loading