schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-10-03 12:02:38 +01:00
parent c49e748c85 7b6eaee05b
commit 19e63b73ed
30 changed files with 190 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
erpnext/public/js/controllers/transaction.js
View File

@@ -101,27 +101,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return me.set_query_for_batch(doc, cdt, cdn)
});
}
},
onload: function() {
var me = this;
if(this.frm.doc.__islocal) {
var today = frappe.datetime.get_today(),
currency = frappe.defaults.get_user_default("currency");
$.each({
currency: currency,
price_list_currency: currency,
status: "Draft",
is_subcontracted: "No",
}, function(fieldname, value) {
if(me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname])
me.frm.set_value(fieldname, value);
});
if(this.frm.doc.company && !this.frm.doc.amended_from) {
this.frm.trigger("company");
}
}
if(this.frm.fields_dict["payment_terms_template"]){
this.frm.trigger("payment_terms_template");
@@ -157,11 +136,36 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
return {
filters: filters
}
};
});
}
},
onload: function() {
var me = this;
this.setup_quality_inspection();
if(this.frm.doc.__islocal) {
var currency = frappe.defaults.get_user_default("currency");
let set_value = (fieldname, value) => {
if(me.frm.fields_dict[fieldname] && !me.frm.doc[fieldname]) {
return me.frm.set_value(fieldname, value);
}
};
return frappe.run_serially([
() => set_value('currency', currency),
() => set_value('price_list_currency', currency),
() => set_value('status', 'Draft'),
() => set_value('is_subcontracted', 'No'),
() => {
if(this.frm.doc.company && !this.frm.doc.amended_from) {
this.frm.trigger("company");
}
}
]);
}
},
setup_quality_inspection: function() {
@@ -199,13 +203,12 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
},
onload_post_render: function() {
var me = this;
if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
&& !(this.frm.doc.__onload ? this.frm.doc.__onload.load_after_mapping : false)) {
this.apply_default_taxes();
frappe.after_ajax(() => this.apply_default_taxes());
} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
&& !this.frm.doc.is_pos) {
me.calculate_taxes_and_totals();
frappe.after_ajax(() => this.calculate_taxes_and_totals());
}
if(frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
this.setup_item_selector();
@@ -383,7 +386,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
var company_currency = me.get_company_currency();
var company_doc = frappe.get_doc(":Company", me.frm.doc.company);
if (!me.frm.doc.currency || me.frm.doc.currency != company_currency) {
if (!me.frm.doc.currency) {
me.frm.set_value("currency", company_currency);
}