Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Anand Doshi 2013-09-05 14:36:59 +05:30
commit f021310cca

View File

@ -257,7 +257,9 @@ class TestSalesInvoice(unittest.TestCase):
self.assertEquals(w.doc.outstanding_amount, w.doc.grand_total)
def test_payment(self):
webnotes.conn.sql("""delete from `tabGL Entry`""")
w = self.make()
from accounts.doctype.journal_voucher.test_journal_voucher \
import test_records as jv_test_records
@ -706,6 +708,7 @@ test_records = [
{
"naming_series": "_T-Sales Invoice-",
"company": "_Test Company",
"is_pos": 0,
"conversion_rate": 1.0,
"currency": "INR",
"debit_to": "_Test Customer - _TC",
@ -769,6 +772,7 @@ test_records = [
{
"naming_series": "_T-Sales Invoice-",
"company": "_Test Company",
"is_pos": 0,
"conversion_rate": 1.0,
"currency": "INR",
"debit_to": "_Test Customer - _TC",
@ -822,6 +826,7 @@ test_records = [
{
"naming_series": "_T-Sales Invoice-",
"company": "_Test Company",
"is_pos": 0,
"conversion_rate": 1.0,
"currency": "INR",
"debit_to": "_Test Customer - _TC",
@ -947,6 +952,7 @@ test_records = [
{
"naming_series": "_T-Sales Invoice-",
"company": "_Test Company",
"is_pos": 0,
"conversion_rate": 1.0,
"currency": "INR",
"debit_to": "_Test Customer - _TC",