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

Merge pull request #16439 from nabinhait/disable-rounded-total

Browse Source 
fix: Disable rounded total field's value honours docfield's default value
This commit is contained in:
Nabin Hait 2019-01-22 09:58:06 +05:30 committed by GitHub
commit 48fa697d54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/public/js/controllers/buying.js
View File

@ -28,7 +28,10 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if (this.frm.doc.__islocal if (this.frm.doc.__islocal
&& frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) { && frappe.meta.has_field(this.frm.doc.doctype, "disable_rounded_total")) {
this.frm.set_value("disable_rounded_total", cint(frappe.sys_defaults.disable_rounded_total));
var df = frappe.meta.get_docfield(this.frm.doc.doctype, "disable_rounded_total");
var disable = df.default || cint(frappe.sys_defaults.disable_rounded_total);
this.frm.set_value("disable_rounded_total", disable);
} }
/* eslint-disable */ /* eslint-disable */
@ -119,7 +122,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if (doc.doctype == "Purchase Order" && item.blanket_order_rate) { if (doc.doctype == "Purchase Order" && item.blanket_order_rate) {
item_rate = item.blanket_order_rate; item_rate = item.blanket_order_rate;
} }
item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100; item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;
item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item)); item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
this.calculate_taxes_and_totals(); this.calculate_taxes_and_totals();
@ -266,26 +269,26 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
d.qty = d.qty - my_qty; d.qty = d.qty - my_qty;
cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor; cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor;
cur_frm.doc.items[i].qty = my_qty; cur_frm.doc.items[i].qty = my_qty;
frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")"); frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
if (qty > 0) if (qty > 0)
{ {
frappe.msgprint("Splitting " + qty + " units of " + d.item_code); frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items"); var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
item_length++; item_length++;
for (var key in cur_frm.doc.items[i]) for (var key in cur_frm.doc.items[i])
{ {
newrow[key] = cur_frm.doc.items[i][key]; newrow[key] = cur_frm.doc.items[i][key];
} }
newrow.idx = item_length; newrow.idx = item_length;
newrow["stock_qty"] = newrow.conversion_factor*qty; newrow["stock_qty"] = newrow.conversion_factor*qty;
newrow["qty"] = qty; newrow["qty"] = qty;
newrow["material_request"] = ""; newrow["material_request"] = "";
newrow["material_request_item"] = ""; newrow["material_request_item"] = "";
} }
} }
}); });
@ -302,7 +305,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if (doc.auto_repeat) { if (doc.auto_repeat) {
frappe.call({ frappe.call({
method:"frappe.desk.doctype.auto_repeat.auto_repeat.update_reference", method:"frappe.desk.doctype.auto_repeat.auto_repeat.update_reference",
args:{ args:{
docname: doc.auto_repeat, docname: doc.auto_repeat,
reference:doc.name reference:doc.name
}, },
@ -427,4 +430,3 @@ erpnext.buying.get_items_from_product_bundle = function(frm) {
}); });
dialog.show(); dialog.show();
} }

5
erpnext/setup/doctype/authorization_rule/authorization_rule.json
View File

@ -1,5 +1,6 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_events_in_timeline": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
@ -352,7 +353,7 @@
"fieldname": "to_emp", "fieldname": "to_emp",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 1,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
@ -618,7 +619,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:42.627233", "modified": "2019-01-21 17:10:39.822125",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Authorization Rule", "name": "Authorization Rule",