Merge branch 'develop' of https://github.com/frappe/erpnext into notification

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -3,6 +3,7 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+from functools import reduce
 import frappe, csv
 from frappe import _
 from frappe.utils import cstr

erpnext/accounts/doctype/payment_entry/payment_entry.py

@@ -161,7 +161,7 @@ class PaymentEntry(AccountsController):
 					d.reference_name, self.party_account_currency)
 
 				for field, value in iteritems(ref_details):
-					if not d.get(field) or force:
+					if field == 'exchange_rate' or not d.get(field) or force:
 						d.set(field, value)
 
 	def validate_payment_type(self):

erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json

@@ -88,7 +88,6 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "fetch_from": "reference_name.due_date", 
    "fetch_if_empty": 0,
    "fieldname": "due_date",
    "fieldtype": "Date",
@@ -288,7 +287,6 @@
    "collapsible": 0,
    "columns": 0,
    "depends_on": "eval:(doc.reference_doctype=='Purchase Invoice')",
-   "fetch_from": "reference_name.conversion_rate", 
    "fetch_if_empty": 0,
    "fieldname": "exchange_rate",
    "fieldtype": "Float",

erpnext/regional/italy/utils.py

@@ -292,7 +292,7 @@ def prepare_and_attach_invoice(doc, replace=False):
 		"content": invoice_xml
 	})
 	_file.save()
-	return file
+	return _file
 
 @frappe.whitelist()
 def generate_single_invoice(docname):