nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-13 10:35:14 +05:30
parent 4c78a682ad
commit cf1eabe049
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/test/accounts_mixin.py
View File

@@ -121,8 +121,6 @@ class AccountsTestMixin:
new_acc.save() new_acc.save()
setattr(self, acc.attribute_name, new_acc.name) setattr(self, acc.attribute_name, new_acc.name)
<<<<<<< HEAD
=======
self.identify_default_warehouses() self.identify_default_warehouses()
def enable_advance_as_liability(self): def enable_advance_as_liability(self):
@@ -144,7 +142,6 @@ class AccountsTestMixin:
): ):
setattr(self, "warehouse_" + w.warehouse_name.lower().strip().replace(" ", "_"), w.name) setattr(self, "warehouse_" + w.warehouse_name.lower().strip().replace(" ", "_"), w.name)
>>>>>>> a21a406d04 (refactor(test): utility methods for enabling advance in separate acc)
def create_usd_receivable_account(self): def create_usd_receivable_account(self):
account_name = "Debtors USD" account_name = "Debtors USD"
if not frappe.db.get_value( if not frappe.db.get_value(