warehouse_id changes

app/catalogues/controllers/router.py

@@ -571,7 +571,7 @@ async def merchant_stock_batches_list(
         # Auto-fill merchant_id from JWT
         merchant_id = current_user.merchant_id
         catalogue_id = payload.catalogue_id
-        location_id = payload.location_id
+        warehouse_id = payload.warehouse_id
         sku = payload.sku
         skip = payload.skip or 0
         limit = payload.limit or 100
@@ -590,7 +590,7 @@ async def merchant_stock_batches_list(
         result, count = await service.list_merchant_stock_batches(
             merchant_id=merchant_id,
             catalogue_id=catalogue_id,
-            location_id=location_id,
+            warehouse_id=warehouse_id,
             sku=sku,
             skip=skip,
             limit=limit,
@@ -602,7 +602,7 @@ async def merchant_stock_batches_list(
             extra={
                 "merchant_id": merchant_id,
                 "catalogue_id": catalogue_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku,
                 "count": count,
                 "duration": time.time() - start_time

app/catalogues/schemas/schema.py

@@ -1062,7 +1062,7 @@ class MerchantStockBatchesFilter(BaseModel):
     """Merchant stock batches list request with PostgreSQL data from scm_stock"""
     merchant_id: Optional[str] = Field(None, description="Merchant ID (auto-filled from JWT)")
     catalogue_id: Optional[str] = Field(None, description="Filter by catalogue ID")
-    location_id: Optional[str] = Field(None, description="Filter by warehouse/location ID")
+    warehouse_id: Optional[str] = Field(None, description="Filter by warehouse/location ID")
     sku: Optional[str] = Field(None, description="Filter by SKU")
     skip: int = Field(0, ge=0, description="Number of records to skip")
     limit: int = Field(100, ge=1, le=1000, description="Maximum number of records to return")
@@ -1080,7 +1080,7 @@ class MerchantStockBatchesFilter(BaseModel):
         # Stock batch fields from scm_stock and catalogue_ref
         allowed_fields = {
             # Stock fields
-            'stock_id', 'merchant_id', 'location_id', 'catalogue_id', 'sku', 
+            'stock_id', 'merchant_id', 'warehouse_id', 'catalogue_id', 'sku', 
             'batch_no', 'expiry_date', 'qty_on_hand', 'qty_reserved', 'qty_available',
             'cost_price', 'uom', 'created_at', 'updated_at',
             # Catalogue fields
@@ -1099,7 +1099,7 @@ class MerchantStockBatchesFilter(BaseModel):
             "example": {
                 "merchant_id": "mch_01HZQX5K3N2P8R6T4V9W",
                 "catalogue_id": "cat_01HZQX5K3N2P8R6T4V9W",
-                "location_id": "loc_warehouse_001",
+                "warehouse_id": "loc_warehouse_001",
                 "skip": 0,
                 "limit": 50,
                 "projection_list": [
@@ -1118,7 +1118,7 @@ class StockBatchResponse(BaseModel):
     """Response schema for stock batch information"""
     stock_id: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     catalogue_id: str
     sku: str
     batch_no: str
@@ -1143,7 +1143,7 @@ class StockBatchResponse(BaseModel):
             "example": {
                 "stock_id": "stock_01HZQX5K3N2P8R6T4V9W",
                 "merchant_id": "mch_01HZQX5K3N2P8R6T4V9W",
-                "location_id": "loc_warehouse_001",
+                "warehouse_id": "loc_warehouse_001",
                 "catalogue_id": "cat_01HZQX5K3N2P8R6T4V9W",
                 "sku": "SHMP-500-001",
                 "batch_no": "BATCH-2024-001",

app/catalogues/services/service.py

@@ -1004,7 +1004,7 @@ class CatalogueService:
         self,
         merchant_id: str,
         catalogue_id: str = None,
-        location_id: str = None,
+        warehouse_id: str = None,
         sku: str = None,
         skip: int = 0,
         limit: int = 100,
@@ -1043,7 +1043,7 @@ class CatalogueService:
                 SELECT 
                     s.stock_id,
                     s.merchant_id,
-                    s.location_id,
+                    s.warehouse_id,
                     s.catalogue_id,
                     s.sku,
                     s.batch_no,
@@ -1076,9 +1076,9 @@ class CatalogueService:
                 where_conditions.append("s.catalogue_id = :catalogue_id")
                 params["catalogue_id"] = catalogue_id
 
-            if location_id:
-                where_conditions.append("s.location_id = :location_id")
-                params["location_id"] = location_id
+            if warehouse_id:
+                where_conditions.append("s.warehouse_id = :warehouse_id")
+                params["warehouse_id"] = warehouse_id
 
             if sku:
                 where_conditions.append("s.sku = :sku")
@@ -1108,7 +1108,7 @@ class CatalogueService:
                 batch_dict = {
                     "stock_id": str(row.stock_id),
                     "merchant_id": row.merchant_id,
-                    "location_id": row.location_id,
+                    "warehouse_id": row.warehouse_id,
                     "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,

app/inventory/adjustments/controllers/router.py

@@ -187,7 +187,7 @@ async def list_stock_adjustments(
     **Request Body:**
     - **filters**: Filter criteria (optional)
       - merchant_id: Filter by merchant
-      - location_id: Filter by location
+      - warehouse_id: Filter by location
       - status: Filter by status (pending, approved, rejected)
       - adjustment_number: Search by adjustment number (partial match)
     - **skip**: Number of records to skip (pagination)
@@ -196,7 +196,7 @@ async def list_stock_adjustments(
     
     **Projection Examples:**
     - Basic info: ["adjustment_master_id", "adjustment_number", "status", "total_items"]
-    - Summary: ["adjustment_number", "location_id", "total_items", "total_value", "status"]
+    - Summary: ["adjustment_number", "warehouse_id", "total_items", "total_value", "status"]
     - Full details: null (returns all fields)
     
     **Filter Examples:**

app/inventory/adjustments/schemas/schema.py

@@ -42,7 +42,7 @@ class CreateStockAdjustmentRequest(BaseModel):
 class CreateStockAdjustmentRequestSingle(BaseModel):
     """Request schema for creating single stock adjustment (legacy support)"""
     merchant_id: str = Field(..., description="Merchant ID")
-    location_id: str = Field(..., description="Location ID")
+    warehouse_id: str = Field(..., description="Location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: Optional[str] = Field(None, description="Batch number")
     adj_type: AdjustmentType = Field(..., description="Adjustment type")
@@ -85,7 +85,7 @@ class StockAdjustmentResponse(BaseModel):
     """Response schema for stock adjustment (single line item)"""
     adjustment_id: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     sku: str
     batch_no: Optional[str]
     adj_type: AdjustmentType
@@ -122,7 +122,7 @@ class StockAdjustmentMasterResponse(BaseModel):
     adjustment_master_id: str
     adjustment_number: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     adjustment_date: datetime
     description: Optional[str]
     additional_notes: Optional[str]
@@ -147,7 +147,7 @@ class StockTakeModel(BaseModel):
     """Stock take model"""
     stock_take_id: str = Field(..., description="Unique stock take identifier")
     merchant_id: str = Field(..., description="Merchant ID")
-    location_id: str = Field(..., description="Location ID")
+    warehouse_id: str = Field(..., description="Location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: Optional[str] = Field(None, description="Batch number")
     system_qty: int = Field(..., ge=0, description="System quantity")
@@ -177,7 +177,7 @@ class CreateStockTakeRequest(BaseModel):
 class CreateStockTakeRequestSingle(BaseModel):
     """Request schema for creating single stock take (legacy support)"""
     merchant_id: str = Field(..., description="Merchant ID")
-    location_id: str = Field(..., description="Location ID")
+    warehouse_id: str = Field(..., description="Location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: Optional[str] = Field(None, description="Batch number")
     system_qty: int = Field(..., ge=0, description="System quantity")
@@ -194,7 +194,7 @@ class StockTakeResponse(BaseModel):
     """Response schema for stock take"""
     stock_take_id: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     sku: str
     batch_no: Optional[str]
     system_qty: int

app/inventory/adjustments/services/service.py

@@ -42,7 +42,7 @@ class StockAdjustmentService:
     @staticmethod
     async def _validate_stock_availability(
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: Optional[str],
         qty: Decimal
@@ -53,7 +53,7 @@ class StockAdjustmentService:
                 query = select(ScmStock).where(
                     and_(
                         ScmStock.merchant_id == merchant_id,
-                        ScmStock.location_id == location_id,
+                        ScmStock.warehouse_id == warehouse_id,
                         ScmStock.sku == sku
                     )
                 )
@@ -93,7 +93,7 @@ class StockAdjustmentService:
     async def _create_ledger_entry(
         session,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: Optional[str],
         txn_type: TransactionType,
@@ -106,7 +106,7 @@ class StockAdjustmentService:
         try:
             ledger_entry = ScmStockLedger(
                 merchant_id=merchant_id,
-                location_id=location_id,
+                warehouse_id=warehouse_id,
                 sku=sku,
                 batch_no=batch_no,
                 txn_type=txn_type.value,
@@ -133,7 +133,7 @@ class StockAdjustmentService:
     async def _update_stock_snapshot(
         session,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: Optional[str],
         qty_change: Decimal
@@ -143,7 +143,7 @@ class StockAdjustmentService:
             query = select(ScmStock).where(
                 and_(
                     ScmStock.merchant_id == merchant_id,
-                    ScmStock.location_id == location_id,
+                    ScmStock.warehouse_id == warehouse_id,
                     ScmStock.sku == sku
                 )
             )
@@ -163,7 +163,7 @@ class StockAdjustmentService:
             else:
                 stock = ScmStock(
                     merchant_id=merchant_id,
-                    location_id=location_id,
+                    warehouse_id=warehouse_id,
                     sku=sku,
                     batch_no=batch_no,
                     qty_on_hand=max(Decimal('0'), qty_change),
@@ -205,7 +205,7 @@ class StockAdjustmentService:
                 master = ScmStockAdjustmentMaster(
                     adjustment_number=adjustment_number,
                     merchant_id=effective_merchant_id,
-                    location_id=payload.warehouse_id,
+                    warehouse_id=payload.warehouse_id,
                     adjustment_date=payload.adjustment_date or datetime.utcnow(),
                     description=f"Stock adjustment session - {len(payload.entries)} items",
                     additional_notes=payload.additional_notes or "Created via API",
@@ -261,7 +261,7 @@ class StockAdjustmentService:
                     stock_query = select(ScmStock).where(
                         and_(
                             ScmStock.merchant_id == effective_merchant_id,
-                            ScmStock.location_id == payload.warehouse_id,
+                            ScmStock.warehouse_id == payload.warehouse_id,
                             ScmStock.sku == entry.sku
                         )
                     )
@@ -299,7 +299,7 @@ class StockAdjustmentService:
                     results.append(StockAdjustmentResponse(
                         adjustment_id=str(detail.adjustment_detail_id),
                         merchant_id=master.merchant_id,
-                        location_id=master.location_id,
+                        warehouse_id=master.warehouse_id,
                         sku=detail.sku,
                         batch_no=detail.batch_no,
                         adj_type=AdjustmentType(detail.adj_type),
@@ -358,7 +358,7 @@ class StockAdjustmentService:
             if payload.adj_type in [AdjustmentType.DAMAGE, AdjustmentType.EXPIRED, AdjustmentType.SHRINKAGE]:
                 await StockAdjustmentService._validate_stock_availability(
                     payload.merchant_id,
-                    payload.location_id,
+                    payload.warehouse_id,
                     payload.sku,
                     payload.batch_no,
                     qty_decimal
@@ -377,7 +377,7 @@ class StockAdjustmentService:
                 master = ScmStockAdjustmentMaster(
                     adjustment_number=adjustment_number,
                     merchant_id=payload.merchant_id,
-                    location_id=payload.location_id,
+                    warehouse_id=payload.warehouse_id,
                     adjustment_date=datetime.utcnow(),
                     description=f"Single adjustment - {payload.sku}",
                     status="pending",
@@ -393,7 +393,7 @@ class StockAdjustmentService:
                 stock_query = select(ScmStock).where(
                     and_(
                         ScmStock.merchant_id == payload.merchant_id,
-                        ScmStock.location_id == payload.location_id,
+                        ScmStock.warehouse_id == payload.warehouse_id,
                         ScmStock.sku == payload.sku
                     )
                 )
@@ -447,7 +447,7 @@ class StockAdjustmentService:
                 return StockAdjustmentResponse(
                     adjustment_id=str(detail.adjustment_detail_id),
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     sku=detail.sku,
                     batch_no=detail.batch_no,
                     adj_type=AdjustmentType(detail.adj_type),
@@ -492,7 +492,7 @@ class StockAdjustmentService:
             stock_query = select(ScmStock).where(
                 and_(
                     ScmStock.merchant_id == master.merchant_id,
-                    ScmStock.location_id == master.location_id,
+                    ScmStock.warehouse_id == master.warehouse_id,
                     ScmStock.sku == detail.sku,
                     ScmStock.batch_no == detail.batch_no
                 )
@@ -512,7 +512,7 @@ class StockAdjustmentService:
             # Create stock transaction
             stock_transaction = StockTransaction(
                 merchant_id=master.merchant_id,
-                location_id=master.location_id,
+                warehouse_id=master.warehouse_id,
                 catalogue_id=catalogue_id,
                 sku=detail.sku,
                 batch_no=detail.batch_no,
@@ -625,7 +625,7 @@ class StockAdjustmentService:
                 return StockAdjustmentResponse(
                     adjustment_id=str(detail.adjustment_detail_id),
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     sku=detail.sku,
                     batch_no=detail.batch_no,
                     adj_type=AdjustmentType(detail.adj_type),
@@ -738,7 +738,7 @@ class StockAdjustmentService:
                 return StockAdjustmentResponse(
                     adjustment_id=str(detail.adjustment_detail_id),
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     sku=detail.sku,
                     batch_no=detail.batch_no,
                     adj_type=AdjustmentType(detail.adj_type),
@@ -851,7 +851,7 @@ class StockAdjustmentService:
                 return StockAdjustmentResponse(
                     adjustment_id=str(detail.adjustment_detail_id),
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     sku=detail.sku,
                     batch_no=detail.batch_no,
                     adj_type=AdjustmentType(detail.adj_type),
@@ -897,8 +897,8 @@ class StockAdjustmentService:
                 elif filters.get("merchant_id"):
                     conditions.append(ScmStockAdjustmentMaster.merchant_id == filters["merchant_id"])
                     
-                if filters.get("location_id"):
-                    conditions.append(ScmStockAdjustmentMaster.location_id == filters["location_id"])
+                if filters.get("warehouse_id"):
+                    conditions.append(ScmStockAdjustmentMaster.warehouse_id == filters["warehouse_id"])
                 if filters.get("status"):
                     conditions.append(ScmStockAdjustmentMaster.status == filters["status"])
                 if filters.get("adjustment_number"):
@@ -941,7 +941,7 @@ class StockAdjustmentService:
                             adjustment_master_id=str(master.adjustment_master_id),
                             adjustment_number=master.adjustment_number,
                             merchant_id=master.merchant_id,
-                            location_id=master.location_id,
+                            warehouse_id=master.warehouse_id,
                             adjustment_date=master.adjustment_date,
                             description=master.description,
                             additional_notes=master.additional_notes,

app/inventory/stock/controllers/router.py

@@ -163,7 +163,7 @@ async def get_stock_summary(
         service = StockService(pg_session)
         result = await service.get_stock_summary_with_projection(
             merchant_id=current_user.merchant_id,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             sku=payload.sku,
             catalogue_id=payload.catalogue_id,
             projection_list=payload.projection_list
@@ -213,7 +213,7 @@ async def get_stock_valuation(
         service = StockService(pg_session)
         result = await service.get_stock_valuation(
             merchant_id=current_user.merchant_id,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             as_of_date=payload.as_of_date,
             projection_list=payload.projection_list
         )
@@ -238,7 +238,7 @@ async def reserve_stock(
         service = StockService(pg_session)
         success = await service.reserve_stock(
             merchant_id=current_user.merchant_id,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             sku=payload.sku,
             batch_no=payload.batch_no,
             qty=payload.qty,
@@ -269,7 +269,7 @@ async def release_stock_reservation(
         service = StockService(pg_session)
         success = await service.release_stock_reservation(
             merchant_id=current_user.merchant_id,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             sku=payload.sku,
             batch_no=payload.batch_no,
             qty=payload.qty,
@@ -305,7 +305,7 @@ async def adjust_stock(
         
         transaction_id, success = await service.process_stock_adjustment(
             merchant_id=current_user.merchant_id,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             sku=payload.sku,
             batch_no=payload.batch_no,
             adjustment_qty=payload.adjustment_qty,
@@ -351,7 +351,7 @@ async def bulk_adjust_stock(
                 ref_id = f"{bulk_ref_id}_{adjustment.sku}_{adjustment.batch_no}"
                 transaction_id, success = await service.process_stock_adjustment(
                     merchant_id=current_user.merchant_id,
-                    location_id=adjustment.location_id,
+                    warehouse_id=adjustment.warehouse_id,
                     sku=adjustment.sku,
                     batch_no=adjustment.batch_no,
                     adjustment_qty=adjustment.adjustment_qty,
@@ -412,8 +412,8 @@ async def transfer_stock(
         
         success = await service.process_stock_transfer(
             merchant_id=current_user.merchant_id,
-            from_location_id=payload.from_location_id,
-            to_location_id=payload.to_location_id,
+            from_warehouse_id=payload.from_warehouse_id,
+            to_warehouse_id=payload.to_warehouse_id,
             sku=payload.sku,
             batch_no=payload.batch_no,
             qty=payload.qty,

app/inventory/stock/models/model.py

@@ -22,7 +22,7 @@ class ScmStock(Base):
 
     stock_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     merchant_id = Column(String(64), nullable=False)
-    location_id = Column(String(64), nullable=False)
+    warehouse_id = Column(String(64), nullable=False)
     sku = Column(String(64), nullable=False)
     batch_no = Column(String(50), nullable=True)
     
@@ -53,7 +53,7 @@ class ScmStockLedger(Base):
 
     ledger_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     merchant_id = Column(String(64), nullable=False)
-    location_id = Column(String(64), nullable=False)
+    warehouse_id = Column(String(64), nullable=False)
     sku = Column(String(64), nullable=False)
     batch_no = Column(String(50))
     
@@ -83,7 +83,7 @@ class ScmStockAdjustmentMaster(Base):
     adjustment_master_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     adjustment_number = Column(String(50), nullable=False)  # Human readable: ADJ-2024-001
     merchant_id = Column(String(64), nullable=False)
-    location_id = Column(String(64), nullable=False)
+    warehouse_id = Column(String(64), nullable=False)
     
     # Document level info
     adjustment_date = Column(TIMESTAMP(timezone=True), nullable=False, default=datetime.utcnow)
@@ -174,7 +174,7 @@ class ScmStockTakeMaster(Base):
     stock_take_master_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     stock_take_number = Column(String(50), nullable=False)  # Human readable: ST-2024-001
     merchant_id = Column(String(64), nullable=False)
-    location_id = Column(String(64), nullable=False)
+    warehouse_id = Column(String(64), nullable=False)
     
     # Document level info
     stock_take_date = Column(TIMESTAMP(timezone=True), nullable=False)
@@ -272,7 +272,7 @@ class ScmStockAdjustment(Base):
 
     adjustment_id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     merchant_id = Column(String(64), nullable=False)
-    location_id = Column(String(64), nullable=False)
+    warehouse_id = Column(String(64), nullable=False)
     sku = Column(String(64), nullable=False)
     batch_no = Column(String(50))
     

app/inventory/stock/schemas/schema.py

@@ -51,7 +51,7 @@ class StockAdjustmentListFilter(BaseModel):
 
 class StockReservationRequest(BaseModel):
     """Stock reservation request"""
-    location_id: str = Field(..., description="Warehouse/location ID")
+    warehouse_id: str = Field(..., description="Warehouse/location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: str = Field(..., description="Batch number")
     qty: Decimal = Field(..., gt=0, description="Quantity to reserve")
@@ -60,7 +60,7 @@ class StockReservationRequest(BaseModel):
 
 class StockAdjustmentRequest(BaseModel):
     """Stock adjustment request"""
-    location_id: str = Field(..., description="Warehouse/location ID")
+    warehouse_id: str = Field(..., description="Warehouse/location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: str = Field(..., description="Batch number")
     adjustment_qty: Decimal = Field(..., description="Adjustment quantity (positive for increase, negative for decrease)")
@@ -70,8 +70,8 @@ class StockAdjustmentRequest(BaseModel):
 
 class StockTransferRequest(BaseModel):
     """Stock transfer request"""
-    from_location_id: str = Field(..., description="Source location ID")
-    to_location_id: str = Field(..., description="Destination location ID")
+    from_warehouse_id: str = Field(..., description="Source location ID")
+    to_warehouse_id: str = Field(..., description="Destination location ID")
     sku: str = Field(..., description="SKU code")
     batch_no: str = Field(..., description="Batch number")
     qty: Decimal = Field(..., gt=0, description="Quantity to transfer")
@@ -86,7 +86,7 @@ class BulkStockAdjustmentRequest(BaseModel):
 
 class StockSummaryRequest(BaseModel):
     """Stock summary request with projection support"""
-    location_id: Optional[str] = Field(None, description="Filter by location")
+    warehouse_id: Optional[str] = Field(None, description="Filter by location")
     sku: Optional[str] = Field(None, description="Filter by SKU")
     catalogue_id: Optional[str] = Field(None, description="Filter by catalogue ID")
     projection_list: Optional[List[str]] = Field(
@@ -97,7 +97,7 @@ class StockSummaryRequest(BaseModel):
 
 class StockAvailabilityRequest(BaseModel):
     """Stock availability check request"""
-    items: List[Dict[str, Any]] = Field(..., description="List of items to check (sku, qty, location_id)")
+    items: List[Dict[str, Any]] = Field(..., description="List of items to check (sku, qty, warehouse_id)")
     projection_list: Optional[List[str]] = Field(
         None,
         description="List of fields to include in response"
@@ -106,7 +106,7 @@ class StockAvailabilityRequest(BaseModel):
 
 class StockValuationRequest(BaseModel):
     """Stock valuation request"""
-    location_id: Optional[str] = Field(None, description="Filter by location")
+    warehouse_id: Optional[str] = Field(None, description="Filter by location")
     as_of_date: Optional[datetime] = Field(None, description="Valuation as of date")
     projection_list: Optional[List[str]] = Field(
         None,

app/inventory/stock/services/service.py

@@ -43,7 +43,7 @@ class StockTransaction:
     def __init__(
         self,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         catalogue_id: str,
         sku: str,
         batch_no: str,
@@ -58,7 +58,7 @@ class StockTransaction:
         created_by: str = "system"
     ):
         self.merchant_id = merchant_id
-        self.location_id = location_id
+        self.warehouse_id = warehouse_id
         self.catalogue_id = catalogue_id
         self.sku = sku
         self.batch_no = batch_no
@@ -93,14 +93,14 @@ class StockService:
     #         # Call stored procedure with correct parameters (10 parameters as per procedure definition)
     #         query = text("""
     #             SELECT trans.apply_stock_movement(
-    #                 :merchant_id, :location_id, :sku, :batch_no, :qty,
+    #                 :merchant_id, :warehouse_id, :sku, :batch_no, :qty,
     #                 :txn_type, :ref_type, :ref_id, :ref_no, :created_by
     #             )
     #         """)
             
     #         await self.db.execute(query, {
     #             "merchant_id": transaction.merchant_id,
-    #             "location_id": transaction.location_id,
+    #             "warehouse_id": transaction.warehouse_id,
     #             "sku": transaction.sku,
     #             "batch_no": transaction.batch_no,
     #             "qty": float(transaction.qty),  # Convert Decimal to float for PostgreSQL NUMERIC
@@ -145,7 +145,7 @@ class StockService:
             for transaction in transactions:
                 movement = {
                     "merchant_id": transaction.merchant_id,
-                    "location_id": transaction.location_id,
+                    "warehouse_id": transaction.warehouse_id,
                     "sku": transaction.sku,
                     "batch_no": transaction.batch_no,
                     "catalogue_id": transaction.catalogue_id,
@@ -161,7 +161,7 @@ class StockService:
             
             # Call bulk stored procedure
             query = text("SELECT trans.apply_bulk_stock_movements(:movements) as results")
-            logger.info(f"merchant_id: {transaction.merchant_id},location_id: {transaction.location_id},sku: {transaction.sku},batch_no: {transaction.batch_no},catalogue_id: {transaction.catalogue_id} ,uom: {transaction.uom}, expiry_date: {transaction.exp_dt} ,qty: {str(transaction.qty)},txn_type: {transaction.txn_type.value} ,ref_type: {transaction.ref_type.value} , ref_id: {str(transaction.ref_id)} ,created_by: {transaction.created_by}")
+            logger.info(f"merchant_id: {transaction.merchant_id},warehouse_id: {transaction.warehouse_id},sku: {transaction.sku},batch_no: {transaction.batch_no},catalogue_id: {transaction.catalogue_id} ,uom: {transaction.uom}, expiry_date: {transaction.exp_dt} ,qty: {str(transaction.qty)},txn_type: {transaction.txn_type.value} ,ref_type: {transaction.ref_type.value} , ref_id: {str(transaction.ref_id)} ,created_by: {transaction.created_by}")
 
             result = await self.db.execute(query, {
                 "movements": json.dumps(movements)
@@ -202,8 +202,8 @@ class StockService:
         if not transaction.merchant_id:
             raise ValueError("merchant_id is required")
         
-        if not transaction.location_id:
-            raise ValueError("location_id is required")
+        if not transaction.warehouse_id:
+            raise ValueError("warehouse_id is required")
         
         if not transaction.sku:
             raise ValueError("sku is required")
@@ -255,7 +255,7 @@ class StockService:
             for item in grn_items:
                 transaction = StockTransaction(
                     merchant_id=item.merchant_id,
-                    location_id=item.wh_location or "default",
+                    warehouse_id=item.wh_location or "default",
                     catalogue_id=str(item.catalogue_id),
                     sku=item.sku,
                     batch_no=item.batch_no,
@@ -284,7 +284,7 @@ class StockService:
     async def process_stock_adjustment(
         self,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: str,
         adjustment_qty: Decimal,
@@ -305,13 +305,13 @@ class StockService:
             # Get catalogue_id and uom from existing stock
             stock_query = text("""
                 SELECT catalogue_id, uom FROM trans.scm_stock
-                WHERE merchant_id = :merchant_id AND location_id = :location_id 
+                WHERE merchant_id = :merchant_id AND warehouse_id = :warehouse_id 
                   AND sku = :sku AND batch_no = :batch_no
             """)
             
             result = await self.db.execute(stock_query, {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku,
                 "batch_no": batch_no
             })
@@ -329,7 +329,7 @@ class StockService:
             
             transaction = StockTransaction(
                 merchant_id=merchant_id,
-                location_id=location_id,
+                warehouse_id=warehouse_id,
                 catalogue_id=catalogue_id,
                 sku=sku,
                 batch_no=batch_no,
@@ -352,15 +352,15 @@ class StockService:
     async def get_stock_summary(
         self,
         merchant_id: str,
-        location_id: Optional[str] = None,
+        warehouse_id: Optional[str] = None,
         sku: Optional[str] = None
     ) -> List[Dict[str, Any]]:
         """Get current stock summary using stored procedure"""
         try:
-            query = text("SELECT * FROM get_stock_summary(:merchant_id, :location_id, :sku)")
+            query = text("SELECT * FROM get_stock_summary(:merchant_id, :warehouse_id, :sku)")
             result = await self.db.execute(query, {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku
             })
             
@@ -369,7 +369,7 @@ class StockService:
             return [
                 {
                     "stock_id": str(stock.stock_id),
-                    "location_id": stock.location_id,
+                    "warehouse_id": stock.warehouse_id,
                     "catalogue_id": str(stock.catalogue_id),
                     "sku": stock.sku,
                     "batch_no": stock.batch_no,
@@ -408,7 +408,7 @@ class StockService:
             return [
                 {
                     "ledger_id": str(entry.ledger_id),
-                    "location_id": entry.location_id,
+                    "warehouse_id": entry.warehouse_id,
                     "catalogue_id": str(entry.catalogue_id),
                     "sku": entry.sku,
                     "batch_no": entry.batch_no,
@@ -441,7 +441,7 @@ class StockService:
             # Build base query
             base_query = """
                 SELECT 
-                    stock_id, merchant_id, location_id, catalogue_id, sku, batch_no,
+                    stock_id, merchant_id, warehouse_id, catalogue_id, sku, batch_no,
                     exp_dt, qty_on_hand, qty_reserved, qty_available, uom,
                     created_at, updated_at, last_updated_at
                 FROM trans.scm_stock
@@ -456,9 +456,9 @@ class StockService:
                 if key == "merchant_id":
                     where_conditions.append("merchant_id = :merchant_id")
                     params["merchant_id"] = value
-                elif key == "location_id":
-                    where_conditions.append("location_id = :location_id")
-                    params["location_id"] = value
+                elif key == "warehouse_id":
+                    where_conditions.append("warehouse_id = :warehouse_id")
+                    params["warehouse_id"] = value
                 elif key == "sku":
                     where_conditions.append("sku ILIKE :sku")
                     params["sku"] = f"%{value}%"
@@ -494,7 +494,7 @@ class StockService:
                 row_dict = {
                     "stock_id": str(row.stock_id),
                     "merchant_id": row.merchant_id,
-                    "location_id": row.location_id,
+                    "warehouse_id": row.warehouse_id,
                     "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,
@@ -541,7 +541,7 @@ class StockService:
             # Build base query
             base_query = """
                 SELECT 
-                    ledger_id, merchant_id, location_id, catalogue_id, sku, batch_no,
+                    ledger_id, merchant_id, warehouse_id, catalogue_id, sku, batch_no,
                     exp_dt, qty, uom, txn_type, ref_type, ref_id, ref_no,
                     remarks, created_by, created_at
                 FROM trans.scm_stock_ledger
@@ -556,9 +556,9 @@ class StockService:
                 if key == "merchant_id":
                     where_conditions.append("merchant_id = :merchant_id")
                     params["merchant_id"] = value
-                elif key == "location_id":
-                    where_conditions.append("location_id = :location_id")
-                    params["location_id"] = value
+                elif key == "warehouse_id":
+                    where_conditions.append("warehouse_id = :warehouse_id")
+                    params["warehouse_id"] = value
                 elif key == "sku":
                     where_conditions.append("sku ILIKE :sku")
                     params["sku"] = f"%{value}%"
@@ -594,7 +594,7 @@ class StockService:
                 row_dict = {
                     "ledger_id": str(row.ledger_id),
                     "merchant_id": row.merchant_id,
-                    "location_id": row.location_id,
+                    "warehouse_id": row.warehouse_id,
                     "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,
@@ -643,7 +643,7 @@ class StockService:
             # Build base query
             base_query = """
                 SELECT 
-                    adjustment_id, merchant_id, location_id, catalogue_id, sku, batch_no,
+                    adjustment_id, merchant_id, warehouse_id, catalogue_id, sku, batch_no,
                     adjustment_qty, adjustment_type, reason, status, approved_by,
                     approved_at, created_by, created_at, updated_at
                 FROM trans.scm_stock_adjustment
@@ -658,9 +658,9 @@ class StockService:
                 if key == "merchant_id":
                     where_conditions.append("merchant_id = :merchant_id")
                     params["merchant_id"] = value
-                elif key == "location_id":
-                    where_conditions.append("location_id = :location_id")
-                    params["location_id"] = value
+                elif key == "warehouse_id":
+                    where_conditions.append("warehouse_id = :warehouse_id")
+                    params["warehouse_id"] = value
                 elif key == "sku":
                     where_conditions.append("sku ILIKE :sku")
                     params["sku"] = f"%{value}%"
@@ -693,7 +693,7 @@ class StockService:
                 row_dict = {
                     "adjustment_id": str(row.adjustment_id),
                     "merchant_id": row.merchant_id,
-                    "location_id": row.location_id,
+                    "warehouse_id": row.warehouse_id,
                     "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,
@@ -732,7 +732,7 @@ class StockService:
     async def reserve_stock(
         self,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: str,
         qty: Decimal,
@@ -742,12 +742,12 @@ class StockService:
         """Reserve stock using stored procedure"""
         try:
             query = text("""
-                SELECT reserve_stock(:merchant_id, :location_id, :sku, :batch_no, :qty, :ref_id, :created_by)
+                SELECT reserve_stock(:merchant_id, :warehouse_id, :sku, :batch_no, :qty, :ref_id, :created_by)
             """)
             
             result = await self.db.execute(query, {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku,
                 "batch_no": batch_no,
                 "qty": float(qty),
@@ -769,7 +769,7 @@ class StockService:
     async def release_stock_reservation(
         self,
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: str,
         qty: Decimal,
@@ -779,12 +779,12 @@ class StockService:
         """Release stock reservation using stored procedure"""
         try:
             query = text("""
-                SELECT release_stock_reservation(:merchant_id, :location_id, :sku, :batch_no, :qty, :ref_id, :created_by)
+                SELECT release_stock_reservation(:merchant_id, :warehouse_id, :sku, :batch_no, :qty, :ref_id, :created_by)
             """)
             
             result = await self.db.execute(query, {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku,
                 "batch_no": batch_no,
                 "qty": float(qty),
@@ -806,7 +806,7 @@ class StockService:
     async def get_stock_summary_with_projection(
         self,
         merchant_id: str,
-        location_id: Optional[str] = None,
+        warehouse_id: Optional[str] = None,
         sku: Optional[str] = None,
         catalogue_id: Optional[str] = None,
         projection_list: Optional[List[str]] = None
@@ -814,17 +814,17 @@ class StockService:
         """Get stock summary with optional projection"""
         try:
             # Build query with optional filters
-            query_parts = ["SELECT * FROM get_stock_summary(:merchant_id, :location_id, :sku)"]
+            query_parts = ["SELECT * FROM get_stock_summary(:merchant_id, :warehouse_id, :sku)"]
             params = {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "sku": sku
             }
             
             # If catalogue_id is provided, add it as a filter
             if catalogue_id:
                 query_parts[0] = """
-                    SELECT s.* FROM get_stock_summary(:merchant_id, :location_id, :sku) s
+                    SELECT s.* FROM get_stock_summary(:merchant_id, :warehouse_id, :sku) s
                     WHERE s.catalogue_id = :catalogue_id
                 """
                 params["catalogue_id"] = catalogue_id
@@ -837,7 +837,7 @@ class StockService:
             for stock in stocks:
                 stock_dict = {
                     "stock_id": str(stock.stock_id),
-                    "location_id": stock.location_id,
+                    "warehouse_id": stock.warehouse_id,
                     "catalogue_id": str(stock.catalogue_id),
                     "sku": stock.sku,
                     "batch_no": stock.batch_no,
@@ -877,7 +877,7 @@ class StockService:
             for item in items:
                 sku = item.get("sku")
                 required_qty = item.get("qty", 0)
-                location_id = item.get("location_id")
+                warehouse_id = item.get("warehouse_id")
                 
                 if not sku:
                     continue
@@ -885,20 +885,20 @@ class StockService:
                 # Query available stock
                 query = text("""
                     SELECT 
-                        sku, location_id, batch_no, qty_available, exp_dt,
+                        sku, warehouse_id, batch_no, qty_available, exp_dt,
                         catalogue_id, uom
                     FROM trans.scm_stock 
                     WHERE merchant_id = :merchant_id 
                       AND sku = :sku 
                       AND qty_available > 0
-                      AND (:location_id IS NULL OR location_id = :location_id)
+                      AND (:warehouse_id IS NULL OR warehouse_id = :warehouse_id)
                     ORDER BY exp_dt ASC NULLS LAST, created_at ASC
                 """)
                 
                 result = await self.db.execute(query, {
                     "merchant_id": merchant_id,
                     "sku": sku,
-                    "location_id": location_id
+                    "warehouse_id": warehouse_id
                 })
                 
                 stock_rows = result.fetchall()
@@ -912,7 +912,7 @@ class StockService:
                     "required_qty": required_qty,
                     "total_available": total_available,
                     "is_available": is_available,
-                    "location_id": location_id,
+                    "warehouse_id": warehouse_id,
                     "batches": [
                         {
                             "batch_no": row.batch_no,
@@ -920,7 +920,7 @@ class StockService:
                             "exp_dt": row.exp_dt.isoformat() if row.exp_dt else None,
                             "catalogue_id": str(row.catalogue_id),
                             "uom": row.uom,
-                            "location_id": row.location_id
+                            "warehouse_id": row.warehouse_id
                         }
                         for row in stock_rows
                     ]
@@ -945,7 +945,7 @@ class StockService:
     async def get_stock_valuation(
         self,
         merchant_id: str,
-        location_id: Optional[str] = None,
+        warehouse_id: Optional[str] = None,
         as_of_date: Optional[datetime] = None,
         projection_list: Optional[List[str]] = None
     ) -> List[Dict[str, Any]]:
@@ -954,7 +954,7 @@ class StockService:
             # Build query for stock valuation
             query = text("""
                 SELECT 
-                    s.stock_id, s.location_id, s.catalogue_id, s.sku, s.batch_no,
+                    s.stock_id, s.warehouse_id, s.catalogue_id, s.sku, s.batch_no,
                     s.qty_on_hand, s.uom, s.exp_dt,
                     cr.mrp, cr.base_price,
                     (s.qty_on_hand * COALESCE(cr.base_price, cr.mrp, 0)) as valuation_amount
@@ -962,14 +962,14 @@ class StockService:
                 LEFT JOIN trans.catalogue_ref cr ON s.catalogue_id = cr.catalogue_id
                 WHERE s.merchant_id = :merchant_id
                   AND s.qty_on_hand > 0
-                  AND (:location_id IS NULL OR s.location_id = :location_id)
+                  AND (:warehouse_id IS NULL OR s.warehouse_id = :warehouse_id)
                   AND (:as_of_date IS NULL OR s.created_at <= :as_of_date)
                 ORDER BY s.sku, s.batch_no
             """)
             
             params = {
                 "merchant_id": merchant_id,
-                "location_id": location_id,
+                "warehouse_id": warehouse_id,
                 "as_of_date": as_of_date
             }
             
@@ -986,7 +986,7 @@ class StockService:
                 
                 valuation_dict = {
                     "stock_id": str(row.stock_id),
-                    "location_id": row.location_id,
+                    "warehouse_id": row.warehouse_id,
                     "catalogue_id": str(row.catalogue_id),
                     "sku": row.sku,
                     "batch_no": row.batch_no,
@@ -1032,7 +1032,7 @@ class StockService:
         try:
             query = text("""
                 SELECT 
-                    s.stock_id, s.merchant_id, s.location_id, s.catalogue_id, s.sku, s.batch_no,
+                    s.stock_id, s.merchant_id, s.warehouse_id, s.catalogue_id, s.sku, s.batch_no,
                     s.exp_dt, s.qty_on_hand, s.qty_reserved, s.qty_available, s.uom,
                     s.created_at, s.updated_at, s.last_updated_at,
                     cr.catalogue_name, cr.mrp, cr.base_price
@@ -1053,7 +1053,7 @@ class StockService:
             stock_dict = {
                 "stock_id": str(row.stock_id),
                 "merchant_id": row.merchant_id,
-                "location_id": row.location_id,
+                "warehouse_id": row.warehouse_id,
                 "catalogue_id": str(row.catalogue_id),
                 "sku": row.sku,
                 "batch_no": row.batch_no,
@@ -1092,8 +1092,8 @@ class StockService:
     async def process_stock_transfer(
         self,
         merchant_id: str,
-        from_location_id: str,
-        to_location_id: str,
+        from_warehouse_id: str,
+        to_warehouse_id: str,
         sku: str,
         batch_no: str,
         qty: Decimal,
@@ -1106,13 +1106,13 @@ class StockService:
             # Get catalogue_id and uom from existing stock
             stock_query = text("""
                 SELECT catalogue_id, uom FROM trans.scm_stock
-                WHERE merchant_id = :merchant_id AND location_id = :from_location_id 
+                WHERE merchant_id = :merchant_id AND warehouse_id = :from_warehouse_id 
                   AND sku = :sku AND batch_no = :batch_no AND qty_available >= :qty
             """)
             
             result = await self.db.execute(stock_query, {
                 "merchant_id": merchant_id,
-                "from_location_id": from_location_id,
+                "from_warehouse_id": from_warehouse_id,
                 "sku": sku,
                 "batch_no": batch_no,
                 "qty": float(qty)
@@ -1128,7 +1128,7 @@ class StockService:
             # Create transfer OUT transaction
             transfer_out = StockTransaction(
                 merchant_id=merchant_id,
-                location_id=from_location_id,
+                warehouse_id=from_warehouse_id,
                 catalogue_id=catalogue_id,
                 sku=sku,
                 batch_no=batch_no,
@@ -1138,14 +1138,14 @@ class StockService:
                 txn_type=TransactionType.TRANSFER_OUT,
                 ref_type=ReferenceType.TRANSFER,
                 ref_id=ref_id,
-                remarks=f"Transfer to {to_location_id}: {remarks}" if remarks else f"Transfer to {to_location_id}",
+                remarks=f"Transfer to {to_warehouse_id}: {remarks}" if remarks else f"Transfer to {to_warehouse_id}",
                 created_by=created_by
             )
             
             # Create transfer IN transaction
             transfer_in = StockTransaction(
                 merchant_id=merchant_id,
-                location_id=to_location_id,
+                warehouse_id=to_warehouse_id,
                 catalogue_id=catalogue_id,
                 sku=sku,
                 batch_no=batch_no,
@@ -1155,7 +1155,7 @@ class StockService:
                 txn_type=TransactionType.TRANSFER_IN,
                 ref_type=ReferenceType.TRANSFER,
                 ref_id=ref_id,
-                remarks=f"Transfer from {from_location_id}: {remarks}" if remarks else f"Transfer from {from_location_id}",
+                remarks=f"Transfer from {from_warehouse_id}: {remarks}" if remarks else f"Transfer from {from_warehouse_id}",
                 created_by=created_by
             )
             
@@ -1167,7 +1167,7 @@ class StockService:
             success = all(result[1] for result in results)
             
             if success:
-                logger.info(f"Stock transfer completed: {sku} from {from_location_id} to {to_location_id}")
+                logger.info(f"Stock transfer completed: {sku} from {from_warehouse_id} to {to_warehouse_id}")
             
             return success
             

app/inventory/stock_take/controllers/router.py

@@ -140,7 +140,7 @@ async def get_stock_take(
     {
       "stock_take_id": "detail-uuid",
       "merchant_id": "merchant_123",
-      "location_id": "WH_001",
+      "warehouse_id": "WH_001",
       "sku": "SKU_001",
       "system_qty": 100,
       "physical_qty": 98,
@@ -182,7 +182,7 @@ async def get_stock_take_session(
       "stock_take_master_id": "uuid",
       "stock_take_number": "ST-2024-12-001",
       "merchant_id": "merchant_123",
-      "location_id": "WH_001",
+      "warehouse_id": "WH_001",
       "status": "completed",
       "total_items": 3,
       "total_variance_value": -45.50,
@@ -220,7 +220,7 @@ async def list_stock_takes(
     **Request Body:**
     - **filters**: Filter criteria (optional)
       - merchant_id: Filter by merchant
-      - location_id: Filter by location
+      - warehouse_id: Filter by location
       - status: Filter by status (draft, completed, applied)
       - stock_take_number: Search by stock take number (partial match)
     - **skip**: Number of records to skip (pagination)
@@ -229,7 +229,7 @@ async def list_stock_takes(
     
     **Projection Examples:**
     - Basic info: ["stock_take_master_id", "stock_take_number", "status", "total_items"]
-    - Summary: ["stock_take_number", "location_id", "total_items", "total_variance_value", "status"]
+    - Summary: ["stock_take_number", "warehouse_id", "total_items", "total_variance_value", "status"]
     - Full details: null (returns all fields)
     
     **Filter Examples:**
@@ -439,21 +439,21 @@ async def list_pending_approvals(
     
     **Request Body:**
     - **filters**: Additional filter criteria (optional)
-      - location_id: Filter by location
+      - warehouse_id: Filter by location
       - created_by: Filter by creator
     - **skip**: Number of records to skip (pagination)
     - **limit**: Maximum records to return (1-1000)
     - **projection_list**: List of fields to include in response (optional)
     
     **Useful Projections:**
-    - Dashboard: ["stock_take_number", "location_id", "total_items", "total_variance_value", "created_by", "created_at"]
+    - Dashboard: ["stock_take_number", "warehouse_id", "total_items", "total_variance_value", "created_by", "created_at"]
     - Summary: ["stock_take_master_id", "stock_take_number", "status", "total_variance_value"]
     
     **Example:**
     ```json
     {
       "filters": {
-        "location_id": "WH_001"
+        "warehouse_id": "WH_001"
       },
       "skip": 0,
       "limit": 50,

app/inventory/stock_take/schemas/approval_schema.py

@@ -38,7 +38,7 @@ class StockTakeMasterRead(BaseModel):
     stock_take_master_id: UUID
     stock_take_number: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     stock_take_date: datetime
     description: Optional[str]
     additional_notes: Optional[str]
@@ -100,7 +100,7 @@ class StockTakeApprovalListRequest(BaseModel):
             "example": {
                 "filters": {
                     "status": "submitted",
-                    "location_id": "WH_001"
+                    "warehouse_id": "WH_001"
                 },
                 "skip": 0,
                 "limit": 50,
@@ -133,7 +133,7 @@ class StockTakeSummaryRead(BaseModel):
     """Summary view for stock take approval dashboard"""
     stock_take_master_id: UUID
     stock_take_number: str
-    location_id: str
+    warehouse_id: str
     total_items: int
     total_variance_value: float
     status: str

app/inventory/stock_take/schemas/schema.py

@@ -50,7 +50,7 @@ class StockTakeSessionResponse(BaseModel):
     stock_take_master_id: str
     stock_take_number: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     stock_take_date: datetime
     description: Optional[str]
     additional_notes: Optional[str]
@@ -71,7 +71,7 @@ class StockTakeMasterResponse(BaseModel):
     stock_take_master_id: str
     stock_take_number: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     stock_take_date: datetime
     description: Optional[str]
     additional_notes: Optional[str]
@@ -88,7 +88,7 @@ class StockTakeResponse(BaseModel):
     """Response schema for stock take"""
     stock_take_id: str
     merchant_id: str
-    location_id: str
+    warehouse_id: str
     sku: str
     batch_no: Optional[str]
     system_qty: int

app/inventory/stock_take/services/approval_service.py

@@ -210,7 +210,7 @@ class StockTakeApprovalService:
                     stock_query = select(ScmStock).where(
                         and_(
                             ScmStock.merchant_id == master.merchant_id,
-                            ScmStock.location_id == master.location_id,
+                            ScmStock.warehouse_id == master.warehouse_id,
                             ScmStock.sku == detail.sku
                         )
                     )
@@ -236,7 +236,7 @@ class StockTakeApprovalService:
                     stock_transactions.append(
                         StockTransaction(
                             merchant_id=master.merchant_id,
-                            location_id=master.location_id,
+                            warehouse_id=master.warehouse_id,
                             catalogue_id=str(catalogue_id),
                             sku=detail.sku,
                             batch_no=detail.batch_no,
@@ -478,8 +478,8 @@ class StockTakeApprovalService:
                 elif filters.get("merchant_id"):
                     conditions.append(ScmStockTakeMaster.merchant_id == filters["merchant_id"])
                 
-                if filters.get("location_id"):
-                    conditions.append(ScmStockTakeMaster.location_id == filters["location_id"])
+                if filters.get("warehouse_id"):
+                    conditions.append(ScmStockTakeMaster.warehouse_id == filters["warehouse_id"])
                 
                 if filters.get("created_by"):
                     conditions.append(ScmStockTakeMaster.created_by == filters["created_by"])

app/inventory/stock_take/services/service.py

@@ -36,7 +36,7 @@ class StockTakeService:
     @staticmethod
     async def _validate_stock_record(
         merchant_id: str,
-        location_id: str,
+        warehouse_id: str,
         sku: str,
         batch_no: Optional[str]
     ) -> bool:
@@ -46,7 +46,7 @@ class StockTakeService:
                 query = select(ScmStock).where(
                     and_(
                         ScmStock.merchant_id == merchant_id,
-                        ScmStock.location_id == location_id,
+                        ScmStock.warehouse_id == warehouse_id,
                         ScmStock.sku == sku
                     )
                 )
@@ -100,7 +100,7 @@ class StockTakeService:
                 master = ScmStockTakeMaster(
                     stock_take_number=stock_take_number,
                     merchant_id=effective_merchant_id,
-                    location_id=payload.warehouse_id,
+                    warehouse_id=payload.warehouse_id,
                     stock_take_date=payload.stock_take_date or datetime.utcnow(),
                     description=f"Stock take session - {len(payload.entries)} items",
                     additional_notes=payload.additional_notes,
@@ -121,7 +121,7 @@ class StockTakeService:
                     stock_query = select(ScmStock).where(
                         and_(
                             ScmStock.merchant_id == effective_merchant_id,
-                            ScmStock.location_id == payload.warehouse_id,
+                            ScmStock.warehouse_id == payload.warehouse_id,
                             ScmStock.sku == entry.sku
                         )
                     )
@@ -168,7 +168,7 @@ class StockTakeService:
                     results.append(StockTakeResponse(
                         stock_take_id=str(detail.stock_take_detail_id),
                         merchant_id=master.merchant_id,
-                        location_id=master.location_id,
+                        warehouse_id=master.warehouse_id,
                         sku=detail.sku,
                         batch_no=detail.batch_no,
                         system_qty=int(detail.system_qty),
@@ -269,7 +269,7 @@ class StockTakeService:
                     # Create internal stock adjustment for the variance
                     adjustment_request = CreateStockAdjustmentRequestSingle(
                         merchant_id=master.merchant_id,
-                        location_id=master.location_id,
+                        warehouse_id=master.warehouse_id,
                         sku=detail.sku,
                         batch_no=detail.batch_no,
                         adj_type=AdjustmentType.CYCLE_COUNT,
@@ -320,7 +320,7 @@ class StockTakeService:
                 return StockTakeResponse(
                     stock_take_id=str(detail.stock_take_detail_id),
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     sku=detail.sku,
                     batch_no=detail.batch_no,
                     system_qty=int(detail.system_qty),
@@ -369,7 +369,7 @@ class StockTakeService:
                     return StockTakeResponse(
                         stock_take_id=str(detail.stock_take_detail_id),
                         merchant_id=master.merchant_id,
-                        location_id=master.location_id,
+                        warehouse_id=master.warehouse_id,
                         sku=detail.sku,
                         batch_no=detail.batch_no,
                         system_qty=int(detail.system_qty),
@@ -415,7 +415,7 @@ class StockTakeService:
                     return StockTakeResponse(
                         stock_take_id=str(first_detail.stock_take_detail_id),
                         merchant_id=master.merchant_id,
-                        location_id=master.location_id,
+                        warehouse_id=master.warehouse_id,
                         sku=first_detail.sku,
                         batch_no=first_detail.batch_no,
                         system_qty=int(first_detail.system_qty),
@@ -510,7 +510,7 @@ class StockTakeService:
                     stock_take_master_id=str(master.stock_take_master_id),
                     stock_take_number=master.stock_take_number,
                     merchant_id=master.merchant_id,
-                    location_id=master.location_id,
+                    warehouse_id=master.warehouse_id,
                     stock_take_date=master.stock_take_date,
                     description=master.description,
                     additional_notes=master.additional_notes,
@@ -556,8 +556,8 @@ class StockTakeService:
                 elif filters.get("merchant_id"):
                     conditions.append(ScmStockTakeMaster.merchant_id == filters["merchant_id"])
                     
-                if filters.get("location_id"):
-                    conditions.append(ScmStockTakeMaster.location_id == filters["location_id"])
+                if filters.get("warehouse_id"):
+                    conditions.append(ScmStockTakeMaster.warehouse_id == filters["warehouse_id"])
                 if filters.get("status"):
                     conditions.append(ScmStockTakeMaster.status == filters["status"])
                 if filters.get("stock_take_number"):
@@ -600,7 +600,7 @@ class StockTakeService:
                             stock_take_master_id=str(master.stock_take_master_id),
                             stock_take_number=master.stock_take_number,
                             merchant_id=master.merchant_id,
-                            location_id=master.location_id,
+                            warehouse_id=master.warehouse_id,
                             stock_take_date=master.stock_take_date,
                             description=master.description,
                             additional_notes=master.additional_notes,

app/purchases/orders/services/service.py

@@ -210,7 +210,7 @@ class OrdersService:
                     poi.tax_amt,
                     poi.created_at,
                     s.batch_no,
-                    s.location_id as warehouse_id,
+                    s.warehouse_id as warehouse_id,
                     cr.catalogue_name
                 FROM trans.scm_po_item poi
                 LEFT JOIN trans.catalogue_ref cr ON poi.catalogue_id = cr.catalogue_id

app/sql/apply_bulk_stock_movements.sql

@@ -23,7 +23,7 @@ BEGIN
             -- Apply individual stock movement using the 9-parameter function
             PERFORM trans.apply_stock_movement(
                 (v_movement->>'merchant_id')::TEXT,
-                (v_movement->>'location_id')::TEXT,
+                (v_movement->>'warehouse_id')::TEXT,
                 (v_movement->>'sku')::TEXT,
                 (v_movement->>'batch_no')::TEXT,
 				(v_movement->>'catalogue_id')::TEXT,

app/sql/apply_stock_movement.sql

@@ -4,7 +4,7 @@
 
 CREATE OR REPLACE FUNCTION trans.apply_stock_movement(
 	p_merchant_id text,
-	p_location_id text,
+	p_warehouse_id text,
 	p_sku text,
 	p_batch_no text,
 	p_catalogue_id text,
@@ -67,7 +67,7 @@ BEGIN
     RAISE NOTICE 'Inserting ledger: %, %, %, %, %, %, %, %, %, %, %',
         v_ledger_id,
         p_merchant_id,
-        p_location_id,
+        p_warehouse_id,
         p_sku,
         p_batch_no,
         p_txn_type,
@@ -83,7 +83,7 @@ BEGIN
     INSERT INTO trans.scm_stock_ledger (
         ledger_id,
         merchant_id,
-        location_id,
+        warehouse_id,
         sku,
         batch_no,
         txn_type,
@@ -95,7 +95,7 @@ BEGIN
     ) VALUES (
         v_ledger_id,
         p_merchant_id,
-        p_location_id,
+        p_warehouse_id,
         p_sku,
         p_batch_no,
         p_txn_type,
@@ -113,7 +113,7 @@ BEGIN
     ----------------------------------------------------------------
     INSERT INTO trans.scm_stock (
         merchant_id,
-        location_id,
+        warehouse_id,
         sku,
         batch_no,
         catalogue_id,
@@ -128,7 +128,7 @@ BEGIN
         updated_at
     ) VALUES (
         p_merchant_id,
-        p_location_id,
+        p_warehouse_id,
         p_sku,
         p_batch_no,
         p_catalogue_id,
@@ -142,7 +142,7 @@ BEGIN
         NOW(),
         NOW()
     )
-    ON CONFLICT (merchant_id, location_id, catalogue_id, batch_no)
+    ON CONFLICT (merchant_id, warehouse_id, catalogue_id, batch_no)
     DO UPDATE SET
         qty_on_hand   = GREATEST(trans.scm_stock.qty_on_hand + v_qty_change, 0),
         qty_available = GREATEST((trans.scm_stock.qty_on_hand + v_qty_change) - trans.scm_stock.qty_reserved, 0),

app/sql/fn_get_po_items_for_order_process.sql

@@ -34,7 +34,7 @@ BEGIN
             ON po.catalogue_id = cr.catalogue_id
         JOIN trans.scm_stock st
             ON st.catalogue_id = po.catalogue_id
-           AND st.location_id = p_warehouse_id
+           AND st.warehouse_id = p_warehouse_id
         WHERE po.po_id = p_po_id
           AND (po.ord_qty - coalesce(po.dispatched_qty,0)) > 0
           AND st.qty_available > 0

app/sql/fn_get_po_items_for_purchase_return.sql

@@ -37,7 +37,7 @@ BEGIN
         ON cr.catalogue_id = pi.catalogue_id
     JOIN trans.scm_stock st
         ON st.catalogue_id = pi.catalogue_id
-       AND st.location_id = p_warehouse_id
+       AND st.warehouse_id = p_warehouse_id
 
     WHERE pi.po_id = p_po_id
       AND st.qty_available > 0

app/sql/get_stock_ledger.sql

@@ -7,7 +7,7 @@ CREATE OR REPLACE FUNCTION trans.get_stock_ledger(
 	p_sku character varying DEFAULT NULL::character varying,
 	p_batch_no character varying DEFAULT NULL::character varying,
 	p_limit integer DEFAULT 100)
-    RETURNS TABLE(ledger_id uuid, location_id character varying, catalogue_id uuid, sku character varying, batch_no character varying, txn_type character varying, qty numeric, uom character varying, ref_type character varying, ref_id uuid, ref_no character varying, remarks text, created_by character varying, created_at timestamp without time zone) 
+    RETURNS TABLE(ledger_id uuid, warehouse_id character varying, catalogue_id uuid, sku character varying, batch_no character varying, txn_type character varying, qty numeric, uom character varying, ref_type character varying, ref_id uuid, ref_no character varying, remarks text, created_by character varying, created_at timestamp without time zone) 
     LANGUAGE 'plpgsql'
     COST 100
     VOLATILE PARALLEL UNSAFE
@@ -16,7 +16,7 @@ CREATE OR REPLACE FUNCTION trans.get_stock_ledger(
 AS $BODY$
 BEGIN
     RETURN QUERY
-    SELECT l.ledger_id, l.location_id, l.catalogue_id, l.sku, l.batch_no,
+    SELECT l.ledger_id, l.warehouse_id, l.catalogue_id, l.sku, l.batch_no,
            l.txn_type, l.qty, l.uom, l.ref_type, l.ref_id, l.ref_no,
            l.remarks, l.created_by, l.created_at
     FROM trans.scm_stock_ledger l

app/sql/get_stock_summary.sql

@@ -4,9 +4,9 @@
 
 CREATE OR REPLACE FUNCTION trans.get_stock_summary(
 	p_merchant_id character varying,
-	p_location_id character varying DEFAULT NULL::character varying,
+	p_warehouse_id character varying DEFAULT NULL::character varying,
 	p_sku character varying DEFAULT NULL::character varying)
-    RETURNS TABLE(stock_id uuid, location_id character varying, catalogue_id uuid, sku character varying, batch_no character varying, qty_on_hand numeric, qty_reserved numeric, qty_available numeric, uom character varying, last_updated_at timestamp without time zone) 
+    RETURNS TABLE(stock_id uuid, warehouse_id character varying, catalogue_id uuid, sku character varying, batch_no character varying, qty_on_hand numeric, qty_reserved numeric, qty_available numeric, uom character varying, last_updated_at timestamp without time zone) 
     LANGUAGE 'plpgsql'
     COST 100
     VOLATILE PARALLEL UNSAFE
@@ -15,11 +15,11 @@ CREATE OR REPLACE FUNCTION trans.get_stock_summary(
 AS $BODY$
 BEGIN
     RETURN QUERY
-    SELECT s.stock_id, s.location_id, s.catalogue_id, s.sku, s.batch_no,
+    SELECT s.stock_id, s.warehouse_id, s.catalogue_id, s.sku, s.batch_no,
            s.qty_on_hand, s.qty_reserved, s.qty_available, s.uom, s.last_updated_at
     FROM trans.scm_stock s
     WHERE s.merchant_id = p_merchant_id
-      AND (p_location_id IS NULL OR s.location_id = p_location_id)
+      AND (p_warehouse_id IS NULL OR s.warehouse_id = p_warehouse_id)
       AND (p_sku IS NULL OR s.sku = p_sku)
     ORDER BY s.sku, s.batch_no;
 END;

app/sql/release_stock_reservation.sql

@@ -4,7 +4,7 @@
 
 CREATE OR REPLACE FUNCTION trans.release_stock_reservation(
 	p_merchant_id character varying,
-	p_location_id character varying,
+	p_warehouse_id character varying,
 	p_sku character varying,
 	p_batch_no character varying,
 	p_qty numeric,
@@ -22,7 +22,7 @@ BEGIN
         qty_available = qty_on_hand - GREATEST(qty_reserved - p_qty, 0),
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     

app/sql/reserve_stock.sql

@@ -4,7 +4,7 @@
 
 CREATE OR REPLACE FUNCTION trans.reserve_stock(
 	p_merchant_id character varying,
-	p_location_id character varying,
+	p_warehouse_id character varying,
 	p_sku character varying,
 	p_batch_no character varying,
 	p_qty numeric,
@@ -23,7 +23,7 @@ BEGIN
     INTO v_available_qty
     FROM trans.scm_stock
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -39,7 +39,7 @@ BEGIN
         qty_available = qty_available - p_qty,
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     

app/trade_sales/services/service.py

@@ -492,7 +492,7 @@ class TradeSalesService:
                     # Prepare stock transaction (outbound from supplier)
                     stock_transaction = StockTransaction(
                         merchant_id=supplier_id,
-                        location_id=str(request.warehouse_id),
+                        warehouse_id=str(request.warehouse_id),
                         catalogue_id=str(order_item.catalogue_id),
                         sku=ship_item.sku,
                         batch_no=ship_item.batch_no,

app/transports/controllers/router.py

@@ -54,7 +54,7 @@ async def create_transport(
     - tracking_url: Tracking URL template with {awb} placeholder
     - supports_cod: Cash on Delivery support (default: false)
     - supports_tracking: Tracking support (default: false)
-    - location_ids: Location IDs (required if location_scope is 'selected')
+    - warehouse_ids: Location IDs (required if location_scope is 'selected')
     - serviceable_regions: List of serviceable regions
     - notes: Additional notes
     
@@ -193,7 +193,7 @@ async def list_transports(
     **Filters:**
     - type: Filter by transport type (courier, internal, freight)
     - status: Filter by status (active, inactive, draft)
-    - location_id: Filter by location ID (shows transports with scope 'all' or containing this location)
+    - warehouse_id: Filter by location ID (shows transports with scope 'all' or containing this location)
     - search: Search in transport name or code
     
     **Pagination:**
@@ -216,7 +216,7 @@ async def list_transports(
             merchant_id=current_user.merchant_id,  # Use merchant_id from JWT token
             transport_type=payload.type,
             status=payload.status,
-            location_id=payload.location_id,
+            warehouse_id=payload.warehouse_id,
             search=payload.search,
             skip=payload.skip,
             limit=payload.limit,

app/transports/models/model.py

@@ -28,7 +28,7 @@ class TransportModel(BaseModel):
     
     # Coverage
     location_scope: str = Field(..., description="Location scope (all, selected)")
-    location_ids: List[str] = Field(default_factory=list, description="Location IDs if scope is 'selected'")
+    warehouse_ids: List[str] = Field(default_factory=list, description="Location IDs if scope is 'selected'")
     serviceable_regions: List[str] = Field(default_factory=list, description="Serviceable regions")
     
     # Status and Audit
@@ -56,7 +56,7 @@ class TransportModel(BaseModel):
                 "supports_cod": True,
                 "supports_tracking": True,
                 "location_scope": "all",
-                "location_ids": [],
+                "warehouse_ids": [],
                 "serviceable_regions": ["Mumbai", "Delhi"],
                 "status": "active",
                 "notes": "Primary courier partner",

app/transports/schemas/schema.py

@@ -24,7 +24,7 @@ class TransportCreate(BaseModel):
     
     # Coverage
     location_scope: str = Field(..., description="Location scope (all, selected)")
-    location_ids: Optional[List[str]] = Field(None, description="Location IDs if scope is 'selected'")
+    warehouse_ids: Optional[List[str]] = Field(None, description="Location IDs if scope is 'selected'")
     serviceable_regions: Optional[List[str]] = Field(None, description="Serviceable regions")
     
     notes: Optional[str] = Field(None, description="Additional notes")
@@ -108,7 +108,7 @@ class TransportCreate(BaseModel):
                 "supports_cod": True,
                 "supports_tracking": True,
                 "location_scope": "all",
-                "location_ids": None,
+                "warehouse_ids": None,
                 "serviceable_regions": ["Mumbai", "Delhi"],
                 "notes": "Primary courier partner"
             }
@@ -130,7 +130,7 @@ class TransportUpdate(BaseModel):
     supports_tracking: Optional[bool] = Field(None, description="Tracking support")
     
     location_scope: Optional[str] = Field(None, description="Location scope")
-    location_ids: Optional[List[str]] = Field(None, description="Location IDs")
+    warehouse_ids: Optional[List[str]] = Field(None, description="Location IDs")
     serviceable_regions: Optional[List[str]] = Field(None, description="Serviceable regions")
     
     notes: Optional[str] = Field(None, description="Additional notes")
@@ -214,7 +214,7 @@ class TransportResponse(BaseModel):
     supports_tracking: bool = False
     
     location_scope: str
-    location_ids: List[str] = Field(default_factory=list)
+    warehouse_ids: List[str] = Field(default_factory=list)
     serviceable_regions: List[str] = Field(default_factory=list)
     
     status: str
@@ -229,7 +229,7 @@ class TransportListRequest(BaseModel):
     """Schema for listing transports with filters"""
     type: Optional[str] = Field(None, description="Filter by transport type")
     status: Optional[str] = Field(None, description="Filter by status (active/inactive)")
-    location_id: Optional[str] = Field(None, description="Filter by location ID")
+    warehouse_id: Optional[str] = Field(None, description="Filter by location ID")
     search: Optional[str] = Field(None, description="Search in name or code")
     skip: int = Field(0, ge=0, description="Pagination offset")
     limit: int = Field(100, ge=1, le=500, description="Items per page")

app/transports/services/service.py

@@ -106,11 +106,11 @@ class TransportService:
                     detail=f"Transport code {payload.code} already exists for this merchant"
                 )
                 
-            # 3) Validate location_ids if location_scope is 'selected'
-            if payload.location_scope == "selected" and (not payload.location_ids or len(payload.location_ids) == 0):
+            # 3) Validate warehouse_ids if location_scope is 'selected'
+            if payload.location_scope == "selected" and (not payload.warehouse_ids or len(payload.warehouse_ids) == 0):
                 raise HTTPException(
                     status_code=status.HTTP_400_BAD_REQUEST,
-                    detail="location_ids required when location_scope is 'selected'"
+                    detail="warehouse_ids required when location_scope is 'selected'"
                 )
             
             # 4) Create transport model with timestamps
@@ -128,7 +128,7 @@ class TransportService:
             # Set defaults for optional fields
             transport_data["supports_cod"] = transport_data.get("supports_cod", False)
             transport_data["supports_tracking"] = transport_data.get("supports_tracking", False)
-            transport_data["location_ids"] = transport_data.get("location_ids", [])
+            transport_data["warehouse_ids"] = transport_data.get("warehouse_ids", [])
             transport_data["serviceable_regions"] = transport_data.get("serviceable_regions", [])
             
             transport_model = TransportModel(**transport_data)
@@ -203,13 +203,13 @@ class TransportService:
             update_data["updated_by"] = payload.updated_by
             update_data["updated_at"] = now.isoformat()
             
-            # 4) Validate location_ids if location_scope is being updated to 'selected'
+            # 4) Validate warehouse_ids if location_scope is being updated to 'selected'
             if update_data.get("location_scope") == "selected":
-                location_ids = update_data.get("location_ids") or existing.get("location_ids", [])
-                if not location_ids or len(location_ids) == 0:
+                warehouse_ids = update_data.get("warehouse_ids") or existing.get("warehouse_ids", [])
+                if not warehouse_ids or len(warehouse_ids) == 0:
                     raise HTTPException(
                         status_code=status.HTTP_400_BAD_REQUEST,
-                        detail="location_ids required when location_scope is 'selected'"
+                        detail="warehouse_ids required when location_scope is 'selected'"
                     )
             
             # 5) Update in database
@@ -249,7 +249,7 @@ class TransportService:
         merchant_id: Optional[str] = None,
         transport_type: Optional[str] = None,
         status: Optional[str] = None,
-        location_id: Optional[str] = None,
+        warehouse_id: Optional[str] = None,
         search: Optional[str] = None,
         skip: int = 0,
         limit: int = 100,
@@ -262,7 +262,7 @@ class TransportService:
             merchant_id: Filter by merchant ID
             transport_type: Filter by transport type
             status: Filter by status
-            location_id: Filter by location ID
+            warehouse_id: Filter by location ID
             search: Search in name or code
             skip: Pagination offset
             limit: Page size
@@ -280,10 +280,10 @@ class TransportService:
                 query["type"] = transport_type.lower()
             if status:
                 query["status"] = status.lower()
-            if location_id:
+            if warehouse_id:
                 query["$or"] = [
                     {"location_scope": "all"},
-                    {"location_ids": location_id}
+                    {"warehouse_ids": warehouse_id}
                 ]
             if search:
                 query["$or"] = [
@@ -314,7 +314,7 @@ class TransportService:
                 "filters": {
                     "type": transport_type,
                     "status": status,
-                    "location_id": location_id,
+                    "warehouse_id": warehouse_id,
                     "search": search
                 }
             })

app/utils/stock_utils.py

@@ -36,7 +36,7 @@ async def process_grn_stock_update(
 async def process_stock_adjustment(
     db: AsyncSession,
     merchant_id: str,
-    location_id: str,
+    warehouse_id: str,
     sku: str,
     batch_no: str,
     adjustment_qty: float,
@@ -53,7 +53,7 @@ async def process_stock_adjustment(
         
         # Process adjustment
         ledger_id, success = await process_stock_adjustment(
-            db, merchant_id, location_id, sku, batch_no,
+            db, merchant_id, warehouse_id, sku, batch_no,
             adjustment_qty, "damage", "Damaged goods", user_id, adjustment_id
         )
     
@@ -65,7 +65,7 @@ async def process_stock_adjustment(
     stock_service = StockService(db)
     return await stock_service.process_stock_adjustment(
         merchant_id=merchant_id,
-        location_id=location_id,
+        warehouse_id=warehouse_id,
         sku=sku,
         batch_no=batch_no,
         adjustment_qty=Decimal(str(adjustment_qty)),
@@ -79,7 +79,7 @@ async def process_stock_adjustment(
 async def get_current_stock(
     db: AsyncSession,
     merchant_id: str,
-    location_id: str = None,
+    warehouse_id: str = None,
     sku: str = None
 ) -> List[dict]:
     """
@@ -92,13 +92,13 @@ async def get_current_stock(
         stock = await get_current_stock(db, merchant_id)
         
         # Get stock for specific location
-        stock = await get_current_stock(db, merchant_id, location_id="WH001")
+        stock = await get_current_stock(db, merchant_id, warehouse_id="WH001")
         
         # Get stock for specific SKU
         stock = await get_current_stock(db, merchant_id, sku="PROD001")
     """
     stock_service = StockService(db)
-    return await stock_service.get_stock_summary(merchant_id, location_id, sku)
+    return await stock_service.get_stock_summary(merchant_id, warehouse_id, sku)
 
 
 async def get_stock_history(
@@ -127,7 +127,7 @@ async def get_stock_history(
 async def reserve_stock(
     db: AsyncSession,
     merchant_id: str,
-    location_id: str,
+    warehouse_id: str,
     sku: str,
     batch_no: str,
     qty: float,
@@ -141,14 +141,14 @@ async def reserve_stock(
         from app.utils.stock_utils import reserve_stock
         
         # Reserve stock for sales order
-        success = await reserve_stock(db, merchant_id, location_id, sku, 
+        success = await reserve_stock(db, merchant_id, warehouse_id, sku, 
                                     batch_no, qty, sales_order_id, user_id)
     """
     from decimal import Decimal
     
     stock_service = StockService(db)
     return await stock_service.reserve_stock(
-        merchant_id, location_id, sku, batch_no, 
+        merchant_id, warehouse_id, sku, batch_no, 
         Decimal(str(qty)), ref_id, created_by
     )
 
@@ -156,7 +156,7 @@ async def reserve_stock(
 async def release_stock_reservation(
     db: AsyncSession,
     merchant_id: str,
-    location_id: str,
+    warehouse_id: str,
     sku: str,
     batch_no: str,
     qty: float,

docs/database/sql/stored_procedures/stock_management.sql

@@ -4,7 +4,7 @@
 -- Simplified stock movement function with idempotency
 CREATE OR REPLACE FUNCTION apply_stock_movement(
     p_merchant_id TEXT,
-    p_location_id TEXT,
+    p_warehouse_id TEXT,
     p_sku TEXT,
     p_batch_no TEXT,
     p_qty NUMERIC,
@@ -25,22 +25,22 @@ BEGIN
     
     -- Insert ledger entry (immutable audit trail)
     INSERT INTO scm_stock_ledger (
-        ledger_id, merchant_id, location_id, sku, batch_no,
+        ledger_id, merchant_id, warehouse_id, sku, batch_no,
         qty, txn_type, ref_type, ref_id, ref_no, created_by
     ) VALUES (
-        gen_random_uuid(), p_merchant_id, p_location_id, p_sku, p_batch_no,
+        gen_random_uuid(), p_merchant_id, p_warehouse_id, p_sku, p_batch_no,
         p_qty, p_txn_type, p_ref_type, p_ref_id, p_ref_no, p_user
     );
     
     -- Stock snapshot upsert (create or update)
     INSERT INTO scm_stock (
-        stock_id, merchant_id, location_id, sku, batch_no,
+        stock_id, merchant_id, warehouse_id, sku, batch_no,
         qty_on_hand, qty_reserved, qty_available
     ) VALUES (
-        gen_random_uuid(), p_merchant_id, p_location_id, p_sku, p_batch_no,
+        gen_random_uuid(), p_merchant_id, p_warehouse_id, p_sku, p_batch_no,
         p_qty, 0, p_qty
     )
-    ON CONFLICT (merchant_id, location_id, sku, batch_no)
+    ON CONFLICT (merchant_id, warehouse_id, sku, batch_no)
     DO UPDATE SET
         qty_on_hand = scm_stock.qty_on_hand + p_qty,
         qty_available = scm_stock.qty_available + p_qty,
@@ -66,7 +66,7 @@ BEGIN
         -- Apply individual stock movement
         SELECT apply_stock_movement(
             (v_movement->>'merchant_id')::VARCHAR(64),
-            (v_movement->>'location_id')::VARCHAR(64),
+            (v_movement->>'warehouse_id')::VARCHAR(64),
             (v_movement->>'catalogue_id')::UUID,
             (v_movement->>'sku')::VARCHAR(64),
             (v_movement->>'batch_no')::VARCHAR(50),
@@ -100,7 +100,7 @@ $$;
 -- Function to reserve stock (for sales orders)
 CREATE OR REPLACE FUNCTION reserve_stock(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64),
+    p_warehouse_id VARCHAR(64),
     p_sku VARCHAR(64),
     p_batch_no VARCHAR(50),
     p_qty NUMERIC(14,3),
@@ -117,7 +117,7 @@ BEGIN
     INTO v_available_qty
     FROM scm_stock
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -133,7 +133,7 @@ BEGIN
         qty_available = qty_available - p_qty,
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -144,7 +144,7 @@ $$;
 -- Function to release stock reservation
 CREATE OR REPLACE FUNCTION release_stock_reservation(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64),
+    p_warehouse_id VARCHAR(64),
     p_sku VARCHAR(64),
     p_batch_no VARCHAR(50),
     p_qty NUMERIC(14,3),
@@ -160,7 +160,7 @@ BEGIN
         qty_available = qty_on_hand - GREATEST(qty_reserved - p_qty, 0),
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -171,11 +171,11 @@ $$;
 -- Function to get current stock summary
 CREATE OR REPLACE FUNCTION get_stock_summary(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64) DEFAULT NULL,
+    p_warehouse_id VARCHAR(64) DEFAULT NULL,
     p_sku VARCHAR(64) DEFAULT NULL
 ) RETURNS TABLE (
     stock_id UUID,
-    location_id VARCHAR(64),
+    warehouse_id VARCHAR(64),
     catalogue_id UUID,
     sku VARCHAR(64),
     batch_no VARCHAR(50),
@@ -189,11 +189,11 @@ LANGUAGE plpgsql
 AS $$
 BEGIN
     RETURN QUERY
-    SELECT s.stock_id, s.location_id, s.catalogue_id, s.sku, s.batch_no,
+    SELECT s.stock_id, s.warehouse_id, s.catalogue_id, s.sku, s.batch_no,
            s.qty_on_hand, s.qty_reserved, s.qty_available, s.uom, s.last_updated_at
     FROM scm_stock s
     WHERE s.merchant_id = p_merchant_id
-      AND (p_location_id IS NULL OR s.location_id = p_location_id)
+      AND (p_warehouse_id IS NULL OR s.warehouse_id = p_warehouse_id)
       AND (p_sku IS NULL OR s.sku = p_sku)
     ORDER BY s.sku, s.batch_no;
 END;
@@ -207,7 +207,7 @@ CREATE OR REPLACE FUNCTION get_stock_ledger(
     p_limit INTEGER DEFAULT 100
 ) RETURNS TABLE (
     ledger_id UUID,
-    location_id VARCHAR(64),
+    warehouse_id VARCHAR(64),
     catalogue_id UUID,
     sku VARCHAR(64),
     batch_no VARCHAR(50),
@@ -225,7 +225,7 @@ LANGUAGE plpgsql
 AS $$
 BEGIN
     RETURN QUERY
-    SELECT l.ledger_id, l.location_id, l.catalogue_id, l.sku, l.batch_no,
+    SELECT l.ledger_id, l.warehouse_id, l.catalogue_id, l.sku, l.batch_no,
            l.txn_type, l.qty, l.uom, l.ref_type, l.ref_id, l.ref_no,
            l.remarks, l.created_by, l.created_at
     FROM scm_stock_ledger l

docs/database/sql/stored_procedures/stock_management_updated.sql

@@ -4,7 +4,7 @@
 -- Simplified stock movement function with idempotency and proper schema references
 CREATE OR REPLACE FUNCTION apply_stock_movement(
     p_merchant_id TEXT,
-    p_location_id TEXT,
+    p_warehouse_id TEXT,
     p_sku TEXT,
     p_batch_no TEXT,
     p_qty NUMERIC,
@@ -25,22 +25,22 @@ BEGIN
     
     -- Insert ledger entry (immutable audit trail)
     INSERT INTO trans.scm_stock_ledger (
-        ledger_id, merchant_id, location_id, sku, batch_no,
+        ledger_id, merchant_id, warehouse_id, sku, batch_no,
         qty, txn_type, ref_type, ref_id, ref_no, created_by, created_at
     ) VALUES (
-        gen_random_uuid(), p_merchant_id, p_location_id, p_sku, p_batch_no,
+        gen_random_uuid(), p_merchant_id, p_warehouse_id, p_sku, p_batch_no,
         p_qty, p_txn_type, p_ref_type, p_ref_id, p_ref_no, p_user, NOW()
     );
     
     -- Stock snapshot upsert (create or update)
     INSERT INTO trans.scm_stock (
-        stock_id, merchant_id, location_id, sku, batch_no,
+        stock_id, merchant_id, warehouse_id, sku, batch_no,
         qty_on_hand, qty_reserved, qty_available, created_at, updated_at, last_updated_at
     ) VALUES (
-        gen_random_uuid(), p_merchant_id, p_location_id, p_sku, p_batch_no,
+        gen_random_uuid(), p_merchant_id, p_warehouse_id, p_sku, p_batch_no,
         GREATEST(p_qty, 0), 0, GREATEST(p_qty, 0), NOW(), NOW(), NOW()
     )
-    ON CONFLICT (merchant_id, location_id, sku, batch_no)
+    ON CONFLICT (merchant_id, warehouse_id, sku, batch_no)
     DO UPDATE SET
         qty_on_hand = trans.scm_stock.qty_on_hand + p_qty,
         qty_available = GREATEST(trans.scm_stock.qty_on_hand + p_qty - trans.scm_stock.qty_reserved, 0),
@@ -69,7 +69,7 @@ BEGIN
             -- Apply individual stock movement
             PERFORM apply_stock_movement(
                 (v_movement->>'merchant_id')::TEXT,
-                (v_movement->>'location_id')::TEXT,
+                (v_movement->>'warehouse_id')::TEXT,
                 (v_movement->>'sku')::TEXT,
                 (v_movement->>'batch_no')::TEXT,
                 (v_movement->>'qty')::NUMERIC,
@@ -119,7 +119,7 @@ $$;
 -- Function to reserve stock (for sales orders) with proper schema
 CREATE OR REPLACE FUNCTION reserve_stock(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64),
+    p_warehouse_id VARCHAR(64),
     p_sku VARCHAR(64),
     p_batch_no VARCHAR(50),
     p_qty NUMERIC(14,3),
@@ -136,7 +136,7 @@ BEGIN
     INTO v_available_qty
     FROM trans.scm_stock
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -153,7 +153,7 @@ BEGIN
         updated_at = NOW(),
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -164,7 +164,7 @@ $$;
 -- Function to release stock reservation with proper schema
 CREATE OR REPLACE FUNCTION release_stock_reservation(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64),
+    p_warehouse_id VARCHAR(64),
     p_sku VARCHAR(64),
     p_batch_no VARCHAR(50),
     p_qty NUMERIC(14,3),
@@ -181,7 +181,7 @@ BEGIN
         updated_at = NOW(),
         last_updated_at = NOW()
     WHERE merchant_id = p_merchant_id
-      AND location_id = p_location_id
+      AND warehouse_id = p_warehouse_id
       AND sku = p_sku
       AND batch_no = p_batch_no;
     
@@ -192,11 +192,11 @@ $$;
 -- Function to get current stock summary with proper schema
 CREATE OR REPLACE FUNCTION get_stock_summary(
     p_merchant_id VARCHAR(64),
-    p_location_id VARCHAR(64) DEFAULT NULL,
+    p_warehouse_id VARCHAR(64) DEFAULT NULL,
     p_sku VARCHAR(64) DEFAULT NULL
 ) RETURNS TABLE (
     stock_id UUID,
-    location_id VARCHAR(64),
+    warehouse_id VARCHAR(64),
     catalogue_id UUID,
     sku VARCHAR(64),
     batch_no VARCHAR(50),
@@ -210,11 +210,11 @@ LANGUAGE plpgsql
 AS $$
 BEGIN
     RETURN QUERY
-    SELECT s.stock_id, s.location_id, s.catalogue_id, s.sku, s.batch_no,
+    SELECT s.stock_id, s.warehouse_id, s.catalogue_id, s.sku, s.batch_no,
            s.qty_on_hand, s.qty_reserved, s.qty_available, s.uom, s.last_updated_at
     FROM trans.scm_stock s
     WHERE s.merchant_id = p_merchant_id
-      AND (p_location_id IS NULL OR s.location_id = p_location_id)
+      AND (p_warehouse_id IS NULL OR s.warehouse_id = p_warehouse_id)
       AND (p_sku IS NULL OR s.sku = p_sku)
     ORDER BY s.sku, s.batch_no;
 END;
@@ -228,7 +228,7 @@ CREATE OR REPLACE FUNCTION get_stock_ledger(
     p_limit INTEGER DEFAULT 100
 ) RETURNS TABLE (
     ledger_id UUID,
-    location_id VARCHAR(64),
+    warehouse_id VARCHAR(64),
     catalogue_id UUID,
     sku VARCHAR(64),
     batch_no VARCHAR(50),
@@ -246,7 +246,7 @@ LANGUAGE plpgsql
 AS $$
 BEGIN
     RETURN QUERY
-    SELECT l.ledger_id, l.location_id, l.catalogue_id, l.sku, l.batch_no,
+    SELECT l.ledger_id, l.warehouse_id, l.catalogue_id, l.sku, l.batch_no,
            l.txn_type, l.qty, l.uom, l.ref_type, l.ref_id, l.ref_no,
            l.remarks, l.created_by, l.created_at
     FROM trans.scm_stock_ledger l

tests/test_merchant_catalogue_list.py

@@ -159,7 +159,7 @@ class MerchantCatalogueListTester:
             # Create test scm_stock records
             stock_insert_query = """
                 INSERT INTO scm_stock (
-                    stock_id, merchant_id, location_id, sku, batch_no,
+                    stock_id, merchant_id, warehouse_id, sku, batch_no,
                     qty_on_hand, qty_reserved, qty_available, last_updated, created_at
                 ) VALUES (gen_random_uuid(), $1, $2, $3, $4, $5, $6, $7, $8, $9)
                 ON CONFLICT (stock_id) DO NOTHING
@@ -168,7 +168,7 @@ class MerchantCatalogueListTester:
             self.test_stock_data = [
                 {
                     "merchant_id": self.test_merchant_id,
-                    "location_id": "LOC-001",
+                    "warehouse_id": "LOC-001",
                     "sku": "SKU-SHAMPOO-001",
                     "batch_no": "BATCH-001",
                     "qty_on_hand": 100.0,
@@ -179,7 +179,7 @@ class MerchantCatalogueListTester:
                 },
                 {
                     "merchant_id": self.test_merchant_id,
-                    "location_id": "LOC-002",
+                    "warehouse_id": "LOC-002",
                     "sku": "SKU-SHAMPOO-001",
                     "batch_no": "BATCH-002",
                     "qty_on_hand": 50.0,
@@ -190,7 +190,7 @@ class MerchantCatalogueListTester:
                 },
                 {
                     "merchant_id": self.test_merchant_id,
-                    "location_id": "LOC-001",
+                    "warehouse_id": "LOC-001",
                     "sku": "SKU-CONDITIONER-001",
                     "batch_no": "BATCH-003",
                     "qty_on_hand": 75.0,
@@ -206,7 +206,7 @@ class MerchantCatalogueListTester:
                 await self.pg_session.execute(
                     stock_insert_query,
                     [
-                        stock_data["merchant_id"], stock_data["location_id"],
+                        stock_data["merchant_id"], stock_data["warehouse_id"],
                         stock_data["sku"], stock_data["batch_no"],
                         stock_data["qty_on_hand"], stock_data["qty_reserved"],
                         stock_data["qty_available"], stock_data["last_updated"],