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

asset: rec_name - einheit als währung/menge

Browse source
This commit is contained in:
Frederik Jaeckel 2022-12-01 16:55:27 +01:00
parent de99f0e473
commit f4310c596a
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
asset.py
View file

@ -796,10 +796,9 @@ class Asset(ModelSQL, ModelView):
def get_rec_name(self, name): def get_rec_name(self, name):
""" record name """ record name
""" """
return '%(prod)s - %(rate)s %(curr)s/%(unit)s [%(date)s]' % { return '%(prod)s | %(rate)s %(unit)s | %(date)s' % {
'prod': getattr(self.product, 'rec_name', '-'), 'prod': getattr(self.product, 'rec_name', '-'),
'curr': getattr(self.currency, 'symbol', '-'), 'unit': self.uom_symbol,
'unit': getattr(self.uom, 'rec_name', '-'),
'rate': Report.format_number(self.rate, lang=None, 'rate': Report.format_number(self.rate, lang=None,
digits=self.currency_digits or 4) \ digits=self.currency_digits or 4) \
if self.rate is not None else '-', if self.rate is not None else '-',

32
tests/test_asset.py
View file

@ -61,9 +61,9 @@ class AssetTestCase(ModuleTestCase):
'currency_digits': 4, 'currency_digits': 4,
'uom': product.default_uom.id, 'uom': product.default_uom.id,
}]) }])
self.assertEqual(asset.rec_name, '%s - - usd/%s [-]' % ( self.assertEqual(asset.rec_name, '%s | - usd/%s | -' % (
product.rec_name, product.rec_name,
asset.uom.rec_name, asset.uom.symbol,
)) ))
self.assertEqual(asset.currency.rec_name, 'usd') self.assertEqual(asset.currency.rec_name, 'usd')
self.assertEqual(asset.currency_digits, 4) self.assertEqual(asset.currency_digits, 4)
@ -100,7 +100,7 @@ class AssetTestCase(ModuleTestCase):
company=company, company=company,
product = product) product = product)
self.assertEqual(asset.rec_name, 'Product 1 - - usd/Unit [-]') self.assertEqual(asset.rec_name, 'Product 1 | - usd/u | -')
Asset.write(*[ Asset.write(*[
[asset], [asset],
@ -110,7 +110,7 @@ class AssetTestCase(ModuleTestCase):
'rate': Decimal('2.45'), 'rate': Decimal('2.45'),
}])], }])],
}]) }])
self.assertEqual(asset.rec_name, 'Product 1 - 2.4500 usd/Unit [05/15/2022]') self.assertEqual(asset.rec_name, 'Product 1 | 2.4500 usd/u | 05/15/2022')
self.assertEqual(Asset.search_count([('name', '=', 'Product 1')]), 1) self.assertEqual(Asset.search_count([('name', '=', 'Product 1')]), 1)
@with_transaction() @with_transaction()
@ -156,8 +156,8 @@ class AssetTestCase(ModuleTestCase):
}])], }])],
}, },
]) ])
self.assertEqual(asset1.rec_name, 'Product 1 - 3.5000 usd/Unit [05/18/2022]') self.assertEqual(asset1.rec_name, 'Product 1 | 3.5000 usd/u | 05/18/2022')
self.assertEqual(asset2.rec_name, 'Product 2 - 2.6000 usd/Unit [05/17/2022]') self.assertEqual(asset2.rec_name, 'Product 2 | 2.6000 usd/u | 05/17/2022')
assets = Asset.search([], order=[('date', 'ASC')]) assets = Asset.search([], order=[('date', 'ASC')])
self.assertEqual(len(assets), 2) self.assertEqual(len(assets), 2)
@ -205,7 +205,7 @@ class AssetTestCase(ModuleTestCase):
asset1 = self.prep_asset_item( asset1 = self.prep_asset_item(
company=company, company=company,
product = product) product = product)
self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -')
Asset.write(*[ Asset.write(*[
[asset1], [asset1],
@ -225,7 +225,7 @@ class AssetTestCase(ModuleTestCase):
}])], }])],
}, },
]) ])
self.assertEqual(asset1.rec_name, 'Product 1 - 2.6000 usd/Unit [05/16/2022]') self.assertEqual(asset1.rec_name, 'Product 1 | 2.6000 usd/u | 05/16/2022')
self.assertEqual(len(asset1.rates), 4) self.assertEqual(len(asset1.rates), 4)
self.assertEqual(asset1.rates[0].date, date(2022, 5, 16)) self.assertEqual(asset1.rates[0].date, date(2022, 5, 16))
self.assertEqual(asset1.rates[1].date, date(2022, 5, 15)) self.assertEqual(asset1.rates[1].date, date(2022, 5, 15))
@ -317,9 +317,9 @@ class AssetTestCase(ModuleTestCase):
}, ])], }, ])],
}, },
]) ])
self.assertEqual(asset1.rec_name, 'Product 1 - 2.6000 usd/Unit [05/16/2022]') self.assertEqual(asset1.rec_name, 'Product 1 | 2.6000 usd/u | 05/16/2022')
self.assertEqual(len(asset1.rates), 4) self.assertEqual(len(asset1.rates), 4)
self.assertEqual(asset2.rec_name, 'Product 1 - 1.5000 usd/Unit [05/17/2022]') self.assertEqual(asset2.rec_name, 'Product 1 | 1.5000 usd/u | 05/17/2022')
self.assertEqual(len(asset2.rates), 7) self.assertEqual(len(asset2.rates), 7)
self.assertEqual(asset1.rates[0].date, date(2022, 5, 16)) self.assertEqual(asset1.rates[0].date, date(2022, 5, 16))
self.assertEqual(asset1.rates[1].date, date(2022, 5, 15)) self.assertEqual(asset1.rates[1].date, date(2022, 5, 15))
@ -378,8 +378,8 @@ class AssetTestCase(ModuleTestCase):
company=company, company=company,
product = product) product = product)
self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -')
self.assertEqual(asset2.rec_name, 'Product 1 - - usd/Unit [-]') self.assertEqual(asset2.rec_name, 'Product 1 | - usd/u | -')
Asset.write(*[ Asset.write(*[
[asset1], [asset1],
@ -403,8 +403,8 @@ class AssetTestCase(ModuleTestCase):
}])], }])],
}, },
]) ])
self.assertEqual(asset1.rec_name, 'Product 1 - 2.6000 usd/Unit [05/16/2022]') self.assertEqual(asset1.rec_name, 'Product 1 | 2.6000 usd/u | 05/16/2022')
self.assertEqual(asset2.rec_name, 'Product 1 - 5.2500 usd/Unit [05/15/2022]') self.assertEqual(asset2.rec_name, 'Product 1 | 5.2500 usd/u | 05/15/2022')
self.assertEqual(asset1.change_day1, Decimal('6.12')) self.assertEqual(asset1.change_day1, Decimal('6.12'))
self.assertEqual(asset2.change_day1, Decimal('-8.7')) self.assertEqual(asset2.change_day1, Decimal('-8.7'))
self.assertEqual(asset1.change_month1, None) self.assertEqual(asset1.change_month1, None)
@ -481,7 +481,7 @@ class AssetTestCase(ModuleTestCase):
company=company, company=company,
product = product) product = product)
self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -')
Asset.write(*[ Asset.write(*[
[asset1], [asset1],
@ -500,7 +500,7 @@ class AssetTestCase(ModuleTestCase):
'rate': Decimal('2.8'), 'rate': Decimal('2.8'),
},])], },])],
}]) }])
self.assertEqual(asset1.rec_name, 'Product 1 - 2.6000 usd/Unit [05/16/2022]') self.assertEqual(asset1.rec_name, 'Product 1 | 2.6000 usd/u | 05/16/2022')
self.assertEqual(len(asset1.rates), 4) self.assertEqual(len(asset1.rates), 4)
self.assertEqual(asset1.rates[0].date, date(2022, 5, 16)) self.assertEqual(asset1.rates[0].date, date(2022, 5, 16))
self.assertEqual(asset1.rates[1].date, date(2022, 5, 15)) self.assertEqual(asset1.rates[1].date, date(2022, 5, 15))

8
view/asset_list.xml
View file

@ -4,13 +4,13 @@ The COPYRIGHT file at the top level of this repository contains the
full copyright notices and license terms. --> full copyright notices and license terms. -->
<tree> <tree>
<field name="name" expand="2"/> <field name="name" expand="2"/>
<field name="isin" expand="1"/>
<field name="wkn" expand="1"/>
<field name="change_day1" /> <field name="change_day1" />
<field name="change_month1" /> <field name="change_month1" />
<field name="change_month3" /> <field name="change_month3" />
<field name="change_month6" /> <field name="change_month6" />
<field name="date" expand="1"/> <field name="date"/>
<field name="rate" expand="1"/> <field name="rate"/>
<field name="uom_symbol"/> <field name="uom_symbol"/>
<field name="isin"/>
<field name="wkn" />
</tree> </tree>