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

translations.

Browse Source
This commit is contained in:
81552433qqcom 2014-09-11 08:37:49 +08:00 committed by Anand Doshi
parent 4bab0a2f54
commit 351be9ca42
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/selling/page/sales_browser/sales_browser.js
View File

@ -112,7 +112,7 @@ erpnext.SalesChart = Class.extend({
var fields = [
{fieldtype:'Data', fieldname: 'name_field',
label:__('New {0} Name',[me.ctype]), reqd:true},
label:__('New {0} Name',[__(me.ctype)]), reqd:true},
{fieldtype:'Select', fieldname:'is_group', label:__('Group Node'), options:'No\nYes',
description: __("Further nodes can be only created under 'Group' type nodes")},
{fieldtype:'Button', fieldname:'create_new', label:__('Create New') }

13
erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
View File

@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.utils import flt
def execute(filters=None):
@ -40,12 +41,12 @@ def execute(filters=None):
def get_columns(filters):
"""return columns based on filters"""
columns = ["Item:Link/Item:100"] + ["Item Name::100"] + \
["Description::150"] + ["UOM:Link/UOM:90"] + \
["Consumed Qty:Float:110"] + ["Consumed Amount:Currency:130"] + \
["Delivered Qty:Float:110"] + ["Delivered Amount:Currency:130"] + \
["Total Qty:Float:110"] + ["Total Amount:Currency:130"] + \
["Supplier(s)::250"]
columns = [_("Item") + ":Link/Item:100"] + [_("Item Name") + "::100"] + \
[_("Description") + "::150"] + [_("UOM") + ":Link/UOM:90"] + \
[_("Consumed Qty") + ":Float:110"] + [_("Consumed Amount") + ":Currency:130"] + \
[_("Delivered Qty") + ":Float:110"] + [_("Delivered Amount") + ":Currency:130"] + \
[_("Total Qty") + ":Float:110"] + [_("Total Amount") + ":Currency:130"] + \
[_("Supplier(s)") + "::250"]
return columns