fixed conflict while merging develop into v5

2014-12-31 13:24:36 +05:30
parent a4e547d71d b02788b915
commit 54361e8651
43 changed files with 5821 additions and 5738 deletions
--- a/erpnext/patches/v4_1/fix_jv_remarks.py
+++ b/erpnext/patches/v4_1/fix_jv_remarks.py
@@ -6,8 +6,9 @@ import frappe

 def execute():
 	reference_date = guess_reference_date()
+	frappe.reload_doc('accounts', 'doctype', 'journal_voucher_detail')
 	for name in frappe.db.sql_list("""select name from `tabJournal Entry`
-		where date(creation)>=%s""", reference_date):
+			where date(creation)>=%s""", reference_date):
 		jv = frappe.get_doc("Journal Entry", name)
 		try:
 			jv.create_remarks()