Merge pull request #15759 from codingCoffee/salesperson
fix(): fetch correct warehouse for item in report
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index d44bf40..ec3f371 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.61'
+__version__ = '10.1.62'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 1be3d74..459f492 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -306,19 +306,20 @@
additional_conditions = get_additional_conditions(from_date, ignore_closing_entries, filters)
+ accounts = frappe.db.sql_list("""select name from `tabAccount`
+ where lft >= %s and rgt <= %s""", (root_lft, root_rgt))
+ additional_conditions += " and account in ('{}')"\
+ .format("', '".join([frappe.db.escape(d) for d in accounts]))
+
gl_entries = frappe.db.sql("""select posting_date, account, debit, credit, is_opening, fiscal_year from `tabGL Entry`
where company=%(company)s
{additional_conditions}
and posting_date <= %(to_date)s
- and account in (select name from `tabAccount`
- where lft >= %(lft)s and rgt <= %(rgt)s)
order by account, posting_date""".format(additional_conditions=additional_conditions),
{
"company": company,
"from_date": from_date,
"to_date": to_date,
- "lft": root_lft,
- "rgt": root_rgt
},
as_dict=True)
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index af90756..8e9e2ca 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -73,7 +73,7 @@
{% for(var j=i*3; j
<(i+1)*3; j++) { %} <button type="button" class="btn btn-default numeric-keypad" val="{{j+1}}">{{j+1}}</button>
{% } %}
- <button type="button" {% if((!allow_user_to_edit_rate && chartData[i] == __("Price")) || (!allow_user_to_edit_discount && chartData[i] == __("Disc"))) { %} disabled {% } %} id="pos-item-{{ chartData[i].toLowerCase() }}" class="btn text-center btn-default numeric-keypad pos-operation">{{ __(chartData[i]) }}</button>
+ <button type="button" {% if((!allow_user_to_edit_rate && __(chartData[i]) == __("Price")) || (!allow_user_to_edit_discount && __(chartData[i]) == __("Disc"))) { %} disabled {% } %} id="pos-item-{{ chartData[i].toLowerCase() }}" class="btn text-center btn-default numeric-keypad pos-operation">{{ __(chartData[i]) }}</button>
</div>
{% } %}
<div class="row text-right">