nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33317 from frappe/version-13-hotfix

Browse Source 
chore: release v13
This commit is contained in:
Ankush Menat
2022-12-13 17:59:05 +05:30
committed by GitHub
parent 104967881d 12f11a6976
commit e44646054c
5 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
View File

@@ -25,7 +25,8 @@
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
"options": "DocType", "options": "DocType",
"reqd": 1 "reqd": 1,
"search_index": 1
}, },
{ {
"columns": 2, "columns": 2,
@@ -35,7 +36,8 @@
"in_list_view": 1, "in_list_view": 1,
"label": "Name", "label": "Name",
"options": "reference_doctype", "options": "reference_doctype",
"reqd": 1 "reqd": 1,
"search_index": 1
}, },
{ {
"fieldname": "due_date", "fieldname": "due_date",
@@ -104,7 +106,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-09-26 17:06:55.597389", "modified": "2022-12-12 12:31:44.919895",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry Reference", "name": "Payment Entry Reference",
@@ -113,5 +115,6 @@
"quick_entry": 1, "quick_entry": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"states": [],
"track_changes": 1 "track_changes": 1
} }

11
erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
View File

@@ -533,12 +533,13 @@ def get_accounts(root_type, companies):
], ],
filters={"company": company, "root_type": root_type}, filters={"company": company, "root_type": root_type},
): ):
if account.account_name not in added_accounts: if account.account_number:
account_key = account.account_number + "-" + account.account_name
else:
account_key = account.account_name
if account_key not in added_accounts:
accounts.append(account) accounts.append(account)
if account.account_number:
account_key = account.account_number + "-" + account.account_name
else:
account_key = account.account_name
added_accounts.append(account_key) added_accounts.append(account_key)
return accounts return accounts

8
erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
View File

@@ -4,7 +4,7 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.query_builder.functions import Floor, Sum from frappe.query_builder.functions import Sum
from pypika.terms import ExistsCriterion from pypika.terms import ExistsCriterion
@@ -58,9 +58,9 @@ def get_bom_stock(filters):
bom_item.description, bom_item.description,
bom_item.stock_qty, bom_item.stock_qty,
bom_item.stock_uom, bom_item.stock_uom,
bom_item.stock_qty * qty_to_produce / bom.quantity, (bom_item.stock_qty / bom.quantity) * qty_to_produce,
Sum(bin.actual_qty).as_("actual_qty"), Sum(bin.actual_qty),
Sum(Floor(bin.actual_qty / (bom_item.stock_qty * qty_to_produce / bom.quantity))), Sum(bin.actual_qty) / (bom_item.stock_qty / bom.quantity),
) )
.where((bom_item.parent == filters.get("bom")) & (bom_item.parenttype == "BOM")) .where((bom_item.parent == filters.get("bom")) & (bom_item.parenttype == "BOM"))
.groupby(bom_item.item_code) .groupby(bom_item.item_code)

15
erpnext/manufacturing/report/production_planning_report/production_planning_report.py
View File

@@ -49,7 +49,7 @@ class ProductionPlanReport(object):
parent.bom_no, parent.bom_no,
parent.fg_warehouse.as_("warehouse"), parent.fg_warehouse.as_("warehouse"),
) )
.where(parent.status.notin(["Completed", "Stopped"])) .where(parent.status.notin(["Completed", "Stopped", "Closed"]))
) )
if order_by == "Planned Start Date": if order_by == "Planned Start Date":
@@ -79,10 +79,11 @@ class ProductionPlanReport(object):
query = query.where(child.parent.isin(self.filters.docnames)) query = query.where(child.parent.isin(self.filters.docnames))
if doctype == "Sales Order": if doctype == "Sales Order":
query = query.select( query = query.select(child.delivery_date, parent.base_grand_total,).where(
child.delivery_date, (child.stock_qty > child.produced_qty)
parent.base_grand_total, & (parent.per_delivered < 100.0)
).where((child.stock_qty > child.produced_qty) & (parent.per_delivered < 100.0)) & (parent.status.notin(["Completed", "Closed"]))
)
if order_by == "Delivery Date": if order_by == "Delivery Date":
query = query.orderby(child.delivery_date, order=Order.asc) query = query.orderby(child.delivery_date, order=Order.asc)
@@ -91,7 +92,9 @@ class ProductionPlanReport(object):
elif doctype == "Material Request": elif doctype == "Material Request":
query = query.select(child.schedule_date,).where( query = query.select(child.schedule_date,).where(
(parent.per_ordered < 100) & (parent.material_request_type == "Manufacture") (parent.per_ordered < 100)
& (parent.material_request_type == "Manufacture")
& (parent.status != "Stopped")
) )
if order_by == "Required Date": if order_by == "Required Date":

5
erpnext/selling/doctype/sales_order/sales_order_dashboard.py
View File

@@ -12,7 +12,10 @@ def get_data():
"Auto Repeat": "reference_document", "Auto Repeat": "reference_document",
"Maintenance Visit": "prevdoc_docname", "Maintenance Visit": "prevdoc_docname",
}, },
"internal_links": {"Quotation": ["items", "prevdoc_docname"]}, "internal_links": {
"Quotation": ["items", "prevdoc_docname"],
"Material Request": ["items", "material_request"],
},
"transactions": [ "transactions": [
{ {
"label": _("Fulfillment"), "label": _("Fulfillment"),