Merge pull request #7138 from rohitwaghchaure/so_po_status_issue
[Fix] Status of sales order and purchase order
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index 8cf0688..57a3711 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -55,8 +55,8 @@
ss = frappe.get_doc("Salary Slip",
self.make_employee_salary_slip("test_employee@salary.com"))
- self.assertEquals(ss.total_days_in_month, 27)
- self.assertEquals(ss.payment_days, 27)
+ self.assertEquals(ss.total_days_in_month, 28)
+ self.assertEquals(ss.payment_days, 28)
self.assertEquals(ss.earnings[0].amount, 5000)
self.assertEquals(ss.earnings[0].default_amount, 5000)
self.assertEquals(ss.earnings[1].amount, 3000)
@@ -76,23 +76,23 @@
ss = frappe.get_doc("Salary Slip",
self.make_employee_salary_slip("test_employee@salary.com"))
- self.assertEquals(ss.total_days_in_month, 27)
- self.assertEquals(ss.payment_days, 27)
+ self.assertEquals(ss.total_days_in_month, 28)
+ self.assertEquals(ss.payment_days, 28)
# set relieving date in the same month
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", "12-12-2016")
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Left")
- self.assertEquals(ss.total_days_in_month, 27)
- self.assertEquals(ss.payment_days, 27)
+ self.assertEquals(ss.total_days_in_month, 28)
+ self.assertEquals(ss.payment_days, 28)
ss.save()
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
# Holidays included in working days
frappe.db.set_value("HR Settings", None, "include_holidays_in_total_working_days", 1)
- self.assertEquals(ss.total_days_in_month, 27)
- self.assertEquals(ss.payment_days, 27)
+ self.assertEquals(ss.total_days_in_month, 28)
+ self.assertEquals(ss.payment_days, 28)
ss.save()
#
# frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "date_of_joining", "2001-01-11")
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 02e5f18..5483320 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -28,6 +28,7 @@
self.update_cost()
self.calculate_total_amounts()
self.calculate_percentage_billed()
+ self.set_dates()
def set_employee_name(self):
if self.employee and not self.employee_name:
@@ -86,9 +87,6 @@
self.start_date = getdate(start_date)
self.end_date = getdate(end_date)
- def before_submit(self):
- self.set_dates()
-
def before_cancel(self):
self.set_status()
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 36e4819..23df503 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -16,6 +16,9 @@
test_records = frappe.get_test_records('Customer')
class TestCustomer(unittest.TestCase):
+ def tearDown(self):
+ frappe.db.set_value("Customer", '_Test Customer', 'credit_limit', 0.0)
+
def test_party_details(self):
from erpnext.accounts.party import get_party_details