From a65b28772fd043b4303300da161aa5b4f9b37600 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 6 Mar 2018 18:01:01 +0530 Subject: [PATCH 1/5] [fix] setup_party_account_field on init --- erpnext/accounts/doctype/payment_entry/payment_entry.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py index 7561b352453..305c08babdf 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.py +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py @@ -20,6 +20,11 @@ class InvalidPaymentEntry(ValidationError): 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 @@ class PaymentEntry(AccountsController): def set_unallocated_amount(self): self.unallocated_amount = 0 + if self.party: total_deductions = sum([flt(d.amount) for d in self.get("deductions")]) From 1fa992564a446079567c1f8c4ebc3e893d51ef38 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Wed, 7 Mar 2018 12:08:52 +0530 Subject: [PATCH 2/5] fix the desktop icon for course schedule --- erpnext/config/desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 6bc4104221f..6d4fe023603 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -200,7 +200,7 @@ def get_data(): "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 From ca6e2236944f9a6ff475d17135f0ce3e5e8a35dc Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 5 Mar 2018 17:03:05 +0530 Subject: [PATCH 3/5] [fix] use join instead of subquery --- .../update_status_for_multiple_source_in_po.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py b/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py index 1de9d976f84..fd3be08b89b 100644 --- a/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py +++ b/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py @@ -9,15 +9,17 @@ def execute(): # update the sales order item in the material request frappe.reload_doc('stock', 'doctype', 'material_request_item') - frappe.db.sql('''update `tabMaterial Request Item` mri set sales_order_item = (select name from - `tabSales Order Item` soi where soi.parent=mri.sales_order and soi.item_code=mri.item_code) where docstatus = 1 and - ifnull(mri.sales_order, "")!="" + frappe.db.sql('''update `tabMaterial Request Item` mri, `tabSales Order Item` soi + set mri.sales_order_item = soi.name + where ifnull(mri.sales_order, "")!="" and soi.parent=mri.sales_order + and soi.item_code=mri.item_code and mri.docstatus=1 ''') # update the sales order item in the purchase order - frappe.db.sql('''update `tabPurchase Order Item` poi set sales_order_item = (select name from - `tabSales Order Item` soi where soi.parent=poi.sales_order and soi.item_code=poi.item_code) where docstatus = 1 and - ifnull(poi.sales_order, "")!="" + frappe.db.sql('''update `tabPurchase Order Item` poi, `tabSales Order Item` soi + set poi.sales_order_item = soi.name + where ifnull(poi.sales_order, "")!="" and soi.parent=poi.sales_order + and soi.item_code=poi.item_code and poi.docstatus = 1 ''') # Update the status in material request and sales order From 12d7bfb6584ea9388e64867721b1eff82a7b47eb Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Wed, 7 Mar 2018 12:52:31 +0530 Subject: [PATCH 4/5] allow renaming of the guardian --- erpnext/education/doctype/guardian/guardian.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/education/doctype/guardian/guardian.json b/erpnext/education/doctype/guardian/guardian.json index d8722e2c900..191e92a0f90 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", From 36b4faab48ea8c2e215ae6d64eea463232fef09a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Mar 2018 13:39:05 +0600 Subject: [PATCH 5/5] bumped to version 10.1.6 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 6ec290c5e50..99981bd713e 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.5' +__version__ = '10.1.6' def get_default_company(user=None): '''Get default company for user'''