admin/tradon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linkage

Browse Source
This commit is contained in:
laurentbarontini
2026-07-15 08:51:00 +02:00
parent 9b0dd0e7c1
commit 59171ec07b
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/purchase_trade/stock.py
View File

@@ -1639,11 +1639,11 @@ class ShipmentIn(metaclass=PoolMeta):
@classmethod @classmethod
def _report_currency_code(cls, record): def _report_currency_code(cls, record):
currency = getattr(record, 'currency', None) currency = getattr(record, 'currency', None)
return ( for name in ('code', 'rec_name', 'name', 'symbol'):
getattr(currency, 'code', None) value = getattr(currency, name, None)
or getattr(currency, 'name', None) if value and not str(value).isdigit():
or getattr(currency, 'symbol', None) return value
or '') return ''
@classmethod @classmethod
def _report_unit_symbol(cls, line): def _report_unit_symbol(cls, line):
@@ -2062,11 +2062,7 @@ class ShipmentIn(metaclass=PoolMeta):
@property @property
def report_linkage_desk(self): def report_linkage_desk(self):
purchase_lines = self._get_report_linkage_purchase_lines() return 'Sulfuric Acid'
product = (
getattr(purchase_lines[0], 'product', None)
if purchase_lines else self._get_report_linkage_product())
return self._report_rec_name(product)
@property @property
def report_linkage_book(self): def report_linkage_book(self):

4
modules/purchase_trade/tests/test_module.py
View File

@@ -6912,7 +6912,7 @@ description</t></is></c>
self.assertEqual( self.assertEqual(
shipment.report_linkage_title, 'Linkage P-10/S-20 26.0001') 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_book, 'H2SO4 Chile FY26')
self.assertEqual( self.assertEqual(
shipment.report_linkage_bl_date, 'Thursday, April 30, 2026') shipment.report_linkage_bl_date, 'Thursday, April 30, 2026')
@@ -6945,7 +6945,7 @@ description</t></is></c>
shipment.moves = [] shipment.moves = []
shipment.lotqt = [] shipment.lotqt = []
currency = SimpleNamespace(code='USD') currency = SimpleNamespace(id=1, rec_name='USD')
unit = SimpleNamespace(symbol='MT') unit = SimpleNamespace(symbol='MT')
product = SimpleNamespace(id=1, rec_name='Sulphuric Acid') product = SimpleNamespace(id=1, rec_name='Sulphuric Acid')
purchase = SimpleNamespace( purchase = SimpleNamespace(

4
modules/stock/linkage.fodt
View File

@@ -599,10 +599,10 @@
<style:table-column-properties style:column-width="3.764cm" style:rel-column-width="8626*"/> <style:table-column-properties style:column-width="3.764cm" style:rel-column-width="8626*"/>
</style:style> </style:style>
<style:style style:name="LKFinancialDetails.1" style:family="table-row"> <style:style style:name="LKFinancialDetails.1" style:family="table-row">
<style:table-row-properties style:min-row-height="0.19cm"/> <style:table-row-properties style:min-row-height="0.25cm"/>
</style:style> </style:style>
<style:style style:name="LKFinancialDetails.A1" style:family="table-cell"> <style:style style:name="LKFinancialDetails.A1" style:family="table-cell">
<style:table-cell-properties fo:padding="0.01cm" fo:border="none"/> <style:table-cell-properties fo:padding="0.018cm" fo:border="none"/>
</style:style> </style:style>
<style:style style:name="LKFinancialDetails.2" style:family="table-row"> <style:style style:name="LKFinancialDetails.2" style:family="table-row">
<style:table-row-properties style:min-row-height="0.011cm"/> <style:table-row-properties style:min-row-height="0.011cm"/>