Index: paypal.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ecommerce/paypal/paypal.module,v
retrieving revision 1.37.2.4
diff -U3 -r1.37.2.4 paypal.module
--- paypal.module	2 Oct 2006 00:33:20 -0000	1.37.2.4
+++ paypal.module	8 Nov 2006 14:51:23 -0000
@@ -226,18 +227,12 @@
     watchdog('paypal', t('IPN hit, no transaction ID given.'));
   }
 
-  $has_shippable_item = false;
   foreach($i as $key => $value) {
     $pp_item = new StdClass();
     $pp_item->nid = $value;
     $pp_item->qty = $quantity[$key];
     $pp_item->title = $name[$key];
     $pp_item->price = null;
-
-    if (product_is_shippable($pp_item->nid)) {
-      $has_shippable_item = true;
-    }
-
     $item[] = $pp_item;
   }
 
@@ -313,10 +308,6 @@
              removed from your account and returned to the customer */
           case 'COMPLETED':
               $data['payment_status'] = payment_get_status_id('completed');
-              // If there are no shippable items, assume the transaction workflow is complete.
-              if (!$has_shippable_item) {
-                $data['workflow'] = 6;
-              }
               $txnid = store_transaction_save($data);
               if ($is_new && $txnid) {
                 /* Compose and send confirmation email to the user */