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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait 2018-03-07 13:09:07 +05:30
commit c50d7446b5
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.5' __version__ = '10.1.6'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

6
erpnext/accounts/doctype/payment_entry/payment_entry.py
View File

@ -21,6 +21,11 @@ class InvalidPaymentEntry(ValidationError):
class PaymentEntry(AccountsController): 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): def setup_party_account_field(self):
self.party_account_field = None self.party_account_field = None
self.party_account = None self.party_account = None
@ -288,6 +293,7 @@ class PaymentEntry(AccountsController):
def set_unallocated_amount(self): def set_unallocated_amount(self):
self.unallocated_amount = 0 self.unallocated_amount = 0
if self.party: if self.party:
total_deductions = sum([flt(d.amount) for d in self.get("deductions")]) total_deductions = sum([flt(d.amount) for d in self.get("deductions")])

2
erpnext/config/desktop.py
View File

@ -200,7 +200,7 @@ def get_data():
"color": "#fd784f", "color": "#fd784f",
"icon": "octicon octicon-calendar", "icon": "octicon octicon-calendar",
"label": _("Course Schedule"), "label": _("Course Schedule"),
"link": "Calendar/Course Schedule", "link": "List/Course Schedule/Calendar",
"_doctype": "Course Schedule", "_doctype": "Course Schedule",
"type": "list", "type": "list",
"hidden": 1 "hidden": 1

4
erpnext/education/doctype/guardian/guardian.json
View File

@ -2,7 +2,7 @@
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 1,
"autoname": "GARD.####", "autoname": "GARD.####",
"beta": 0, "beta": 0,
"creation": "2016-07-21 15:32:51.163292", "creation": "2016-07-21 15:32:51.163292",
@ -507,7 +507,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-12-06 18:17:38.090252", "modified": "2018-03-07 12:51:06.941609",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Guardian", "name": "Guardian",

14
erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py
View File

@ -9,15 +9,17 @@ def execute():
# update the sales order item in the material request # update the sales order item in the material request
frappe.reload_doc('stock', 'doctype', 'material_request_item') frappe.reload_doc('stock', 'doctype', 'material_request_item')
frappe.db.sql('''update `tabMaterial Request Item` mri set sales_order_item = (select name from frappe.db.sql('''update `tabMaterial Request Item` mri, `tabSales Order Item` soi
`tabSales Order Item` soi where soi.parent=mri.sales_order and soi.item_code=mri.item_code) where docstatus = 1 and set mri.sales_order_item = soi.name
ifnull(mri.sales_order, "")!="" 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 # update the sales order item in the purchase order
frappe.db.sql('''update `tabPurchase Order Item` poi set sales_order_item = (select name from frappe.db.sql('''update `tabPurchase Order Item` poi, `tabSales Order Item` soi
`tabSales Order Item` soi where soi.parent=poi.sales_order and soi.item_code=poi.item_code) where docstatus = 1 and set poi.sales_order_item = soi.name
ifnull(poi.sales_order, "")!="" 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 # Update the status in material request and sales order