Merge branch 'develop' into payment-terms

This commit is contained in:
tundebabzy
2017-09-05 11:14:47 +01:00
committed by GitHub
76 changed files with 12812 additions and 11218 deletions

View File

@@ -8,6 +8,16 @@ frappe.ui.form.on("Company", {
erpnext.company.setup_queries(frm);
},
company_name: function(frm) {
if(frm.doc.__islocal) {
let parts = frm.doc.company_name.split();
let abbr = $.map(parts, function (p) {
return p? p.substr(0, 1) : null;
}).join("");
frm.set_value("abbr", abbr);
}
},
refresh: function(frm) {
if(frm.doc.abbr && !frm.doc.__islocal) {
frm.set_df_property("abbr", "read_only", 1);

View File

@@ -8,7 +8,7 @@ def get_data():
'graph': True,
'graph_method': "frappe.utils.goal.get_monthly_goal_graph_data",
'graph_method_args': {
'title': 'Sales',
'title': _('Sales'),
'goal_value_field': 'monthly_sales_target',
'goal_total_field': 'total_monthly_sales',
'goal_history_field': 'sales_monthly_history',