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

[MERGE]removed some conflicts in view

Browse Source 
bzr revid: csn@openerp.com-20120924130335-vvkhdz9jexcnsqrq
This commit is contained in:
Cedric Snauwaert
2012-09-24 15:03:35 +02:00
parent 3d2607669f
commit a9d4bf30bb
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/fleet_view.xml
+15 -11
View File
@@ -228,17 +228,21 @@
</record>
<record model='ir.ui.view' id='fleet_vehicle_log_tree'>
<field name="name">fleet.vehicle.log.tree</field>
<field name="model">fleet.vehicle.log</field>
<field name="arch" type="xml">
<tree string="Logs">
<field name="type" />
<field name="create_date" />
<field name="vehicle_id" />
<field name="employee_id" />
<field name="description" />
</tree>
</field>
<field name="name">fleet.vehicle.log.tree</field>
<field name="model">fleet.vehicle.log</field>
<field name="arch" type="xml">
<tree string="Logs">
<field name="type" />
<field name="create_date" />
<field name="vehicle_id" />
<field name="employee_id" />
<field name="description" />
</tree>
</field>
</record>
<record model='ir.actions.act_window' id='fleet_vehicle_log_act'>