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

[minor] show price list in sales order (via support ticket)

Browse Source
This commit is contained in:
Rushabh Mehta 2015-08-27 10:25:07 +05:30
parent 17679c6902
commit 00eba4d7f6
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@ -165,6 +165,7 @@ class PurchaseOrder(BuyingController):
self.update_ordered_qty() self.update_ordered_qty()
msgprint(_("Status of {0} {1} is now {2}").format(self.doctype, self.name, status)) msgprint(_("Status of {0} {1} is now {2}").format(self.doctype, self.name, status))
self.notify_modified()
def on_submit(self): def on_submit(self):
super(PurchaseOrder, self).on_submit() super(PurchaseOrder, self).on_submit()
@ -237,8 +238,6 @@ def stop_or_unstop_purchase_orders(names, status):
if po.status == "Stopped": if po.status == "Stopped":
po.update_status("Submitted") po.update_status("Submitted")
po.notify_modified()
frappe.local.message_log = [] frappe.local.message_log = []

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

@ -83,7 +83,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
refresh: function() { refresh: function() {
erpnext.toggle_naming_series(); erpnext.toggle_naming_series();
erpnext.hide_company(); erpnext.hide_company();
this.hide_currency_and_price_list()
this.show_item_wise_taxes(); this.show_item_wise_taxes();
this.set_dynamic_labels(); this.set_dynamic_labels();
erpnext.pos.make_pos_btn(this.frm); erpnext.pos.make_pos_btn(this.frm);
@ -140,14 +139,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
} }
}, },
hide_currency_and_price_list: function() {
if(this.frm.doc.conversion_rate == 1 && this.frm.doc.docstatus > 0) {
hide_field("currency_and_price_list");
} else {
unhide_field("currency_and_price_list");
}
},
barcode: function(doc, cdt, cdn) { barcode: function(doc, cdt, cdn) {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
if(d.barcode=="" || d.barcode==null) { if(d.barcode=="" || d.barcode==null) {