Skip to content

Commit 05b69a6

Browse files
author
odoo
committed
refactor: Improve logging format and clean up imports across multiple files
1 parent 634338e commit 05b69a6

File tree

7 files changed

+66
-28
lines changed

7 files changed

+66
-28
lines changed

records_management/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ def _post_init_hook(env):
1818
import logging
1919
_logger = logging.getLogger(__name__)
2020
_logger.warning(
21-
f"Required module '{module_name}' is not installed. "
22-
f"Please install it for full functionality."
21+
"Required module '%s' is not installed. "
22+
"Please install it for full functionality.",
23+
module_name
2324
)
2425

2526
# Initialize sequences if needed

records_management/controllers/portal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from odoo import http
2-
from odoo.http import request
2+
33

44
class InventoryPortal(http.Controller):
55
@http.route('/my/inventory', type='http', auth='user', website=True)

records_management/models/installer.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# -*- coding: utf-8 -*-
2-
from odoo import models, fields, api, _
2+
from odoo import models, api, _
33
from odoo.exceptions import UserError
44

5+
56
class RecordsManagementInstaller(models.TransientModel):
67
_name = 'records.management.installer'
78
_description = 'Records Management Installation Helper'

records_management/models/pickup_request.py

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,35 @@
11
from odoo import models, fields, api
2-
from odoo.exceptions import ValidationError
2+
33

44
class PickupRequest(models.Model):
55
_name = 'pickup.request'
66
_description = 'Pickup Request'
77
_inherit = ['mail.thread', 'mail.activity.mixin']
88

9-
name = fields.Char(string='Name', required=True, default='New', tracking=True)
10-
customer_id = fields.Many2one('res.partner', string='Customer', required=True, tracking=True)
11-
request_date = fields.Date(string='Request Date', default=fields.Date.context_today, required=True, tracking=True)
12-
request_item_ids = fields.One2many('pickup.request.item', 'pickup_id', string='Request Items')
9+
name = fields.Char(
10+
string='Name', required=True, default='New', tracking=True
11+
)
12+
customer_id = fields.Many2one(
13+
'res.partner', string='Customer', required=True, tracking=True
14+
)
15+
request_date = fields.Date(
16+
string='Request Date', default=fields.Date.context_today,
17+
required=True, tracking=True
18+
)
19+
request_item_ids = fields.One2many(
20+
'pickup.request.item', 'pickup_id', string='Request Items'
21+
)
1322
notes = fields.Text(string='Notes')
1423

1524
# New fields
16-
product_id = fields.Many2one('product.product', string='Product', required=True, tracking=True)
25+
product_id = fields.Many2one(
26+
'product.product', string='Product', required=True, tracking=True
27+
)
1728
quantity = fields.Float(string='Quantity', required=True, tracking=True)
18-
lot_id = fields.Many2one('stock.lot', string='Lot', domain="[('product_id', '=', product_id)]")
29+
lot_id = fields.Many2one(
30+
'stock.lot', string='Lot',
31+
domain="[('product_id', '=', product_id)]"
32+
)
1933

