nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[usability] [fixes] stock entry and production order

Browse Source
This commit is contained in:
Rushabh Mehta
2015-02-19 16:28:35 +05:30
parent d60acb9f26
commit c7a11cc451
14 changed files with 157 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
erpnext/templates/form_grid/stock_entry_grid.html
View File

@@ -5,32 +5,34 @@
{% if(!doc) { %}
<div class="row">
<div class="col-sm-8 col-xs-6">{%= __("Item") %}</div>
<div class="col-sm-5 col-xs-4">{%= __("Item") %}</div>
<div class="col-sm-3 col-xs-4">{%= __("Warehouse") %}</div>
<div class="col-sm-2 col-xs-2 text-right">{%= __("Qty") %}</div>
<div class="col-sm-2 col-xs-4 text-right">{%= __("Amount") %}</div>
<div class="col-sm-2 col-xs-2 text-right">{%= __("Amount") %}</div>
</div>
{% } else { %}
<div class="row">
<div class="col-sm-8 col-xs-6"><strong>{%= doc.item_code %}</strong>
<div class="col-sm-5 col-xs-4"><strong>{%= doc.item_code %}</strong>
{% if(doc.item_name != doc.item_code) { %}
<br>{%= doc.item_name %}{% } %}
{% if(doc.item_name != doc.description) { %}
<p>{%= doc.description %}</p>{% } %}
{% include "templates/form_grid/includes/visible_cols.html" %}
<div>
{% if(doc.s_warehouse) { %}
<span class="label label-primary">
{%= doc.s_warehouse || "" %}</span>
{% } %}
<i class="octicon octicon-arrow-small-right"></i>
{% if(doc.t_warehouse) { %}<span class="label label-primary">
{%= doc.t_warehouse || "" %}</span>{% } %}
{% if(doc.s_warehouse && doc.actual_qty < doc.qty) { %}
<span class="text-danger small" style="margin-left: 15px;">
<span class="octicon octicon-stop" style="font-size: 12px;"></span> Not in Stock
</span>
{% } %}
</div>
{% if(frm.doc.docstatus==0 && doc.s_warehouse && doc.actual_qty < doc.qty) { %}
<span class="text-danger small" style="margin-left: 15px;">
<span class="octicon octicon-stop" style="font-size: 12px;"></span> Not in Stock
</span>
{% } %}
</div>
<!-- warehouse -->
<div class="col-sm-3 col-xs-4">
{% if(doc.s_warehouse) { %}
<span class="label label-default" title="{% __("Source" )%}">
{%= doc.s_warehouse || "" %}</span>
{% } %}
{% if(doc.t_warehouse) { %}<span class="label label-primary" title="{% __("Target" )%}">
{%= doc.t_warehouse || "" %}</span>{% } %}
</div>
<!-- qty -->
@@ -40,7 +42,7 @@
</div>
<!-- amount -->
<div class="col-sm-2 col-xs-4 text-right">
<div class="col-sm-2 col-xs-2 text-right">
{%= doc.get_formatted("amount") %}
<div class="small text-muted">
{%= doc.get_formatted("incoming_rate") %}