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

Fix related to user_default

Browse Source
This commit is contained in:
Nabin Hait 2014-03-14 15:10:42 +05:30
parent 27bb7892b3
commit 73083dc960
18 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){
$.each(r.message, function(i, v) { $.each(r.message, function(i, v) {
$('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select); $('<option>').html(v).attr('value', v).appendTo(wrapper.$company_select);
}); });
wrapper.$company_select.val(frappe.defaults.get_default("company") || r[0]).change(); wrapper.$company_select.val(frappe.defaults.get_user_default("company") || r[0]).change();
} }
}); });
} }

2
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@ -8,7 +8,7 @@ frappe.query_reports["Accounts Payable"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
}, },
{ {
"fieldname":"account", "fieldname":"account",

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@ -8,7 +8,7 @@ frappe.query_reports["Accounts Receivable"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
}, },
{ {
"fieldname":"account", "fieldname":"account",

2
erpnext/accounts/report/budget_variance_report/budget_variance_report.js
View File

@ -22,7 +22,7 @@ frappe.query_reports["Budget Variance Report"] = {
label: frappe._("Company"), label: frappe._("Company"),
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
default: frappe.defaults.get_default("company") default: frappe.defaults.get_user_default("company")
}, },
] ]
} }

2
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.js
View File

@ -45,7 +45,7 @@ frappe.query_reports["Item-wise Purchase Register"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.js
View File

@ -39,7 +39,7 @@ frappe.query_reports["Item-wise Sales Register"] = frappe.query_reports["Sales R
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js
View File

@ -42,7 +42,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
label: frappe._("Company"), label: frappe._("Company"),
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
default: frappe.defaults.get_default("company") default: frappe.defaults.get_user_default("company")
}, },
] ]
} }

2
erpnext/accounts/report/purchase_register/purchase_register.js
View File

@ -39,7 +39,7 @@ frappe.query_reports["Purchase Register"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/accounts/report/sales_register/sales_register.js
View File

@ -39,7 +39,7 @@ frappe.query_reports["Sales Register"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.js
View File

@ -29,7 +29,7 @@ frappe.query_reports["Monthly Attendance Sheet"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/hr/report/monthly_salary_register/monthly_salary_register.js
View File

@ -29,7 +29,7 @@ frappe.query_reports["Monthly Salary Register"] = {
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
} }
] ]
} }

2
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
View File

@ -2,7 +2,7 @@
// License: GNU General Public License v3. See license.txt // License: GNU General Public License v3. See license.txt
cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.set_value("company", frappe.defaults.get_default("company")) cur_frm.set_value("company", frappe.defaults.get_user_default("company"))
cur_frm.set_value("use_multi_level_bom", 1) cur_frm.set_value("use_multi_level_bom", 1)
} }

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

@ -36,7 +36,7 @@ var get_filters = function(){
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
}, },
]; ];
} }

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

@ -36,7 +36,7 @@ var get_filters = function(){
"label": frappe._("Company"), "label": frappe._("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_default("company") "default": frappe.defaults.get_user_default("company")
}, },
]; ];
} }

6
erpnext/public/js/transaction.js
View File

@ -9,7 +9,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
var me = this; var me = this;
if(this.frm.doc.__islocal) { if(this.frm.doc.__islocal) {
var today = get_today(), var today = get_today(),
currency = frappe.defaults.get_default("currency"); currency = frappe.defaults.get_user_default("currency");
$.each({ $.each({
posting_date: today, posting_date: today,
@ -18,8 +18,8 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
currency: currency, currency: currency,
price_list_currency: currency, price_list_currency: currency,
status: "Draft", status: "Draft",
company: frappe.defaults.get_default("company"), company: frappe.defaults.get_user_default("company"),
fiscal_year: frappe.defaults.get_default("fiscal_year"), fiscal_year: frappe.defaults.get_user_default("fiscal_year"),
is_subcontracted: "No", is_subcontracted: "No",
}, function(fieldname, value) { }, function(fieldname, value) {
if(me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname]) if(me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname])

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

@ -31,7 +31,7 @@ $.extend(erpnext, {
add_applicable_territory: function() { add_applicable_territory: function() {
if(cur_frm.doc.__islocal && if(cur_frm.doc.__islocal &&
frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) { frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) {
var default_territory = frappe.defaults.get_default("territory"); var default_territory = frappe.defaults.get_user_default("territory");
if(default_territory) { if(default_territory) {
var territory = frappe.model.add_child(cur_frm.doc, "Applicable Territory", var territory = frappe.model.add_child(cur_frm.doc, "Applicable Territory",
"valid_for_territories"); "valid_for_territories");

4
erpnext/selling/doctype/opportunity/opportunity.js
View File

@ -22,8 +22,8 @@ erpnext.selling.Opportunity = frappe.ui.form.Controller.extend({
set_multiple(cdt, cdn, { status:'Draft' }); set_multiple(cdt, cdn, { status:'Draft' });
if(!this.frm.doc.date) if(!this.frm.doc.date)
this.frm.doc.transaction_date = date.obj_to_str(new Date()); this.frm.doc.transaction_date = date.obj_to_str(new Date());
if(!this.frm.doc.company && frappe.defaults.get_default("company")) if(!this.frm.doc.company && frappe.defaults.get_user_default("company"))
set_multiple(cdt, cdn, { company:frappe.defaults.get_default("company") }); set_multiple(cdt, cdn, { company:frappe.defaults.get_user_default("company") });
if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year) if(!this.frm.doc.fiscal_year && sys_defaults.fiscal_year)
set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year }); set_multiple(cdt, cdn, { fiscal_year:sys_defaults.fiscal_year });

2
erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
View File

@ -33,7 +33,7 @@ frappe.query_reports["Sales Person-wise Transaction Summary"] = {
label: frappe._("Company"), label: frappe._("Company"),
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
default: frappe.defaults.get_default("company") default: frappe.defaults.get_user_default("company")
}, },
{ {
fieldname:"item_group", fieldname:"item_group",