[merge] 4.x to 5.0

2014-10-06 12:56:51 +05:30
parent 214164cc38 4f614b4030
commit c68646c694
65 changed files with 3986 additions and 3726 deletions
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 import frappe
 from frappe import _, msgprint
 from frappe.utils import flt, rounded
+
 from erpnext.setup.utils import get_company_currency
 from erpnext.accounts.party import get_party_details