refactored client side Model and Meta - frappe/frappe#478
This commit is contained in:
parent
5c6b34a84c
commit
aa355af2cf
@ -87,7 +87,7 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
||||||
return $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) {
|
return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
|
||||||
if(r.message == 1) {
|
if(r.message == 1) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
}
|
}
|
||||||
@ -95,7 +95,7 @@ cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
||||||
return $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) {
|
return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
|
||||||
if(r.message == 1) {
|
if(r.message == 1) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
}
|
}
|
||||||
|
@ -7,8 +7,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn){
|
|||||||
refresh_field('budget_distribution_details');
|
refresh_field('budget_distribution_details');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $c('runserverobj',args={'method' : 'get_months', 'docs' :
|
return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);
|
||||||
frappe.model.compress(make_doclist(doc.doctype, doc.name))},callback1);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
||||||
return $c_obj(cur_frm.get_doclist(),'convert_group_to_ledger','',function(r,rt) {
|
return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
|
||||||
if(r.message == 1) {
|
if(r.message == 1) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
}
|
}
|
||||||
@ -78,7 +78,7 @@ cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
|
||||||
return $c_obj(cur_frm.get_doclist(),'convert_ledger_to_group','',function(r,rt) {
|
return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
|
||||||
if(r.message == 1) {
|
if(r.message == 1) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
}
|
}
|
||||||
|
@ -12,8 +12,7 @@ erpnext.accounts.JournalVoucher = frappe.ui.form.Controller.extend({
|
|||||||
load_defaults: function() {
|
load_defaults: function() {
|
||||||
if(this.frm.doc.__islocal && this.frm.doc.company) {
|
if(this.frm.doc.__islocal && this.frm.doc.company) {
|
||||||
frappe.model.set_default_values(this.frm.doc);
|
frappe.model.set_default_values(this.frm.doc);
|
||||||
$.each(frappe.model.get_doclist(this.frm.doc.doctype,
|
$.each(this.frm.doc.entries, function(i, jvd) {
|
||||||
this.frm.doc.name, {parentfield: "entries"}), function(i, jvd) {
|
|
||||||
frappe.model.set_default_values(jvd);
|
frappe.model.set_default_values(jvd);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -156,7 +155,7 @@ cur_frm.cscript.credit = function(doc,dt,dn) { cur_frm.cscript.update_totals(doc
|
|||||||
|
|
||||||
cur_frm.cscript.get_balance = function(doc,dt,dn) {
|
cur_frm.cscript.get_balance = function(doc,dt,dn) {
|
||||||
cur_frm.cscript.update_totals(doc);
|
cur_frm.cscript.update_totals(doc);
|
||||||
return $c_obj(make_doclist(dt,dn), 'get_balance', '', function(r, rt){
|
return $c_obj(cur_frm.doc, 'get_balance', '', function(r, rt){
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -194,8 +193,7 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
|
|||||||
cur_frm.set_df_property("cheque_no", "reqd", doc.voucher_type=="Bank Voucher");
|
cur_frm.set_df_property("cheque_no", "reqd", doc.voucher_type=="Bank Voucher");
|
||||||
cur_frm.set_df_property("cheque_date", "reqd", doc.voucher_type=="Bank Voucher");
|
cur_frm.set_df_property("cheque_date", "reqd", doc.voucher_type=="Bank Voucher");
|
||||||
|
|
||||||
if(frappe.model.get("Journal Voucher Detail", {"parent":doc.name}).length!==0 // too late
|
if((doc.entries || []).length!==0 || !doc.company) // too early
|
||||||
|| !doc.company) // too early
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var update_jv_details = function(doc, r) {
|
var update_jv_details = function(doc, r) {
|
||||||
|
@ -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){
|
||||||
return $c_obj(make_doclist(cdt,cdn),'get_series','',function(r,rt){
|
return $c_obj(cur_frm.doc, 'get_series','',function(r,rt){
|
||||||
if(r.message) set_field_options('naming_series', r.message);
|
if(r.message) set_field_options('naming_series', r.message);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -68,7 +68,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
|
|||||||
if(cint(doc.update_stock)!=1) {
|
if(cint(doc.update_stock)!=1) {
|
||||||
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
|
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
|
||||||
var from_delivery_note = false;
|
var from_delivery_note = false;
|
||||||
from_delivery_note = cur_frm.get_doclist({parentfield: "entries"})
|
from_delivery_note = cur_frm.doc.entries
|
||||||
.some(function(item) {
|
.some(function(item) {
|
||||||
return item.delivery_note ? true : false;
|
return item.delivery_note ? true : false;
|
||||||
});
|
});
|
||||||
|
@ -156,7 +156,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
|
|||||||
project_name: function(doc, cdt, cdn) {
|
project_name: function(doc, cdt, cdn) {
|
||||||
var item = frappe.model.get_doc(cdt, cdn);
|
var item = frappe.model.get_doc(cdt, cdn);
|
||||||
if(item.project_name) {
|
if(item.project_name) {
|
||||||
$.each(frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name, {parentfield: this.fname}),
|
$.each(this.frm.doc[this.fname],
|
||||||
function(i, other_item) {
|
function(i, other_item) {
|
||||||
if(!other_item.project_name) {
|
if(!other_item.project_name) {
|
||||||
other_item.project_name = item.project_name;
|
other_item.project_name = item.project_name;
|
||||||
|
@ -128,7 +128,7 @@ cur_frm.fields_dict['po_details'].grid.get_field('project_name').get_query = fun
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){
|
cur_frm.cscript.get_last_purchase_rate = function(doc, cdt, cdn){
|
||||||
return $c_obj(make_doclist(doc.doctype, doc.name), 'get_last_purchase_rate', '', function(r, rt) {
|
return $c_obj(doc, 'get_last_purchase_rate', '', function(r, rt) {
|
||||||
refresh_field(cur_frm.cscript.fname);
|
refresh_field(cur_frm.cscript.fname);
|
||||||
var doc = locals[cdt][cdn];
|
var doc = locals[cdt][cdn];
|
||||||
cur_frm.cscript.calc_amount( doc, 2);
|
cur_frm.cscript.calc_amount( doc, 2);
|
||||||
@ -140,7 +140,7 @@ cur_frm.cscript['Stop Purchase Order'] = function() {
|
|||||||
var check = confirm(frappe._("Do you really want to STOP ") + doc.name);
|
var check = confirm(frappe._("Do you really want to STOP ") + doc.name);
|
||||||
|
|
||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
|
return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs':doc}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -151,7 +151,7 @@ cur_frm.cscript['Unstop Purchase Order'] = function() {
|
|||||||
var check = confirm(frappe._("Do you really want to UNSTOP ") + doc.name);
|
var check = confirm(frappe._("Do you really want to UNSTOP ") + doc.name);
|
||||||
|
|
||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted', 'docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
|
return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted', 'docs':doc}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ erpnext.hr.EmployeeController = frappe.ui.form.Controller.extend({
|
|||||||
Go to the active Salary Structure and set \"Is Active\" = \"No\""));
|
Go to the active Salary Structure and set \"Is Active\" = \"No\""));
|
||||||
} else if(!r.exc) {
|
} else if(!r.exc) {
|
||||||
frappe.model.map({
|
frappe.model.map({
|
||||||
source: frappe.model.get_doclist(me.frm.doc.doctype, me.frm.doc.name),
|
source: me.frm.doc,
|
||||||
target: "Salary Structure"
|
target: "Salary Structure"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ cur_frm.cscript.validate = function(doc) {
|
|||||||
cur_frm.cscript.calculate_total = function(doc,cdt,cdn){
|
cur_frm.cscript.calculate_total = function(doc,cdt,cdn){
|
||||||
doc.total_claimed_amount = 0;
|
doc.total_claimed_amount = 0;
|
||||||
doc.total_sanctioned_amount = 0;
|
doc.total_sanctioned_amount = 0;
|
||||||
$.each(frappe.model.get("Expense Claim Detail", {parent:doc.name}), function(i, d) {
|
$.each((doc.expense_voucher_details || []), function(i, d) {
|
||||||
doc.total_claimed_amount += d.claim_amount;
|
doc.total_claimed_amount += d.claim_amount;
|
||||||
if(d.sanctioned_amount==null) {
|
if(d.sanctioned_amount==null) {
|
||||||
d.sanctioned_amount = d.claim_amount;
|
d.sanctioned_amount = d.claim_amount;
|
||||||
|
@ -9,7 +9,7 @@ cur_frm.cscript.onload = function(doc, dt, dn){
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.to_date = function(doc, cdt, cdn) {
|
cur_frm.cscript.to_date = function(doc, cdt, cdn) {
|
||||||
return $c('runserverobj', args={'method':'to_date_validation','docs':frappe.model.compress(make_doclist(doc.doctype, doc.name))},
|
return $c('runserverobj', args={'method':'to_date_validation','docs':doc},
|
||||||
function(r, rt) {
|
function(r, rt) {
|
||||||
var doc = locals[cdt][cdn];
|
var doc = locals[cdt][cdn];
|
||||||
if (r.message) {
|
if (r.message) {
|
||||||
|
@ -15,7 +15,7 @@ cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
|
|||||||
if (r.message)
|
if (r.message)
|
||||||
display_activity_log(r.message);
|
display_activity_log(r.message);
|
||||||
}
|
}
|
||||||
return $c('runserverobj', args={'method':'create_sal_slip','docs':frappe.model.compress(make_doclist (cdt, cdn))},callback);
|
return $c('runserverobj', args={'method':'create_sal_slip','docs':doc},callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
|
cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
|
||||||
@ -25,7 +25,7 @@ cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
|
|||||||
if (r.message)
|
if (r.message)
|
||||||
display_activity_log(r.message);
|
display_activity_log(r.message);
|
||||||
}
|
}
|
||||||
return $c('runserverobj', args={'method':'submit_salary_slip','docs':frappe.model.compress(make_doclist (cdt, cdn))},callback);
|
return $c('runserverobj', args={'method':'submit_salary_slip','docs':doc},callback);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -59,5 +59,5 @@ cur_frm.cscript.make_jv = function(doc, dt, dn) {
|
|||||||
|
|
||||||
loaddoc('Journal Voucher', jv.name);
|
loaddoc('Journal Voucher', jv.name);
|
||||||
}
|
}
|
||||||
return $c_obj(make_doclist(dt, dn), 'get_acc_details', '', call_back);
|
return $c_obj(doc, 'get_acc_details', '', call_back);
|
||||||
}
|
}
|
||||||
|
@ -21,7 +21,7 @@ cur_frm.cscript.onload = function(doc,dt,dn){
|
|||||||
// Get leave details
|
// Get leave details
|
||||||
//---------------------------------------------------------------------
|
//---------------------------------------------------------------------
|
||||||
cur_frm.cscript.fiscal_year = function(doc,dt,dn){
|
cur_frm.cscript.fiscal_year = function(doc,dt,dn){
|
||||||
return $c_obj(make_doclist(doc.doctype,doc.name), 'get_emp_and_leave_details','',function(r, rt) {
|
return $c_obj(doc, 'get_emp_and_leave_details','',function(r, rt) {
|
||||||
var doc = locals[dt][dn];
|
var doc = locals[dt][dn];
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
calculate_all(doc, dt, dn);
|
calculate_all(doc, dt, dn);
|
||||||
@ -32,7 +32,7 @@ cur_frm.cscript.month = cur_frm.cscript.employee = cur_frm.cscript.fiscal_year;
|
|||||||
|
|
||||||
cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
|
cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
|
||||||
if (doc.employee && doc.fiscal_year && doc.month) {
|
if (doc.employee && doc.fiscal_year && doc.month) {
|
||||||
return $c_obj(make_doclist(doc.doctype,doc.name), 'get_leave_details',doc.leave_without_pay,function(r, rt) {
|
return $c_obj(doc, 'get_leave_details',doc.leave_without_pay,function(r, rt) {
|
||||||
var doc = locals[dt][dn];
|
var doc = locals[dt][dn];
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
calculate_all(doc, dt, dn);
|
calculate_all(doc, dt, dn);
|
||||||
|
@ -7,7 +7,7 @@ cur_frm.cscript.onload = function(doc, dt, dn){
|
|||||||
e_tbl = getchildren('Salary Structure Earning', doc.name, 'earning_details', doc.doctype);
|
e_tbl = getchildren('Salary Structure Earning', doc.name, 'earning_details', doc.doctype);
|
||||||
d_tbl = getchildren('Salary Structure Deduction', doc.name, 'deduction_details', doc.doctype);
|
d_tbl = getchildren('Salary Structure Deduction', doc.name, 'deduction_details', doc.doctype);
|
||||||
if (e_tbl.length == 0 && d_tbl.length == 0)
|
if (e_tbl.length == 0 && d_tbl.length == 0)
|
||||||
return $c_obj(make_doclist(doc.doctype,doc.name),'make_earn_ded_table','', function(r, rt) { refresh_many(['earning_details', 'deduction_details']);});
|
return $c_obj(doc,'make_earn_ded_table','', function(r, rt) { refresh_many(['earning_details', 'deduction_details']);});
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.refresh = function(doc, dt, dn){
|
cur_frm.cscript.refresh = function(doc, dt, dn){
|
||||||
|
@ -70,7 +70,7 @@ cur_frm.cscript['Stop Production Order'] = function() {
|
|||||||
var doc = cur_frm.doc;
|
var doc = cur_frm.doc;
|
||||||
var check = confirm(frappe._("Do you really want to stop production order: " + doc.name));
|
var check = confirm(frappe._("Do you really want to stop production order: " + doc.name));
|
||||||
if (check) {
|
if (check) {
|
||||||
return $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();});
|
return $c_obj(doc, 'stop_unstop', 'Stopped', function(r, rt) {cur_frm.refresh();});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ cur_frm.cscript['Unstop Production Order'] = function() {
|
|||||||
var doc = cur_frm.doc;
|
var doc = cur_frm.doc;
|
||||||
var check = confirm(frappe._("Do really want to unstop production order: " + doc.name));
|
var check = confirm(frappe._("Do really want to unstop production order: " + doc.name));
|
||||||
if (check)
|
if (check)
|
||||||
return $c_obj(make_doclist(doc.doctype, doc.name), 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();});
|
return $c_obj(doc, 'stop_unstop', 'Unstopped', function(r, rt) {cur_frm.refresh();});
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript['Transfer Raw Materials'] = function() {
|
cur_frm.cscript['Transfer Raw Materials'] = function() {
|
||||||
|
@ -25,9 +25,9 @@ cur_frm.cscript.item_code = function(doc,cdt,cdn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.download_materials_required = function(doc, cdt, cdn) {
|
cur_frm.cscript.download_materials_required = function(doc, cdt, cdn) {
|
||||||
return $c_obj(make_doclist(cdt, cdn), 'validate_data', '', function(r, rt) {
|
return $c_obj(doc, 'validate_data', '', function(r, rt) {
|
||||||
if (!r['exc'])
|
if (!r['exc'])
|
||||||
$c_obj_csv(make_doclist(cdt, cdn), 'download_raw_materials', '', '');
|
$c_obj_csv(doc, 'download_raw_materials', '', '');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -30,9 +30,8 @@ $.extend(cur_frm.cscript, {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
make_invoice: function() {
|
make_invoice: function() {
|
||||||
var doc = cur_frm.doc;
|
|
||||||
frappe.model.map({
|
frappe.model.map({
|
||||||
source: frappe.model.get_doclist(doc.doctype, doc.name),
|
source: cur_frm.doc,
|
||||||
target: "Sales Invoice"
|
target: "Sales Invoice"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,6 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
|
|||||||
freeze: true,
|
freeze: true,
|
||||||
callback: function(r) {
|
callback: function(r) {
|
||||||
// remove this call when using client side mapper
|
// remove this call when using client side mapper
|
||||||
me.set_default_values();
|
|
||||||
me.set_dynamic_labels();
|
me.set_dynamic_labels();
|
||||||
me.calculate_taxes_and_totals();
|
me.calculate_taxes_and_totals();
|
||||||
}
|
}
|
||||||
@ -192,18 +191,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
|
|||||||
validate: function() {
|
validate: function() {
|
||||||
this.calculate_taxes_and_totals();
|
this.calculate_taxes_and_totals();
|
||||||
},
|
},
|
||||||
|
|
||||||
set_default_values: function() {
|
|
||||||
$.each(frappe.model.get_doclist(this.frm.doctype, this.frm.docname), function(i, doc) {
|
|
||||||
var updated = frappe.model.set_default_values(doc);
|
|
||||||
if(doc.parentfield) {
|
|
||||||
refresh_field(doc.parentfield);
|
|
||||||
} else {
|
|
||||||
refresh_field(updated);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
company: function() {
|
company: function() {
|
||||||
if(this.frm.doc.company && this.frm.fields_dict.currency) {
|
if(this.frm.doc.company && this.frm.fields_dict.currency) {
|
||||||
var company_currency = this.get_company_currency();
|
var company_currency = this.get_company_currency();
|
||||||
@ -517,13 +505,11 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
|
|||||||
},
|
},
|
||||||
|
|
||||||
get_item_doclist: function() {
|
get_item_doclist: function() {
|
||||||
return frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name,
|
return this.frm.doc[this.fname] || [];
|
||||||
{parentfield: this.fname});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
get_tax_doclist: function() {
|
get_tax_doclist: function() {
|
||||||
return frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name,
|
return this.frm.doc[this.other_fname] || [];
|
||||||
{parentfield: this.other_fname});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
validate_conversion_rate: function() {
|
validate_conversion_rate: function() {
|
||||||
@ -716,8 +702,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
|
|||||||
|
|
||||||
calculate_total_advance: function(parenttype, advance_parentfield) {
|
calculate_total_advance: function(parenttype, advance_parentfield) {
|
||||||
if(this.frm.doc.doctype == parenttype && this.frm.doc.docstatus < 2) {
|
if(this.frm.doc.doctype == parenttype && this.frm.doc.docstatus < 2) {
|
||||||
var advance_doclist = frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name,
|
var advance_doclist = this.frm.doc[advance_parentfield] || [];
|
||||||
{parentfield: advance_parentfield});
|
|
||||||
this.frm.doc.total_advance = flt(frappe.utils.sum(
|
this.frm.doc.total_advance = flt(frappe.utils.sum(
|
||||||
$.map(advance_doclist, function(adv) { return adv.allocated_amount })
|
$.map(advance_doclist, function(adv) { return adv.allocated_amount })
|
||||||
), precision("total_advance"));
|
), precision("total_advance"));
|
||||||
|
@ -29,8 +29,7 @@ $.extend(erpnext, {
|
|||||||
},
|
},
|
||||||
|
|
||||||
add_applicable_territory: function() {
|
add_applicable_territory: function() {
|
||||||
if(cur_frm.doc.__islocal &&
|
if(cur_frm.doc.__islocal && (cur_frm.doc.valid_for_territories || []).length===0) {
|
||||||
frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) {
|
|
||||||
var default_territory = frappe.defaults.get_user_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",
|
||||||
|
@ -162,7 +162,7 @@ cur_frm.cscript['Stop Sales Order'] = function() {
|
|||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', {
|
return $c('runserverobj', {
|
||||||
'method':'stop_sales_order',
|
'method':'stop_sales_order',
|
||||||
'docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))
|
'docs': doc
|
||||||
}, function(r,rt) {
|
}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
@ -177,7 +177,7 @@ cur_frm.cscript['Unstop Sales Order'] = function() {
|
|||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', {
|
return $c('runserverobj', {
|
||||||
'method':'unstop_sales_order',
|
'method':'unstop_sales_order',
|
||||||
'docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))
|
'docs': doc
|
||||||
}, function(r,rt) {
|
}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
|
@ -98,7 +98,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
|
|||||||
this.frm.toggle_display("customer_name",
|
this.frm.toggle_display("customer_name",
|
||||||
(this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer));
|
(this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer));
|
||||||
if(this.frm.fields_dict.packing_details) {
|
if(this.frm.fields_dict.packing_details) {
|
||||||
var packing_list_exists = this.frm.get_doclist({parentfield: "packing_details"}).length;
|
var packing_list_exists = (this.frm.doc.packing_details || []).length;
|
||||||
this.frm.toggle_display("packing_list", packing_list_exists ? true : false);
|
this.frm.toggle_display("packing_list", packing_list_exists ? true : false);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -434,8 +434,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
|
|||||||
|
|
||||||
calculate_contribution: function() {
|
calculate_contribution: function() {
|
||||||
var me = this;
|
var me = this;
|
||||||
$.each(frappe.model.get_doclist(this.frm.doc.doctype, this.frm.doc.name,
|
$.each(this.frm.doc.doctype.sales_team || [], function(i, sales_person) {
|
||||||
{parentfield: "sales_team"}), function(i, sales_person) {
|
|
||||||
frappe.model.round_floats_in(sales_person);
|
frappe.model.round_floats_in(sales_person);
|
||||||
if(sales_person.allocated_percentage) {
|
if(sales_person.allocated_percentage) {
|
||||||
sales_person.allocated_amount = flt(
|
sales_person.allocated_amount = flt(
|
||||||
@ -545,8 +544,8 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
|
|||||||
// toggle columns
|
// toggle columns
|
||||||
var item_grid = this.frm.fields_dict[this.fname].grid;
|
var item_grid = this.frm.fields_dict[this.fname].grid;
|
||||||
var show = (this.frm.doc.currency != company_currency) ||
|
var show = (this.frm.doc.currency != company_currency) ||
|
||||||
(frappe.model.get_doclist(cur_frm.doctype, cur_frm.docname,
|
(cur_frm.doc.other_charges.filter(
|
||||||
{parentfield: "other_charges", included_in_print_rate: 1}).length);
|
function(d) { return d.included_in_print_rate===1}).length);
|
||||||
|
|
||||||
$.each(["base_rate", "base_price_list_rate", "base_amount"], function(i, fname) {
|
$.each(["base_rate", "base_price_list_rate", "base_amount"], function(i, fname) {
|
||||||
if(frappe.meta.get_docfield(item_grid.doctype, fname))
|
if(frappe.meta.get_docfield(item_grid.doctype, fname))
|
||||||
|
@ -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.get_states=function(doc, dt, dn) {
|
cur_frm.cscript.get_states=function(doc, dt, dn) {
|
||||||
return $c('runserverobj', args={'method': 'check_state', 'docs':frappe.model.compress(make_doclist(doc.doctype, doc.name))},
|
return $c('runserverobj', args={'method': 'check_state', 'docs':doc},
|
||||||
function(r, rt) {
|
function(r, rt) {
|
||||||
if(r.message)
|
if(r.message)
|
||||||
set_field_options('state', r.message);
|
set_field_options('state', r.message);
|
||||||
|
@ -9,7 +9,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
|||||||
cur_frm.add_custom_button(frappe._('View Now'), function() {
|
cur_frm.add_custom_button(frappe._('View Now'), function() {
|
||||||
doc = locals[dt][dn];
|
doc = locals[dt][dn];
|
||||||
if(doc.__unsaved != 1) {
|
if(doc.__unsaved != 1) {
|
||||||
return $c_obj(make_doclist(dt, dn), 'get_digest_msg', '', function(r, rt) {
|
return $c_obj(doc, 'get_digest_msg', '', function(r, rt) {
|
||||||
if(r.exc) {
|
if(r.exc) {
|
||||||
msgprint(err_msg);
|
msgprint(err_msg);
|
||||||
console.log(r.exc);
|
console.log(r.exc);
|
||||||
@ -32,7 +32,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
|||||||
cur_frm.add_custom_button(frappe._('Send Now'), function() {
|
cur_frm.add_custom_button(frappe._('Send Now'), function() {
|
||||||
doc = locals[dt][dn];
|
doc = locals[dt][dn];
|
||||||
if(doc.__unsaved != 1) {
|
if(doc.__unsaved != 1) {
|
||||||
return $c_obj(make_doclist(dt, dn), 'send', '', function(r, rt) {
|
return $c_obj(doc, 'send', '', function(r, rt) {
|
||||||
if(r.exc) {
|
if(r.exc) {
|
||||||
msgprint(err_msg);
|
msgprint(err_msg);
|
||||||
console.log(r.exc);
|
console.log(r.exc);
|
||||||
@ -49,7 +49,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
|
|||||||
|
|
||||||
cur_frm.cscript.addremove_recipients = function(doc, dt, dn) {
|
cur_frm.cscript.addremove_recipients = function(doc, dt, dn) {
|
||||||
// Get user list
|
// Get user list
|
||||||
return $c_obj(make_doclist(dt, dn), 'get_users', '', function(r, rt) {
|
return $c_obj(doc, 'get_users', '', function(r, rt) {
|
||||||
if(r.exc) {
|
if(r.exc) {
|
||||||
msgprint(r.exc);
|
msgprint(r.exc);
|
||||||
} else {
|
} else {
|
||||||
|
@ -18,7 +18,7 @@ $.extend(cur_frm.cscript, {
|
|||||||
},
|
},
|
||||||
|
|
||||||
validate: function(doc, cdt, cdn) {
|
validate: function(doc, cdt, cdn) {
|
||||||
return $c_obj(make_doclist(cdt, cdn), 'get_defaults', '', function(r, rt){
|
return $c_obj(doc, 'get_defaults', '', function(r, rt){
|
||||||
sys_defaults = r.message;
|
sys_defaults = r.message;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -29,7 +29,7 @@ cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(doc.select_doc_for_series)
|
if(doc.select_doc_for_series)
|
||||||
return $c_obj(make_doclist(doc.doctype, doc.name),'get_options','',callback);
|
return $c_obj(doc,'get_options','',callback);
|
||||||
}
|
}
|
||||||
|
|
||||||
cur_frm.cscript.update = function() {
|
cur_frm.cscript.update = function() {
|
||||||
|
@ -8,6 +8,6 @@ cur_frm.cscript.select_transaction = function(doc, cdt, cdn) {
|
|||||||
doc.custom_message = r.message;
|
doc.custom_message = r.message;
|
||||||
refresh_field('custom_message');
|
refresh_field('custom_message');
|
||||||
}
|
}
|
||||||
return $c_obj(make_doclist(cdt, cdn),'get_message',doc.select_transaction, callback)
|
return $c_obj(doc,'get_message',doc.select_transaction, callback)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,8 +20,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
|
|||||||
if(!doc.__billing_complete && doc.docstatus==1) {
|
if(!doc.__billing_complete && doc.docstatus==1) {
|
||||||
// show Make Invoice button only if Delivery Note is not created from Sales Invoice
|
// show Make Invoice button only if Delivery Note is not created from Sales Invoice
|
||||||
var from_sales_invoice = false;
|
var from_sales_invoice = false;
|
||||||
from_sales_invoice = cur_frm.get_doclist({parentfield: "delivery_note_details"})
|
from_sales_invoice = cur_frm.doc.delivery_note_details.some(function(item) {
|
||||||
.some(function(item) {
|
|
||||||
return item.against_sales_invoice ? true : false;
|
return item.against_sales_invoice ? true : false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -151,8 +151,7 @@ cur_frm.fields_dict.item_supplier_details.grid.get_field("supplier").get_query =
|
|||||||
|
|
||||||
cur_frm.cscript.copy_from_item_group = function(doc) {
|
cur_frm.cscript.copy_from_item_group = function(doc) {
|
||||||
frappe.model.with_doc("Item Group", doc.item_group, function() {
|
frappe.model.with_doc("Item Group", doc.item_group, function() {
|
||||||
$.each(frappe.model.get("Item Website Specification", {parent:doc.item_group}),
|
$.each((doc.item_website_specifications || []), function(i, d) {
|
||||||
function(i, d) {
|
|
||||||
var n = frappe.model.add_child(doc, "Item Website Specification",
|
var n = frappe.model.add_child(doc, "Item Website Specification",
|
||||||
"item_website_specifications");
|
"item_website_specifications");
|
||||||
n.label = d.label;
|
n.label = d.label;
|
||||||
|
@ -80,7 +80,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten
|
|||||||
schedule_date: function(doc, cdt, cdn) {
|
schedule_date: function(doc, cdt, cdn) {
|
||||||
var val = locals[cdt][cdn].schedule_date;
|
var val = locals[cdt][cdn].schedule_date;
|
||||||
if(val) {
|
if(val) {
|
||||||
$.each(frappe.model.get("Material Request Item", { parent: cur_frm.doc.name }), function(i, d) {
|
$.each((doc.indent_details || []), function(i, d) {
|
||||||
if(!d.schedule_date) {
|
if(!d.schedule_date) {
|
||||||
d.schedule_date = val;
|
d.schedule_date = val;
|
||||||
}
|
}
|
||||||
@ -172,7 +172,7 @@ cur_frm.cscript['Stop Material Request'] = function() {
|
|||||||
var check = confirm(frappe._("Do you really want to STOP this Material Request?"));
|
var check = confirm(frappe._("Do you really want to STOP this Material Request?"));
|
||||||
|
|
||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
|
return $c('runserverobj', args={'method':'update_status', 'arg': 'Stopped', 'docs': doc}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -183,7 +183,7 @@ cur_frm.cscript['Unstop Material Request'] = function(){
|
|||||||
var check = confirm(frappe._("Do you really want to UNSTOP this Material Request?"));
|
var check = confirm(frappe._("Do you really want to UNSTOP this Material Request?"));
|
||||||
|
|
||||||
if (check) {
|
if (check) {
|
||||||
return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': frappe.model.compress(make_doclist(doc.doctype, doc.name))}, function(r,rt) {
|
return $c('runserverobj', args={'method':'update_status', 'arg': 'Submitted','docs': doc}, function(r,rt) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -94,8 +94,7 @@ cur_frm.cscript.periodicity = function(doc, cdt, cdn){
|
|||||||
|
|
||||||
cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
|
cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
|
||||||
if (!doc.__islocal) {
|
if (!doc.__islocal) {
|
||||||
return $c('runserverobj', args={'method':'generate_schedule',
|
return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
|
||||||
'docs':frappe.model.compress(make_doclist(cdt,cdn))},
|
|
||||||
function(r, rt) {
|
function(r, rt) {
|
||||||
refresh_field('maintenance_schedule_detail');
|
refresh_field('maintenance_schedule_detail');
|
||||||
});
|
});
|
||||||
|
@ -17,7 +17,7 @@ cur_frm.cscript.refresh = function(doc) {
|
|||||||
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
|
if(!doc.__islocal && !cint(doc.email_sent) && !doc.__unsaved
|
||||||
&& inList(frappe.boot.user.can_write, doc.doctype)) {
|
&& inList(frappe.boot.user.can_write, doc.doctype)) {
|
||||||
cur_frm.add_custom_button(frappe._('Send'), function() {
|
cur_frm.add_custom_button(frappe._('Send'), function() {
|
||||||
return $c_obj(make_doclist(doc.doctype, doc.name), 'send_emails', '', function(r) {
|
return $c_obj(doc, 'send_emails', '', function(r) {
|
||||||
cur_frm.refresh();
|
cur_frm.refresh();
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user