From 7ac0031a8d9c35e741806d6ab22d2fadf516d498 Mon Sep 17 00:00:00 2001 From: b00lean Date: Mon, 8 Jul 2013 17:36:36 +0200 Subject: [PATCH] Fixes after tests --- brmbar3/brmbar-cli.py | 7 ++++--- brmbar3/brmbar/Shop.py | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/brmbar3/brmbar-cli.py b/brmbar3/brmbar-cli.py index 7695986..0661819 100755 --- a/brmbar3/brmbar-cli.py +++ b/brmbar3/brmbar-cli.py @@ -152,8 +152,9 @@ elif sys.argv[1] == "inventory": iamt = int(sys.argv[2]) iacct = load_item(sys.argv[3]) #TODO:use barcodes later print("Current state {} (id {}): {} pcs".format(iacct.name, iacct.id, iacct.balance())) - shop.fix_inventory(item = iacct, amount = iamt) - print("New state {} (id {}): {} pcs".format(iacct.name, iacct.id, iacct.balance())) - + if shop.fix_inventory(item = iacct, amount = iamt): + print("New state {} (id {}): {} pcs".format(iacct.name, iacct.id, iacct.balance())) + else: + print ("No action needed amount is correct.") else: help() diff --git a/brmbar3/brmbar/Shop.py b/brmbar3/brmbar/Shop.py index f872328..ad24563 100644 --- a/brmbar3/brmbar/Shop.py +++ b/brmbar3/brmbar/Shop.py @@ -156,8 +156,12 @@ class Shop: item.debit(transaction, diff, "Inventory fix excess") self.excess.credit(transaction, buy_total, "Inventory fix excess " + item.name) self.db.commit() + return True elif amount_in_reality < amount_in_system: transaction = self._transaction(description = "BrmBar inventory fix of {}pcs {} in system to {}pcs in reality".format(amount_in_system, item.name,amount_in_reality)) item.credit(transaction, diff, "Inventory fix deficit") - self.deficit.credit(transaction, buy_total, "Inventory fix deficit " + item.name) + self.deficit.debit(transaction, buy_total, "Inventory fix deficit " + item.name) self.db.commit() + return True + else: + return False \ No newline at end of file