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

Merge pull request #7872 from rohitwaghchaure/delivery_note_serail_no_issue

Browse Source 
[Fix] Serial nos not pulling on the delivery note, for spanish language add serial no button is not working
This commit is contained in:
Nabin Hait 2017-02-27 14:11:30 +05:30 committed by GitHub
commit afd0d086a7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -781,9 +781,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(k=="price_list_rate") { if(k=="price_list_rate") {
if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true; if(flt(v) != flt(d.price_list_rate)) price_list_rate_changed = true;
} }
if(v) {
frappe.model.set_value(d.doctype, d.name, k, v); frappe.model.set_value(d.doctype, d.name, k, v);
} }
} }
}
// if pricing rule set as blank from an existing value, apply price_list // if pricing rule set as blank from an existing value, apply price_list
if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rule) { if(!me.frm.doc.ignore_pricing_rule && existing_pricing_rule && !d.pricing_rule) {

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

@ -47,6 +47,7 @@ $.extend(erpnext, {
fields: [ fields: [
{ {
"fieldtype": "Link", "fieldtype": "Link",
"fieldname": "serial_no",
"options": "Serial No", "options": "Serial No",
"label": __("Serial No"), "label": __("Serial No"),
"get_query": function () { "get_query": function () {
@ -60,6 +61,7 @@ $.extend(erpnext, {
}, },
{ {
"fieldtype": "Button", "fieldtype": "Button",
"fieldname": "add",
"label": __("Add") "label": __("Add")
} }
] ]