Merge pull request #15530 from rohitwaghchaure/consolidated_report_issue_v11
[Fix] Consolidated Financial Statement report
diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py
index 4e08105..2167b12 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.py
+++ b/erpnext/setup/doctype/naming_series/naming_series.py
@@ -166,13 +166,12 @@
def parse_naming_series(self):
parts = self.prefix.split('.')
- # If series contain date format like INV.YYYY.MM.#####
- if len(parts) > 2:
- del parts[-1] # Removed ### from the series
- prefix = parse_naming_series(parts)
- else:
- prefix = parts[0]
+ # Remove ### from the end of series
+ if parts[-1] == "#" * len(parts[-1]):
+ del parts[-1]
+
+ prefix = parse_naming_series(parts)
return prefix
def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True):
diff --git a/erpnext/templates/includes/products_as_grid.html b/erpnext/templates/includes/products_as_grid.html
index 9908c8a..8da82de 100644
--- a/erpnext/templates/includes/products_as_grid.html
+++ b/erpnext/templates/includes/products_as_grid.html
@@ -3,8 +3,8 @@
<a class="product-link" href="{{ route|abs_url }}">
<div class="col-sm-4 col-xs-4 product-image-wrapper">
<div class="product-image-img">
- {{ product_image_square(thumbnail or website_image) }}
- <div class="product-text" itemprop="name">{{ item_name }}</div>
+ {{ product_image_square(thumbnail or website_image or image) }}
+ <div class="product-text" itemprop="name">{{ item_name or name }}</div>
{% if price_sales_uom %}
<div>{{ price_sales_uom }}</div>
<div style='font-size: small; margin-bottom: 10px;'>({{ price_stock_uom }} / {{ stock_uom }})</div>