From f4310c596ab964bb8c15923df58d0adca08568cc Mon Sep 17 00:00:00 2001 From: Frederik Jaeckel Date: Thu, 1 Dec 2022 16:55:27 +0100 Subject: [PATCH] =?UTF-8?q?asset:=20rec=5Fname=20-=20einheit=20als=20w?= =?UTF-8?q?=C3=A4hrung/menge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asset.py | 5 ++--- tests/test_asset.py | 32 ++++++++++++++++---------------- view/asset_list.xml | 8 ++++---- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/asset.py b/asset.py index f428cab..c6bda9b 100644 --- a/asset.py +++ b/asset.py @@ -796,10 +796,9 @@ class Asset(ModelSQL, ModelView): def get_rec_name(self, 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', '-'), - 'curr': getattr(self.currency, 'symbol', '-'), - 'unit': getattr(self.uom, 'rec_name', '-'), + 'unit': self.uom_symbol, 'rate': Report.format_number(self.rate, lang=None, digits=self.currency_digits or 4) \ if self.rate is not None else '-', diff --git a/tests/test_asset.py b/tests/test_asset.py index 5499638..3805d6c 100644 --- a/tests/test_asset.py +++ b/tests/test_asset.py @@ -61,9 +61,9 @@ class AssetTestCase(ModuleTestCase): 'currency_digits': 4, 'uom': product.default_uom.id, }]) - self.assertEqual(asset.rec_name, '%s - - usd/%s [-]' % ( + self.assertEqual(asset.rec_name, '%s | - usd/%s | -' % ( product.rec_name, - asset.uom.rec_name, + asset.uom.symbol, )) self.assertEqual(asset.currency.rec_name, 'usd') self.assertEqual(asset.currency_digits, 4) @@ -100,7 +100,7 @@ class AssetTestCase(ModuleTestCase): company=company, product = product) - self.assertEqual(asset.rec_name, 'Product 1 - - usd/Unit [-]') + self.assertEqual(asset.rec_name, 'Product 1 | - usd/u | -') Asset.write(*[ [asset], @@ -110,7 +110,7 @@ class AssetTestCase(ModuleTestCase): '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) @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(asset2.rec_name, 'Product 2 - 2.6000 usd/Unit [05/17/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/u | 05/17/2022') assets = Asset.search([], order=[('date', 'ASC')]) self.assertEqual(len(assets), 2) @@ -205,7 +205,7 @@ class AssetTestCase(ModuleTestCase): asset1 = self.prep_asset_item( company=company, product = product) - self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') + self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -') Asset.write(*[ [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(asset1.rates[0].date, date(2022, 5, 16)) 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(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(asset1.rates[0].date, date(2022, 5, 16)) self.assertEqual(asset1.rates[1].date, date(2022, 5, 15)) @@ -378,8 +378,8 @@ class AssetTestCase(ModuleTestCase): company=company, product = product) - self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') - self.assertEqual(asset2.rec_name, 'Product 1 - - usd/Unit [-]') + self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -') + self.assertEqual(asset2.rec_name, 'Product 1 | - usd/u | -') Asset.write(*[ [asset1], @@ -403,8 +403,8 @@ class AssetTestCase(ModuleTestCase): }])], }, ]) - self.assertEqual(asset1.rec_name, 'Product 1 - 2.6000 usd/Unit [05/16/2022]') - self.assertEqual(asset2.rec_name, 'Product 1 - 5.2500 usd/Unit [05/15/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/u | 05/15/2022') self.assertEqual(asset1.change_day1, Decimal('6.12')) self.assertEqual(asset2.change_day1, Decimal('-8.7')) self.assertEqual(asset1.change_month1, None) @@ -481,7 +481,7 @@ class AssetTestCase(ModuleTestCase): company=company, product = product) - self.assertEqual(asset1.rec_name, 'Product 1 - - usd/Unit [-]') + self.assertEqual(asset1.rec_name, 'Product 1 | - usd/u | -') Asset.write(*[ [asset1], @@ -500,7 +500,7 @@ class AssetTestCase(ModuleTestCase): '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(asset1.rates[0].date, date(2022, 5, 16)) self.assertEqual(asset1.rates[1].date, date(2022, 5, 15)) diff --git a/view/asset_list.xml b/view/asset_list.xml index 0da0451..1f5e868 100644 --- a/view/asset_list.xml +++ b/view/asset_list.xml @@ -4,13 +4,13 @@ The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. --> - - - - + + + +