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

[fix] analytics reports + remove print item tables #2667

Browse Source
This commit is contained in:
Rushabh Mehta 2015-02-03 17:55:52 +05:30
parent d2b762d760
commit c567e8e960
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/page/financial_analytics/financial_analytics.js
View File

@ -49,7 +49,7 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({
],
setup_columns: function() {
var std_columns = [
{id: "check", name: __("Plot"), field: "check", width: 30,
{id: "_check", name: __("Plot"), field: "_check", width: 30,
formatter: this.check_formatter},
{id: "name", name: __("Account"), field: "name", width: 300,
formatter: this.tree_formatter},

2
erpnext/buying/page/purchase_analytics/purchase_analytics.js
View File

@ -74,7 +74,7 @@ erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({
this.tree_grid = this.tree_grids[this.tree_type];
var std_columns = [
{id: "check", name: __("Plot"), field: "check", width: 30,
{id: "_check", name: __("Plot"), field: "_check", width: 30,
formatter: this.check_formatter},
{id: "name", name: this.tree_grid.label, field: "name", width: 300,
formatter: this.tree_formatter},

5
erpnext/controllers/buying_controller.py
View File

@ -15,9 +15,8 @@ from erpnext.controllers.stock_controller import StockController
class BuyingController(StockController):
def __setup__(self):
if hasattr(self, "items"):
self.table_print_templates = {
"items": "templates/print_formats/includes/item_grid.html",
"taxes": "templates/print_formats/includes/taxes.html",
self.print_templates = {
"taxes": "templates/print_formats/includes/taxes.html"
}
def get_feed(self):

5
erpnext/controllers/selling_controller.py
View File

@ -13,9 +13,8 @@ from erpnext.controllers.stock_controller import StockController
class SellingController(StockController):
def __setup__(self):
if hasattr(self, "items"):
self.table_print_templates = {
"items": "templates/print_formats/includes/item_grid.html",
"taxes": "templates/print_formats/includes/taxes.html",
self.print_templates = {
"taxes": "templates/print_formats/includes/taxes.html"
}
def get_feed(self):

2
erpnext/public/js/stock_analytics.js
View File

@ -36,7 +36,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
},
setup_columns: function() {
var std_columns = [
{id: "check", name: __("Plot"), field: "check", width: 30,
{id: "_check", name: __("Plot"), field: "_check", width: 30,
formatter: this.check_formatter},
{id: "name", name: __("Item"), field: "name", width: 300,
formatter: this.tree_formatter},

2
erpnext/support/page/support_analytics/support_analytics.js
View File

@ -37,7 +37,7 @@ erpnext.SupportAnalytics = frappe.views.GridReportWithPlot.extend({
setup_columns: function() {
var std_columns = [
{id: "check", name: __("Plot"), field: "check", width: 30,
{id: "_check", name: __("Plot"), field: "_check", width: 30,
formatter: this.check_formatter},
{id: "status", name: __("Status"), field: "status", width: 100},
];