From 0437274c58e4c6f3024b052254174fb7b608d4b5 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 15 Mar 2024 11:39:54 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/controllers/accounts_controller.py | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 771c03c2179..61bdc4f52a9 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -957,33 +957,6 @@ class AccountsController(TransactionBase): return gl_dict -<<<<<<< HEAD -======= - def get_voucher_subtype(self): - voucher_subtypes = { - "Journal Entry": "voucher_type", - "Payment Entry": "payment_type", - "Stock Entry": "stock_entry_type", - "Asset Capitalization": "entry_type", - } - if self.doctype in voucher_subtypes: - return self.get(voucher_subtypes[self.doctype]) - elif self.doctype == "Purchase Receipt" and self.is_return: - return "Purchase Return" - elif self.doctype == "Delivery Note" and self.is_return: - return "Sales Return" - elif (self.doctype == "Sales Invoice" and self.is_return) or self.doctype == "Purchase Invoice": - return "Credit Note" - elif (self.doctype == "Purchase Invoice" and self.is_return) or self.doctype == "Sales Invoice": - return "Debit Note" - return self.doctype - - def get_value_in_transaction_currency(self, account_currency, args, field): - if account_currency == self.get("currency"): - return args.get(field + "_in_account_currency") - else: - return flt(args.get(field, 0) / self.get("conversion_rate", 1)) - def validate_zero_qty_for_return_invoices_with_stock(self): rows = [] for item in self.items: @@ -996,7 +969,6 @@ class AccountsController(TransactionBase): ).format(frappe.bold(comma_and(["#" + str(x.idx) for x in rows]))) ) ->>>>>>> 898affbee9 (refactor: disallow '0' qty return invoices with stock effect) def validate_qty_is_not_zero(self): if self.doctype == "Purchase Receipt": return