Subversion Repositories SmartDukaan

Rev

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

Rev 6861 Rev 6880
Line 260... Line 260...
260
                        if availability.has_key(item.id):
260
                        if availability.has_key(item.id):
261
                            availability[item.id] = [availability[item.id][0] + quantity, item]
261
                            availability[item.id] = [availability[item.id][0] + quantity, item]
262
                        else:
262
                        else:
263
                            availability[item.id] = [quantity, item]
263
                            availability[item.id] = [quantity, item]
264
 
264
 
-
 
265
            previouslyOrderedQty = {}
265
            unfulfilledPurchaseOrders = PurchaseOrder.query.filter(or_(PurchaseOrder.status == POStatus.PARTIALLY_FULFILLED, PurchaseOrder.status == POStatus.READY)).filter(PurchaseOrder.type == POType.REAL).all()
266
            unfulfilledPurchaseOrders = PurchaseOrder.query.filter(or_(PurchaseOrder.status == POStatus.PARTIALLY_FULFILLED, PurchaseOrder.status == POStatus.READY)).filter(PurchaseOrder.type == POType.REAL).all()
266
            for purchaseOrder in unfulfilledPurchaseOrders:
267
            for purchaseOrder in unfulfilledPurchaseOrders:
267
                for lineitem in purchaseOrder.lineitems:
268
                for lineitem in purchaseOrder.lineitems:
-
 
269
                    if previouslyOrderedQty.has_key(lineitem.itemId):
-
 
270
                        previouslyOrderedQty[lineitem.itemId] = previouslyOrderedQty[lineitem.itemId] + lineitem.unfulfilledQuantity
-
 
271
                    else:
-
 
272
                        previouslyOrderedQty[lineitem.itemId] = lineitem.unfulfilledQuantity
-
 
273
                    
268
                    if availability.has_key(lineitem.itemId):
274
                    if availability.has_key(lineitem.itemId):
269
                        availability[lineitem.itemId] = [availability[lineitem.itemId][0] + lineitem.unfulfilledQuantity, availability[lineitem.itemId][1]]
275
                        availability[lineitem.itemId] = [availability[lineitem.itemId][0] + lineitem.unfulfilledQuantity, availability[lineitem.itemId][1]]
270
                    else:
276
                    else:
271
                        item = self.__get_item_from_master(lineitem.itemId)
277
                        item = self.__get_item_from_master(lineitem.itemId)
272
                        availability[item.id] = [lineitem.unfulfilledQuantity, item]
278
                        availability[item.id] = [lineitem.unfulfilledQuantity, item]
Line 386... Line 392...
386
                    t_po_lineitem.brand = item.brand
392
                    t_po_lineitem.brand = item.brand
387
                    t_po_lineitem.modelNumber = item.modelNumber
393
                    t_po_lineitem.modelNumber = item.modelNumber
388
                    t_po_lineitem.modelName = item.modelName
394
                    t_po_lineitem.modelName = item.modelName
389
                    t_po_lineitem.color = item.color
395
                    t_po_lineitem.color = item.color
390
                    t_po_lineitem.itemId = item.id
396
                    t_po_lineitem.itemId = item.id
391
                    if quantity <0:
397
                    #if quantity <0:
392
                        quantity=0
398
                    #    quantity=0
393
                    t_po_lineitem.quantity = quantity
399
                    t_po_lineitem.quantity = quantity
394
                    t_po_lineitem.availableQuantity = 0
400
                    t_po_lineitem.availableQuantity = 0
395
                    if availability.has_key(item.id):
401
                    if availability.has_key(item.id):
-
 
402
                        if previouslyOrderedQty.has_key(item.id):
-
 
403
                            t_po_lineitem.availableQuantity = availability[item.id][0] - previouslyOrderedQty[item.id]
-
 
404
                        else:
396
                        t_po_lineitem.availableQuantity = availability[item.id][0]
405
                            t_po_lineitem.availableQuantity = availability[item.id][0]
397
                    if requirements.has_key(item.id):
406
                    if requirements.has_key(item.id):
398
                        t_po_lineitem.reservedQuantity = requirements[item.id]
407
                        t_po_lineitem.reservedQuantity = requirements[item.id]
399
                    t_po_lineitem.suggestedQuantity = max(advancedPOParameters[item.id][0], advancedPOParameters[item.id][3]) + key[1]
408
                    t_po_lineitem.suggestedQuantity = max(advancedPOParameters[item.id][0], advancedPOParameters[item.id][3]) + key[1]
400
                    t_po_lineitem.avgSales = advancedPOParameters[item.id][1]
409
                    t_po_lineitem.avgSales = advancedPOParameters[item.id][1]
401
                    t_po_lineitem.numberOfDaysInStock = advancedPOParameters[item.id][2] 
410
                    t_po_lineitem.numberOfDaysInStock = advancedPOParameters[item.id][2] 
402
                    t_po_lineitem.minStockLevel = advancedPOParameters[item.id][3]
411
                    t_po_lineitem.minStockLevel = advancedPOParameters[item.id][3]
403
                    t_po_lineitem.numberOfDaysStock = advancedPOParameters[item.id][4]
412
                    t_po_lineitem.numberOfDaysStock = advancedPOParameters[item.id][4]
404
                    t_po_lineitem.lastXdaysSale = advancedPOParameters[item.id][5] 
413
                    t_po_lineitem.lastXdaysSale = advancedPOParameters[item.id][5]
-
 
414
                    if previouslyOrderedQty.has_key(item.id):
-
 
415
                        t_po_lineitem.previouslyOrderedQty = previouslyOrderedQty[item.id]
-
 
416
                    else:
-
 
417
                        t_po_lineitem.previouslyOrderedQty = 0
405
                    if codRequirements.has_key(item.id):
418
                    if codRequirements.has_key(item.id):
406
                        t_po_lineitem.codCount = min(codRequirements[item.id], quantity)
419
                        t_po_lineitem.codCount = min(codRequirements[item.id], quantity)
407
                    try:
420
                    try:
408
                        item_pricing = inventory_client.getItemPricing(item.id, vendorId)
421
                        item_pricing = inventory_client.getItemPricing(item.id, vendorId)
409
                    except Exception as e:
422
                    except Exception as e: