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

[minor] merge conflict fixed

Browse Source
This commit is contained in:
Nabin Hait
2013-11-21 12:28:50 +05:30
parent ad45e31356 e5a1a84d8d
commit 8eb0c61649
25 changed files with 225 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/page/stock_ageing/stock_ageing.js
View File

@@ -25,7 +25,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
page: wrapper,
parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe,
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand"],
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Item Group", "Brand", "Serial No"],
})
},
setup_columns: function() {
@@ -175,7 +175,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
grid: { hoverable: true, clickable: true },
xaxis: {
ticks: $.map(me.data, function(item, idx) { return [[idx+1, item.name]] }),
max: 20
max: 15
},
series: { downsample: { threshold: 1000 } }
}