From be6c97cfad7a6c1d2e398cdf00e48b577c5bfbe0 Mon Sep 17 00:00:00 2001
From: Luis Ernesto Portillo Zaldivar <luis_portillo@siman.com>
Date: Wed, 16 Jul 2025 08:55:59 -0600
Subject: [PATCH] =?UTF-8?q?fix(#60):=20Corregir=20impresi=C3=B3n=20de=20et?=
 =?UTF-8?q?iquetas=20para=20incluir=20re-muestras=20activas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Modificar action_print_sample_labels para usar all_sample_ids
- Filtrar muestras rechazadas, canceladas y desechadas
- Actualizar condición del botón para usar all_sample_ids
- Ahora imprime etiquetas de re-muestras activas

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../__pycache__/sale_order.cpython-312.pyc    | Bin 13714 -> 14960 bytes
 lims_management/models/sale_order.py          |  17 +++++++++++------
 lims_management/views/sale_order_views.xml    |   2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lims_management/models/__pycache__/sale_order.cpython-312.pyc b/lims_management/models/__pycache__/sale_order.cpython-312.pyc
index 7492287ffe7dcd0fa136df7461fe8e87377c05cb..c909f78430dc05945d08575af7e447071ba251e4 100644
GIT binary patch
delta 2702
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

delta 1477
zcmZ9MO>7%Q6vubG&c;cdCfmezK5WM&iCyQ@iPP9gle9F1w$RW+L5Ngk<#;ElslA)d
zIB8QwY9duA0whT107XD=R7ep*@}XyhDj~rk=Me~T0E8d{L@S{l5burEv|<lG&Aj*a
z?R)<>vwxOvT|W3tLqoj=&%K_jmj*_*5B}i!PTT(DlapK8BC%U;`sNSVft%XA-wpyB
z>=5vv-3n~9+kj0ft{vh`y94%zwzO+xzWKbC3|G>gxTkW@H>&qaFQ>&tsWZxDjmvDx
zB%!j-vhu|o=a$85pn@1Y8{#cvoP<T2KSH`I8ULr=?hv?GD<Ih@>#4(67`0r7vcq7K
z-h#8}vMxc){u-%MXH|@t@t|y3q7acQQ`_RX(sGen1)GbDX0)LPvl*DJmc_-EdE6(B
zYKZvOY&ZJQ9TmTu-DJFC9=bq0e`^(|IjtMjGQ{2Bu>+?u=mo?Xu@`)<2`gb4L>Hn*
zJR6!Iaj_oi2%G}LeseLV(vOLq&;Yquk)atvW-HOQEuEYacf&`?8S#BM(uSFT)dAP_
z!NEbPCF`qs&x+<q7nv5B$Vcs2a7({Kua&KZH7oDhRC>#W5@p?DFA}+N4&C+3IaUT4
zpm%lw3@VHCzTp-eHiZF3o>9<9DanpvL=5o^q86ca^07FsPa?1#>Erau3U%_7E#TI>
znk#ZPgYG1N`!uad%@XHX?RY}mjwZ;Pl`o@rY99-^7=N7v#r=41U<hALA%+nnh_vt~
zhMpgU<s&mzro7B!Fz1*$I<aIk8^s`{yQ*91t~4<gn0u8|_96zHMa+q{L}yBkXMgx?
z2|cLNQ!RJn7KKSd%i`-qH2X4Iurm-BYEb>jI$T=C0@MVp{;$(cuw0Lbzsy!cRsBU}
z^2oZLehCvzBBl}e;iO*G^%XSWH@FVimuy-5)_277izWj7ufZX4`*(EmstBiSVu{UE
zFX<CIsciUPe9r{@v!Q)(_)g+>Vz*~%w|#0uW3#u0&$sR09d;RlSP39KFn&uEhkv@^
zz&6>)I?z>zu7+H`TyPyLpM&WZSpXfX>Ikl$sP~lIoaR{m5<7+gsNIvHB<rdTCcrAq
z>K)@&*?pXSM(mCR`Z;=QOO*565@qX{p%=ih9uNbc6C2f2v?<JV*z-WE45jbm#d$dT
zGcnXbm=r&bb&{+gnf3r4R%tN0?6NZVs4T2cq%yN4DONLAj9D-xTf|;w>NNHzeRDZy
zZ3KTPct>QN+Lpjp?K})d7DbF9CJ;Dewv5<Bye;0%20B&M1okJY)nWrmRXim8WARm%
zc^(AC#`pl46`zlv8+Zo;@CeJAIk>+?75o_t4(<4(c;uTbx%NttPO}e1@5FGx^^)W7
P8SneI{SP%<tI+=de-LAR

diff --git a/lims_management/models/sale_order.py b/lims_management/models/sale_order.py
index 2865e4d..4e4bea2 100644
--- a/lims_management/models/sale_order.py
+++ b/lims_management/models/sale_order.py
@@ -320,17 +320,22 @@ class SaleOrder(models.Model):
         return res
     
     def action_print_sample_labels(self):
-        """Imprimir etiquetas de todas las muestras generadas para esta orden"""
+        """Imprimir etiquetas de todas las muestras activas (incluyendo re-muestras)"""
         self.ensure_one()
         
-        if not self.generated_sample_ids:
-            raise UserError(_('No hay muestras generadas para esta orden. Por favor, confirme la orden primero.'))
+        # Obtener todas las muestras activas (no rechazadas ni canceladas)
+        active_samples = self.all_sample_ids.filtered(
+            lambda s: s.state not in ['rejected', 'cancelled', 'disposed']
+        )
+        
+        if not active_samples:
+            raise UserError(_('No hay muestras activas para imprimir. Todas las muestras están rechazadas, canceladas o desechadas.'))
         
         # Asegurar que todas las muestras tengan código de barras
-        self.generated_sample_ids._ensure_barcode()
+        active_samples._ensure_barcode()
         
         # Obtener el reporte
         report = self.env.ref('lims_management.action_report_sample_label')
         
-        # Retornar la acción de imprimir el reporte para todas las muestras
-        return report.report_action(self.generated_sample_ids)
+        # Retornar la acción de imprimir el reporte para las muestras activas
+        return report.report_action(active_samples)
diff --git a/lims_management/views/sale_order_views.xml b/lims_management/views/sale_order_views.xml
index 5848844..58ee2cd 100644
--- a/lims_management/views/sale_order_views.xml
+++ b/lims_management/views/sale_order_views.xml
@@ -14,7 +14,7 @@
                             string="Imprimir Etiquetas" 
                             type="object" 
                             class="btn-primary"
-                            invisible="not is_lab_request or state != 'sale' or not generated_sample_ids"
+                            invisible="not is_lab_request or state != 'sale' or not all_sample_ids"
                             icon="fa-print"/>
                 </xpath>
                 <xpath expr="//field[@name='partner_id']" position="after">