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:
Sagar Vora 2019-01-30 20:09:45 +05:30
commit 7a1c40c7c1
5 changed files with 11 additions and 6 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__ = '11.1.1' __version__ = '11.1.2'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

3
erpnext/manufacturing/doctype/bom/bom.json
View File

@ -642,6 +642,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "Valuation Rate",
"fieldname": "rm_cost_as_per", "fieldname": "rm_cost_as_per",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
@ -1977,7 +1978,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-12-13 17:45:44.843197", "modified": "2019-01-30 16:39:34.353721",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "BOM", "name": "BOM",

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -163,6 +163,8 @@ class BOM(WebsiteGenerator):
def get_rm_rate(self, arg): def get_rm_rate(self, arg):
""" Get raw material rate as per selected method, if bom exists takes bom cost """ """ Get raw material rate as per selected method, if bom exists takes bom cost """
rate = 0 rate = 0
if not self.rm_cost_as_per:
self.rm_cost_as_per = "Valuation Rate"
if arg.get('scrap_items'): if arg.get('scrap_items'):
rate = self.get_valuation_rate(arg) rate = self.get_valuation_rate(arg)

8
erpnext/patches/v11_1/setup_guardian_role.py
View File

@ -3,8 +3,10 @@ import frappe
def execute(): def execute():
if 'Education' in frappe.get_active_domains() and not frappe.db.exists("Role", "Guardian"): if 'Education' in frappe.get_active_domains() and not frappe.db.exists("Role", "Guardian"):
frappe.new_doc({ doc = frappe.new_doc("Role")
"doctype": "Role", doc.update({
"role_name": "Guardian", "role_name": "Guardian",
"desk_access": 0 "desk_access": 0
}).insert(ignore_permissions=True) })
doc.insert(ignore_permissions=True)

2
erpnext/templates/pages/product_search.html
View File

@ -10,7 +10,7 @@
<script> <script>
frappe.ready(function() { frappe.ready(function() {
var txt = frappe.utils.get_url_arg("search"); var txt = frappe.utils.get_url_arg("search");
$(".search-results").html('{{ _("Search results for") + ": " + html2text(frappe.form_dict.search or "")|trim }}'); $(".search-results").html('{{ _("Search results for") + ": " + html2text(frappe.form_dict.search or "") | e | trim }}');
window.search = txt; window.search = txt;
window.start = 0; window.start = 0;
window.get_product_list(); window.get_product_list();