Merge branch 'develop'

This commit is contained in:
Anand Doshi 2015-10-20 18:35:49 +05:30
commit 1b4c5ad1e1
5 changed files with 26 additions and 24 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.5.2'
__version__ = '6.5.3'

View File

@ -29,7 +29,7 @@ blogs.
"""
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "6.5.2"
app_version = "6.5.3"
github_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com"

View File

@ -3,8 +3,8 @@ import frappe
def execute():
frappe.reload_doctype("File")
frappe.reload_doctype("Item")
for item in frappe.get_all("Item", fields=("name", "website_image")):
if item.website_image:
for item in frappe.get_all("Item", fields=("name", "website_image", "thumbnail")):
if item.website_image and not item.thumbnail:
item_doc = frappe.get_doc("Item", item.name)
try:
item_doc.make_thumbnail()

View File

@ -26,29 +26,31 @@
<p class="text-muted">
{{ _("Item Code") }}: <span itemprop="productID">{{ name }}</span></p>
<br>
<div class="item-attribute-selectors">
{% if has_variants %}
{% for d in attributes %}
<div class="item-view-attribute"
style="margin-bottom: 10px;">
<h6 class="text-muted">{{ _(d.attribute) }}</h6>
<select class="form-control"
style="max-width: 140px"
data-attribute="{{ d.attribute }}">
{% for value in attribute_values[d.attribute] %}
<option value="{{ value }}"
{% if selected_attributes and selected_attributes[d.attribute]==value -%} selected {%- endif %}>
{{ _(value) }}
</option>
{% endfor %}
</select>
</div>
{% endfor %}
{% endif %}
</div>
<br>
<div style="min-height: 100px; margin: 10px 0;">
<h4 class="item-price" itemprop="price"></h4>
<div class="item-stock" itemprop="availablity"></div>
<div class="item-cart hide">
{% if has_variants %}
{% for d in attributes %}
<div class="item-view-attribute"
style="margin-bottom: 10px;">
<h6 class="text-muted">{{ _(d.attribute) }}</h6>
<select class="form-control"
style="max-width: 140px"
data-attribute="{{ d.attribute }}">
{% for value in attribute_values[d.attribute] %}
<option value="{{ value }}"
{% if selected_attributes and selected_attributes[d.attribute]==value -%} selected {%- endif %}>
{{ _(value) }}
</option>
{% endfor %}
</select>
</div>
{% endfor %}
{% endif %}
</select>
<div id="item-add-to-cart">
<button class="btn btn-primary btn-sm">
{{ _("Add to Cart") }}</button>

View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = "6.5.2"
version = "6.5.3"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()