brmlab/brmbar-github
4
0
Fork 1
mirror of https://github.com/brmlab/brmbar.git synced 2025-06-07 21:04:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

brmbar-cli stats: Separate credit and overflow

Browse source
This commit is contained in:
brmbar 2016-01-07 05:06:37 +01:00
parent 9a70088591
commit 2bfd1796d0
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
brmbar3/brmbar-cli.py
View file

@ -162,9 +162,10 @@ elif sys.argv[1] == "listitems":
elif sys.argv[1] == "stats": elif sys.argv[1] == "stats":
print("Cash: {}".format(shop.cash.balance_str())) print("Cash: {}".format(shop.cash.balance_str()))
print("Profit: {}".format(shop.profits.balance_str())) print("Overflow: {}".format(shop.currency.str(shop.credit_balance(overflow='only'))))
print("Credit: {}".format(shop.credit_negbalance_str()))
print("Inventory: {}".format(shop.inventory_balance_str())) print("Inventory: {}".format(shop.inventory_balance_str()))
print("Credit: {}".format(shop.credit_negbalance_str(overflow='exclude')))
print("Profit: {}".format(shop.profits.balance_str()))
print("Excess: {}".format(shop.excess.negbalance_str())) print("Excess: {}".format(shop.excess.negbalance_str()))
print("Deficit: {}".format(shop.deficit.balance_str())) print("Deficit: {}".format(shop.deficit.balance_str()))

8
brmbar3/brmbar/Shop.py
View file

@ -106,7 +106,7 @@ class Shop:
transaction = transaction[0] transaction = transaction[0]
return transaction return transaction
def credit_balance(self): def credit_balance(self, overflow=None):
# We assume all debt accounts share a currency # We assume all debt accounts share a currency
sumselect = """ sumselect = """
SELECT SUM(ts.amount) SELECT SUM(ts.amount)
@ -114,13 +114,15 @@ class Shop:
LEFT JOIN transaction_splits AS ts ON a.id = ts.account LEFT JOIN transaction_splits AS ts ON a.id = ts.account
WHERE a.acctype = %s AND ts.side = %s WHERE a.acctype = %s AND ts.side = %s
""" """
if overflow is not None:
sumselect += ' AND a.name ' + ('NOT ' if overflow == 'exclude' else '') + ' LIKE \'%%-overflow\''
cur = self.db.execute_and_fetch(sumselect, ["debt", 'debit']) cur = self.db.execute_and_fetch(sumselect, ["debt", 'debit'])
debit = cur[0] or 0 debit = cur[0] or 0
credit = self.db.execute_and_fetch(sumselect, ["debt", 'credit']) credit = self.db.execute_and_fetch(sumselect, ["debt", 'credit'])
credit = credit[0] or 0 credit = credit[0] or 0
return debit - credit return debit - credit
def credit_negbalance_str(self): def credit_negbalance_str(self, overflow=None):
return self.currency.str(-self.credit_balance()) return self.currency.str(-self.credit_balance(overflow=overflow))
# XXX causing extra heavy delay ( thousands of extra SQL queries ), disabled # XXX causing extra heavy delay ( thousands of extra SQL queries ), disabled
def inventory_balance(self): def inventory_balance(self):