Subversion Repositories SmartDukaan

Rev

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

Rev 9173 Rev 12956
Line 445... Line 445...
445
        shipments = root.findall('Shipment')
445
        shipments = root.findall('Shipment')
446
        for shipment in shipments:
446
        for shipment in shipments:
447
            nodes = shipment.findall('Scans/ScanDetail')
447
            nodes = shipment.findall('Scans/ScanDetail')
448
            node_number = 0
448
            node_number = 0
449
            for element in nodes:
449
            for element in nodes:
450
                if element.findtext('ScanType', '') == 'DL' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('Delivered'):
450
                if element.findtext('ScanType', '') == 'DL' and getTrimedString('Delivered') in getTrimedString(element.findtext('Scan', '')) :
451
                    delivery_date = get_py_datetime(element.findtext('ScanDateTime', ''))
451
                    delivery_date = get_py_datetime(element.findtext('ScanDateTime', ''))
452
                    receiver = shipment.findtext('Status/RecievedBy', '')
452
                    receiver = shipment.findtext('Status/RecievedBy', '')
453
                    delivered_orders[shipment.findtext('AWB', '')] = str(delivery_date) + "|" +  receiver
453
                    delivered_orders[shipment.findtext('AWB', '')] = str(delivery_date) + "|" +  receiver
454
                    break
454
                    break
455
                elif element.findtext('ScanType', '') == 'RT' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('Returned'):
455
                elif element.findtext('ScanType', '') == 'RT' and getTrimedString(element.findtext('Scan', '')) == getTrimedString('Returned'):