[freeside-commits] freeside/bin import-did-inventory, 1.1.2.13, 1.1.2.14

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/bin
In directory wavetail.420.am:/tmp/cvs-serv2002/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.13
retrieving revision 1.1.2.14
diff -u -w -d -r1.1.2.13 -r1.1.2.14
--- import-did-inventory	15 Jun 2011 03:51:48 -0000	1.1.2.13
+++ import-did-inventory	15 Jun 2011 23:21:08 -0000	1.1.2.14
@@ -358,10 +358,11 @@
         $o = $did_order{$vendor_order_id};
 #       warn "$submitted $confirmed $received $vendor_order_id".Dumper($o);
         fatal("vendor order #$vendor_order_id - order data differs from one item to another")
-            unless ( ($o->submitted == $submitted
+            unless ( ( abs($o->submitted-$submitted) < 5
                         || $o->vendor_order_id == 293011) # yet another bad data hack
-                    && $o->confirmed == $confirmed
-                    && $o->received == $received);
+                    && abs($o->confirmed-$confirmed) < 5
+                    && abs($o->received-$received) < 5
+                    );
 #        fatal("customer mismatch for vendor order #$vendor_order_id")
 #           unless (    ($o->custnum && $cust{'custnum'} 
 #                        && ($o->custnum == $cust{'custnum'}