diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2012-10-03 15:30:15 +0200 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2012-10-03 15:30:15 +0200 |
| commit | 543e1a22ddebbb23a2d4b7c3acb16fdc3f1a0e06 (patch) | |
| tree | 473f937cc00f894dcd2a8b2fa41249901d20b656 | |
| parent | f4aa60ad14271de5f55c13927c88ffdd8d020c92 (diff) | |
[FIX]add class to kanban view to better show when contract alert shows up
bzr revid: csn@openerp.com-20121003133015-5qkcdmisubkks2tv
| -rw-r--r-- | addons/fleet/demo.xml | 4 | ||||
| -rw-r--r-- | addons/fleet/fleet_view.xml | 29 |
2 files changed, 16 insertions, 17 deletions
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml index d8926afe79b..c83076311a4 100644 --- a/addons/fleet/demo.xml +++ b/addons/fleet/demo.xml @@ -1855,11 +1855,11 @@ gg== </record> <record id="vehicle_contract_type_bigrisks" model="fleet.contract.type"> - <field name="name">Big risks</field> + <field name="name">Insurance</field> </record> <record id="vehicle_contract_type_smallrisks" model="fleet.contract.type"> - <field name="name">Small risks</field> + <field name="name">Leasing</field> </record> <record id="vehicle_contract_type_omium" model="fleet.contract.type"> diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 1f838ef697d..72b973c2ccc 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -231,6 +231,7 @@ <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/> <field name="driver"/> <field name="tag_ids"/> + <field name="location"/> </search> </field> </record> @@ -265,6 +266,17 @@ <field name="model_id" /> </a> </h4> + <t t-if="record.contract_renewal_due_soon.raw_value > 0 and record.contract_renewal_overdue.raw_value lte 0"> + <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:orange"> + <span class="oe_kanban_button oe_kanban_color_3">Contract Renewal</span> + </a> + </t> + + <t t-if="record.contract_renewal_overdue.raw_value > 0"> + <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:red"> + <span class="oe_kanban_button oe_kanban_color_2">Contract Renewal</span> + </a> + </t> <div class="oe_kanban_partner_categories"> <span class="oe_kanban_list_many2many"> <div modifiers="{}" name="tag_ids" class="oe_form_field oe_tags" model="fleet.vehicle.tag" t-att-data="record.tag_ids.raw_value" /> @@ -277,20 +289,7 @@ <li> <t t-if="record.location.raw_value"><field name="location"/></t> </li> - <li> - <t t-if="record.contract_renewal_due_soon.raw_value > 0 and record.contract_renewal_overdue.raw_value lte 0"> - <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:orange"> - Alert Contract Renewal - </a> - </t> - - <t t-if="record.contract_renewal_overdue.raw_value > 0"> - <a data-type="object" data-name="act_show_log_contract" href="#" class="oe_kanban_action oe_kanban_action_a" Style="color:red"> - Alert Contract Renewal - </a> - </t> - - </li> + </ul> @@ -404,7 +403,7 @@ <field name="name">fleet.vehicle.log.contract.tree</field> <field name="model">fleet.vehicle.log.contract</field> <field name="arch" type="xml"> - <tree string="Contract logs" version="7.0" colors="orange:warning_date>0 and warning_date<15;red:warning_date==0"> + <tree string="Contract logs" version="7.0" colors="orange:warning_date>0 and warning_date<15;red:warning_date==0;grey:state=='closed'"> <field name="vehicle_id" /> <field name="contract_type" /> <field name="state" /> |