brmlab/brmbar
9
0
Fork 0
forked from brmlab/brmbar-github
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: brmlab:aee3a1d24f1ae93b24fc2b110d28916684396bf3
Branches Tags
brmlab:master
brmlab:deployed
brmlab:py3
brmlab:sql-refactor
brmlab:test_cache
brmlab:db-reconnect
brmlab:brmbar3
..
compare: brmlab/brmbar:dd8c93e967436affdb9fbc1f52fbad7c4eae9874
Branches Tags
brmlab/brmbar:master
brmlab/brmbar:deployed
brmlab/brmbar:py3
brmlab/brmbar:sql-refactor
brmlab/brmbar:test_cache
brmlab/brmbar:db-reconnect
brmlab/brmbar:brmbar3
brmlab:pasky/sql-fixups-and-tests
brmlab:master
brmlab:test_cache
brmlab:db-reconnect
brmlab:brmbar3

No commits in common. "aee3a1d24f1ae93b24fc2b110d28916684396bf3" and "dd8c93e967436affdb9fbc1f52fbad7c4eae9874" have entirely different histories.
aee3a1d24f ... dd8c93e967

1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brmbar3/brmbar/Account.py
View file

@ -20,7 +20,7 @@ class Account:
@classmethod @classmethod
def load_by_barcode(cls, db, barcode): def load_by_barcode(cls, db, barcode):
logger.debug("load_by_barcode: '%s'", barcode) logger.debug("load_by_barcode: '%s'", barcode)
account_id, account_name, account_acctype, currency_id, currency_name = self.db.execute_and_fetch( account_id, account_name, account_acctype, currency_id, currency_name = db_execute_and_fetch(
"SELECT account_id, account_name, account_acctype, currency_id, currency_name FROM public.account_class_initialization_data('by_barcode', NULL, %s)", "SELECT account_id, account_name, account_acctype, currency_id, currency_name FROM public.account_class_initialization_data('by_barcode', NULL, %s)",
[barcode]) [barcode])
currency = Currency(db, currency_id, currency_name) currency = Currency(db, currency_id, currency_name)
@ -29,7 +29,7 @@ class Account:
@classmethod @classmethod
def load(cls, db, id=None): def load(cls, db, id=None):
"""Constructor for existing account""" """Constructor for existing account"""
account_id, account_name, account_acctype, currency_id, currency_name = self.db.execute_and_fetch( account_id, account_name, account_acctype, currency_id, currency_name = db_execute_and_fetch(
"SELECT account_id, account_name, account_acctype, currency_id, currency_name FROM public.account_class_initialization_data('by_id', %s, NULL)", "SELECT account_id, account_name, account_acctype, currency_id, currency_name FROM public.account_class_initialization_data('by_id', %s, NULL)",
[id]) [id])
currency = Currency(db, currency_id, currency_name) currency = Currency(db, currency_id, currency_name)