nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Rushabh Mehta
2016-11-22 23:18:28 +05:30
parent 8132be288f 6557e37d5c
commit 89246df735
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.1.16' __version__ = '7.1.17'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/patches/v7_0/repost_gle_for_pi_with_update_stock.py
View File

@@ -9,6 +9,8 @@ def execute():
if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")): if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
return return
frappe.reload_doctype("Purchase Invoice")
for pi in frappe.db.sql("""select name from `tabPurchase Invoice` for pi in frappe.db.sql("""select name from `tabPurchase Invoice`
where update_stock=1 and docstatus=1 order by posting_date asc""", as_dict=1): where update_stock=1 and docstatus=1 order by posting_date asc""", as_dict=1):

2
erpnext/schools/doctype/student_admission/student_admission.py
View File

@@ -23,7 +23,7 @@ class StudentAdmission(WebsiteGenerator):
context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }] context.parents = [{'name': 'admissions', 'title': _('All Student Admissions') }]
def get_title(self): def get_title(self):
return _("Admissions for {0}").format(self.academic_term) return _("Admissions for {0}").format(self.academic_year)
def get_list_context(context): def get_list_context(context):
context.title = _("Student Admissions") context.title = _("Student Admissions")

3
erpnext/selling/sales_common.js
View File

@@ -66,7 +66,8 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
}); });
} }
if(this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) { if(this.frm.fields_dict["packed_items"] &&
this.frm.fields_dict["packed_items"].grid.get_field('batch_no')) {
this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) { this.frm.set_query("batch_no", "packed_items", function(doc, cdt, cdn) {
return me.set_query_for_batch(doc, cdt, cdn) return me.set_query_for_batch(doc, cdt, cdn)
}); });