Subversion Repositories SmartDukaan

Rev

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

Rev 7635 Rev 7848
Line 359... Line 359...
359
            children = root.getchildren()
359
            children = root.getchildren()
360
            for child in children:
360
            for child in children:
361
                nodes = child.findall('Scans/ScanDetail')
361
                nodes = child.findall('Scans/ScanDetail')
362
                for element in reversed(nodes):
362
                for element in reversed(nodes):
363
                    #Start:- Added By Manish Sharma for Making changes in case of Orders dispatched from Mumbai Warehouse on 26-Jun-2013
363
                    #Start:- Added By Manish Sharma for Making changes in case of Orders dispatched from Mumbai Warehouse on 26-Jun-2013
364
                    if order.warehouse_id == 12:
364
                    #Start:- Modified By Manish Sharma for Making changes in case of Orders dispatched from Bhiwandi Warehouse on 29-Jul-2013
365
                        if (getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('TARDEO') or getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('MUMBAI HUB')) and element.findtext('ScanType', '') == 'UD' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('SHIPMENT OUTSCANNED TO NETWORK'):
365
                    if (getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('OVALI WAREHOUSE') or getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('TARDEO') or getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('MUMBAI HUB')) and element.findtext('ScanType', '') == 'UD' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('SHIPMENT OUTSCANNED TO NETWORK'):
366
                            datestring = element.findtext('ScanDate', '')
366
                        datestring = element.findtext('ScanDate', '')
367
                            timestring = element.findtext('ScanTime', '')
367
                        timestring = element.findtext('ScanTime', '')
368
                            delivery_date = get_py_datetime(datestring, timestring)
368
                        delivery_date = get_py_datetime(datestring, timestring)
369
                            local_connected_orders[order.airwaybill_no] = str(delivery_date)
369
                        local_connected_orders[order.airwaybill_no] = str(delivery_date)
370
                            break
370
                        break
371
                    else:
-
 
372
                        if (getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('RAMA ROAD HUB') or getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('DELHI HUB')) and element.findtext('ScanType', '') == 'UD' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('SHIPMENT OUTSCANNED TO NETWORK'):
371
                    if (getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('RAMA ROAD HUB') or getTrimedString(element.findtext('ScannedLocation', '')) == getTrimedString('DELHI HUB')) and element.findtext('ScanType', '') == 'UD' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('SHIPMENT OUTSCANNED TO NETWORK'):
373
                            datestring = element.findtext('ScanDate', '')
372
                        datestring = element.findtext('ScanDate', '')
374
                            timestring = element.findtext('ScanTime', '')
373
                        timestring = element.findtext('ScanTime', '')
375
                            delivery_date = get_py_datetime(datestring, timestring)
374
                        delivery_date = get_py_datetime(datestring, timestring)
376
                            local_connected_orders[order.airwaybill_no] = str(delivery_date)
375
                        local_connected_orders[order.airwaybill_no] = str(delivery_date)
377
                            break
376
                        break
-
 
377
                    #End:- Modified By Manish Sharma for Making changes in case of Orders dispatched from Bhiwandi Warehouse on 29-Jul-2013
378
                    #End:- Added By Manish Sharma for Making changes in case of Orders dispatched from Mumbai Warehouse on 26-Jun-2013
378
                    #End:- Added By Manish Sharma for Making changes in case of Orders dispatched from Mumbai Warehouse on 26-Jun-2013
379
                break
379
                break
380
        except:
380
        except:
381
            pass
381
            pass
382
    
382