diff --git a/frontend/src/components/domain/onboarding/steps/UploadSalesDataStep.tsx b/frontend/src/components/domain/onboarding/steps/UploadSalesDataStep.tsx
index ffbd3748..16ed6968 100644
--- a/frontend/src/components/domain/onboarding/steps/UploadSalesDataStep.tsx
+++ b/frontend/src/components/domain/onboarding/steps/UploadSalesDataStep.tsx
@@ -359,7 +359,7 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
     const newErrors: Record<string, string> = {};
 
     if (!stockFormData.current_quantity || Number(stockFormData.current_quantity) <= 0) {
-      newErrors.current_quantity = 'La cantidad debe ser mayor que cero';
+      newErrors.current_quantity = t('setup_wizard:inventory.stock_errors.quantity_required', 'La cantidad debe ser mayor que cero');
     }
 
     if (stockFormData.expiration_date) {
@@ -368,13 +368,13 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
       today.setHours(0, 0, 0, 0);
 
       if (expDate < today) {
-        newErrors.expiration_date = 'La fecha de caducidad está en el pasado';
+        newErrors.expiration_date = t('setup_wizard:inventory.stock_errors.expiration_past', 'La fecha de caducidad está en el pasado');
       }
 
       const threeDaysFromNow = new Date(today);
       threeDaysFromNow.setDate(threeDaysFromNow.getDate() + 3);
       if (expDate < threeDaysFromNow) {
-        newErrors.expiration_warning = '⚠️ Este ingrediente caduca muy pronto!';
+        newErrors.expiration_warning = t('setup_wizard:inventory.stock_errors.expiring_soon', '⚠️ Este ingrediente caduca muy pronto!');
       }
     }
 
