mdsfred/investment
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

asset: Feld 'symbol' in übersetzter form

Browse source
This commit is contained in:
Frederik Jaeckel 2022-12-09 09:43:30 +01:00
parent e30953a55c
commit fcabafa080
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
asset.py
View file

@ -236,9 +236,12 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
tab_templ = ProdTempl.__table__() tab_templ = ProdTempl.__table__()
tab_prod = Product.__table__() tab_prod = Product.__table__()
tab_uom = Uom.__table__() tab_uom = Uom.__table__()
tab_uom2 = Uom.__table__()
tab_cur = Currency.__table__() tab_cur = Currency.__table__()
# get translated symbol-column from UOM
(tab1, join1, col1) = Uom.symbol._get_translation_column(Uom, 'symbol')
tab_symb = join1.select(tab1.id, col1.as_('symbol'))
query = tab_asset.join(tab_prod, query = tab_asset.join(tab_prod,
condition=tab_asset.product==tab_prod.id, condition=tab_asset.product==tab_prod.id,
).join(tab_templ, ).join(tab_templ,
@ -247,13 +250,13 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
condition=tab_templ.default_uom==tab_uom.id, condition=tab_templ.default_uom==tab_uom.id,
).join(tab_cur, ).join(tab_cur,
condition=tab_asset.currency==tab_cur.id, condition=tab_asset.currency==tab_cur.id,
).join(tab_uom2, ).join(tab_symb,
condition=tab_asset.uom==tab_uom2.id, condition=tab_asset.uom==tab_symb.id,
).select( ).select(
tab_asset.id, tab_asset.id,
tab_templ.name, tab_templ.name,
tab_uom.category.as_('product_uom'), tab_uom.category.as_('product_uom'),
Concat2(tab_cur.symbol, '/', tab_uom2.symbol).as_('symbol'), Concat2(tab_cur.symbol, '/', tab_symb.symbol).as_('symbol'),
) )
return (query, tab_asset) return (query, tab_asset)