pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]Contracts cost cron weekly fixed

Browse Source 
bzr revid: dle@openerp.com-20121023174447-imj5zsc3we4jlasb
This commit is contained in:
Denis Ledoux dle@openerp.com
2012-10-23 19:44:47 +02:00
parent 2bf0904440
commit 0ddd32f68f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/fleet.py
+4 -4
View File
@@ -872,21 +872,21 @@ class fleet_vehicle_log_contract(osv.Model):
else:
startdate = datetime.datetime(int(contract.start_date[:4]),1,1)
enddate = datetime.datetime(d.year,1,1)
if contract.cost_frequency == 'monthly':
elif contract.cost_frequency == 'monthly':
delta = relativedelta(months=+1)
if last_cost_date:
startdate = datetime.datetime(int(last_cost_date[:4]),int(last_cost_date[5:7]),1) + relativedelta(months=+1)
else:
startdate = datetime.datetime(int(contract.start_date[:4]),int(contract.start_date[5:7]),1)
enddate = datetime.datetime(d.year,d.month,1)
if contract.cost_frequency == 'weekly':
elif contract.cost_frequency == 'weekly':
delta = relativedelta(weeks=+1)
if last_cost_date:
startdate = datetime.datetime.strptime(last_cost_date[:4]+'-'+last_cost_date[5:7]+'-'+str(self.str_to_date(last_cost_date).weekday()),'%Y-%m-%w') + relativedelta(weeks=+1)
else:
startdate = datetime.datetime.strptime(contract.start_date[:4]+'-'+contract.start_date[5:7]+'-'+str(self.str_to_date(contract.start_date).weekday()),'%Y-%m-%w')
enddate = datetime.datetime.strptime(d.year+'-'+d.month+'-'+d.weekday(),'%Y-%m-%w')
if contract.cost_frequency == 'daily':
enddate = datetime.datetime.strptime(str(d.year)+'-'+d.strftime('%W')+'-'+d.strftime('%w'),'%Y-%W-%w')
elif contract.cost_frequency == 'daily':
delta = relativedelta(days=+1)
if last_cost_date:
startdate = datetime.datetime.strptime(last_cost_date,'%Y-%m-%d') + relativedelta(days=+1)