@@ -385,38 +385,45 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
   const handleSaveStockLot = (addAnother: boolean = false) => {
     if (!addingStockForId || !validateStockForm()) return;
 
-    // Create a temporary stock lot entry (will be saved when ingredients are created)
-    const newLot: StockResponse = {
-      id: `temp-${Date.now()}`,
-      tenant_id: tenantId,
-      ingredient_id: addingStockForId,
-      current_quantity: Number(stockFormData.current_quantity),
-      expiration_date: stockFormData.expiration_date || undefined,
-      supplier_id: stockFormData.supplier_id || undefined,
-      batch_number: stockFormData.batch_number || undefined,
-      production_stage: ProductionStage.RAW_INGREDIENT,
-      quality_status: 'good',
-      created_at: new Date().toISOString(),
-      updated_at: new Date().toISOString(),
-    } as StockResponse;
+    try {
+      // Create a temporary stock lot entry (will be saved when ingredients are created)
+      const newLot: StockResponse = {
+        id: `temp-${Date.now()}`,
+        tenant_id: tenantId,
+        ingredient_id: addingStockForId,
+        current_quantity: Number(stockFormData.current_quantity),
+        expiration_date: stockFormData.expiration_date || undefined,
+        supplier_id: stockFormData.supplier_id || undefined,
+        batch_number: stockFormData.batch_number || undefined,
+        production_stage: ProductionStage.RAW_INGREDIENT,
+        quality_status: 'good',
+        created_at: new Date().toISOString(),
+        updated_at: new Date().toISOString(),
+      } as StockResponse;
 
-    // Add to local state
-    setIngredientStocks(prev => ({
-      ...prev,
-      [addingStockForId]: [...(prev[addingStockForId] || []), newLot],
-    }));
+      // Add to local state for display
+      setIngredientStocks(prev => ({
+        ...prev,
+        [addingStockForId]: [...(prev[addingStockForId] || []), newLot],
+      }));
 
-    if (addAnother) {
-      // Reset form for adding another lot
-      setStockFormData({
-        current_quantity: '',
-        expiration_date: '',
-        supplier_id: stockFormData.supplier_id, // Keep supplier selected
-        batch_number: '',
+      if (addAnother) {
+        // Reset form for adding another lot
+        setStockFormData({
+          current_quantity: '',
+          expiration_date: '',
+          supplier_id: stockFormData.supplier_id, // Keep supplier selected
+          batch_number: '',
+        });
+        setStockErrors({});
+      } else {
+        handleCancelStock();
+      }
+    } catch (error) {
+      console.error('Error adding stock lot:', error);
+      setStockErrors({
+        submit: t('common:error_saving', 'Error guardando. Por favor, inténtalo de nuevo.')
       });
-      setStockErrors({});
-    } else {
-      handleCancelStock();
     }
   };
 
@@ -694,25 +701,29 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
                               {lots.map((lot) => (
                                 <div
                                   key={lot.id}
-                                  className="flex items-center justify-between p-2 bg-[var(--bg-primary)] rounded text-xs"
+                                  className="flex items-center justify-between p-2 bg-[var(--bg-primary)] border border-[var(--border-secondary)] rounded text-xs"
                                 >
                                   <div className="flex items-center gap-3">
                                     <span className="font-medium">{lot.current_quantity} {item.unit_of_measure}</span>
                                     {lot.expiration_date && (
-                                      <span className="text-[var(--text-tertiary)]">
-                                        📅 Caduca: {new Date(lot.expiration_date).toLocaleDateString('es-ES')}
+                                      <span className="flex items-center gap-1 text-[var(--text-secondary)]">
+                                        <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" />
+                                        </svg>
+                                        {t('setup_wizard:inventory.expires', 'Exp')}: {new Date(lot.expiration_date).toLocaleDateString('es-ES')}
                                       </span>
                                     )}
                                     {lot.batch_number && (
                                       <span className="text-[var(--text-tertiary)]">
-                                        Lote: {lot.batch_number}
+                                        {t('setup_wizard:inventory.batch', 'Lote')}: {lot.batch_number}
                                       </span>
                                     )}
                                   </div>
                                   <button
                                     onClick={() => handleDeleteStockLot(item.id, lot.id)}
-                                    className="p-1 text-[var(--text-secondary)] hover:text-[var(--color-error)] rounded"
-                                    title="Eliminar lote"
+                                    className="p-1 text-[var(--text-secondary)] hover:text-[var(--color-error)] rounded transition-colors"
+                                    title={t('common:delete', 'Eliminar lote')}
+                                    aria-label={t('common:delete', 'Eliminar lote')}
                                   >
                                     <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                                       <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M6 18L18 6M6 6l12 12" />
@@ -727,17 +738,34 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
                         {isAddingStock ? (
                           <div className="p-3 bg-[var(--color-primary)]/5 border-2 border-[var(--color-primary)] rounded-lg">
                             <div className="space-y-3">
+                              {/* Form Header */}
+                              <div className="flex items-center justify-between mb-2">
+                                <h5 className="text-sm font-medium text-[var(--text-primary)] flex items-center gap-2">
+                                  <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" />
+                                  </svg>
+                                  {t('setup_wizard:inventory.add_stock', 'Agregar Stock Inicial')}
+                                </h5>
+                                <button
+                                  type="button"
+                                  onClick={handleCancelStock}
+                                  className="text-xs text-[var(--text-secondary)] hover:text-[var(--text-primary)]"
+                                >
+                                  {t('common:cancel', 'Cancelar')}
+                                </button>
+                              </div>
+
                               <div className="grid grid-cols-2 gap-3">
                                 <div>
                                   <label className="block text-xs font-medium text-[var(--text-primary)] mb-1">
-                                    Cantidad * <span className="text-[var(--text-tertiary)]">({item.unit_of_measure})</span>
+                                    {t('setup_wizard:inventory.quantity', 'Cantidad')} ({item.unit_of_measure}) <span className="text-[var(--color-error)]">*</span>
                                   </label>
                                   <input
                                     type="number"
                                     value={stockFormData.current_quantity}
                                     onChange={(e) => setStockFormData(prev => ({ ...prev, current_quantity: e.target.value }))}
-                                    className="w-full px-2 py-1 text-sm border rounded"
-                                    placeholder="0"
+                                    className={`w-full px-2 py-1 text-sm border ${stockErrors.current_quantity ? 'border-[var(--color-error)]' : 'border-[var(--border-secondary)]'} rounded focus:outline-none focus:ring-2 focus:ring-[var(--color-primary)]`}
+                                    placeholder="25.0"
                                     min="0"
                                     step="0.01"
                                   />
@@ -747,33 +775,38 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
                                 </div>
                                 <div>
                                   <label className="block text-xs font-medium text-[var(--text-primary)] mb-1">
-                                    Fecha de caducidad
+                                    {t('setup_wizard:inventory.expiration_date', 'Fecha de caducidad')}
                                   </label>
                                   <input
                                     type="date"
                                     value={stockFormData.expiration_date}
                                     onChange={(e) => setStockFormData(prev => ({ ...prev, expiration_date: e.target.value }))}
-                                    className="w-full px-2 py-1 text-sm border rounded"
+                                    className={`w-full px-2 py-1 text-sm border ${stockErrors.expiration_date ? 'border-[var(--color-error)]' : 'border-[var(--border-secondary)]'} rounded focus:outline-none focus:ring-2 focus:ring-[var(--color-primary)]`}
                                   />
                                   {stockErrors.expiration_date && (
                                     <p className="text-xs text-[var(--color-error)] mt-1">{stockErrors.expiration_date}</p>
                                   )}
                                   {stockErrors.expiration_warning && (
-                                    <p className="text-xs text-[var(--color-warning)] mt-1">{stockErrors.expiration_warning}</p>
+                                    <p className="text-xs text-[var(--color-warning)] mt-1 flex items-center gap-1">
+                                      <svg className="w-3 h-3" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" />
+                                      </svg>
+                                      {stockErrors.expiration_warning}
+                                    </p>
                                   )}
                                 </div>
                               </div>
                               <div className="grid grid-cols-2 gap-3">
                                 <div>
                                   <label className="block text-xs font-medium text-[var(--text-primary)] mb-1">
-                                    Proveedor
+                                    {t('setup_wizard:inventory.supplier', 'Proveedor')}
                                   </label>
                                   <select
                                     value={stockFormData.supplier_id}
                                     onChange={(e) => setStockFormData(prev => ({ ...prev, supplier_id: e.target.value }))}
-                                    className="w-full px-2 py-1 text-sm border rounded"
+                                    className="w-full px-2 py-1 text-sm border border-[var(--border-secondary)] rounded focus:outline-none focus:ring-2 focus:ring-[var(--color-primary)]"
                                   >
-                                    <option value="">Seleccionar...</option>
+                                    <option value="">{t('common:none', 'Ninguno')}</option>
                                     {suppliers.map(s => (
                                       <option key={s.id} value={s.id}>{s.company_name}</option>
                                     ))}
@@ -781,38 +814,50 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
                                 </div>
                                 <div>
                                   <label className="block text-xs font-medium text-[var(--text-primary)] mb-1">
-                                    Número de lote
+                                    {t('setup_wizard:inventory.batch_number', 'Número de lote')}
                                   </label>
                                   <input
                                     type="text"
                                     value={stockFormData.batch_number}
                                     onChange={(e) => setStockFormData(prev => ({ ...prev, batch_number: e.target.value }))}
-                                    className="w-full px-2 py-1 text-sm border rounded"
-                                    placeholder="Opcional"
+                                    className="w-full px-2 py-1 text-sm border border-[var(--border-secondary)] rounded focus:outline-none focus:ring-2 focus:ring-[var(--color-primary)]"
+                                    placeholder="LOT-2024-11"
                                   />
                                 </div>
                               </div>
-                              <div className="text-xs text-[var(--text-tertiary)] italic">
-                                💡 Los lotes con fecha de caducidad se gestionarán automáticamente con FIFO
-                              </div>
-                              <div className="flex gap-2">
+
+                              {/* Help Text with Icon */}
+                              <p className="text-xs text-[var(--text-secondary)] flex items-start gap-1">
+                                <svg className="w-3 h-3 mt-0.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                </svg>
+                                {t('setup_wizard:inventory.stock_help', 'El seguimiento de caducidad ayuda a prevenir desperdicios y habilita gestión de inventario FIFO')}
+                              </p>
+
+                              {/* Error Display */}
+                              {stockErrors.submit && (
+                                <div className="p-2 bg-[var(--color-error)]/10 border border-[var(--color-error)]/20 rounded text-xs text-[var(--color-error)]">
+                                  {stockErrors.submit}
+                                </div>
+                              )}
+
+                              {/* Action Buttons */}
+                              <div className="flex items-center gap-2 pt-2">
                                 <button
+                                  type="button"
                                   onClick={() => handleSaveStockLot(true)}
-                                  className="px-3 py-1 text-xs bg-[var(--bg-secondary)] hover:bg-[var(--bg-tertiary)] border rounded transition-colors"
+                                  disabled={false}
+                                  className="px-3 py-1 text-xs bg-[var(--bg-primary)] border border-[var(--border-secondary)] text-[var(--text-primary)] rounded hover:bg-[var(--bg-secondary)] disabled:opacity-50 transition-colors"
                                 >
-                                  + Agregar Otro Lote
+                                  {t('setup_wizard:inventory.add_another_lot', '+ Agregar Otro Lote')}
                                 </button>
                                 <button
+                                  type="button"
                                   onClick={() => handleSaveStockLot(false)}
-                                  className="px-3 py-1 text-xs bg-[var(--color-primary)] text-white rounded hover:opacity-90 transition-opacity"
+                                  disabled={false}
+                                  className="px-3 py-1 text-xs bg-[var(--color-primary)] text-white rounded hover:opacity-90 disabled:opacity-50 transition-opacity"
                                 >
-                                  Guardar
-                                </button>
-                                <button
-                                  onClick={handleCancelStock}
-                                  className="px-3 py-1 text-xs text-[var(--text-secondary)] hover:text-[var(--text-primary)] transition-colors"
-                                >
-                                  Cancelar
+                                  {t('common:save', 'Guardar')}
                                 </button>
                               </div>
                             </div>
@@ -822,7 +867,10 @@ export const UploadSalesDataStep: React.FC<UploadSalesDataStepProps> = ({
                             onClick={() => handleAddStockClick(item.id)}
                             className="w-full px-3 py-2 text-xs border-2 border-dashed border-[var(--border-secondary)] hover:border-[var(--color-primary)] hover:bg-[var(--bg-secondary)] rounded-lg transition-colors text-[var(--text-secondary)] hover:text-[var(--color-primary)] font-medium"
                           >
-                            {lots.length === 0 ? '+ Agregar Stock Inicial (Opcional)' : '+ Agregar Otro Lote'}
+                            {lots.length === 0 ?
+                              t('setup_wizard:inventory.add_initial_stock', '+ Agregar Stock Inicial (Opcional)') :
+                              t('setup_wizard:inventory.add_another_lot', '+ Agregar Otro Lote')
+                            }
                           </button>
                         )}
                       </div>