[FIX]Missing caps
authorDenis Ledoux dle@openerp.com <>
Fri, 28 Sep 2012 09:05:10 +0000 (11:05 +0200)
committerDenis Ledoux dle@openerp.com <>
Fri, 28 Sep 2012 09:05:10 +0000 (11:05 +0200)
bzr revid: dle@openerp.com-20120928090510-wco5cjdjczmnfhw9

addons/fleet/fleet.py
addons/fleet/fleet_view.xml

index 29b089b..673ff38 100644 (file)
@@ -49,7 +49,7 @@ class fleet_vehicle_model(osv.Model):
     _columns = {
         'name' : fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
         'modelname' : fields.char('Model name', size=32, required=True), 
-        'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model brand', required=True, help='Brand of the vehicle'),
+        'brand' : fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
         'vendors': fields.many2many('res.partner','fleet_vehicle_model_vendors','model_id', 'partner_id',string='Vendors',required=False),
         'image': fields.related('brand','image',type="binary",string="Logo",store=False)
     }
@@ -126,7 +126,7 @@ class fleet_vehicle(osv.Model):
     _columns = {
         'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True),
         'company_id': fields.many2one('res.company', 'Company'),
-        'license_plate' : fields.char('License plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
+        'license_plate' : fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
         'vin_sn' : fields.char('Chassis Number', size=32, required=False, help='Unique number written on the vehicle motor (VIN/SN number)'),
         'driver' : fields.many2one('res.partner', 'Driver',required=False, help='Driver of the vehicle'),
         'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
@@ -134,12 +134,12 @@ class fleet_vehicle(osv.Model):
         'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'),
         'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'),
         'log_insurances' : fields.one2many('fleet.vehicle.log.insurance','vehicle_id', 'Insurances'),
-        'acquisition_date' : fields.date('Acquisition date', required=False, help='Date when the vehicle has been bought'),
+        'acquisition_date' : fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
         'acquisition_price' : fields.integer('Price', help='Price of the bought vehicle'),
         'color' : fields.char('Color',size=32, help='Color of the vehicle'),
         'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', domain='[]'),
         'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'),
-        'doors' : fields.integer('Number of doors', help='Number of doors of the vehicle'),
+        'doors' : fields.integer('Doors Number', help='Number of doors of the vehicle'),
         'tag_ids' :fields.many2many('fleet.vehicle.tag','vehicle_vehicle_tag_rel','vehicle_tag_id','tag_id','Tags'),
 
         'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False),
@@ -300,7 +300,7 @@ class fleet_vehicle_log_fuel(osv.Model):
         #'name' : fields.char('Name',size=64),
 
         'liter' : fields.float('Liter'),
-        'price_per_liter' : fields.float('Price per liter'),
+        'price_per_liter' : fields.float('Price Per Liter'),
         'amount': fields.float('Total price'),
         'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
         'inv_ref' : fields.char('Invoice Reference', size=64),
@@ -346,8 +346,8 @@ class fleet_vehicle_log_insurance(osv.Model):
         #'name' : fields.char('Name',size=64),
 
         'insurance_type' : fields.many2one('fleet.insurance.type', 'Type', required=False, help='Type of the insurance'),
-        'start_date' : fields.date('Start date', required=False, help='Date when the coverage of the insurance begins'),
-        'expiration_date' : fields.date('Expiration date', required=False, help='Date when the coverage of the insurance expirates'),
+        'start_date' : fields.date('Start Date', required=False, help='Date when the coverage of the insurance begins'),
+        'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the insurance expirates'),
         'price' : fields.float('Price', help="Cost of the insurance for the specified period"),
         'insurer_id' :fields.many2one('res.partner', 'Insurer', domain="[('supplier','=',True)]"),
         'purchaser_id' : fields.many2one('res.partner', 'Purchaser'),
@@ -362,13 +362,4 @@ class fleet_service_type(osv.Model):
     _name = 'fleet.service.type'
     _columns = {
         'name': fields.char('Name', required=True, translate=True),
-    }
-
-#class hr_employee(osv.Model):
-#    _inherit = 'hr.employee'
-
-#    _columns = {
-#        'vehicle_id' : fields.one2many('fleet.vehicle','driver', 'Vehicle',type="char"),
-#        'log_ids' : fields.one2many('fleet.vehicle.log', 'employee_id', 'Logs'),
-#    }
-
+    }
\ No newline at end of file
index 9de3385..0897b0d 100644 (file)
                     </header>
                     <sheet>
                        <div class="oe_right oe_button_box">
