From 69ca38252998eb3be502b70db229901cd4f3f5f6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Oct 2016 17:15:42 +0530 Subject: [PATCH 1/3] [fix] image size fix in print format --- .../print_formats/includes/item_table_description.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/templates/print_formats/includes/item_table_description.html b/erpnext/templates/print_formats/includes/item_table_description.html index e8a98f0b05..16e98e0ea4 100644 --- a/erpnext/templates/print_formats/includes/item_table_description.html +++ b/erpnext/templates/print_formats/includes/item_table_description.html @@ -3,8 +3,7 @@ {% if doc.in_format_data("image") and doc.get("image") and not doc.is_print_hide("image")-%}
-
-
+
{%- endif %} From d114aca20dcff1556e5f9009c2483bd08e4fce64 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 3 Oct 2016 17:36:17 +0530 Subject: [PATCH 2/3] GL Entries for Purchase Invoices with Update Stock option checked and having non-stock items --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index adc30e2de7..914c9be0a8 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -372,7 +372,7 @@ class PurchaseInvoice(BuyingController): if flt(item.base_net_amount): account_currency = get_account_currency(item.expense_account) - if self.update_stock and self.auto_accounting_for_stock: + if self.update_stock and self.auto_accounting_for_stock and item.item_code in stock_items: val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9 # warehouse account From e2b8ae56e11dfd4446e2b1f60bc4b8860a8011f6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 3 Oct 2016 18:35:10 +0600 Subject: [PATCH 3/3] bumped to version 7.0.53 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index d41c074ebe..ab7a83bc34 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.0.52' +__version__ = '7.0.53' def get_default_company(user=None): '''Get default company for user'''