Update: latest changes

Author: John75SunCity

.devcontainer/devcontainer.json

@@ -1,5 +1,12 @@
 {
   "features": {
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "tht13.python"
+      ]
+    }
   }
 }

.vscode/launch.json

@@ -4,6 +4,8 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+
+        
         {
             "name": "Python Debugger: Current File",
             "type": "debugpy",

HTTP Controller

@@ -5,8 +5,10 @@ _logger = logging.getLogger(__name__)
 
 CUSTOMER_FIELD = 'customer_id'
 INTERNAL_USAGE = 'internal'
+INVENTORY_PAGE_LIMIT = 100  # Limit for scalability
 
 class MyController(http.Controller):
+<<<<<<< HEAD
     """
     Controller for managing inventory-related HTTP requests.
     """
@@ -24,6 +26,102 @@ class MyController(http.Controller):
             ('lot_id', 'in', serials.ids),
             ('location_id.usage', '=', INTERNAL_USAGE)
         ])
+=======
+    def _get_current_user(self):
+        """
+        Helper to get the current Odoo user.
+        Returns:
+            res.users recordset
+        """
+        return http.request.env.user
+
+    def _get_current_partner(self):
+        """
+        Helper to get the current user's partner.
+        Returns:
+            res.partner recordset
+        """
+        return self._get_current_user().partner_id
+
+    def _handle_message(self, error=None, success=None):
+        """
+        Modularize error and success message handling.
+        Args:
+            error (str): Error message.
+            success (str): Success message.
+        Returns:
+            dict: Message context for rendering.
+        """
+        if error:
+            return {'message': error, 'message_type': 'error'}
+        if success:
+            return {'message': success, 'message_type': 'success'}
+        return {'message': '', 'message_type': ''}
+
+    def _get_partner_inventory(self, partner, limit=INVENTORY_PAGE_LIMIT):
+        """
+        Retrieve inventory for a given partner, paginated for scalability.
+        Args:
+            partner: res.partner recordset.
+            limit (int): Max number of records to return.
+        Returns:
+            stock.quant recordset.
+        Example:
+            >>> self._get_partner_inventory(partner)
+            stock.quant(1, 2, 3)
+        Edge Cases:
+            - Partner has no inventory: returns empty recordset.
+            - Large inventory: returns only up to 'limit' records.
+        """
+        try:
+            serials = http.request.env['stock.production.lot'].search([(CUSTOMER_FIELD, '=', partner.id)])
+            if not serials:
+                _logger.info("No serials found for partner %s", partner.id)
+                return http.request.env['stock.quant'].browse([])
+            quants = http.request.env['stock.quant'].search([
+                ('lot_id', 'in', serials.ids),
+                ('location_id.usage', '=', INTERNAL_USAGE)
+            ], limit=limit)
+            _logger.info("Fetched %d inventory items for partner %s", len(quants), partner.id)
+            return quants
+        except Exception as e:
+            _logger.error("Database error fetching inventory for partner %s: %s", partner.id, e)
+            return http.request.env['stock.quant'].browse([])
+
+    def _parse_item_ids(self, form):
+        """
+        Safely parse item_ids from form data.
+        Args:
+            form: werkzeug.form object.
+        Returns:
+            List of item_ids as integers, or None if parsing fails.
+        Example:
+            >>> self._parse_item_ids(form)
+            [1, 2, 3]
+        Edge Cases:
+            - No item_ids: returns None.
+            - Non-integer values: returns None.
+            - Duplicates: returns unique integers.
+        """
+        item_ids = form.getlist('item_ids')
+        if not item_ids:
+            _logger.warning("No item_ids provided in the form.")
+            return None
+        try:
+            # Validate: only allow positive integers, remove duplicates
+            parsed_ids = []
+            for id_str in item_ids:
+                id_int = int(id_str)
+                if id_int <= 0:
+                    raise ValueError("Item ID must be positive.")
+                parsed_ids.append(id_int)
+            unique_ids = list(set(parsed_ids))
+            _logger.info("Parsed item_ids: %s", unique_ids)
+            return unique_ids
+        except Exception as e:
+            _logger.error("Error parsing item_ids: %s. Data: %s", e, item_ids)
+            return None
+>>>>>>> 46620db (Update: latest changes)
 
     def _parse_item_ids(self, form):
         """
@@ -41,6 +139,7 @@ class MyController(http.Controller):
     @http.route('/my/inventory/request_pickup', type='http', auth='user', methods=['POST'], csrf=True)
     def request_pickup(self, **kw):
         """