-                        <button name="act_show_log_fuel" type="object" string="fuel logs" help="show the fuel logs for this vehicle" />
-                        <button name="act_show_log_insurance" type="object" string="insurance logs" help="show the insurance logs for this vehicle" />
-                        <button name="act_show_log_services" type="object" string="services logs" help="show the services logs for this vehicle" />
+                        <button name="act_show_log_fuel" type="object" string="Fuel Logs" help="show the fuel logs for this vehicle" />
+                        <button name="act_show_log_insurance" type="object" string="Insurance Logs" help="show the insurance logs for this vehicle" />
+                        <button name="act_show_log_services" type="object" string="Services Logs" help="show the services logs for this vehicle" />
                         </div>
                         <field name="image" widget='image'/>
                         <group col ="2">
-                            <group string="General properties">
+                            <group string="General Properties">
                                 <field name="model_id" />
                                 <field name="license_plate" />
                                 <field name="vin_sn" />
                                  <field name="location" />
                                 <field name="company_id" groups="base.group_multi_company"/>
                             </group>
-                            <group string="Additional properties">
+                            <group string="Additional Properties">
                                 <field name="tag_ids" widget="many2many_tags" />
                                 <field name="acquisition_date" />
                                 <field name="acquisition_price" />
                                 <form string="Insurances" version="7.0">
                                     <sheet>
                                         <group col="2">
-                                            <group string="Insurance details">
+                                            <group string="Insurance Details">
                                                 <field name="insurance_type" />
                                                 <field name="start_date" />
                                                 <field name="expiration_date" />
                                             <group></group>
                                         </group>
                                         <group col="2">
-                                            <group string="Odometer details">
+                                            <group string="Odometer Details">
                                                 <field name="value" />
                                                 <field name="unit" />
                                             </group>
-                                            <group string="Additional details">
+                                            <group string="Additional Details">
                                                 <field name="date" />
                                                 <field name="insurer_id" />
                                                 <field name="ins_ref" />
                 <form string="Fuel Logs" version="7.0">
                     <sheet>
                         <group col="2">
-                            <group string="Vehicle details">
+                            <group string="Vehicle Details">
                                 <field name="vehicle_id"/>
                             </group>
-                            <group string="Refueling details">
+                            <group string="Refueling Details">
                                 <field name="liter" on_change="on_change_liter(liter,price_per_liter,amount)"/>
                                 <field name="price_per_liter" on_change="on_change_price_per_liter(liter,price_per_liter,amount)" />
                                 <field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
                             </group>
                         </group>
                         <group col="2">
-                            <group string="Odometer details">
+                            <group string="Odometer Details">
                                 <field name="value" />
                                 <field name="unit" />
                             </group>
-                            <group string="Additional details">
+                            <group string="Additional Details">
                                 <field name="date" />
                                 <field name="purchaser_id" />
                                 <field name="inv_ref" />
                 <form string="Services Logs" version="7.0">
                     <sheet>
                         <group col="2">
-                            <group string="Vehicle details">
+                            <group string="Vehicle Details">
                                 <field name="vehicle_id" />
                             </group>
-                            <group string="Services details">
+                            <group string="Services Details">
                                 <field name="service_ids" widget="many2many_tags"/>
                                 <field name="amount" />
                             </group>
                         </group>
                         <group col="2">
-                            <group string="Odometer details">
+                            <group string="Odometer Details">
                                 <field name="value" />
                                 <field name="unit" />
                             </group>
-                            <group string="Additional details">
+                            <group string="Additional Details">
                                 <field name="date" />
                                 <field name="purchaser_id" />
                                 <field name="vendor_id" />
            <field name="model">fleet.vehicle.log.services</field>
            <field name="type">graph</field>
            <field name="arch" type="xml">
-                <graph string="Odometer value per month">
+                <graph string="Services total amount per month">
                     <field name="month" />
                     <field name="vehicle_id" group="True" /> 
                     <field name="amount" operator="+"/>
             <field name="name">fleet.vehicle.odometer.form</field>
             <field name="model">fleet.vehicle.odometer</field>
             <field name="arch" type="xml">
-                <form string="Odometer logs" version="7.0">
+                <form string="Odometer Logs" version="7.0">
                     <sheet>
                         <group>
                             <field name="vehicle_id" />
             <field name="name">fleet.vehicle.odometer.tree</field>
             <field name="model">fleet.vehicle.odometer</field>
             <field name="arch" type="xml">
-                <tree string="Odometer logs" version="7.0" editable="bottom">
+                <tree string="Odometer Logs" version="7.0" editable="bottom">
                     <field name="vehicle_id" />
                     <field name="value" />
                     <field name="unit" />