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

fix according to the suggestion.

Browse Source
This commit is contained in:
81552433qqcom 2014-09-12 10:03:30 +08:00 committed by Anand Doshi
parent 951da0ca3d
commit c5a0ef8399
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/report/budget_variance_report/budget_variance_report.py
View File

@ -5,6 +5,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _, msgprint from frappe import _, msgprint
from frappe.utils import flt from frappe.utils import flt
from frappe.utils import formatdate
import time import time
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges from erpnext.controllers.trends import get_period_date_ranges, get_period_month_ranges
@ -51,9 +52,9 @@ def get_columns(filters):
for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]): for from_date, to_date in get_period_date_ranges(filters["period"], filters["fiscal_year"]):
for label in [_("Target") + " (%s)", _("Actual") + " (%s)", _("Variance") + " (%s)"]: for label in [_("Target") + " (%s)", _("Actual") + " (%s)", _("Variance") + " (%s)"]:
if group_months: if group_months:
label = label % (_(from_date.strftime("%b")) + " - " + _(to_date.strftime("%b"))) label = label % (formatdate(from_date, format_string="MMM") + " - " + formatdate(from_date, format_string="MMM"))
else: else:
label = label % _(from_date.strftime("%b")) label = label % formatdate(from_date, format_string="MMM")
columns.append(label+":Float:120") columns.append(label+":Float:120")