Merge branch develop into dimensions

2019-05-28 12:18:32 +05:30
parent f5b6ee9ae7 5fef786441
commit acc2422167
30 changed files with 6343 additions and 7874 deletions
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -356,7 +356,7 @@ class AccountsController(TransactionBase):
 			'fiscal_year': fiscal_year,
 			'voucher_type': self.doctype,
 			'voucher_no': self.name,
-			'remarks': self.get("remarks"),
+			'remarks': self.get("remarks") or self.get("remark"),
 			'debit': 0,
 			'credit': 0,
 			'debit_in_account_currency': 0,