refactor: checkbox to toggle merging of JE account heads
This commit is contained in:
		
							parent
							
								
									5c75894065
								
							
						
					
					
						commit
						a3e3fe149d
					
				| @ -19,6 +19,8 @@ | ||||
|   "column_break_17", | ||||
|   "enable_common_party_accounting", | ||||
|   "allow_multi_currency_invoices_against_single_party_account", | ||||
|   "journals_section", | ||||
|   "merge_similar_account_heads", | ||||
|   "report_setting_section", | ||||
|   "use_custom_cash_flow", | ||||
|   "deferred_accounting_settings_section", | ||||
| @ -369,6 +371,18 @@ | ||||
|    "fieldname": "book_tax_discount_loss", | ||||
|    "fieldtype": "Check", | ||||
|    "label": "Book Tax Loss on Early Payment Discount" | ||||
|   }, | ||||
|   { | ||||
|    "fieldname": "journals_section", | ||||
|    "fieldtype": "Section Break", | ||||
|    "label": "Journals" | ||||
|   }, | ||||
|   { | ||||
|    "default": "0", | ||||
|    "description": "Rows with Same Account heads will be merged on Ledger", | ||||
|    "fieldname": "merge_similar_account_heads", | ||||
|    "fieldtype": "Check", | ||||
|    "label": "Merge Similar Account Heads" | ||||
|   } | ||||
|  ], | ||||
|  "icon": "icon-cog", | ||||
| @ -376,7 +390,7 @@ | ||||
|  "index_web_pages_for_search": 1, | ||||
|  "issingle": 1, | ||||
|  "links": [], | ||||
|  "modified": "2023-04-14 17:22:03.680886", | ||||
|  "modified": "2023-04-17 11:45:42.049247", | ||||
|  "modified_by": "Administrator", | ||||
|  "module": "Accounts", | ||||
|  "name": "Accounts Settings", | ||||
|  | ||||
| @ -885,6 +885,8 @@ class JournalEntry(AccountsController): | ||||
| 	def make_gl_entries(self, cancel=0, adv_adj=0): | ||||
| 		from erpnext.accounts.general_ledger import make_gl_entries | ||||
| 
 | ||||
| 		merge_entries = frappe.db.get_single_value("Accounts Settings", "merge_similar_account_heads") | ||||
| 
 | ||||
| 		gl_map = self.build_gl_map() | ||||
| 		if self.voucher_type in ("Deferred Revenue", "Deferred Expense"): | ||||
| 			update_outstanding = "No" | ||||
| @ -892,7 +894,13 @@ class JournalEntry(AccountsController): | ||||
| 			update_outstanding = "Yes" | ||||
| 
 | ||||
| 		if gl_map: | ||||
| 			make_gl_entries(gl_map, cancel=cancel, adv_adj=adv_adj, update_outstanding=update_outstanding) | ||||
| 			make_gl_entries( | ||||
| 				gl_map, | ||||
| 				cancel=cancel, | ||||
| 				adv_adj=adv_adj, | ||||
| 				merge_entries=merge_entries, | ||||
| 				update_outstanding=update_outstanding, | ||||
| 			) | ||||
| 
 | ||||
| 	@frappe.whitelist() | ||||
| 	def get_balance(self, difference_account=None): | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user