nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging perpetual branch into master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-24 14:36:55 +05:30
parent 66adb3c0cf 2b9cfcbe0b
commit 11f41955c9
107 changed files with 2671 additions and 2122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/complete_setup.js
View File

@@ -122,5 +122,5 @@ $.extend(erpnext.complete_setup, {
fy_start_list: ['', '1st Jan', '1st Apr', '1st Jul', '1st Oct'],
domains: ['', "Manufacturing", "Retail", "Distribution", "Services"],
domains: ['', "Manufacturing", "Retail", "Distribution", "Services", "Other"],
});

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

@@ -20,7 +20,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({
},
show_general_ledger: function() {
var me = this;
if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_inventory_accounting"))) {
if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) {
cur_frm.add_custom_button('Accounting Ledger', function() {
wn.route_options = {
"voucher_no": me.frm.doc.name,