From 9e6f00abab91454c447a926b8f59fbe6e05f5d37 Mon Sep 17 00:00:00 2001 From: Nijil Y Date: Wed, 21 Dec 2011 14:54:14 +0530 Subject: [PATCH] fixes for notification --- .../accounts/doctype/receivable_voucher/receivable_voucher.py | 2 +- erpnext/patches/auto_indent.py | 4 ++-- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- erpnext/stock/doctype/stock_ledger/stock_ledger.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py index 20b0ed8073..9e4baa18ca 100644 --- a/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py +++ b/erpnext/accounts/doctype/receivable_voucher/receivable_voucher.py @@ -520,7 +520,7 @@ class DocType(TransactionBase): if stock_item[0]['is_stock_item'] == "Yes": # Reduce actual qty from warehouse self.make_sl_entry( d, d.warehouse, - flt(d.qty) , 0, update_stock) - get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values) + get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values, self.doc.amended_from and 'Yes' or 'No') #-------------------POS Stock Updatation Part---------------------------------------------- diff --git a/erpnext/patches/auto_indent.py b/erpnext/patches/auto_indent.py index 1877bd13a4..b709f260ab 100644 --- a/erpnext/patches/auto_indent.py +++ b/erpnext/patches/auto_indent.py @@ -3,6 +3,6 @@ def execute(): from webnotes.modules.module_manager import reload_doc reload_doc('setup', 'doctype', 'manage_account') reload_doc('stock', 'doctype', 'item') - webnotes.conn.sql("alter table `tabItem` drop column `minimum_inventory_level`") + webnotes.conn.sql("delete from `tabDocField` where fieldname=`minimum_inventory_level`") webnotes.conn.sql("update `tabItem` set re_order_level = minimum_inventory_level wehre ifnull(re_order_level,0) = 0 ") - \ No newline at end of file + diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 208dd288f4..9eeb11f0d6 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -245,7 +245,7 @@ class DocType: self.add_to_values(d, cstr(d.s_warehouse), -flt(d.transfer_qty), is_cancelled) if cstr(d.t_warehouse): self.add_to_values(d, cstr(d.t_warehouse), flt(d.transfer_qty), is_cancelled) - get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values) + get_obj('Stock Ledger', 'Stock Ledger').update_stock(self.values, self.doc.amended_from and 'Yes' or 'No') def validate_for_production_order(self, pro_obj): diff --git a/erpnext/stock/doctype/stock_ledger/stock_ledger.py b/erpnext/stock/doctype/stock_ledger/stock_ledger.py index f339970afa..f22d2c20a4 100644 --- a/erpnext/stock/doctype/stock_ledger/stock_ledger.py +++ b/erpnext/stock/doctype/stock_ledger/stock_ledger.py @@ -207,7 +207,7 @@ class DocType: # ------------- # update stock # ------------- - def update_stock(self, values): + def update_stock(self, values, is_amended = 'No'): for v in values: sle_id, serial_nos = '', '' @@ -224,7 +224,7 @@ class DocType: if v["actual_qty"]: sle_id = self.make_entry(v) - get_obj('Warehouse', v["warehouse"]).update_bin(flt(v["actual_qty"]), 0, 0, 0, 0, v["item_code"], v["posting_date"], sle_id, v["posting_time"], '', v["is_cancelled"],v["voucher_type"],v["voucher_no"]) + get_obj('Warehouse', v["warehouse"]).update_bin(flt(v["actual_qty"]), 0, 0, 0, 0, v["item_code"], v["posting_date"], sle_id, v["posting_time"], '', v["is_cancelled"],v["voucher_type"],v["voucher_no"], is_amended) # -----------