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

Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py
This commit is contained in:
Anand Doshi
2013-09-25 19:55:41 +05:30
242 changed files with 3879 additions and 3910 deletions

View File

@@ -116,10 +116,12 @@ class DocType:
"""update planned qty in bin"""
args = {
"item_code": self.doc.production_item,
"warehouse": self.doc.fg_warehouse,
"posting_date": nowdate(),
"planned_qty": flt(qty)
}
get_obj('Warehouse', self.doc.fg_warehouse).update_bin(args)
from stock.utils import update_bin
update_bin(args)
@webnotes.whitelist()
def get_item_details(item):