Merge branch 'develop'

This commit is contained in:
Anand Doshi
2016-01-04 17:58:13 +05:30
7 changed files with 18 additions and 10 deletions

View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.16.0' __version__ = '6.16.1'

View File

@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple""" app_description = """ERP made simple"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.16.0" app_version = "6.16.1"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

View File

@@ -125,7 +125,7 @@ class StockReconciliation(StockController):
for msg in self.validation_messages: for msg in self.validation_messages:
msgprint(msg) msgprint(msg)
raise frappe.ValidationError raise frappe.ValidationError(self.validation_messages)
def validate_item(self, item_code, row_num): def validate_item(self, item_code, row_num):
from erpnext.stock.doctype.item.item import validate_end_of_life, \ from erpnext.stock.doctype.item.item import validate_end_of_life, \

View File

@@ -8,6 +8,10 @@
{% include 'templates/includes/product_search_box.html' %} {% include 'templates/includes/product_search_box.html' %}
{% endblock %} {% endblock %}
{% block breadcrumbs %}
{% include "templates/includes/breadcrumbs.html" %}
{% endblock %}
{% block page_content %} {% block page_content %}
{% from "erpnext/templates/includes/macros.html" import product_image %} {% from "erpnext/templates/includes/macros.html" import product_image %}
<div class="item-content"> <div class="item-content">

View File

@@ -4,6 +4,10 @@
{% include 'templates/includes/product_search_box.html' %} {% include 'templates/includes/product_search_box.html' %}
{% endblock %} {% endblock %}
{% block breadcrumbs %}
{% include "templates/includes/breadcrumbs.html" %}
{% endblock %}
{% block page_content %} {% block page_content %}
<div class="item-group-content"> <div class="item-group-content">
<div> <div>

View File

@@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
from pip.req import parse_requirements from pip.req import parse_requirements
version = "6.16.0" version = "6.16.1"
requirements = parse_requirements("requirements.txt", session="") requirements = parse_requirements("requirements.txt", session="")
setup( setup(