Subversion Repositories SmartDukaan

Rev

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

Rev 2086 Rev 2088
Line 165... Line 165...
165
 
165
 
166
        if xfer_price !="":
166
        if xfer_price !="":
167
            item.transfer_price = xfer_price
167
            item.transfer_price = xfer_price
168
            vendor_item_pricing.transfer_price = xfer_price
168
            vendor_item_pricing.transfer_price = xfer_price
169
        
169
        
170
        if item.startDate == None or item.startDate == '':
170
        if start_date is not None and start_date != '':
171
            item.startDate = datetime.datetime.now()
171
            #If a start date has been specified, it takes precedence.
172
        else:
-
 
173
            item.startDate = datetime.datetime(*xlrd.xldate_as_tuple(start_date, workbook.datemode))
172
            item.startDate = datetime.datetime(*xlrd.xldate_as_tuple(start_date, workbook.datemode))
-
 
173
        elif item.startDate == None or item.startDate == '': 
-
 
174
            #If start date is not specified and item's start date is not set, set it to current time
-
 
175
            item.startDate = datetime.datetime.now()
174
 
176
 
175
        item.sellingPrice = sp
177
        item.sellingPrice = sp
176
        item.model_name = model_name
178
        item.model_name = model_name
177
 
179
 
178
        if weight != "":    
180
        if weight != "":