+<<<<<<< HEAD
         Handle inventory pickup requests for logged-in users.
         """
         user = http.request.env.user
@@ -56,10 +155,40 @@ class MyController(http.Controller):
         _logger.info('Pickup requested for items %s by partner ID %s', item_ids, partner.id)
         # ...existing pickup processing code should be placed here...
         return http.request.redirect('/my/inventory?success=pickup_requested')
+=======
+        Handle pickup requests for inventory items.
+        Enhanced logging, error handling, and user feedback.
+        """
+        user = self._get_current_user()
+        partner = self._get_current_partner()
+        _logger.info('Pickup request initiated by user %s (ID: %s), partner %s', user.login, user.id, partner.id)
+        item_ids = self._parse_item_ids(http.request.httprequest.form)
+        if item_ids is None:
+            error_msg = (
+                "Invalid item selection. Please select valid inventory items. "
+                "If the problem persists, contact support."
+            )
+            _logger.warning("User %s (ID: %s) provided invalid item_ids: %s", user.login, user.id, http.request.httprequest.form.getlist('item_ids'))
+            return http.request.redirect('/my/inventory?error=invalid_item_ids')
+        try:
+            # ...existing code for processing pickup...
+            _logger.info('Pickup requested for items %s by partner %s', item_ids, partner.id)
+            # On success:
+            success_msg = "Pickup request submitted successfully for selected items."
+            return http.request.redirect('/my/inventory?success=pickup_requested')
+        except Exception as e:
+            _logger.error("Error processing pickup request for user %s: %s", user.login, e)
+            error_msg = (
+                "An error occurred while processing your pickup request. "
+                "Please try again later or contact support."
+            )
+            return http.request.redirect('/my/inventory?error=pickup_failed')
+>>>>>>> 46620db (Update: latest changes)
 
     @http.route('/my/inventory', type='http', auth='user', website=True, methods=['GET'], csrf=True)
     def my_inventory(self, **kw):
         """
+<<<<<<< HEAD
         Display inventory relevant to the logged-in user.
         """
         user = http.request.env.user
@@ -77,11 +206,41 @@ class MyController(http.Controller):
         elif success:
             message = 'Your pickup request has been submitted.'
 
