odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[ADD]Demo values and optimize date comparaison for generation of contracts costs 

bzr revid: dle@openerp.com-20121023143108-3gq57w6l0fzmdv01
This commit is contained in:
Denis Ledoux dle@openerp.com 2012-10-23 16:31:08 +02:00
parent 5663bd8335
commit ba1adaef65
3 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/fleet/board_fleet_view.xml
View File

@ -28,9 +28,7 @@
<record model="ir.actions.act_window" id="action_fleet_vehicle_log_services_graph">
<field name="name">Services Costs by Month</field>
<field name="res_model">fleet.vehicle.log.services</field>
<field name="view_id" ref="fleet_vehicle_log_services_graph">
</field>
<field name="view_id" ref="fleet_vehicle_log_services_graph" />
<field name="view_type">form</field>
<field name="view_mode">tree</field>
</record>

50
addons/fleet/demo.xml
View File

@ -729,6 +729,50 @@
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
<record id="log_service_3" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">513</field>
<field name="cost_type" ref="type_service_service_8"/>
<field name="date">2012-10-15</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">124</field>
<field name="vendor_id" ref="base.res_partner_13" />
<field name="notes">Maintenance</field>
</record>
<record id="log_service_4" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">412</field>
<field name="cost_type" ref="type_service_service_8"/>
<field name="date">2012-10-08</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">20984</field>
<field name="vendor_id" ref="base.res_partner_13" />
<field name="notes">Maintenance</field>
</record>
<record id="log_service_5" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">275</field>
<field name="cost_type" ref="type_service_service_8"/>
<field name="date">2012-09-25</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">241</field>
<field name="vendor_id" ref="base.res_partner_13" />
<field name="notes">Maintenance</field>
</record>
<record id="log_service_6" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">302</field>
<field name="cost_type" ref="type_service_service_8"/>
<field name="date">2012-09-15</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">22513</field>
<field name="vendor_id" ref="base.res_partner_13" />
<field name="notes">Maintenance</field>
</record>
<record id="log_contract_1" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">0</field>
@ -771,7 +815,7 @@
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">weekly</field>
<field name="cost_frequency">monthly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
<field name="start_date" eval="time.strftime('%Y-01-01')" />
@ -809,7 +853,7 @@
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">daily</field>
<field name="cost_frequency">monthly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
<field name="start_date" eval="time.strftime('%Y-01-01')" />
@ -847,7 +891,7 @@
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">yearly</field>
<field name="cost_frequency">monthly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
<field name="start_date" eval="time.strftime('%Y-01-01')" />

6
addons/fleet/fleet.py
View File

@ -851,8 +851,8 @@ class fleet_vehicle_log_contract(osv.Model):
def run_scheduler(self,cr,uid,context=None):
d = datetime.datetime.now()
#d = datetime.date(2001, 01, 01)
#d = datetime.datetime.now()
d = datetime.date(2012, 8, 01)
frequencies = []
if d.day == 1 and d.month == 1:
@ -867,7 +867,7 @@ class fleet_vehicle_log_contract(osv.Model):
for i in range(frequencies_size-1):
frequencies.insert(0,'|')
condition = ['&','&','&',('state','=','open',),('start_date','<=',d),('expiration_date','>=',d)]
condition = ['&','&','&',('state','=','open',),('start_date','<=',d.strftime('%Y-%m-%d')),('expiration_date','>=',d.strftime('%Y-%m-%d'))]
condition.extend(frequencies)
print str(condition)