feat(General Ledger Report): Grouped Print

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -19,34 +19,34 @@ def get_payment_entries(self):
 
 		condition = ""
 		if not self.include_reconciled_entries:
-			condition = " and (clearance_date is null or clearance_date='0000-00-00')"
+			condition = "and ({0}clearance_date is null or {0}clearance_date='0000-00-00')"
 
 		account_cond = ""
 		if self.bank_account_no:
 			account_cond = " and t2.bank_account_no = {0}".format(frappe.db.escape(self.bank_account_no))
 
 		journal_entries = frappe.db.sql("""
 			select
-				"Journal Entry" as payment_document, t1.name as payment_entry,
-				t1.cheque_no as cheque_number, t1.cheque_date,
-				sum(t2.debit_in_account_currency) as debit, sum(t2.credit_in_account_currency) as credit,
-				t1.posting_date, t2.against_account, t1.clearance_date, t2.account_currency
+				'Journal Entry' as payment_document, t1.name as payment_entry,
+				'Journal Entry Account' as payment_detail_dt, t2.name as payment_detail_dn,
+				t2.cheque_no as cheque_number, t2.cheque_date,
+				t2.debit_in_account_currency as debit, t2.credit_in_account_currency as credit, 
+				t1.posting_date, t2.against_account, t2.clearance_date, t2.account_currency 
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
 				t2.parent = t1.name and t2.account = %s and t1.docstatus=1
 				and t1.posting_date >= %s and t1.posting_date <= %s
 				and ifnull(t1.is_opening, 'No') = 'No' {0} {1}
-			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
-		""".format(condition, account_cond), (self.bank_account, self.from_date, self.to_date), as_dict=1)
+		""".format(condition.format("t2."), account_cond), (self.bank_account, self.from_date, self.to_date), as_dict=1)  # nosec
 
 		if self.bank_account_no:
 			condition = " and bank_account = %(bank_account_no)s"
 
 		payment_entries = frappe.db.sql("""
 			select
-				"Payment Entry" as payment_document, name as payment_entry,
+				'Payment Entry' as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
 				if(paid_from=%(account)s, paid_amount, 0) as credit,
 				if(paid_from=%(account)s, 0, received_amount) as debit,
@@ -58,15 +58,15 @@ def get_payment_entries(self):
 				and posting_date >= %(from)s and posting_date <= %(to)s {0}
 			order by
 				posting_date ASC, name DESC
-		""".format(condition),
-		        {"account":self.bank_account, "from":self.from_date,
-				"to":self.to_date, "bank_account_no": self.bank_account_no}, as_dict=1)
+		""".format(condition.format("")),  # nosec
+				{"account":self.bank_account, "from": self.from_date,
+				"to": self.to_date, "bank_account_no": self.bank_account_no}, as_dict=1)
 
 		pos_entries = []
 		if self.include_pos_transactions:
 			pos_entries = frappe.db.sql("""
 				select
-					"Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
+					'Sales Invoice Payment' as payment_document, sip.name as payment_entry, sip.amount as debit,
 					si.posting_date, si.debit_to as against_account, sip.clearance_date,
 					account.account_currency, 0 as credit
 				from `tabSales Invoice Payment` sip, `tabSales Invoice` si, `tabAccount` account
@@ -75,8 +75,8 @@ def get_payment_entries(self):
 					and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s {0}
 				order by
 					si.posting_date ASC, si.name DESC
-			""".format(condition),
-			        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
+			""".format(condition.format("sip.")),  # nosec
+				{"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 
 		entries = sorted(list(payment_entries)+list(journal_entries+list(pos_entries)),
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
@@ -115,8 +115,8 @@ def update_clearance_date(self):
 
 				frappe.db.set_value(d.payment_document, d.payment_entry, "clearance_date", d.clearance_date)
 				frappe.db.sql("""update `tab{0}` set clearance_date = %s, modified = %s
-					where name=%s""".format(d.payment_document),
-				(d.clearance_date, nowdate(), d.payment_entry))
+					where name=%s""".format(d.get("payment_detail_dt") or d.payment_document),
+				(d.clearance_date, nowdate(), d.get("payment_detail_dn") or d.payment_entry))
 
 				clearance_date_updated = True
 

erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json

@@ -310,6 +310,72 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_detail_dt", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Detail DocType", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "DocType", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "payment_detail_dn", 
+   "fieldtype": "Dynamic Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Payment Detail DocName", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "payment_detail_dt", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
  ], 
  "has_web_view": 0, 
@@ -323,7 +389,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2019-01-07 16:52:07.174687", 
+ "modified": "2018-10-27 04:38:34.979129", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
@@ -337,4 +403,4 @@
  "track_changes": 0, 
  "track_seen": 0, 
  "track_views": 0
-}
+}

erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py

@@ -93,8 +93,11 @@ def populate_payment_entries(self):
 
 	def map_transactions_on_journal_entry(self):
 		for entry in self.new_transaction_items:
-			vouchers = frappe.db.sql("""select name, posting_date from `tabJournal Entry`
-										where posting_date='{0}' and total_credit={1} and cheque_no='{2}' and docstatus != 2
+			vouchers = frappe.db.sql("""select jv.name, jv.posting_date
+										from `tabJournal Entry` jv, `tabJournal Entry` jvd
+										where jvd.parent = jv.name and jv.docstatus != 2
+										and jv.posting_date='{0}' and jv.total_credit={1} and jvd.cheque_no='{2}'
+										group by jv.name, jv.posting_date
 									""".format(entry.transaction_date, abs(entry.amount), frappe.safe_decode(entry.description)), as_dict=True)
 			if (len(vouchers) == 1):
 				entry.reference_name = vouchers[0].name