diff --git a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateFrom_Invoice_data.xsql
@@ -87,6 +87,7 @@
         AND o.AD_Org_ID IN ('1')
         AND o.C_BPartner_ID = ?
         AND pl.istaxincluded = ?
+        AND o.InvoiceRule <> 'N'
         AND EXISTS (SELECT 1 
                      FROM C_ORDERLINE l left join M_MATCHPO m on  l.C_OrderLine_ID=m.C_OrderLine_ID
                                                               and m.C_InvoiceLine_ID IS NOT NULL  
@@ -388,6 +389,7 @@
                            left join m_pricelist pl on pl.m_pricelist_id = o.m_pricelist_id
                       WHERE l.M_INOUT_ID = s.M_INOUT_ID 
                         AND (l.c_orderline_id is null OR pl.istaxincluded = ?)
+                        AND o.InvoiceRule <> 'N'
                       GROUP BY l.MovementQty, l.M_InOutLine_ID 
                       HAVING  (l.MovementQty-SUM(COALESCE(mi.Qty,0))) <> 0)
         ORDER BY NAME