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

minor fixes

Browse Source
This commit is contained in:
Nabin Hait 2015-07-09 19:48:21 +05:30
parent 5cbe3441e8
commit 6336ff7323
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@ -759,12 +759,11 @@ class TestSalesInvoice(unittest.TestCase):
self.assertRaises(SerialNoDuplicateError, si.cancel) self.assertRaises(SerialNoDuplicateError, si.cancel)
def test_invoice_due_date_against_customers_credit_days(self): def test_invoice_due_date_against_customers_credit_days(self):
si = create_sales_invoice()
# set customer's credit days # set customer's credit days
frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days") frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days")
frappe.db.set_value("Customer", "_Test Customer", "credit_days", 10) frappe.db.set_value("Customer", "_Test Customer", "credit_days", 10)
si.validate() si = create_sales_invoice()
self.assertEqual(si.due_date, add_days(nowdate(), 10)) self.assertEqual(si.due_date, add_days(nowdate(), 10))
# set customer's credit days is last day of the next month # set customer's credit days is last day of the next month

2
erpnext/accounts/party.py
View File

@ -164,7 +164,7 @@ def get_due_date(posting_date, party_type, party, company):
"""Set Due Date = Posting Date + Credit Days""" """Set Due Date = Posting Date + Credit Days"""
due_date = None due_date = None
if posting_date and party: if posting_date and party:
due_date = nowdate() due_date = posting_date
if party_type=="Customer": if party_type=="Customer":
credit_days_based_on, credit_days = get_credit_days(party_type, party, company) credit_days_based_on, credit_days = get_credit_days(party_type, party, company)
if credit_days_based_on == "Fixed Days" and credit_days: if credit_days_based_on == "Fixed Days" and credit_days: