Documentation for payments

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -36,9 +36,6 @@ class PurchaseInvoice(BuyingController):
 			'overflow_type': 'billing'
 		}]
 
-	def onload(self):
-		self.get("__onload").journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
-
 	def validate(self):
 		if not self.is_opening:
 			self.is_opening = 'No'

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -49,9 +49,6 @@ class SalesInvoice(SellingController):
 			self.indicator_color = "green"
 			self.indicator_title = _("Paid")
 
-	def onload(self):
-		self.get("__onload").journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
-
 	def validate(self):
 		super(SalesInvoice, self).validate()
 		self.validate_posting_time()

erpnext/buying/doctype/purchase_order/purchase_order.py

@@ -33,9 +33,6 @@ class PurchaseOrder(BuyingController):
 			'overflow_type': 'order'
 		}]
 
-	def onload(self):
-		self.get("__onload").journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
-
 	def validate(self):
 		super(PurchaseOrder, self).validate()
 

erpnext/controllers/accounts_controller.py

@@ -26,6 +26,9 @@ class AccountsController(TransactionBase):
 
 		return self.__company_currency
 
+	def onload(self):
+		self.get("__onload").make_payment_via_journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
+
 	def validate(self):
 		if self.get("_action") and self._action != "update_after_submit":
 			self.set_missing_values(for_validate=True)

erpnext/controllers/selling_controller.py

@@ -23,6 +23,7 @@ class SellingController(StockController):
 			self.grand_total)
 
 	def onload(self):
+		super(SellingController, self).onload()
 		if self.doctype in ("Sales Order", "Delivery Note", "Sales Invoice"):
 			for item in self.get("items"):
 				item.update(get_bin_details(item.item_code,

erpnext/docs/user/manual/en/accounts/index.txt

@@ -3,6 +3,7 @@ opening-accounts
 sales-invoice
 point-of-sale-pos-invoice
 purchase-invoice
+payments
 journal-entry
 payment-entry
 multi-currency-accounting

erpnext/docs/user/manual/en/accounts/payments.md

@@ -0,0 +1,48 @@
+Payment can be made against following transactions.
+
+  1. Sales Invoice.
+  2. Purchase Invoice.
+  3. Sales Order (Advance Payment)
+  4. Purchase Order (Advance Payment)
+  
+In ERPNext, there is two options through which user can capture the payment
+
+  1. Payment Entry(Default).
+  2. Journal Entry.
+  
+## Payment Entry
+
+####Step 1: Make Payment
+
+On submitting a document against which Payment Entry can be made, you will find Make Payment button.
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
+
+####Step 2: Payment Entry
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-9.png">
+
+For more details about payment entry [check here.](https://frappe.github.io/erpnext/user/manual/en/accounts/payment-entry)
+
+## Journal Entry
+
+To make paymant using journal entry, check below steps
+
+####Step 1: Activate Payment via Journal Entry
+
+Goto Accounts Settings > checked Make Payment via Journal Entry
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/account-settings.png">
+
+####Step 2: Make Payment
+
+On submitting a document against which Journal Entry can be made, you will find Make Payment button.
+
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-1.png">
+
+####Step 3: Journal Entry
+
+Save and submit the journal entry to record the payament against the invoice
+<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
+
+For more details about journal entry [check here.](https://frappe.github.io/erpnext/user/manual/en/accounts/journal-entry)

erpnext/public/js/controllers/transaction.js

@@ -1004,7 +1004,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 
 	get_method_for_payment: function(){
 		method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"
-		if(cur_frm.doc.__onload && cur_frm.doc.__onload.journal_entry){
+		if(cur_frm.doc.__onload && cur_frm.doc.__onload.make_payment_via_journal_entry){
 			if(in_list(['Sales Invoice', 'Purchase Invoice'],  cur_frm.doc.doctype)){
 				method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice"
 			}else {

erpnext/selling/doctype/sales_order/sales_order.py

@@ -24,9 +24,6 @@ class SalesOrder(SellingController):
 	def __init__(self, arg1, arg2=None):
 		super(SalesOrder, self).__init__(arg1, arg2)
 
-	def onload(self):
-		self.get("__onload").journal_entry = frappe.db.get_single_value('Accounts Settings', 'make_payment_via_journal_entry')
-
 	def validate(self):
 		super(SalesOrder, self).validate()