schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappe/frappe#478, frappe tests pass, .txt renamed to .json

Browse Source
This commit is contained in:
Rushabh Mehta
2014-03-31 17:27:06 +05:30
parent 0e13cd5ac9
commit 0a0f2495a2
410 changed files with 347 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/stock_controller.py
View File

@@ -131,7 +131,7 @@ class StockController(AccountsController):
warehouse_account = self.get_warehouse_account()
for voucher_type, voucher_no in future_stock_vouchers:
existing_gle = gle.get((voucher_type, voucher_no), [])
voucher_obj = frappe.get_obj(voucher_type, voucher_no)
voucher_obj = frappe.get_doc(voucher_type, voucher_no)
expected_gle = voucher_obj.get_gl_entries(warehouse_account)
if expected_gle:
matched = True
@@ -276,7 +276,7 @@ def update_gl_entries_after(posting_date, posting_time, warehouse_account=None,
for voucher_type, voucher_no in future_stock_vouchers:
existing_gle = gle.get((voucher_type, voucher_no), [])
voucher_obj = frappe.get_obj(voucher_type, voucher_no)
voucher_obj = frappe.get_doc(voucher_type, voucher_no)
expected_gle = voucher_obj.get_gl_entries(warehouse_account)
if expected_gle:
if not existing_gle or not compare_existing_and_expected_gle(existing_gle,