Skip to content

Commit 1f0d698

Browse files
wip
1 parent ca609c9 commit 1f0d698

File tree

3 files changed

+40
-18
lines changed

3 files changed

+40
-18
lines changed

stock_move_value_report/report/stock_move_line_value_report.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959
</td>
6060
<td class="text-end">
6161
<t
62-
t-set="valuation_layers"
63-
t-value="move_line.move_id.stock_valuation_layer_ids"
62+
t-set="move"
63+
t-value="move_line.move_id"
6464
/>
6565
<t
6666
t-set="cost"
67-
t-value="sum(valuation_layers.mapped(lambda svl: svl.unit_cost if svl.quantity > 0 else -svl.unit_cost))"
67+
t-value="sum(move.mapped(lambda m: m.value if m.quantity > 0 else -m.value))"
6868
/>
6969
<span
7070
t-esc="cost"
@@ -98,12 +98,12 @@
9898
<t t-set="total" t-value="0" />
9999
<t t-foreach="move_lines" t-as="move_line">
100100
<t
101-
t-set="valuation_layers"
102-
t-value="move_line.move_id.stock_valuation_layer_ids"
101+
t-set="move"
102+
t-value="move_line.move_id"
103103
/>
104104
<t
105105
t-set="cost"
106-
t-value="sum(valuation_layers.mapped(lambda svl: svl.unit_cost if svl.quantity > 0 else -svl.unit_cost))"
106+
t-value="sum(move.mapped(lambda m: m.value if m.quantity > 0 else -m.value))"
107107
/>
108108
<t
109109
t-set="total"
@@ -134,7 +134,7 @@
134134
<t t-set="ml_from_inventories" />
135135
<t
136136
t-set="ml_from_scraps"
137-
t-value="move_lines_ids.filtered('move_id.scrapped')"
137+
t-value="move_lines_ids.filtered('move_id.scrap_id')"
138138
/>
139139
<!-- ML From Pickings -->
140140
<t t-if="ml_from_pickings">
@@ -147,7 +147,7 @@
147147
t-set="picking_move_lines"
148148
t-value="ml_from_pickings.filtered(lambda x: x.picking_id == picking)"
149149
/>
150-
<h4><span>[<t t-esc="picking.date" />]</span> Picking <t
150+
<h4><span>[<t t-esc="picking.date_done" />]</span> Picking <t
151151
t-esc="picking.name"
152152
/>: <t t-esc="picking.location_id.name" /> &#8594; <t
153153
t-esc="picking.location_dest_id.name"

stock_move_value_report/report/stock_picking_value_report.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<span t-field="picking.state" />
9292
</td>
9393
<td class="text-center">
94-
<span t-field="picking.date" />
94+
<span t-field="picking.date_done" />
9595
</td>
9696
<td class="text-center" name="td_sched_date">
9797
<span t-field="picking.scheduled_date" />

stock_move_value_report/tests/test_stock_move_value_report.py

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,45 @@ class Test(BaseCommon):
1414
@classmethod
1515
def setUpClass(cls):
1616
super().setUpClass()
17-
cls.moves = cls.env["stock.move"].search([], limit=100)
17+
cls.pickings = cls.env["stock.picking"].search([], limit=100)
18+
cls.moves = cls.pickings.move_ids
1819
cls.move_lines = cls.moves.move_line_ids
19-
cls.company = cls.env.company
20+
picking = cls.pickings[0]
21+
product = picking.move_ids[0].product_id
22+
cls.scrap = cls.env['stock.scrap'].create({
23+
'product_id': product.id,
24+
'product_uom_id': product.uom_id.id,
25+
})
2026

21-
def _render_report(self, reportname, records):
27+
def _render_report(self, report_name, records):
28+
"""
29+
Ensure rendering passes without errors
30+
"""
2231
context = {
2332
**self.env.context,
2433
"active_ids": records.ids,
2534
"active_model": "stock.move"
2635
}
2736
self.env["ir.actions.report"].with_context(**context)._render_qweb_pdf(
28-
reportname, records.ids, data={"context": context}
37+
report_name, records.ids, data={"context": context}
2938
)
3039

3140
def test_report_stock_move_line_value(self):
32-
"""
33-
Ensure
34-
"""
35-
reportname = "stock_move_value_report.report_stock_move_line_value"
36-
self._render_report(reportname, self.move_lines)
41+
report_name = "stock_move_value_report.report_stock_move_line_value"
42+
self.assertTrue(bool(self.move_lines))
43+
self._render_report(report_name, self.move_lines)
44+
45+
def test_report_stock_move_value(self):
46+
report_name = "stock_move_value_report.report_stock_move_value"
47+
self.assertTrue(bool(self.moves))
48+
self._render_report(report_name, self.moves)
49+
50+
def test_report_stock_picking_value(self):
51+
report_name = "stock_move_value_report.report_stock_picking_value"
52+
self.assertTrue(bool(self.pickings))
53+
self._render_report(report_name, self.pickings)
54+
55+
def test_report_stock_scrap_value(self):
56+
report_name = "stock_move_value_report.report_stock_scrap_value"
57+
self.assertTrue(bool(self.scrap))
58+
self._render_report(report_name, self.scrap)

0 commit comments

Comments
 (0)