Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '5.6.1'
+__version__ = '5.6.2'

erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py

@@ -18,7 +18,7 @@ def execute(filters=None):
 
 	data = []
 	for d in entries:
-		against_date = invoice_posting_date_map[d.reference_name] or ""
+		against_date = invoice_posting_date_map.get(d.reference_name) or ""
 		if d.reference_type=="Purchase Invoice":
 			payment_amount = flt(d.debit) or -1 * flt(d.credit)
 		else:

erpnext/hooks.py

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

erpnext/patches.txt

@@ -190,5 +190,5 @@ erpnext.patches.v5_4.fix_invoice_outstanding
 execute:frappe.db.sql("update `tabStock Ledger Entry` set stock_queue = '[]' where voucher_type = 'Stock Reconciliation' and ifnull(qty_after_transaction, 0) = 0")
 erpnext.patches.v5_4.fix_missing_item_images
 erpnext.patches.v5_4.stock_entry_additional_costs
-erpnext.patches.v5_4.cleanup_journal_entry
+erpnext.patches.v5_4.cleanup_journal_entry #2015-08-14
 execute:frappe.db.sql("update `tabProduction Order` pro set description = (select description from tabItem where name=pro.production_item) where ifnull(description, '') = ''")

erpnext/patches/v5_4/cleanup_journal_entry.py

@@ -1,4 +1,5 @@
 import frappe
+from MySQLdb import OperationalError
 
 def execute():
 	frappe.reload_doctype("Journal Entry Account")
@@ -10,6 +11,10 @@ def execute():
 		("Journal Entry", "against_jv"),
 		("Expense Claim", "against_expense_claim"),
 	):
+		try:
 			frappe.db.sql("""update `tabJournal Entry Account`
-			set reference_type=%s and reference_name={0} where ifnull({0}, '') != ''
+				set reference_type=%s, reference_name={0} where ifnull({0}, '') != ''
 			""".format(fieldname), doctype)
+		except OperationalError:
+			# column not found
+			pass

erpnext/translations/es.csv

@@ -3306,7 +3306,7 @@ apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Pleas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Advertencia: Orden de Venta {0} ya existe contra el mismo número de Orden de Compra
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Notification Control,Purchase,Compra
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Situación de {0} {1} { 2 es ahora }
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Situación de {0} {1} es ahora {2}
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantidad en Balance
 DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} de {1}

setup.py

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