← Back to branch summary

~vauxoo/addons-vauxoo/7.0-purchase_requisition_contract_analyst-dev-1482-kty

« back to all changes in this revision

Viewing changes to cost_structure/wizard/compute_cost.py

  • Committer: Jose Antonio
  • Date: 2012-05-30 21:21:35 UTC
  • mfrom: (256.2.2 addons-vauxoo)
  • Revision ID: jose@vauxoo.com-20120530212135-60jsp8inif9ogrfx

[MERGE] Merge from cost structure 

Show diffs side-by-side

added added

removed removed

Lines of Context:
cost_structure/wizard/compute_cost.py
162
162
                    time = date and date[2].split(' ')
163
163
                    time = time and time[1].split(":")
164
164
                    date = date and time and datetime.datetime(int(date[0]), int(date[1]), int(date[2][0:2]),int(time[0]),int(time[1]),int(time[2])) or False
165
 
                    date = date and date + datetime.timedelta(seconds=1) or dat.strftime('%Y/%m/%d %H:%M')
 
165
                    date = date and date + datetime.timedelta(seconds=1) or dat.strftime('%Y/%m/%d %H:%M:%S')
166
166
                    
167
167
                    if context.get('not_write',False):
168
168
                        pass