Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[minor] stock_ledger_entry.py

Browse Source
This commit is contained in:
Rushabh Mehta 2015-02-18 11:38:05 +05:30
parent e55def23af
commit 2e0e711eb2
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/stock_ledger.py
View File

@ -177,11 +177,11 @@ class update_entries_after(object):
self.prev_stock_value = self.stock_value self.prev_stock_value = self.stock_value
# update current sle # update current sle
frappe.db.sql("""update `tabStock Ledger Entry` sle.qty_after_transaction = self.qty_after_transaction
set qty_after_transaction=%s, valuation_rate=%s, stock_queue=%s, sle.valuation_rate = self.valuation_rate
stock_value=%s, stock_value_difference=%s where name=%s""", sle.stock_queue = json.dumps(self.stock_queue)
(self.qty_after_transaction, self.valuation_rate, sle.stock_value_difference = stock_value_difference
json.dumps(self.stock_queue), self.stock_value, stock_value_difference, sle.name)) sle.save()
def validate_negative_stock(self, sle): def validate_negative_stock(self, sle):
""" """

11
erpnext/templates/form_grid/material_request_grid.html
View File

@ -15,13 +15,10 @@
<p>{%= doc.description %}</p>{% } %} <p>{%= doc.description %}</p>{% } %}
<div> <div>
{% if(doc.warehouse) { %} {% if(doc.warehouse) { %}
<div style="overflow:hidden; min-height: 25px; <span class="label label-default" title="{%= __("For Warehouse") %}"
white-space:nowrap; text-overflow: ellipsis;" style="margin-right: 10px;">
title="{%= __("For Warehouse") %}"> {%= doc.warehouse %}
<span class="label label-default"> </span>
{%= doc.warehouse %}
</span>
</div>
{% } %} {% } %}
{% if(doc.schedule_date) { %} {% if(doc.schedule_date) { %}
<span title="{%= __("Reqd By Date") %}" class="label {%= <span title="{%= __("Reqd By Date") %}" class="label {%=