Merge branch 'v5.0' of https://github.com/frappe/erpnext into v5.0
This commit is contained in:
@@ -14,6 +14,8 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
frappe.assets.views["Report"]();
|
||||
|
||||
erpnext.AccountTreeGrid = frappe.views.TreeGridReport.extend({
|
||||
init: function(wrapper, title) {
|
||||
this._super({
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
|
||||
// License: GNU General Public License v3. See license.txt
|
||||
|
||||
frappe.assets.views["Report"]();
|
||||
|
||||
erpnext.StockGridReport = frappe.views.TreeGridReport.extend({
|
||||
get_item_warehouse: function(warehouse, item) {
|
||||
if(!this.item_warehouse[item]) this.item_warehouse[item] = {};
|
||||
|
||||
Reference in New Issue
Block a user