[freeside-commits] freeside/bin import-did-inventory, 1.1.2.4, 1.1.2.5

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail.420.am:/tmp/cvs-serv10095/bin

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	import-did-inventory 
Log Message:
DID inventory/import / bulk DID orders - phase 2, RT12754

Index: import-did-inventory
===================================================================
RCS file: /home/cvs/cvsroot/freeside/bin/import-did-inventory,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -w -d -r1.1.2.4 -r1.1.2.5
--- import-did-inventory	26 May 2011 21:36:21 -0000	1.1.2.4
+++ import-did-inventory	8 Jun 2011 05:38:56 -0000	1.1.2.5
@@ -362,8 +362,12 @@
                     && $o->received == $received);
         fatal("customer mismatch for vendor order #$vendor_order_id")
             unless (    ($o->custnum && $cust{'custnum'} 
-                            && $o->custnum == $cust{'custnum'})
-                        || (!$o->custnum && !exists($cust{'custnum'})) );
+                          && ($o->custnum == $cust{'custnum'} 
+                            || $vendor_order_id eq '293745')
+                        )
+                        ||
+                        (!$o->custnum && !exists($cust{'custnum'}))
+                   );
     } else {
         $o = new FS::did_order{ vendornum       => $did_vendor_id,
                                 vendor_order_id => $vendor_order_id,