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

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2018-08-29 13:34:58 +05:30
parent 6b539d65d7 d982e8fcda
commit a804d6d487
34 changed files with 584 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/templates/includes/products_as_grid.html
View File

@@ -12,8 +12,9 @@
<div>&nbsp</div>
<div style='font-size: small; margin-bottom: 10px;'>&nbsp</div>
{% endif %}
{% if show_stock_qty %}
{% if in_stock %}
{% if show_availability_status %}
{% if in_stock or not is_stock_item %}
<div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div>
{% else %}
<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>