pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] stock: clean up traceability report

Browse Source 
- Add new column 'LOT/SERIAL NUMBER'.
- Add label 'Date' for date
- Column 'LOCATION SOURCE' and 'LOCATION DESTINATION' are merged into
  'LOCATION'.
This commit is contained in:
Hiral Bhavsar
2017-09-07 14:23:28 -07:00
committed by Joren Van Onder
parent 0bc29de024
commit ff97f761ea
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/stock/models/stock_traceability.py
+11 -13
View File
@@ -156,8 +156,7 @@ class MrpStockReport(models.TransientModel):
'model':'stock.move.line',
'product_id': move_line.product_id.display_name,
'product_qty_uom': str(move_line.qty_done) + ' ' + move_line.product_id.uom_id.name,
'location_source': move_line.location_id.name,
'location_destination': move_line.location_dest_id.name,
'location': move_line.location_id.name + ' -> ' + move_line.location_dest_id.name,
'reference_id': ref,
'res_id': res_id,
'stream': stream,
@@ -166,9 +165,6 @@ class MrpStockReport(models.TransientModel):
def make_dict_head(self, level, parent_id, model=False, stream=False, move_line=False):
data = []
product_id_name = move_line.product_id.display_name
if move_line.lot_id:
product_id_name += ' ('+move_line.lot_id.name+')'
if model == 'stock.move.line':
data = [{
'level': level,
@@ -177,9 +173,10 @@ class MrpStockReport(models.TransientModel):
'model_id': move_line.id,
'parent_id': parent_id,
'model': model or 'stock.move.line',
'product_id': product_id_name,
'product_id': move_line.product_id.display_name,
'lot_id': move_line.lot_id.name,
'product_qty_uom': str(move_line.qty_done) + ' ' + move_line.product_id.uom_id.name,
'location_source': move_line.location_dest_id.name,
'location': move_line.location_dest_id.name,
'stream': stream,
'reference_id': False}]
elif model == 'stock.quant':
@@ -190,9 +187,10 @@ class MrpStockReport(models.TransientModel):
'model_id': move_line.id,
'parent_id': parent_id,
'model': model or 'stock.quant',
'product_id': product_id_name,
'product_id': move_line.product_id.display_name,
'lot_id': move_line.lot_id.name,
'product_qty_uom': str(move_line.quantity) + ' ' + move_line.product_id.uom_id.name,
'location_source': move_line.location_id.name,
'location': move_line.location_id.name,
'stream': stream,
'reference_id': False}]
return data
@@ -254,10 +252,10 @@ class MrpStockReport(models.TransientModel):
'res_model': data.get('res_model', False),
'name': _(data.get('lot_id', False)),
'columns': [data.get('reference_id', False) or data.get('product_id', False),
data.get('lot_id', False),
data.get('date', False),
data.get('product_qty_uom', 0),
data.get('location_source', False),
data.get('location_destination', False)],
data.get('location', False)],
'level': level,
'unfoldable': data['unfoldable'],
})
@@ -315,10 +313,10 @@ class MrpStockReport(models.TransientModel):
'type': 'line',
'name': _(data.get('lot_id')),
'columns': [data.get('reference_id') or data.get('product_id'),
data.get('lot_id'),
data.get('date'),
data.get('product_qty_uom', 0),
data.get('location_source'),
data.get('location_destination')],
data.get('location')],
'level': data['level'],
'unfoldable': data['unfoldable'],
})
addons/stock/views/report_stock_traceability.xml
+6 -6
View File
@@ -48,10 +48,10 @@
<thead>
<tr class="o_report_header">
<th class="o_report_line_header">PRODUCT</th>
<th class="o_report_line_header"></th>
<th class="o_report_line_header">LOT/SERIAL NUMBER</th>
<th class="o_report_line_header">DATE</th>
<th class="o_report_line_header">QUANTITY</th>
<th class="o_report_line_header">LOCATION SOURCE</th>
<th class="o_report_line_header">LOCATION DESTINATION</th>
<th class="o_report_line_header">LOCATION</th>
<th></th>
</tr>
</thead>
@@ -86,10 +86,10 @@
<thead>
<tr class="o_report_header">
<th class="o_report_line_header">PRODUCT</th>
<th class="o_report_line_header"></th>
<th class="o_report_line_header">LOT/SERIAL NUMBER</th>
<th class="o_report_line_header">DATE</th>
<th class="o_report_line_header">QUANTITY</th>
<th class="o_report_line_header">LOCATION SOURCE</th>
<th class="o_report_line_header">LOCATION DESTINATION</th>
<th class="o_report_line_header">LOCATION</th>
</tr>
</thead>
<tbody>