nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in load defaults of transaction.js

Browse Source
This commit is contained in:
Anand Doshi
2014-07-16 17:52:08 +05:30
parent 2e21e25613
commit f214bfcfc3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,16 +20,13 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
currency: currency, currency: currency,
price_list_currency: currency, price_list_currency: currency,
status: "Draft", status: "Draft",
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])
me.frm.set_value(fieldname, value); me.frm.set_value(fieldname, value);
}); });
if(!this.frm.doc.company) { if(this.frm.doc.company) {
this.frm.set_value("company", frappe.defaults.get_user_default("company"));
} else {
cur_frm.script_manager.trigger("company"); cur_frm.script_manager.trigger("company");
} }
} }
@@ -332,7 +329,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule", method: "erpnext.accounts.doctype.pricing_rule.pricing_rule.apply_pricing_rule",
args: { args: this._get_args(item) }, args: { args: this._get_args(item) },
callback: function(r) { callback: function(r) {
if (!r.exc) { if (!r.exc && r.message) {
me._set_values_for_item_list(r.message); me._set_values_for_item_list(r.message);
if(calculate_taxes_and_totals) me.calculate_taxes_and_totals(); if(calculate_taxes_and_totals) me.calculate_taxes_and_totals();
} }