projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
73e314f
)
DID inventory/import / bulk DID orders - phase 2, RT12754
author
levinse
<levinse>
Wed, 15 Jun 2011 23:21:08 +0000
(23:21 +0000)
committer
levinse
<levinse>
Wed, 15 Jun 2011 23:21:08 +0000
(23:21 +0000)
bin/import-did-inventory
patch
|
blob
|
history
diff --git
a/bin/import-did-inventory
b/bin/import-did-inventory
index
2143181
..
69125eb
100644
(file)
--- a/
bin/import-did-inventory
+++ b/
bin/import-did-inventory
@@
-358,10
+358,11
@@
sub order {
$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")
$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->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'}
# fatal("customer mismatch for vendor order #$vendor_order_id")
# unless ( ($o->custnum && $cust{'custnum'}
# && ($o->custnum == $cust{'custnum'}