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

[FIX]finish renaming some field 

bzr revid: csn@openerp.com-20121206142941-pmq2s4h2or1ey0nl
This commit is contained in:
Cedric Snauwaert 2012-12-06 15:29:41 +01:00
parent b2457a3fc1
commit d37bd882a8
2 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
addons/fleet/fleet_demo.xml
View File

@ -253,7 +253,7 @@
<field name="color">Black</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_18" />
<field name="driver_id" ref="base.res_partner_address_18" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@ -268,7 +268,7 @@
<field name="color">Red</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_19" />
<field name="driver_id" ref="base.res_partner_address_19" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_inactive"/>
<field name="odometer_unit">kilometers</field>
@ -283,7 +283,7 @@
<field name="color">Titanium Grey</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">3</field>
<field name="driver" ref="base.res_partner_address_17" />
<field name="driver_id" ref="base.res_partner_address_17" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@ -298,7 +298,7 @@
<field name="color">White</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">3</field>
<field name="driver" ref="base.res_partner_address_16" />
<field name="driver_id" ref="base.res_partner_address_16" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@ -313,7 +313,7 @@
<field name="color">Brown</field>
<field name="location">Grand-Rosiere</field>
<field name="doors">5</field>
<field name="driver" ref="base.res_partner_address_15" />
<field name="driver_id" ref="base.res_partner_address_15" />
<field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
<field name="state" ref="vehicle_state_active"/>
<field name="odometer_unit">kilometers</field>
@ -862,7 +862,7 @@
<record id="log_service_1" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">650</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-09-02</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">4586</field>
@ -873,7 +873,7 @@
<record id="services_cost_11" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_7"/>
<field name="cost_subtype_id" ref="type_service_7"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@ -881,7 +881,7 @@
<record id="services_cost_12" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_8"/>
<field name="cost_subtype_id" ref="type_service_8"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@ -889,7 +889,7 @@
<record id="services_cost_13" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_9"/>
<field name="cost_subtype_id" ref="type_service_9"/>
<field name="date">2012-09-02</field>
<field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
</record>
@ -897,7 +897,7 @@
<record id="log_service_2" model="fleet.vehicle.log.services" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">350</field>
<field name="cost_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" ref="type_service_service_8"/>
<field name="date">2012-11-02</field>
<field name="purchaser_id" ref="base.res_partner_address_18" />
<field name="inv_ref">4814</field>
@ -908,7 +908,7 @@
<record id="services_cost_21" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_10"/>
<field name="cost_subtype_id" ref="type_service_10"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@ -916,7 +916,7 @@
<record id="services_cost_22" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">150</field>
<field name="cost_subtype" ref="type_service_11"/>
<field name="cost_subtype_id" ref="type_service_11"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@ -924,7 +924,7 @@
<record id="services_cost_23" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_service_12"/>
<field name="cost_subtype_id" ref="type_service_12"/>
<field name="date">2012-11-02</field>
<field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
</record>
@ -932,7 +932,7 @@
<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_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" 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>
@ -943,7 +943,7 @@
<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_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" 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>
@ -954,7 +954,7 @@
<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_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" 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>
@ -965,7 +965,7 @@
<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_subtype" ref="type_service_service_8"/>
<field name="cost_subtype_id" 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>
@ -978,7 +978,7 @@
<field name="amount">0</field>
<field name="cost_generated">20</field>
<field name="cost_frequency">daily</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="(DateTime.now() + timedelta(5)).strftime('%Y-%m-%d')" />
@ -990,7 +990,7 @@
<record id="contract_cost_11" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@ -998,7 +998,7 @@
<record id="contract_cost_12" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@ -1006,7 +1006,7 @@
<record id="contract_cost_13" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
</record>
@ -1016,7 +1016,7 @@
<field name="amount">0</field>
<field name="cost_generated">150</field>
<field name="cost_frequency">weekly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="(DateTime.now() + timedelta(-1)).strftime('%Y-%m-%d')" />
@ -1028,7 +1028,7 @@
<record id="contract_cost_21" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@ -1036,7 +1036,7 @@
<record id="contract_cost_22" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@ -1044,7 +1044,7 @@
<record id="contract_cost_23" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
</record>
@ -1054,7 +1054,7 @@
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">monthly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')"/>
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@ -1066,7 +1066,7 @@
<record id="contract_cost_31" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@ -1074,7 +1074,7 @@
<record id="contract_cost_32" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@ -1082,7 +1082,7 @@
<record id="contract_cost_33" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
</record>
@ -1092,7 +1092,7 @@
<field name="amount">0</field>
<field name="cost_generated">4000</field>
<field name="cost_frequency">yearly</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('%Y-01-01')" />
<field name="start_date" eval="time.strftime('%Y-01-01')" />
<field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@ -1104,7 +1104,7 @@
<record id="contract_cost_41" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@ -1112,7 +1112,7 @@
<record id="contract_cost_42" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@ -1120,7 +1120,7 @@
<record id="contract_cost_43" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
</record>
@ -1130,7 +1130,7 @@
<field name="amount">17000</field>
<field name="cost_generated">0</field>
<field name="cost_frequency">no</field>
<field name="cost_subtype" ref="type_contract_leasing"/>
<field name="cost_subtype_id" ref="type_contract_leasing"/>
<field name="date" eval="time.strftime('2012-01-01')" />
<field name="start_date" eval="time.strftime('2012-01-01')" />
<field name="expiration_date" eval="time.strftime('2016-12-31')" />
@ -1142,7 +1142,7 @@
<record id="contract_cost_51" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">50</field>
<field name="cost_subtype" ref="type_service_service_2"/>
<field name="cost_subtype_id" ref="type_service_service_2"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>
@ -1150,7 +1150,7 @@
<record id="contract_cost_52" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">25</field>
<field name="cost_subtype" ref="type_service_service_3"/>
<field name="cost_subtype_id" ref="type_service_service_3"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>
@ -1158,7 +1158,7 @@
<record id="contract_cost_53" model="fleet.vehicle.cost" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">100</field>
<field name="cost_subtype" ref="type_contract_omnium"/>
<field name="cost_subtype_id" ref="type_contract_omnium"/>
<field name="date">2012-01-01</field>
<field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
</record>

12
addons/fleet/security/fleet_security.xml
View File

@ -22,7 +22,7 @@
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_cost_visibility" model="ir.rule">
<field name="name">User can only see his/her costs</field>
@ -32,7 +32,7 @@
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_service_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's services</field>
@ -42,7 +42,7 @@
<field name="perm_write" eval="False"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_odometer_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's odometer</field>
@ -52,7 +52,7 @@
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="domain_force">[('vehicle_id.driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_fuel_log_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle's fuel log</field>
@ -62,7 +62,7 @@
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="True"/>
<field name="perm_unlink" eval="True"/>
<field name="domain_force">[('cost_id.vehicle_id.driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_vehicle_visibility" model="ir.rule">
<field name="name">User can only see his/her vehicle</field>
@ -72,7 +72,7 @@
<field name="perm_write" eval="True"/>
<field name="perm_create" eval="False"/>
<field name="perm_unlink" eval="False"/>
<field name="domain_force">[('driver','=',user.partner_id.id)]</field>
<field name="domain_force">[('driver_id','=',user.partner_id.id)]</field>
</record>
<record id="fleet_user_contract_visibility_manager" model="ir.rule">
<field name="name">Manager has all rights on vehicle's contracts</field>