Subversion Repositories SmartDukaan

Rev

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

Rev 5163 Rev 5520
Line 429... Line 429...
429
                            delivery_date = get_py_datetime(datestring, timestring)
429
                            delivery_date = get_py_datetime(datestring, timestring)
430
                            reason_for_nondelivery = element.findtext('Scan', '')
430
                            reason_for_nondelivery = element.findtext('Scan', '')
431
                            first_atdl_orders[order.airwaybill_no] = str(delivery_date) + "|" + reason_for_nondelivery
431
                            first_atdl_orders[order.airwaybill_no] = str(delivery_date) + "|" + reason_for_nondelivery
432
                        orderstatus = 'UD'
432
                        orderstatus = 'UD'
433
                        break
433
                        break
-
 
434
                    elif element.findtext('ScanType', '') == 'UD' and getTrimedString(element.findtext('Scan', '')) == getTrimedString("Shpt Held At Destination As Per Shipper's Request"):
-
 
435
                        datestring = element.findtext('ScanDate', '')
-
 
436
                        timestring = element.findtext('ScanTime', '')
-
 
437
                        delivery_date = get_py_datetime(datestring, timestring)
-
 
438
                        reason_for_nondelivery = element.findtext('Scan', '')
-
 
439
                        first_atdl_orders[order.airwaybill_no] = str(delivery_date) + "|" + reason_for_nondelivery
-
 
440
                        orderstatus = 'UD'
-
 
441
                        break
434
                    elif element.findtext('ScanType', '') == 'RD':
442
                    elif element.findtext('ScanType', '') == 'RD':
435
                        if child_number < len(children):
443
                        if child_number < len(children):
436
                            orderstatus = 'RD'
444
                            orderstatus = 'RD'
437
                            break
445
                            break
438
                    node_number = node_number - 1
446
                    node_number = node_number - 1