nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-52675

Browse Source
This commit is contained in:
Nikhil Kothari
2026-03-17 11:25:06 +05:30
parent c9efcb7822 b2d14bd947
commit a8e7d82746
19 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
View File

@@ -101,11 +101,11 @@
"label": "Use HTTP Protocol" "label": "Use HTTP Protocol"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:19:02.873815", "modified": "2026-03-16 13:28:21.075743",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Currency Exchange Settings", "name": "Currency Exchange Settings",

4
erpnext/accounts/doctype/pos_settings/pos_settings.json
View File

@@ -50,10 +50,10 @@
"options": "1" "options": "1"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-09 17:30:41.476806", "modified": "2026-03-16 13:28:19.677217",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Settings", "name": "POS Settings",

4
erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
View File

@@ -15,11 +15,11 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"in_create": 1, "in_create": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:19:08.888368", "modified": "2026-03-16 13:28:21.312607",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Repost Accounting Ledger Settings", "name": "Repost Accounting Ledger Settings",

4
erpnext/accounts/doctype/subscription_settings/subscription_settings.json
View File

@@ -31,10 +31,10 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:34.671062", "modified": "2026-03-16 13:28:20.485964",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Subscription Settings", "name": "Subscription Settings",

4
erpnext/buying/doctype/buying_settings/buying_settings.json
View File

@@ -282,13 +282,13 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "fa fa-cog", "icon": "fa fa-cog",
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:16:35.885540", "modified": "2026-03-16 13:28:19.432589",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Buying Settings", "name": "Buying Settings",

3
erpnext/controllers/selling_controller.py
View File

@@ -526,6 +526,9 @@ class SellingController(StockController):
if self.doctype not in ("Delivery Note", "Sales Invoice"): if self.doctype not in ("Delivery Note", "Sales Invoice"):
return return
if self.doctype == "Sales Invoice" and not self.update_stock and not self.is_internal_transfer():
return
from erpnext.stock.serial_batch_bundle import get_batch_nos, get_serial_nos from erpnext.stock.serial_batch_bundle import get_batch_nos, get_serial_nos
allow_at_arms_length_price = frappe.get_cached_value( allow_at_arms_length_price = frappe.get_cached_value(

4
erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json
View File

@@ -102,10 +102,10 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:46.617101", "modified": "2026-03-16 13:28:21.198138",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Appointment Booking Settings", "name": "Appointment Booking Settings",

4
erpnext/crm/doctype/crm_settings/crm_settings.json
View File

@@ -101,12 +101,12 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "fa fa-cog", "icon": "fa fa-cog",
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:52.204988", "modified": "2026-03-16 13:28:19.573964",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "CRM Settings", "name": "CRM Settings",

3
erpnext/manufacturing/doctype/job_card/job_card.py
View File

@@ -383,9 +383,8 @@ class JobCard(Document):
# if key number reaches/crosses to production_capacity means capacity is full and overlap error generated # if key number reaches/crosses to production_capacity means capacity is full and overlap error generated
# this will store last to_time of sequential job cards # this will store last to_time of sequential job cards
alloted_capacity = {1: time_logs[0]["to_time"]} alloted_capacity = {1: time_logs[0]["to_time"]}
# flag for sequential Job card found
sequential_job_card_found = False
for i in range(1, len(time_logs)): for i in range(1, len(time_logs)):
sequential_job_card_found = False
# scanning for all Existing keys # scanning for all Existing keys
for key in alloted_capacity.keys(): for key in alloted_capacity.keys():
# if current Job Card from time is greater than last to_time in that key means these job card are sequential # if current Job Card from time is greater than last to_time in that key means these job card are sequential

4
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
View File

@@ -239,12 +239,12 @@
"label": "Allow Editing of Items and Quantities in Work Order" "label": "Allow Editing of Items and Quantities in Work Order"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "icon-wrench", "icon": "icon-wrench",
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:05.759229", "modified": "2026-03-16 13:28:20.714576",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Manufacturing Settings", "name": "Manufacturing Settings",

4
erpnext/projects/doctype/projects_settings/projects_settings.json
View File

@@ -43,10 +43,10 @@
"label": "Fetch Timesheet in Sales Invoice" "label": "Fetch Timesheet in Sales Invoice"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:28.414222", "modified": "2026-03-16 13:28:20.265634",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Projects", "module": "Projects",
"name": "Projects Settings", "name": "Projects Settings",

4
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -323,13 +323,13 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "fa fa-cog", "icon": "fa fa-cog",
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-02-27 00:47:46.003305", "modified": "2026-03-16 13:28:18.988883",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",

4
erpnext/setup/doctype/global_defaults/global_defaults.json
View File

@@ -91,13 +91,13 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "fa fa-cog", "icon": "fa fa-cog",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-12 09:45:59.819161", "modified": "2026-03-16 13:28:20.155574",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Global Defaults", "name": "Global Defaults",

4
erpnext/stock/doctype/delivery_settings/delivery_settings.json
View File

@@ -50,10 +50,10 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:39.931428", "modified": "2026-03-16 13:28:20.371015",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Settings", "name": "Delivery Settings",

1
erpnext/stock/doctype/item/item.json
View File

@@ -167,6 +167,7 @@
"set_only_once": 1 "set_only_once": 1
}, },
{ {
"allow_in_quick_entry": 1,
"bold": 1, "bold": 1,
"fieldname": "item_name", "fieldname": "item_name",
"fieldtype": "Data", "fieldtype": "Data",

4
erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
View File

@@ -49,10 +49,10 @@
"label": "Allow Variant UOM to be different from Template UOM" "label": "Allow Variant UOM to be different from Template UOM"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-01-02 18:18:23.005859", "modified": "2026-03-16 13:28:20.597912",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item Variant Settings", "name": "Item Variant Settings",

4
erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
View File

@@ -101,11 +101,11 @@
"label": "Enable Separate Reposting for GL" "label": "Enable Separate Reposting for GL"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-02-25 14:11:33.461173", "modified": "2026-03-16 13:28:20.978007",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reposting Settings", "name": "Stock Reposting Settings",

4
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@@ -558,13 +558,13 @@
"label": "Enable Serial / Batch No for Item" "label": "Enable Serial / Batch No for Item"
} }
], ],
"hide_toolbar": 1, "hide_toolbar": 0,
"icon": "icon-cog", "icon": "icon-cog",
"idx": 1, "idx": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-02-25 10:56:34.105949", "modified": "2026-03-16 13:28:19.254641",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Settings", "name": "Stock Settings",

2
erpnext/support/doctype/support_settings/support_settings.json
View File

@@ -156,7 +156,7 @@
} }
], ],
"grid_page_length": 50, "grid_page_length": 50,
"hide_toolbar": 1, "hide_toolbar": 0,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2026-03-16 16:33:45.859541", "modified": "2026-03-16 16:33:45.859541",