Subversion Repositories SmartDukaan

Rev

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

Rev 20721 Rev 22454
Line 425... Line 425...
425
            node_number = len(nodes)-1
425
            node_number = len(nodes)-1
426
            for element in reversed(nodes):
426
            for element in reversed(nodes):
427
                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'):
427
                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
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
428
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
429
                    receiver = root.findtext('HAWBDetails/DeliveredTo', '')
429
                    receiver = root.findtext('HAWBDetails/DeliveredTo', '')
-
 
430
                    #Added replacement as separator may come itself in reciever
430
                    delivered_orders[order.airwaybill_no] = str(delivery_date) + "|" +  receiver.decode('utf-8','ignore').encode("utf-8")
431
                    delivered_orders[order.airwaybill_no] = str(delivery_date) + "|" +  receiver.decode('utf-8','ignore').encode("utf-8").replace("|", "l")
431
                    break
432
                    break
432
                elif element.findtext('Condition', '') == 'RTRN' and (element.findtext('Status', '') == 'SHRH' or element.findtext('Status', '') == 'SHUP'):
433
                elif element.findtext('Condition', '') == 'RTRN' and (element.findtext('Status', '') == 'SHRH' or element.findtext('Status', '') == 'SHUP'):
433
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
434
                    delivery_date = get_py_datetime(element.findtext('ActionDate', ''))
434
                    if node_number < len(nodes)-1:
435
                    if node_number < len(nodes)-1:
435
                        reason_for_return = nodes[node_number+1].findtext('CustomerDescription', '')
436
                        reason_for_return = nodes[node_number+1].findtext('CustomerDescription', '')