Subversion Repositories SmartDukaan

Rev

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

Rev 22544 Rev 22545
Line 427... Line 427...
427
            for element in reversed(nodes):
427
            for element in reversed(nodes):
428
                if element.findtext('Status', '') == 'SHDL' and (element.findtext('Condition', '') == 'DLVD' or element.findtext('Condition', '') == 'DPTT' or element.findtext('Condition', '') == 'DLPT' or element.findtext('Condition', '') == 'LTRB'):
428
                if element.findtext('Status', '') == 'SHDL' and (element.findtext('Condition', '') == 'DLVD' or element.findtext('Condition', '') == 'DPTT' or element.findtext('Condition', '') == 'DLPT' or element.findtext('Condition', '') == 'LTRB'):
429
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
429
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
430
                    receiver = root.findtext('HAWBDetails/DeliveredTo', '')
430
                    receiver = root.findtext('HAWBDetails/DeliveredTo', '')
431
                    #Added replacement as separator may come itself in reciever
431
                    #Added replacement as separator may come itself in reciever
432
                    delivered_orders[order.airwaybill_no] = str(delivery_date) + "|" +  re.sub(r'[^\x00-\x7F]\s+','', receiver).encode().strip().replace("|", "l")
432
                    delivered_orders[order.airwaybill_no] = str(delivery_date) + "|" +  re.sub(r'[^\x00-\x7F]\s+','', receiver).encode('utf-8', 'ignore').strip().replace("|", "l")
433
                    break
433
                    break
434
                elif element.findtext('Condition', '') == 'RTRN' and (element.findtext('Status', '') == 'SHRH' or element.findtext('Status', '') == 'SHUP'):
434
                elif element.findtext('Condition', '') == 'RTRN' and (element.findtext('Status', '') == 'SHRH' or element.findtext('Status', '') == 'SHUP'):
435
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
435
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
436
                    if node_number < len(nodes)-1:
436
                    if node_number < len(nodes)-1:
437
                        reason_for_return = nodes[node_number+1].findtext('CustomerDescription', '')
437
                        reason_for_return = nodes[node_number+1].findtext('CustomerDescription', '')