mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-29 09:54:47 +00:00
Merge branch 'develop'
This commit is contained in:
@@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '6.16.0'
|
||||
__version__ = '6.16.1'
|
||||
|
||||
@@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
|
||||
app_description = """ERP made simple"""
|
||||
app_icon = "icon-th"
|
||||
app_color = "#e74c3c"
|
||||
app_version = "6.16.0"
|
||||
app_version = "6.16.1"
|
||||
app_email = "info@erpnext.com"
|
||||
app_license = "GNU General Public License (v3)"
|
||||
source_link = "https://github.com/frappe/erpnext"
|
||||
|
||||
@@ -125,7 +125,7 @@ class StockReconciliation(StockController):
|
||||
for msg in self.validation_messages:
|
||||
msgprint(msg)
|
||||
|
||||
raise frappe.ValidationError
|
||||
raise frappe.ValidationError(self.validation_messages)
|
||||
|
||||
def validate_item(self, item_code, row_num):
|
||||
from erpnext.stock.doctype.item.item import validate_end_of_life, \
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
{% include 'templates/includes/product_search_box.html' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{% include "templates/includes/breadcrumbs.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block page_content %}
|
||||
{% from "erpnext/templates/includes/macros.html" import product_image %}
|
||||
<div class="item-content">
|
||||
|
||||
@@ -4,6 +4,10 @@
|
||||
{% include 'templates/includes/product_search_box.html' %}
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{% include "templates/includes/breadcrumbs.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block page_content %}
|
||||
<div class="item-group-content">
|
||||
<div>
|
||||
|
||||
Reference in New Issue
Block a user