Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: minor changes

Browse Source
This commit is contained in:
walstanb 2021-03-27 12:52:23 +05:30 committed by Sagar Vora
parent 225c64a1ad
commit ab673d9e4b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
View File

@ -46,7 +46,6 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):
self.assertFalse(pos_inv.consolidated_invoice == pos_inv3.consolidated_invoice) self.assertFalse(pos_inv.consolidated_invoice == pos_inv3.consolidated_invoice)
finally: finally:
frappe.set_user("Administrator") frappe.set_user("Administrator")
frappe.db.sql("delete from `tabPOS Profile`") frappe.db.sql("delete from `tabPOS Profile`")
frappe.db.sql("delete from `tabPOS Invoice`") frappe.db.sql("delete from `tabPOS Invoice`")
@ -96,7 +95,6 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):
self.assertTrue(frappe.db.get_value("Sales Invoice", pos_inv_cn.consolidated_invoice, "is_return")) self.assertTrue(frappe.db.get_value("Sales Invoice", pos_inv_cn.consolidated_invoice, "is_return"))
finally: finally:
frappe.set_user("Administrator") frappe.set_user("Administrator")
frappe.db.sql("delete from `tabPOS Profile`") frappe.db.sql("delete from `tabPOS Profile`")
frappe.db.sql("delete from `tabPOS Invoice`") frappe.db.sql("delete from `tabPOS Invoice`")

2
erpnext/regional/india/utils.py
View File

@ -826,7 +826,7 @@ def get_regional_round_off_accounts(company, account_list):
gst_account_list = [] gst_account_list = []
for account in ['cgst_account', 'sgst_account', 'igst_account']: for account in ['cgst_account', 'sgst_account', 'igst_account']:
if account in gst_accounts.keys(): if account in gst_accounts:
gst_account_list += gst_accounts.get(account) gst_account_list += gst_accounts.get(account)
account_list.extend(gst_account_list) account_list.extend(gst_account_list)