Merge pull request #3421 from nabinhait/develop
pos link and item description
This commit is contained in:
commit
d3613479c6
@ -9,7 +9,7 @@
|
||||
<button class="btn btn-primary btn-lg">{%= __("Start") %}</button>
|
||||
</p>
|
||||
<p class="pos-setting-message hide">
|
||||
<a class="btn btn-default btn-sm" href="#Form/POS Setting/New POS Setting">
|
||||
{%= __("Make new POS Setting") %}</a>
|
||||
<a class="btn btn-default btn-sm" href="#Form/POS Profile/New POS Profile">
|
||||
{%= __("Make new POS Profile") %}</a>
|
||||
</p>
|
||||
</div>
|
||||
|
@ -1,6 +1,6 @@
|
||||
{% $.each(visible_columns || [], function(i, df) { %}
|
||||
{% var val = doc.get_formatted(df.fieldname);
|
||||
if(val) { %}
|
||||
if((df.fieldname !== "description") && val) { %}
|
||||
<div class="row">
|
||||
<div class="col-xs-4 text-ellipsis">
|
||||
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
|
||||
|
@ -47,6 +47,12 @@
|
||||
|
||||
{% if(doc.item_name != doc.item_code) { %}
|
||||
<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" %}
|
||||
</div>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user