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

fix: Conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2021-11-19 13:11:07 +05:30
committed by GitHub
parent 9b83e3856a
commit d09ed0a578
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
View File

@@ -67,8 +67,6 @@ class TestGSTR3BReport(unittest.TestCase):
self.assertEqual(output["itc_elg"]["itc_avl"][4]["samt"], 22.50) self.assertEqual(output["itc_elg"]["itc_avl"][4]["samt"], 22.50)
self.assertEqual(output["itc_elg"]["itc_avl"][4]["camt"], 22.50) self.assertEqual(output["itc_elg"]["itc_avl"][4]["camt"], 22.50)
<<<<<<< HEAD
=======
def test_gst_rounding(self): def test_gst_rounding(self):
gst_settings = frappe.get_doc('GST Settings') gst_settings = frappe.get_doc('GST Settings')
gst_settings.round_off_gst_values = 1 gst_settings.round_off_gst_values = 1
@@ -143,8 +141,6 @@ class TestGSTR3BReport(unittest.TestCase):
customer.load_from_db() customer.load_from_db()
self.assertEqual(customer.gst_category, 'Registered Regular') self.assertEqual(customer.gst_category, 'Registered Regular')
>>>>>>> cdbc991e3f (fix: Add test for gst category check)
def make_sales_invoice(): def make_sales_invoice():
si = create_sales_invoice(company="_Test Company GST", si = create_sales_invoice(company="_Test Company GST",
customer = '_Test GST Customer', customer = '_Test GST Customer',