Subversion Repositories SmartDukaan

Rev

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

Rev 4556 Rev 4558
Line 665... Line 665...
665
        # Putting NULL as transfer price for cases where its missing
665
        # Putting NULL as transfer price for cases where its missing
666
        if item_pricing is not None:
666
        if item_pricing is not None:
667
            order.lineitems[0].transfer_price = item_pricing.transferPrice
667
            order.lineitems[0].transfer_price = item_pricing.transferPrice
668
 
668
 
669
        # For Mahipal warehouse, we need to scan out items for every billed order
669
        # For Mahipal warehouse, we need to scan out items for every billed order
670
        if order.warehouse_id == 7:
670
        if order.warehouse_id == 17:
671
            try:
671
            try:
672
                warehouse_client = WarehouseClient().get_client()
672
                warehouse_client = WarehouseClient().get_client()
673
                inventoryItem = warehouse_client.scanSerializedItemForOrder(str(imeiNumber), ScanType.SALE, orderId, order.warehouse_id)
673
                inventoryItem = warehouse_client.scanSerializedItemForOrder(str(imeiNumber), ScanType.SALE, orderId, order.warehouse_id)
674
                if (inventoryItem.itemId != item_id):
674
                if (inventoryItem.itemId != item_id):
675
                    item = catalog_client.getItem(inventoryItem.itemId)
675
                    item = catalog_client.getItem(inventoryItem.itemId)
Line 1057... Line 1057...
1057
 
1057
 
1058
def receive_return(order_id, receiveCondition):
1058
def receive_return(order_id, receiveCondition):
1059
    order = get_order(order_id)
1059
    order = get_order(order_id)
1060
 
1060
 
1061
    # FIXME: For Mahipal warehouse, we need to scan in items for every sales return
1061
    # FIXME: For Mahipal warehouse, we need to scan in items for every sales return
1062
    if order.warehouse_id == 7:
1062
    if order.warehouse_id == 17:
1063
        try:
1063
        try:
1064
            warehouse_client = WarehouseClient().get_client()
1064
            warehouse_client = WarehouseClient().get_client()
1065
            lineitem = order.lineitems[0]
1065
            lineitem = order.lineitems[0]
1066
 
1066
 
1067
            # Inventory should not be updated for DOA returns 
1067
            # Inventory should not be updated for DOA returns 
Line 1137... Line 1137...
1137
        return False
1137
        return False
1138
    if is_usable:
1138
    if is_usable:
1139
        order.status = OrderStatus.RET_PRODUCT_USABLE
1139
        order.status = OrderStatus.RET_PRODUCT_USABLE
1140
        order.statusDescription = "Return product usable"
1140
        order.statusDescription = "Return product usable"
1141
        lineitem = order.lineitems[0]
1141
        lineitem = order.lineitems[0]
1142
        if order.warehouse_id == 7:
1142
        if order.warehouse_id == 17:
1143
            catalog_client = CatalogClient().get_client()
1143
            catalog_client = CatalogClient().get_client()
1144
            catalog_client.addInventory(lineitem.item_id, order.warehouse_id, lineitem.quantity)
1144
            catalog_client.addInventory(lineitem.item_id, order.warehouse_id, lineitem.quantity)
1145
    else:
1145
    else:
1146
        order.status = OrderStatus.RET_PRODUCT_UNUSABLE
1146
        order.status = OrderStatus.RET_PRODUCT_UNUSABLE
1147
        order.statusDescription = "Return product unusable"
1147
        order.statusDescription = "Return product unusable"