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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2017-07-27 17:50:27 +05:30
commit 734e635ef6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '8.6.2' __version__ = '8.6.3'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

2
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -225,7 +225,7 @@ class PurchaseReceipt(BuyingController):
# sub-contracting warehouse # sub-contracting warehouse
if flt(d.rm_supp_cost) and warehouse_account.get(self.supplier_warehouse): if flt(d.rm_supp_cost) and warehouse_account.get(self.supplier_warehouse):
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": warehouse_account[self.supplier_warehouse]["name"], "account": warehouse_account[self.supplier_warehouse]["account"],
"against": warehouse_account[d.warehouse]["account"], "against": warehouse_account[d.warehouse]["account"],
"cost_center": d.cost_center, "cost_center": d.cost_center,
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "remarks": self.get("remarks") or _("Accounting Entry for Stock"),

2
erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
View File

@ -3,7 +3,7 @@
frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() { frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
frappe.query_reports["Purchase Receipt Trends"] = { frappe.query_reports["Purchase Receipt Trends"] = {
filters: erpnext.get_sales_trends_filters() filters: erpnext.get_purchase_trends_filters()
} }
}); });