+=======
+        Render the inventory page for the current user.
+        Enhanced with pagination, user-friendly messages, and tooltips.
+        """
+        user = self._get_current_user()
+        partner = self._get_current_partner()
+        error = http.request.params.get('error')
+        success = http.request.params.get('success')
+        message_ctx = self._handle_message(
+            error="Invalid item selection. Please select valid inventory items." if error == 'invalid_item_ids' else (
+                "An error occurred while processing your pickup request. Please try again later." if error == 'pickup_failed' else None
+            ),
+            success="Pickup request submitted successfully!" if success == 'pickup_requested' else None
+        )
+        quants = self._get_partner_inventory(partner)
+        if not quants:
+            message_ctx['message'] = 'No inventory items found. If you believe this is an error, please contact support.'
+            message_ctx['message_type'] = 'info'
+        # Add tooltips/explanations for inventory actions
+        inventory_tooltips = {
+            'pickup': 'Request pickup for selected inventory items. Only available for items in internal locations.'
+        }
+>>>>>>> 46620db (Update: latest changes)
         return http.request.render(
             'records_management.inventory_template',
             {
                 'quants': quants,
+<<<<<<< HEAD
                 'message': message
+=======
+                'message': message_ctx['message'],
+                'message_type': message_ctx['message_type'],
+                'tooltips': inventory_tooltips,
+                'page_limit': INVENTORY_PAGE_LIMIT,
+>>>>>>> 46620db (Update: latest changes)
             }
         )
 

docker-compose.yml

@@ -18,6 +18,7 @@ services:
       - ./records_management:/mnt/extra-addons/records_management
     environment:
       - HOST=db
-      - USER=odoo
+      - USER=
+      
       - PASSWORD=odoo
     restart: always

records_management/models/pickup_request.py

@@ -1,18 +1,93 @@
-from odoo import fields, models
+from odoo import fields, models, api
+from odoo.exceptions import ValidationError
 
 class PickupRequest(models.Model):
+    """
+    PickupRequest Model
+
+    This model represents a request for picking up items by a customer.
+    It manages the customer, requested items, request date, and the workflow state.
+    Includes validation to ensure data integrity and business logic for state transitions.
+    """
     _name = 'pickup.request'
     _description = 'Pickup Request'
 
-    customer_id = fields.Many2one('res.partner', string='Customer', required=True)
-    request_date = fields.Date(string='Request Date', default=fields.Date.today)
+    customer_id = fields.Many2one(
+        'res.partner',
+        string='Customer',
+        required=True,
+        help="The customer requesting the pickup."
+    )
+    request_date = fields.Date(
+        string='Request Date',
+        default=fields.Date.today,
+        required=True,
+        help="The date when the pickup is requested. Cannot be in the past."
+    )
     state = fields.Selection([
         ('draft', 'Draft'),
         ('confirmed', 'Confirmed'),
         ('done', 'Done')
-    ], default='draft', string='Status')
+    ], default='draft', string='Status', help="Current status of the pickup request.")
     item_ids = fields.Many2many(
         'stock.production.lot',
         string='Items',
-        domain="[('customer_id', '=', customer_id)]"
+        domain="[('customer_id', '=', customer_id)]",
+        help="Items to be picked up. Only items belonging to the selected customer are allowed."
     )
+
+    @api.constrains('request_date')
+    def _check_request_date(self):
+        """
+        Ensure the request date is not in the past.
+        """
+        for rec in self:
+            if rec.request_date and rec.request_date < fields.Date.today():
+                raise ValidationError("The request date cannot be in the past.")
+
+    @api.constrains('item_ids', 'customer_id')
+    def _check_item_customer(self):
+        """
+        Ensure all selected items belong to the selected customer.
+        """
+        for rec in self:
+            if rec.customer_id and rec.item_ids:
+                invalid_items = rec.item_ids.filtered(lambda l: l.customer_id != rec.customer_id)
+                if invalid_items:
+                    raise ValidationError("All items must belong to the selected customer.")
+
+    def action_confirm(self):
+        """
+        Confirm the pickup request, moving it to the 'confirmed' state.
+        """
+        for rec in self:
+            rec.state = 'confirmed'
+
+    def action_done(self):
+        """
+        Mark the pickup request as done, moving it to the 'done' state.
+        """
+        for rec in self:
+            rec.state = 'done'
+
+    # Security rules should be defined in the corresponding XML security files.
+    # Example: records_management/security/ir.model.access.csv
+
+    # Optimize domain filtering for item_ids
+    @api.onchange('customer_id')
+    def _onchange_customer_id(self):
+        """
+        Dynamically filter items based on the selected customer.
+        """
+        if self.customer_id:
+            return {
+                'domain': {
+                    'item_ids': [('customer_id', '=', self.customer_id.id)]
+                }
+            }
+        else:
+            return {
+                'domain': {
+                    'item_ids': []
+                }
+            }