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

[fix] Get defaults based on doctype or fieldname

Browse Source
This commit is contained in:
Nabin Hait 2015-12-23 16:37:00 +05:30
parent d55d0c06e3
commit b6b56453e1
37 changed files with 39 additions and 39 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

@ -66,7 +66,7 @@ frappe.pages["Accounts Browser"].on_page_load = 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_user_default("company") || r.message[0]).change(); wrapper.$company_select.val(frappe.defaults.get_user_default("Company") || r.message[0]).change();
} }
}); });
} }

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

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

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

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

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

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

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

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

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

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

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

@ -8,7 +8,7 @@ frappe.query_reports["General Ledger"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

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

@ -9,7 +9,7 @@ frappe.query_reports["Gross Profit"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_default("company") "default": frappe.defaults.get_user_default("Company")
}, },
{ {
"fieldname":"from_date", "fieldname":"from_date",

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

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

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

@ -27,7 +27,7 @@ frappe.query_reports["Item-wise Sales Register"] = frappe.query_reports["Sales R
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_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

@ -9,7 +9,7 @@ frappe.query_reports["Payment Period Based On Invoice Date"] = {
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
reqd: 1, reqd: 1,
default: frappe.defaults.get_user_default("company") default: frappe.defaults.get_user_default("Company")
}, },
{ {
fieldname: "from_date", fieldname: "from_date",

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

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

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

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

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

@ -10,7 +10,7 @@ frappe.query_reports["Trial Balance"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

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

@ -8,7 +8,7 @@ frappe.query_reports["Trial Balance for Party"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

2
erpnext/accounts/utils.py
View File

@ -383,7 +383,7 @@ def get_actual_expense(args):
def get_currency_precision(currency=None): def get_currency_precision(currency=None):
if not currency: if not currency:
currency = frappe.db.get_value("Company", currency = frappe.db.get_value("Company",
frappe.db.get_default("company"), "default_currency", cache=True) frappe.db.get_default("Company"), "default_currency", cache=True)
currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True) currency_format = frappe.db.get_value("Currency", currency, "number_format", cache=True)
from frappe.utils import get_number_format_info from frappe.utils import get_number_format_info

2
erpnext/crm/doctype/lead/lead.py
View File

@ -90,7 +90,7 @@ def _make_customer(source_name, target_doc=None, ignore_permissions=False):
target.customer_type = "Individual" target.customer_type = "Individual"
target.customer_name = source.lead_name target.customer_name = source.lead_name
target.customer_group = frappe.db.get_default("customer_group") target.customer_group = frappe.db.get_default("Customer Group")
doclist = get_mapped_doc("Lead", source_name, doclist = get_mapped_doc("Lead", source_name,
{"Lead": { {"Lead": {

2
erpnext/crm/doctype/newsletter/newsletter.py
View File

@ -121,7 +121,7 @@ def create_lead(email_id):
"lead_name": real_name or email_id, "lead_name": real_name or email_id,
"status": "Lead", "status": "Lead",
"naming_series": get_default_naming_series("Lead"), "naming_series": get_default_naming_series("Lead"),
"company": frappe.db.get_default("company"), "company": frappe.db.get_default("Company"),
"source": "Email" "source": "Email"
}) })
lead.insert() lead.insert()

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

@ -29,8 +29,8 @@ erpnext.crm.Opportunity = frappe.ui.form.Controller.extend({
if(!this.frm.doc.status) if(!this.frm.doc.status)
set_multiple(cdt, cdn, { status:'Draft' }); set_multiple(cdt, cdn, { status:'Draft' });
if(!this.frm.doc.company && frappe.defaults.get_user_default("company")) if(!this.frm.doc.company && frappe.defaults.get_user_default("Company"))
set_multiple(cdt, cdn, { company:frappe.defaults.get_user_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/hr/doctype/appraisal/appraisal.js
View File

@ -13,7 +13,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
} }
cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){ cur_frm.cscript.onload_post_render = function(doc,cdt,cdn){
if(doc.__islocal && doc.employee==frappe.defaults.get_user_default("employee")) { if(doc.__islocal && doc.employee==frappe.defaults.get_user_default("Employee")) {
cur_frm.set_value("employee", ""); cur_frm.set_value("employee", "");
cur_frm.set_value("employee_name", "") cur_frm.set_value("employee_name", "")
} }

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

@ -16,7 +16,7 @@ frappe.query_reports["Employee Birthday"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company") "default": frappe.defaults.get_user_default("Company")
} }
] ]
} }

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

@ -23,7 +23,7 @@ frappe.query_reports["Employee Leave Balance"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_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": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_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": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company") "default": frappe.defaults.get_user_default("Company")
} }
] ]
} }