2034
# Status tracking
2135
state = fields.Selection([
@@ -28,10 +42,20 @@ class PickupRequest(models.Model):
2842

2943
# Additional fields for the view
3044
scheduled_date = fields.Date(string='Scheduled Date', tracking=True)
31-
warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse', tracking=True)
32-
driver_id = fields.Many2one('res.partner', string='Driver', domain="[('is_company', '=', False)]", tracking=True)
33-
vehicle_id = fields.Many2one('fleet.vehicle', string='Vehicle', tracking=True)
34-
priority = fields.Selection([('0', 'Normal'), ('1', 'High')], default='0', string='Priority', tracking=True)
45+
warehouse_id = fields.Many2one(
46+
'stock.warehouse', string='Warehouse', tracking=True
47+
)
48+
driver_id = fields.Many2one(
49+
'res.partner', string='Driver',
50+
domain="[('is_company', '=', False)]", tracking=True
51+
)
52+
vehicle_id = fields.Many2one(
53+
'fleet.vehicle', string='Vehicle', tracking=True
54+
)
55+
priority = fields.Selection(
56+
[('0', 'Normal'), ('1', 'High')], default='0',
57+
string='Priority', tracking=True
58+
)
3559
signature = fields.Binary(string='Signature')
3660
signed_by = fields.Many2one('res.users', string='Signed By')
3761
signature_date = fields.Datetime(string='Signature Date')
@@ -71,5 +95,8 @@ def action_cancel(self):
7195
def create(self, vals_list):
7296
for vals in vals_list:
7397
if vals.get('name', 'New') == 'New':
74-
vals['name'] = self.env['ir.sequence'].next_by_code('pickup.request') or 'New'
98+
vals['name'] = (
99+
self.env['ir.sequence'].next_by_code('pickup.request')
100+
or 'New'
101+
)
75102
return super().create(vals_list)

records_management/models/records_document.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from odoo import models, fields, api, _
2-
from odoo.exceptions import UserError
3-
from datetime import datetime, timedelta
2+
43

54
class RecordsDocument(models.Model):
65
_name = 'records.document'
@@ -9,14 +8,18 @@ class RecordsDocument(models.Model):
98
_order = 'date desc, name'
109

1110
name = fields.Char('Document Reference', required=True, tracking=True)
12-
box_id = fields.Many2one('records.box', string='Box', required=True,
13-
tracking=True, index=True,
14-
domain="[('state', '=', 'active')]")
15-
location_id = fields.Many2one(related='box_id.location_id',
16-
string='Storage Location', store=True)
11+
box_id = fields.Many2one(
12+
'records.box', string='Box', required=True, tracking=True,
13+
index=True, domain="[('state', '=', 'active')]"
14+
)
15+
location_id = fields.Many2one(
16+
related='box_id.location_id', string='Storage Location', store=True
17+
)
1718

1819
# Document metadata
19-
document_type_id = fields.Many2one('records.document.type', string='Document Type')
20+
document_type_id = fields.Many2one(
21+
'records.document.type', string='Document Type'
22+
)
2023
date = fields.Date('Document Date', default=fields.Date.context_today)
2124
description = fields.Html('Description')
2225
tags = fields.Many2many('records.tag', string='Tags')

records_management/models/records_tag.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
from odoo import models, fields, api, _
1+
from odoo import models, fields, api
22
import logging
33

44
_logger = logging.getLogger(__name__)
55

6+
67
class RecordsTag(models.Model):
78
_name = 'records.tag'
89
_description = 'Records Management Tag'

records_management/models/stock_picking.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from odoo import api, models # type: ignore
1+
from odoo import models # type: ignore
2+
23

34
class StockPicking(models.Model):
45
_inherit = 'stock.picking'
@@ -11,7 +12,9 @@ def button_validate(self):
1112
res = super().button_validate()
1213
if self.state == 'done' and self.picking_type_id.code == 'outgoing':
1314
# Filter move lines that have a lot with a customer
14-
customer_items = self.move_line_ids.filtered(lambda l: l.lot_id and l.lot_id.customer_id)
15+
customer_items = self.move_line_ids.filtered(
16+
lambda line: line.lot_id and line.lot_id.customer_id
17+
)
1518
if customer_items:
1619
# Group items by customer
1720
customers = {}
@@ -22,7 +25,9 @@ def button_validate(self):
2225
self.env['sale.order'].create({
2326
'partner_id': customer.id,
2427
'order_line': [(0, 0, {
25-
'product_id': self.env.ref('records_management.retrieval_fee_product').id,
28+
'product_id': self.env.ref(
29+
'records_management.retrieval_fee_product'
30+
).id,
2631
'product_uom_qty': len(items),
2732
})],
2833
})

0 commit comments

Comments
 (0)