Merge pull request #4976 from saurabh6790/pr_from_si
[fixes] set amount in PR by checking party_account_currency field
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index d32e14f..b07a794 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -27,10 +27,6 @@
"Purchase Taxes and Charges Template", "POS Profile", 'BOM'):
delete_for_doctype(doctype, company_name)
- else:
- # un-set company
- frappe.db.sql('update `tab{0}` set company="" where company=%s'.format(doctype), company_name)
-
# Clear notification counts
clear_notifications()
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 1af32ed..43b3657 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -22,40 +22,14 @@
"label": __("Item"),
"fieldtype": "Link",
"width": "80",
- "options": "Item",
- "reqd": 1,
- "on_change": function(me) {
- frappe.query_reports["Stock Balance"].toggle_mandatory_filters(me);
- }
+ "options": "Item"
},
{
"fieldname": "warehouse",
"label": __("Warehouse"),
"fieldtype": "Link",
"width": "80",
- "options": "Warehouse",
- "reqd": 1,
- "on_change": function(me) {
- frappe.query_reports["Stock Balance"].toggle_mandatory_filters(me);
- }
+ "options": "Warehouse"
},
- ],
-
- "toggle_mandatory_filters": function(me) {
- var values = me.get_values(false);
- var item_filter = me.filters_by_name["item_code"];
- var warehouse_filter = me.filters_by_name["warehouse"];
-
- if (values.item_code) {
- warehouse_filter.df.reqd = 0;
- } else if (values.warehouse) {
- item_filter.df.reqd = 0;
- } else {
- item_filter.df.reqd = 1;
- warehouse_filter.df.reqd = 1;
- }
-
- item_filter.set_mandatory(values.item_code);
- warehouse_filter.set_mandatory(values.warehouse);
- }
+ ]
}
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index d465050..43b6b9a 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -8,6 +8,8 @@
def execute(filters=None):
if not filters: filters = {}
+
+ validate_filters(filters)
columns = get_columns()
item_map = get_item_details(filters)
@@ -137,3 +139,10 @@
from tabItem {condition}""".format(condition=condition), value, as_dict=1)
return dict((d.name, d) for d in items)
+
+def validate_filters(filters):
+ if not (filters.get("item_code") or filters.get("warehouse")):
+ sle_count = flt(frappe.db.sql("""select count(name) from `tabStock Ledger Entry`""")[0][0])
+ if sle_count > 500000:
+ frappe.throw(_("Please set filter based on Item or Warehouse"))
+
\ No newline at end of file
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html
index 8016316..866c06e 100644
--- a/erpnext/templates/form_grid/material_request_grid.html
+++ b/erpnext/templates/form_grid/material_request_grid.html
@@ -11,7 +11,7 @@
{% } else { %}
<div class="row">
<div class="col-sm-4">
- <span class="indicator {%= (doc.qty==doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
+ <span class="indicator {%= (doc.qty<=doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
{% if(doc.item_name != doc.item_code) { %}
<br>{%= doc.item_name %}{% } %}
<!-- {% if(doc.item_name != doc.description) { %}
diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html
index b7437a7..99215e8 100644
--- a/erpnext/templates/print_formats/includes/item_table_description.html
+++ b/erpnext/templates/print_formats/includes/item_table_description.html
@@ -35,7 +35,7 @@
{% if compact -%}
{%- for fieldname in doc.flags.show_in_description -%}
- {% if doc.get(fieldname) -%}
+ {% if doc.get(fieldname) and doc.in_format_data(fieldname) -%}
<p>
<strong>{{ _(doc.meta.get_label(fieldname)) }}:</strong>
{{ doc.get_formatted(fieldname, translated=True) }}