Merge pull request #13166 from saurabh6790/patches_fixes
[fix] use join instead of subquery
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 7561b35..305c08b 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -20,6 +20,11 @@
class PaymentEntry(AccountsController):
+ def __init__(self, *args, **kwargs):
+ super(PaymentEntry, self).__init__(*args, **kwargs)
+ if not self.is_new():
+ self.setup_party_account_field()
+
def setup_party_account_field(self):
self.party_account_field = None
self.party_account = None
@@ -287,6 +292,7 @@
def set_unallocated_amount(self):
self.unallocated_amount = 0
+
if self.party:
total_deductions = sum([flt(d.amount) for d in self.get("deductions")])
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 6bc4104..6d4fe02 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -200,7 +200,7 @@
"color": "#fd784f",
"icon": "octicon octicon-calendar",
"label": _("Course Schedule"),
- "link": "Calendar/Course Schedule",
+ "link": "List/Course Schedule/Calendar",
"_doctype": "Course Schedule",
"type": "list",
"hidden": 1
diff --git a/erpnext/education/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json
index d8722e2..191e92a 100644
--- a/erpnext/education/doctype/guardian/guardian.json
+++ b/erpnext/education/doctype/guardian/guardian.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 1,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "GARD.####",
"beta": 0,
"creation": "2016-07-21 15:32:51.163292",
@@ -507,7 +507,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2017-12-06 18:17:38.090252",
+ "modified": "2018-03-07 12:51:06.941609",
"modified_by": "Administrator",
"module": "Education",
"name": "Guardian",