Merge pull request #21483 from alyf-de/bank_account_dashboards
feat: add Bank Account to dashboards
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 496a865..e4412e0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -215,9 +215,7 @@
source_doctype: "Material Request",
target: frm,
date_field: "schedule_date",
- setters: {
- company: frm.doc.company,
- },
+ setters: {},
get_query_filters: {
docstatus: 1,
material_request_type: ["in", ["Material Transfer", "Material Issue"]],
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index bdd0bd0..704ae41 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"allow_import": 1,
"autoname": "naming_series:",
"creation": "2013-04-09 11:43:55",
@@ -12,7 +13,6 @@
"stock_entry_type",
"outgoing_stock_entry",
"purpose",
- "company",
"work_order",
"purchase_order",
"delivery_note_no",
@@ -20,6 +20,7 @@
"pick_list",
"purchase_receipt_no",
"col2",
+ "company",
"posting_date",
"posting_time",
"set_posting_time",
@@ -65,6 +66,7 @@
"dimension_col_break",
"printing_settings",
"select_print_heading",
+ "print_settings_col_break",
"letter_head",
"more_info",
"is_opening",
@@ -291,6 +293,7 @@
"fieldtype": "Section Break"
},
{
+ "description": "Sets 'Source Warehouse' in each row of the items table.",
"fieldname": "from_warehouse",
"fieldtype": "Link",
"in_list_view": 1,
@@ -320,6 +323,7 @@
"fieldtype": "Column Break"
},
{
+ "description": "Sets 'Target Warehouse' in each row of the items table.",
"fieldname": "to_warehouse",
"fieldtype": "Link",
"in_list_view": 1,
@@ -622,12 +626,17 @@
"label": "Pick List",
"options": "Pick List",
"read_only": 1
+ },
+ {
+ "fieldname": "print_settings_col_break",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
"idx": 1,
"is_submittable": 1,
- "modified": "2019-09-27 14:38:20.801420",
+ "links": [],
+ "modified": "2020-04-23 12:56:52.881752",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index a848c80..c16a41c 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -14,12 +14,12 @@
"t_warehouse",
"sec_break1",
"item_code",
- "item_group",
"col_break2",
"item_name",
"section_break_8",
"description",
"column_break_10",
+ "item_group",
"image",
"image_view",
"quantity_and_rate",
@@ -178,6 +178,7 @@
"bold": 1,
"fieldname": "basic_rate",
"fieldtype": "Currency",
+ "in_list_view": 1,
"label": "Basic Rate (as per Stock UOM)",
"oldfieldname": "incoming_rate",
"oldfieldtype": "Currency",
@@ -420,6 +421,7 @@
"options": "Item"
},
{
+ "collapsible": 1,
"fieldname": "reference_section",
"fieldtype": "Section Break",
"label": "Reference"
@@ -466,7 +468,6 @@
"fetch_from": "item_code.item_group",
"fieldname": "item_group",
"fieldtype": "Data",
- "in_list_view": 1,
"label": "Item Group"
},
{
@@ -495,7 +496,7 @@
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-03-19 12:34:09.836295",
+ "modified": "2020-04-23 19:19:28.539769",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 28d7208..0190f09 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -46,19 +46,6 @@
"out_qty": min(sle.actual_qty, 0)
})
- # get the name of the item that was produced using this item
- if sle.voucher_type == "Stock Entry":
- purpose, work_order, fg_completed_qty = frappe.db.get_value(sle.voucher_type, sle.voucher_no, ["purpose", "work_order", "fg_completed_qty"])
-
- if purpose == "Manufacture" and work_order:
- finished_product = frappe.db.get_value("Work Order", work_order, "item_name")
- finished_qty = fg_completed_qty
-
- sle.update({
- "finished_product": finished_product,
- "finished_qty": finished_qty,
- })
-
data.append(sle)
if include_uom:
@@ -77,8 +64,6 @@
{"label": _("In Qty"), "fieldname": "in_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
{"label": _("Out Qty"), "fieldname": "out_qty", "fieldtype": "Float", "width": 80, "convertible": "qty"},
{"label": _("Balance Qty"), "fieldname": "qty_after_transaction", "fieldtype": "Float", "width": 100, "convertible": "qty"},
- {"label": _("Finished Product"), "fieldname": "finished_product", "width": 100},
- {"label": _("Finished Qty"), "fieldname": "finished_qty", "fieldtype": "Float", "width": 100, "convertible": "qty"},
{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 150},
{"label": _("Warehouse"), "fieldname": "warehouse", "fieldtype": "Link", "options": "Warehouse", "width": 150},
{"label": _("Item Group"), "fieldname": "item_group", "fieldtype": "Link", "options": "Item Group", "width": 100},