diff --git a/modules/purchase_trade/stock.py b/modules/purchase_trade/stock.py index 4bcd10f..8df4610 100755 --- a/modules/purchase_trade/stock.py +++ b/modules/purchase_trade/stock.py @@ -1732,9 +1732,11 @@ class ShipmentIn(metaclass=PoolMeta): rows = [] if purchase_lines: - rows.append(('Purchases', '', purchase_total, purchase_total)) + rows.append(( + 'Purchases', '', purchase_total, purchase_total, + 'major')) if sale_lines: - rows.append(('Sales', '', sale_total, sale_total)) + rows.append(('Sales', '', sale_total, sale_total, 'major')) fee_total = Decimal('0') fee_rows = {} @@ -1744,12 +1746,12 @@ class ShipmentIn(metaclass=PoolMeta): fee_total += amount fee_rows[label] = fee_rows.get(label, Decimal('0')) + amount for label, amount in fee_rows.items(): - rows.append(('Costs', label, amount, amount)) + rows.append(('Costs', label, amount, amount, 'cost')) if rows: - rows.append(('Costs', 'Total', fee_total, fee_total)) + rows.append(('Costs', 'Total', fee_total, fee_total, 'cost')) pnl = purchase_total + sale_total + fee_total - rows.append(('P&L', '', pnl, pnl)) + rows.append(('P&L', '', pnl, pnl, 'pnl')) return rows def _get_report_linkage_movement_rows(self): @@ -2013,7 +2015,7 @@ class ShipmentIn(metaclass=PoolMeta): def report_linkage_summary_rows(self): return self._report_table_rows( self._get_report_linkage_summary_rows(), - ('group', 'cost_type', 'estimated', 'validated'), + ('group', 'cost_type', 'estimated', 'validated', 'kind'), {'estimated', 'validated'}) @property diff --git a/modules/stock/linkage.fodt b/modules/stock/linkage.fodt index 8e84c77..f817030 100644 --- a/modules/stock/linkage.fodt +++ b/modules/stock/linkage.fodt @@ -1184,30 +1184,31 @@ - - - - - + + + + + - - + + - + - + - - + + + @@ -1432,7 +1433,12 @@ GroupCost TypeEstimatedValidated <for each="row in shipment.report_linkage_summary_rows"> +<if test="row['kind'] == 'pnl'"> +<row['group']><row['cost_type']><row['estimated']><row['validated']> +</if> +<if test="row['kind'] != 'pnl'"> <row['group']><row['cost_type']><row['estimated']><row['validated']> +</if> </for> @@ -1684,8 +1690,7 @@ -OliverGyslerJeremieCOLLOTStephaneMonnard -SteveZaccarini +OliverGyslerJeremieCOLLOTStephaneMonnardSteveZaccarini </for>