[MERGE] trunk

bzr revid: openerp-sle@openerp-sle.home-20140217142030-619etd09tv45gq3q

addons/account/account_view.xml

@@ -588,7 +588,7 @@
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[
                                         '&amp;',
                                             '|',('parent_id','=',False),('is_company','=',True),
-                                            '|',('customer','=',True),('supplier','=',True)]"/>
+                                            '|',('customer','=',True),('supplier','=',True)]" context="{'default_supplier': 1}"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
                                     <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>

addons/base_iban/base_iban_data.xml

@@ -13,7 +13,7 @@
         <record id="bank_swift_field" model="res.partner.bank.type.field">
             <field name="name">bank_bic</field>
             <field name="bank_type_id" ref="bank_iban"/>
-            <field eval="True" name="required"/>
+            <field eval="False" name="required"/>
             <field eval="False" name="readonly"/>
         </record>
         <record id="bank_country_field" model="res.partner.bank.type.field">

addons/fleet/fleet.py

@@ -62,19 +62,8 @@ class fleet_vehicle_cost(osv.Model):
                 res[record.id] = _('Unknown')
         return res
 
-    def _cost_name_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
-        res = {}
-        for record in self.browse(cr, uid, ids, context=context):
-            name = record.vehicle_id.name
-            if record.cost_subtype_id.name:
-                name += ' / '+ record.cost_subtype_id.name
-            if record.date:
-                name += ' / '+ record.date
-            res[record.id] = name
-        return res
-
     _columns = {
-        'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
+        'name': fields.related('vehicle_id', 'name', type="char", string='Name', store=True),
         'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
         'cost_subtype_id': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
         'amount': fields.float('Total Price'),

addons/fleet/fleet_view.xml

@@ -832,6 +832,9 @@
             </field>
         </record>
 
+        <!--
+            fleet.vehicle.cost
+            -->
         <record model='ir.actions.act_window' id='fleet_vehicle_service_types_act'>
             <field name="name">Service Types</field>
             <field name="res_model">fleet.service.type</field>
@@ -848,6 +851,17 @@
 
         <menuitem action="fleet_vehicle_service_types_act" parent="fleet_configuration" id="fleet_vehicle_service_types_menu" groups="base.group_no_one"/>
 
+        <record model='ir.ui.view' id='fleet_vehicle_cost_tree'>
+            <field name="name">fleet.vehicle.cost.tree</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <tree string="Vehicle Costs">
+                    <field name="vehicle_id"/>
+                    <field name="cost_subtype_id"/>
+                    <field name="date"/>
+                </tree>
+            </field>
+        </record>
 
         <record model='ir.ui.view' id='fleet_vehicle_costs_report'>
             <field name="name">fleet.vehicle.cost.graph</field>
@@ -939,31 +953,5 @@
         </record>
 
         <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" groups="group_fleet_manager"/>
-<!--    
-        <record model='ir.ui.view' id='fleet_hr_employee_form'>
-            <field name="name">fleet.hr.employee.form</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form" />
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Vehicle">
-                        <group>
-                            <field name="vehicle_id" widget="many2many_tags"/>
-                        </group>
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-     <record model="fleet.vehicle.model" id="citroen">
-            <field name="name">Citroen</field>
-        </record>
-
-        <record model="fleet.vehicle" id="stw_vehicle">
-            <field name="name">240BTN</field>
-            <field name="model_id" ref="citroen" />
-        </record>
- -->
     </data>
 </openerp>

addons/website/models/website.py

@@ -87,7 +87,10 @@ def slug(value):
     else:
         # assume name_search result tuple
         id, name = value
-    return "%s-%d" % (slugify(name), id)
+    slugname = slugify(name)
+    if not slugname:
+        return str(id)
+    return "%s-%d" % (slugname, id)
 
 def urlplus(url, params):
     return werkzeug.Href(url)(params or None)