audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

IMP maintenance_repair Guard around not having stock_analytic installed, improve form of code.

Browse Source
This commit is contained in:
Jared Kipe
2020-01-27 15:40:29 -08:00
parent 667bc66618
commit c67db6f9ef
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
maintenance_repair/models/maintenance.py
View File

@@ -102,28 +102,27 @@ class MaintenanceRequestRepairLine(models.Model):
else: else:
line.cost = 0.0 line.cost = 0.0
def _repair_complete_stock_move_values(self):
values = {
'name': self.request_id.name,
'product_id': self.product_id.id,
'product_uom_qty': self.product_uom_qty,
'product_uom': self.product_uom_id.id,
'location_id': self.request_id.repair_location_id.id,
'location_dest_id': self.request_id.repair_location_dest_id.id,
'maintenance_request_id': self.request_id.id,
'origin': self.request_id.name,
}
# Optional modules for linking maintenance requests to projects, and stock moves to analytic accounts
if hasattr(self.request_id, 'project_id') and hasattr(self.env['stock.move'], 'analytic_account_id'):
values['analytic_account_id'] = self.request_id.project_id.analytic_account_id.id
return values
def action_complete(self): def action_complete(self):
# Create stock movements. - Inspired by mrp_repair # Create stock movements. - Inspired by mrp_repair
MoveObj = self.env['stock.move'] stock_move_model = self.env['stock.move']
for line in self.filtered(lambda l: not l.state == 'done'): for line in self.filtered(lambda l: not l.state == 'done'):
request = line.request_id move = stock_move_model.create(self._repair_complete_stock_move_values())
# Optional hooks to `maintenance_timesheet` and `stock_analytic`
analytic_account_id = False
if getattr(request, 'project_id', False):
analytic_account_id = request.project_id.analytic_account_id.id
move = MoveObj.create({
'name': request.name,
'product_id': line.product_id.id,
'product_uom_qty': line.product_uom_qty,
'product_uom': line.product_uom_id.id,
'location_id': request.repair_location_id.id,
'location_dest_id': request.repair_location_dest_id.id,
'maintenance_request_id': request.id,
'origin': request.name,
'analytic_account_id': analytic_account_id,
})
move = move.sudo() move = move.sudo()
move._action_confirm() move._action_confirm()
move._action_assign() move._action_assign()

2
maintenance_repair/tests/test_maintenance_repair.py
View File

@@ -20,7 +20,7 @@ class TestMaintenanceRepair(common.TransactionCase):
}) })
self.assertEqual(request.repair_status, 'no') self.assertEqual(request.repair_status, 'no')
product_to_repair = self.env.ref('product.product_product_24_product_template') product_to_repair = self.env.ref('product.product_product_24_product_template').product_variant_id
line = self.env['maintenance.request.repair.line'].create({ line = self.env['maintenance.request.repair.line'].create({
'request_id': request.id, 'request_id': request.id,
'product_id': product_to_repair.id, 'product_id': product_to_repair.id,