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

[stock-entry] show gl if auto inventory accounting #561

Browse Source
This commit is contained in:
Rushabh Mehta 2013-07-09 12:05:33 +05:30
parent f0e4f9e0c3
commit 5758f7e3b7
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/controllers/stock_controller.js
View File

@ -19,7 +19,7 @@ wn.provide("erpnext.stock");
erpnext.stock.StockController = wn.ui.form.Controller.extend({ erpnext.stock.StockController = wn.ui.form.Controller.extend({
show_stock_ledger: function() { show_stock_ledger: function() {
var me = this; var me = this;
this.frm.add_custom_button("Show Stock Ledger", function() { this.frm.add_custom_button("Stock Ledger", function() {
wn.route_options = { wn.route_options = {
voucher_no: me.frm.doc.name, voucher_no: me.frm.doc.name,
from_date: cur_frm.doc.posting_date, from_date: cur_frm.doc.posting_date,
@ -27,5 +27,17 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
}; };
wn.set_route('stock-ledger'); wn.set_route('stock-ledger');
}, "icon-bar-chart"); }, "icon-bar-chart");
},
show_general_ledger: function() {
if(doc.docstatus==1) {
cur_frm.add_custom_button('Accounting Ledger', function() {
wn.route_options = {
"voucher_no": doc.name,
"from_date": doc.posting_date,
"to_date": doc.posting_date,
};
wn.set_route("general-ledger");
});
}
} }
}); });

4
stock/doctype/delivery_note/delivery_note.js
View File

@ -34,7 +34,9 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1) if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1)
cur_frm.add_custom_button('Make Installation Note', this.make_installation_note); cur_frm.add_custom_button('Make Installation Note', this.make_installation_note);
if (doc.docstatus==1) cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); if (doc.docstatus==1) {
cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
}
if(doc.docstatus==0 && !doc.__islocal) { if(doc.docstatus==0 && !doc.__islocal) {
cur_frm.add_custom_button('Make Packing Slip', cur_frm.cscript['Make Packing Slip']); cur_frm.add_custom_button('Make Packing Slip', cur_frm.cscript['Make Packing Slip']);

2
stock/doctype/stock_entry/stock_entry.js
View File

@ -103,6 +103,8 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
this.toggle_enable_bom(); this.toggle_enable_bom();
if (this.frm.doc.docstatus==1) { if (this.frm.doc.docstatus==1) {
this.show_stock_ledger(); this.show_stock_ledger();
if(wn.boot.auto_inventory_accounting)
this.show_general_ledger();
} }
if(this.frm.doc.docstatus === 1 && if(this.frm.doc.docstatus === 1 &&