diff --git a/modules/purchase_trade/stock.py b/modules/purchase_trade/stock.py index 183c2b9..1e3321e 100755 --- a/modules/purchase_trade/stock.py +++ b/modules/purchase_trade/stock.py @@ -1639,11 +1639,11 @@ class ShipmentIn(metaclass=PoolMeta): @classmethod def _report_currency_code(cls, record): currency = getattr(record, 'currency', None) - return ( - getattr(currency, 'code', None) - or getattr(currency, 'name', None) - or getattr(currency, 'symbol', None) - or '') + for name in ('code', 'rec_name', 'name', 'symbol'): + value = getattr(currency, name, None) + if value and not str(value).isdigit(): + return value + return '' @classmethod def _report_unit_symbol(cls, line): @@ -2062,11 +2062,7 @@ class ShipmentIn(metaclass=PoolMeta): @property def report_linkage_desk(self): - purchase_lines = self._get_report_linkage_purchase_lines() - product = ( - getattr(purchase_lines[0], 'product', None) - if purchase_lines else self._get_report_linkage_product()) - return self._report_rec_name(product) + return 'Sulfuric Acid' @property def report_linkage_book(self): diff --git a/modules/purchase_trade/tests/test_module.py b/modules/purchase_trade/tests/test_module.py index f8d9c8c..3bbabda 100644 --- a/modules/purchase_trade/tests/test_module.py +++ b/modules/purchase_trade/tests/test_module.py @@ -6912,7 +6912,7 @@ description self.assertEqual( shipment.report_linkage_title, 'Linkage P-10/S-20 26.0001') - self.assertEqual(shipment.report_linkage_desk, 'Sulphuric Acid') + self.assertEqual(shipment.report_linkage_desk, 'Sulfuric Acid') self.assertEqual(shipment.report_linkage_book, 'H2SO4 Chile FY26') self.assertEqual( shipment.report_linkage_bl_date, 'Thursday, April 30, 2026') @@ -6945,7 +6945,7 @@ description shipment.moves = [] shipment.lotqt = [] - currency = SimpleNamespace(code='USD') + currency = SimpleNamespace(id=1, rec_name='USD') unit = SimpleNamespace(symbol='MT') product = SimpleNamespace(id=1, rec_name='Sulphuric Acid') purchase = SimpleNamespace( diff --git a/modules/stock/linkage.fodt b/modules/stock/linkage.fodt index 5a4eb1f..3292c15 100644 --- a/modules/stock/linkage.fodt +++ b/modules/stock/linkage.fodt @@ -599,10 +599,10 @@ - + - +