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

Merge pull request #3421 from nabinhait/develop

Browse Source 
pos link and item description
This commit is contained in:
Nabin Hait
2015-06-05 15:51:03 +05:30
parent 8f87cff4bd 6bf301f53c
commit d3613479c6
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/page/pos/pos_page.html
View File

@@ -9,7 +9,7 @@
<button class="btn btn-primary btn-lg">{%= __("Start") %}</button> <button class="btn btn-primary btn-lg">{%= __("Start") %}</button>
</p> </p>
<p class="pos-setting-message hide"> <p class="pos-setting-message hide">
<a class="btn btn-default btn-sm" href="#Form/POS Setting/New POS Setting"> <a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
{%= __("Make new POS Setting") %}</a> {%= __("Make new POS Profile") %}</a>
</p> </p>
</div> </div>

2
erpnext/templates/form_grid/includes/visible_cols.html
View File

@@ -1,6 +1,6 @@
{% $.each(visible_columns || [], function(i, df) { %} {% $.each(visible_columns || [], function(i, df) { %}
{% var val = doc.get_formatted(df.fieldname); {% var val = doc.get_formatted(df.fieldname);
if(val) { %} if((df.fieldname !== "description") && val) { %}
<div class="row"> <div class="row">
<div class="col-xs-4 text-ellipsis"> <div class="col-xs-4 text-ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong> <strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>

6
erpnext/templates/form_grid/item_grid.html
View File

@@ -47,6 +47,12 @@
{% if(doc.item_name != doc.item_code) { %} {% if(doc.item_name != doc.item_code) { %}
<br>{%= doc.item_name %}{% } %} <br>{%= doc.item_name %}{% } %}
{% if((doc.description != doc.item_code != doc.item_name) &&
in_list($.map(visible_columns, function(x, i) {return x.fieldname}), "description")) { %}
<br>
<strong>Description: </strong>
{%= doc.get_formatted("description") %}{% } %}
{% include "templates/form_grid/includes/visible_cols.html" %} {% include "templates/form_grid/includes/visible_cols.html" %}
</div> </div>