4
erpnext/hub_node/doctype/hub_settings/hub_settings.js
View File

@ -1,9 +1,9 @@
frappe.ui.form.on("Hub Settings", "onload", function(frm) { frappe.ui.form.on("Hub Settings", "onload", function(frm) {
if(!frm.doc.seller_country) { if(!frm.doc.seller_country) {
frm.set_value("seller_country", frappe.defaults.get_default("country")); frm.set_value("seller_country", frappe.defaults.get_default("Country"));
} }
if(!frm.doc.seller_name) { if(!frm.doc.seller_name) {
frm.set_value("seller_name", frappe.defaults.get_default("company")); frm.set_value("seller_name", frappe.defaults.get_default("Company"));
} }
}); });

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

@ -4,7 +4,7 @@
frappe.require("assets/erpnext/js/utils.js"); frappe.require("assets/erpnext/js/utils.js");
cur_frm.cscript.onload = function(doc, cdt, cdn) { cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.set_value("company", frappe.defaults.get_user_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/manufacturing/doctype/workstation/workstation.py
View File

@ -45,7 +45,7 @@ class Workstation(Document):
@frappe.whitelist() @frappe.whitelist()
def get_default_holiday_list(): def get_default_holiday_list():
return frappe.db.get_value("Company", frappe.defaults.get_user_default("company"), "default_holiday_list") return frappe.db.get_value("Company", frappe.defaults.get_user_default("Company"), "default_holiday_list")
def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime): def check_if_within_operating_hours(workstation, operation, from_datetime, to_datetime):
if from_datetime and to_datetime: if from_datetime and to_datetime:

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

@ -7,7 +7,7 @@ erpnext.financial_statements = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

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

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

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

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

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

@ -8,7 +8,7 @@ frappe.query_reports["Customer Acquisition and Loyalty"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

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

@ -9,7 +9,7 @@ frappe.query_reports["Customer Credit Balance"] = {
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"reqd": 1, "reqd": 1,
"default": frappe.defaults.get_user_default("company") "default": frappe.defaults.get_user_default("Company")
}, },
{ {
"fieldname":"customer", "fieldname":"customer",

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: __("Company"), label: __("Company"),
fieldtype: "Link", fieldtype: "Link",
options: "Company", options: "Company",
default: frappe.defaults.get_user_default("company") default: frappe.defaults.get_user_default("Company")
}, },
{ {
fieldname:"item_group", fieldname:"item_group",

2
erpnext/stock/get_item_details.py
View File

@ -143,7 +143,7 @@ def get_basic_details(args, item):
item.update_template_tables() item.update_template_tables()
from frappe.defaults import get_user_default_as_list from frappe.defaults import get_user_default_as_list
user_default_warehouse_list = get_user_default_as_list('warehouse') user_default_warehouse_list = get_user_default_as_list('Warehouse')
user_default_warehouse = user_default_warehouse_list[0] \ user_default_warehouse = user_default_warehouse_list[0] \
if len(user_default_warehouse_list)==1 else "" if len(user_default_warehouse_list)==1 else ""

2
erpnext/stock/report/stock_ageing/stock_ageing.js
View File

@ -8,7 +8,7 @@ frappe.query_reports["Stock Ageing"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

2
erpnext/stock/report/stock_ledger/stock_ledger.js
View File

@ -8,7 +8,7 @@ frappe.query_reports["Stock Ledger"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"default": frappe.defaults.get_user_default("company"), "default": frappe.defaults.get_user_default("Company"),
"reqd": 1 "reqd": 1
}, },
{ {

2
erpnext/support/doctype/issue/issue.py
View File

@ -41,7 +41,7 @@ class Issue(Document):
if not self.company: if not self.company:
self.company = frappe.db.get_value("Lead", self.lead, "company") or \ self.company = frappe.db.get_value("Lead", self.lead, "company") or \
frappe.db.get_default("company") frappe.db.get_default("Company")
def update_status(self): def update_status(self):
status = frappe.db.get_value("Issue", self.name, "status") status = frappe.db.get_value("Issue", self.name, "status")