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

Merge pull request #13691 from saurabh6790/supp_180417_1

Browse Source 
[hotfix] multiple fixes
This commit is contained in:
Saurabh
2018-04-19 15:57:35 +05:30
committed by GitHub
parent ff8f1bc88e 2476a8aab9
commit 5b7503c074
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
View File

@@ -29,11 +29,11 @@ def create_or_update_cheque_print_format(template_name):
cheque_print.html = """ cheque_print.html = """
<div style="position: relative; top:%(starting_position_from_top_edge)scm"> <div style="position: relative; top:%(starting_position_from_top_edge)scm">
<div style="width:%(cheque_width)scm;height:%(cheque_height)scm;"> <div style="width:%(cheque_width)scm;height:%(cheque_height)scm;">
<span style="top: {{ %(acc_pay_dist_from_top_edge)s }}cm; left: {{ %(acc_pay_dist_from_left_edge)s }}cm; <span style="top:%(acc_pay_dist_from_top_edge)scm; left:%(acc_pay_dist_from_left_edge)scm;
border-bottom: solid 1px;border-top:solid 1px; position: absolute;"> border-bottom: solid 1px;border-top:solid 1px; position: absolute;">
%(message_to_show)s %(message_to_show)s
</span> </span>
<span style="top:%(date_dist_from_top_edge)s cm; left:%(date_dist_from_left_edge)scm; <span style="top:%(date_dist_from_top_edge)scm; left:%(date_dist_from_left_edge)scm;
position: absolute;"> position: absolute;">
{{ frappe.utils.formatdate(doc.reference_date) or '' }} {{ frappe.utils.formatdate(doc.reference_date) or '' }}
</span> </span>

28
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -200,13 +200,14 @@ def get_item_details(items, sle, filters):
item_details = {} item_details = {}
if not items: if not items:
items = list(set([d.item_code for d in sle])) items = list(set([d.item_code for d in sle]))
for item in frappe.db.sql(""" if items:
select name, item_name, description, item_group, brand, stock_uom for item in frappe.db.sql("""
from `tabItem` select name, item_name, description, item_group, brand, stock_uom
where name in ({0}) from `tabItem`
""".format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1): where name in ({0})
item_details.setdefault(item.name, item) """.format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1):
item_details.setdefault(item.name, item)
if filters.get('show_variant_attributes', 0) == 1: if filters.get('show_variant_attributes', 0) == 1:
variant_values = get_variant_values_for(item_details.keys()) variant_values = get_variant_values_for(item_details.keys())
@@ -215,11 +216,14 @@ def get_item_details(items, sle, filters):
return item_details return item_details
def get_item_reorder_details(items): def get_item_reorder_details(items):
item_reorder_details = frappe.db.sql(""" item_reorder_details = frappe._dict()
select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
from `tabItem Reorder` if items:
where parent in ({0}) item_reorder_details = frappe.db.sql("""
""".format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1) select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
from `tabItem Reorder`
where parent in ({0})
""".format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1)
return dict((d.parent + d.warehouse, d) for d in item_reorder_details) return dict((d.parent + d.warehouse, d) for d in item_reorder_details)

5
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@@ -93,11 +93,14 @@ def get_item_details(items, sl_entries):
if not items: if not items:
items = list(set([d.item_code for d in sl_entries])) items = list(set([d.item_code for d in sl_entries]))
if not items:
return item_details
for item in frappe.db.sql(""" for item in frappe.db.sql("""
select name, item_name, description, item_group, brand, stock_uom select name, item_name, description, item_group, brand, stock_uom
from `tabItem` from `tabItem`
where name in ({0}) where name in ({0})
""".format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1): """.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1, debug=1):
item_details.setdefault(item.name, item) item_details.setdefault(item.name, item)
return item_details return item_details