Subversion Repositories SmartDukaan

Rev

Rev 7149 | Rev 7246 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7149 Rev 7242
Line 516... Line 516...
516 
    availability = 0
 516 
    availability = 0
517 
    billing_warehouse_retid = None
 517 
    billing_warehouse_retid = None
518
518
519 
    if not ignoreAvailability:
 519 
    if not ignoreAvailability:
520 
        for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
 520 
        for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
- 
 
 521 
            entry.reserved = max(entry.reserved, 0)
521 
            #if entry.availability > entry.reserved:
 522 
            #if entry.availability > entry.reserved:
522 
            warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved]
523 
            warehousesAvailability[entry.warehouse_id] = [entry.availability, entry.reserved]
523 
 
 524 
 
524 
    if len(ignoredWhs) > 0:
 525 
    if len(ignoredWhs) > 0:
525 
        for whid in ignoredWhs:
 526 
        for whid in ignoredWhs:
Line 564... Line 565...
564 
    minTransferDelay = None
 565 
    minTransferDelay = None
565 
    minTransferDelayWarehouses = {}
 566 
    minTransferDelayWarehouses = {}
566 
    total_availability = 0
 567 
    total_availability = 0
567 
 
 568 
 
568 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
 569 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
- 
 
 570 
        entry.reserved = max(entry.reserved, 0)
569 
        if warehouses.has_key(entry.warehouse_id):
 571 
        if warehouses.has_key(entry.warehouse_id):
570 
            warehouse = warehouses[entry.warehouse_id]
 572 
            warehouse = warehouses[entry.warehouse_id]
571 
            #if entry.availability > entry.reserved:
 573 
            #if entry.availability > entry.reserved:
572 
            if entry.warehouse_id not in ignoredWhs:
 574 
            if entry.warehouse_id not in ignoredWhs:
573 
                total_availability += entry.availability - entry.reserved
 575 
                total_availability += entry.availability - entry.reserved
Line 586... Line 588...
586 
    warehouse_retid = -1
 588 
    warehouse_retid = -1
587 
    max_availability = 0
 589 
    max_availability = 0
588 
    total_availability = 0
 590 
    total_availability = 0
589 
 
 591 
 
590 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
 592 
    for entry in CurrentInventorySnapshot.query.filter_by(item_id = item_id).all():
- 
 
 593 
        entry.reserved = max(entry.reserved, 0)
591 
        if entry.warehouse_id in warehouse_ids:
 594 
        if entry.warehouse_id in warehouse_ids:
592 
            availability = entry.availability - entry.reserved
 595 
            availability = entry.availability - entry.reserved
593 
            if availability > max_availability:
 596 
            if availability > max_availability:
594 
                warehouse_retid = entry.warehouse_id
 597 
                warehouse_retid = entry.warehouse_id
595 
                max_availability = availability
 598 
                max_availability = availability