nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Saurabh
2018-07-18 17:08:16 +05:30
parent 9baa3bef8b 8ca5940f76
commit d7897f1c53
30 changed files with 298 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -56,6 +56,21 @@ class TestSalesOrder(unittest.TestCase):
si1 = make_sales_invoice(so.name)
self.assertEqual(len(si1.get("items")), 0)
def test_so_billed_amount_against_return_entry(self):
from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_sales_return
so = make_sales_order(do_not_submit=True)
so.submit()
si = make_sales_invoice(so.name)
si.insert()
si.submit()
si1 = make_sales_return(si.name)
si1.update_billed_amount_in_sales_order = 1
si1.submit()
so.load_from_db()
self.assertEquals(so.per_billed, 0)
def test_make_sales_invoice_with_terms(self):
so = make_sales_order(do_not_submit=True)