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

Merge branch 'master' of github.com:webnotes/erpnext into stock_reco

Browse Source 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
This commit is contained in:
Anand Doshi
2013-01-14 13:28:31 +05:30
parent e868db33ab 0c42dc4c22
commit 6c5262abb1
21 changed files with 238 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
cur_frm.fields_dict['item_code'].get_query = function(doc) {
return erpnext.queries.item();
return erpnext.queries.item_std();
}
//==================== Get Items Stock UOM =====================================================

2
stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py
View File

@@ -73,7 +73,7 @@ class DocType:
sql("update `tabBin` set stock_uom = '%s' where item_code = '%s'" % (self.doc.new_stock_uom, self.doc.item_code) )
# acknowledge user
msgprint(" All Bin's Updated Successfully.")
msgprint(" All Bins Updated Successfully.")
def update_stock_ledger_entry(self):
# update stock ledger entry