schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-01-30 11:03:25 +05:30
parent 9212a74913
commit 0884c5ed83
2 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/accounts_controller.py
View File

@@ -321,17 +321,6 @@ class AccountsController(TransactionBase):
(self.doctype, self.name),
)
<<<<<<< HEAD
=======
def remove_serial_and_batch_bundle(self):
bundles = frappe.get_all(
"Serial and Batch Bundle",
filters={"voucher_type": self.doctype, "voucher_no": self.name, "docstatus": ("!=", 1)},
)
for bundle in bundles:
frappe.delete_doc("Serial and Batch Bundle", bundle.name)
def validate_return_against_account(self):
if (
self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against
@@ -346,7 +335,6 @@ class AccountsController(TransactionBase):
)
)
>>>>>>> 6f2fae1b61 (refactor: prevent '{debit/credit}_to' account mismatch)
def validate_deferred_income_expense_account(self):
field_map = {
"Sales Invoice": "deferred_revenue_account",