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

fix: Multiplle sider issues

Browse Source
This commit is contained in:
Deepesh Garg 2020-12-31 11:29:06 +05:30
parent 133ce286f9
commit 23ab5c5cc0
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/budget/budget.js
View File

@ -11,7 +11,7 @@ frappe.ui.form.on('Budget', {
report_type: "Profit and Loss", report_type: "Profit and Loss",
is_group: 0 is_group: 0
} }
} };
}); });
frm.set_query("monthly_distribution", function() { frm.set_query("monthly_distribution", function() {
@ -19,7 +19,7 @@ frappe.ui.form.on('Budget', {
filters: { filters: {
fiscal_year: frm.doc.fiscal_year fiscal_year: frm.doc.fiscal_year
} }
} };
}); });
erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype); erpnext.accounts.dimensions.setup_dimension_filters(frm, frm.doctype);

4
erpnext/education/doctype/fees/fees.js
View File

@ -15,9 +15,9 @@ frappe.ui.form.on("Fees", {
}, },
onload: function(frm){ onload: function(frm){
frm.set_query("academic_term",function(){ frm.set_query("academic_term",function() {
return{ return{
"filters":{ "filters": {
"academic_year": (frm.doc.academic_year) "academic_year": (frm.doc.academic_year)
} }
}; };

2
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -16,7 +16,7 @@ frappe.ui.form.on('Expense Claim', {
frappe.ui.form.on('Expense Claim Detail', { frappe.ui.form.on('Expense Claim Detail', {
expense_type: function(frm, cdt, cdn) { expense_type: function(frm, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
if(!frm.doc.company) { if (!frm.doc.company) {
d.expense_type = ""; d.expense_type = "";
frappe.msgprint(__("Please set the Company")); frappe.msgprint(__("Please set the Company"));
this.frm.refresh_fields(); this.frm.refresh_fields();

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

@ -115,7 +115,7 @@ $.extend(erpnext.queries, {
["Warehouse", "is_group", "=",0] ["Warehouse", "is_group", "=",0]
] ]
} };
}, },
get_filtered_dimensions: function(doc, child_fields, dimension, company) { get_filtered_dimensions: function(doc, child_fields, dimension, company) {

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

@ -202,7 +202,7 @@ $.extend(erpnext.utils, {
let found = filters.some(el => el.fieldname === dimension['fieldname']); let found = filters.some(el => el.fieldname === dimension['fieldname']);
if (!found) { if (!found) {
filters.splice(index, 0 ,{ filters.splice(index, 0, {
"fieldname": dimension["fieldname"], "fieldname": dimension["fieldname"],
"label": __(dimension["label"]), "label": __(dimension["label"]),
"fieldtype": "Link", "fieldtype": "Link",

8
erpnext/public/js/utils/dimension_tree_filter.js
View File

@ -69,13 +69,13 @@ erpnext.accounts.dimensions = {
update_dimension(frm, doctype) { update_dimension(frm, doctype) {
if (this.accounting_dimensions) { if (this.accounting_dimensions) {
this.accounting_dimensions.forEach((dimension) => { this.accounting_dimensions.forEach((dimension) => {
if(frm.is_new()) { if (frm.is_new()) {
if(frm.doc.company && Object.keys(this.default_dimensions || {}).length > 0 if (frm.doc.company && Object.keys(this.default_dimensions || {}).length > 0
&& this.default_dimensions[frm.doc.company]) { && this.default_dimensions[frm.doc.company]) {
let default_dimension = this.default_dimensions[frm.doc.company][dimension['fieldname']]; let default_dimension = this.default_dimensions[frm.doc.company][dimension['fieldname']];
if(default_dimension) { if (default_dimension) {
if (frappe.meta.has_field(doctype, dimension['fieldname'])) { if (frappe.meta.has_field(doctype, dimension['fieldname'])) {
frm.set_value(dimension['fieldname'], default_dimension); frm.set_value(dimension['fieldname'], default_dimension);
} }
@ -98,4 +98,4 @@ erpnext.accounts.dimensions = {
}); });
} }
} }
} };

2
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.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
frappe.provide("erpnext.stock"); frappe.provide("erpnext.stock");
frappe.provide("erpnext.accounts.dimensions") frappe.provide("erpnext.accounts.dimensions");
frappe.ui.form.on("Stock Reconciliation", { frappe.ui.form.on("Stock Reconciliation", {
onload: function(frm) { onload: function(frm) {