Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_car-vta-rename-module-kbh into
lp:~openerp-dev/openobject-addons/trunk-fleet-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_car-vta-rename-module-kbh/+merge/122615
Hello,
hr_car::
I have done following changes.
- rename the module
- dependency changed
- removed contract and employee objects
- view and menu modified.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_car-vta-rename-module-kbh/+merge/122615
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-fleet-apa.
=== modified file 'hr_car/__openerp__.py'
--- hr_car/__openerp__.py 2012-07-24 11:32:51 +0000
+++ hr_car/__openerp__.py 2012-09-04 06:10:43 +0000
@@ -20,13 +20,13 @@
##############################################################################
{
- 'name' : 'hr_car',
+ 'name' : 'Fleet',
'version' : '0.1',
'author' : 'Victor Tabuenca',
'description' : 'Car fleet management module',
'category' : '',
'website' : 'http://www.openerp.com',
- 'depends' : ['base', 'hr', 'hr_contract'],
+ 'depends' : ['base'],
'update_xml' : [
'hr_car_view.xml'
],
=== modified file 'hr_car/hr_car.py'
--- hr_car/hr_car.py 2012-08-17 08:28:04 +0000
+++ hr_car/hr_car.py 2012-09-04 06:10:43 +0000
@@ -57,22 +57,6 @@
"""Class defining a car"""
- def _get_current_driver(self, cr, uid, ids, name, arg, context=None):
-
- """Returns a dict containing the employee_id to which each of the cars is assigned to."""
-
- # Initialize all the employee_ids to False, maybe the car has no driver assigned
- res = dict.fromkeys(ids, False)
-
- osv_employee = self.pool.get('hr.employee')
- employee_ids = osv_employee.search(cr, uid, [('car_id', 'in', ids)], context=context)
-
- # Add the employee_id to the car
- for employee in self.pool.get('hr.employee').browse(cr, uid, employee_ids, context=context):
- if employee.car_id.id:
- res[employee.car_id.id] = employee.id
- return res
-
_name = 'hr.car'
_rec_name = 'plate'
@@ -93,8 +77,7 @@
'insurance_date_stop' : fields.date('End Date of the Insurance'),
'insurance_partner_id' : fields.many2one('res.partner', 'Insurance Company', ondelete='restrict'),
'log_ids' : fields.one2many('hr.car.log', 'car_id'),
- 'employee_id' : fields.function(_get_current_driver, string='Current Driver', type='many2one', relation='hr.employee', store=True)
- #'employee_id' : fields.many2one('hr.employee', string='Current Driver', ondelete='restrict')
+ 'driver_id' : fields.many2one('res.partner', 'Driver'),
}
_sql_constraints = [
@@ -122,7 +105,6 @@
'km' : fields.integer('Actual Km'),
'notes' : fields.text('Notes'),
'car_id' : fields.many2one('hr.car', 'Car', ondelete='restrict'),
- 'employee_id' : fields.many2one('hr.employee', 'Driver', ondelete='restrict')
}
_defaults = {
@@ -130,33 +112,3 @@
# 'employee_id': _get_employee_id,
}
hr_car_log()
-
-
-class hr_contract(osv.osv):
-
- """Class to link a car with a contract."""
-
- _inherit = 'hr.contract'
-
- _columns = {
- 'car_id' : fields.many2one('hr.car', 'Car', ondelete='restrict'),
- 'has_company_car' : fields.boolean('Has Company Car?'),
- 'fuel_card_number' : fields.char('Fuel Card Number', size=256)
- }
-
-hr_contract()
-
-
-class hr_employee(osv.osv):
-
- """Class to link a car with an employee."""
-
- _inherit = 'hr.employee'
-
- _columns = {
- 'car_id' : fields.related('contract_ids', 'car_id', relation='hr.car', type='many2one', string='Car', readonly=True),
- 'has_company_car' : fields.related('contract_ids', 'has_company_car', type='boolean', string='Has Company Car', readonly=True),
- #'car_id' : fields.many2one('hr.car', 'Current Car', ondelete='restrict')
- }
-
-hr_employee()
=== modified file 'hr_car/hr_car_view.xml'
--- hr_car/hr_car_view.xml 2012-08-17 08:28:04 +0000
+++ hr_car/hr_car_view.xml 2012-09-04 06:10:43 +0000
@@ -2,7 +2,7 @@
<openerp>
<data>
- <menuitem id="menu_hr_car" parent="hr.menu_hr_main" name="Car Fleet" sequence="100" />
+ <menuitem id="menu_hr_car" name="Fleet" sequence="100" />
<!-- New Car Form View -->
<record model="ir.ui.view" id="view_hr_car_form">
@@ -26,12 +26,12 @@
<field name="chassis_number" />
</group>
<group>
- <field name="employee_id" />
<field name="km" />
+ <field name="driver_id"/>
</group>
</group>
<notebook>
- <page string="Information">
+ <page string="Information">
<group name="other_info">
<group name="ins_info" string="Insurance Information">
<field name="insurance_partner_id" />
@@ -49,11 +49,10 @@
<field name="note" placeholder="Other Information ..." />
</page>
<page string="Driver Logs">
- <field name="log_ids" context="{'default_employee_id': employee_id}">
- <tree editable="top">
+ <field name="log_ids">
+ <tree editable="top" string="Logs">
<field name="date" />
<field name="km" />
- <field name="employee_id"/>
<field name="notes"/>
</tree>
</field>
@@ -74,7 +73,7 @@
<field name="plate" />
<field name="date_start" />
<field name="model_id" />
- <field name="employee_id" />
+ <field name="driver_id"/>
<field name="is_leasing" />
<field name="partner_id" />
<field name="insurance_partner_id" />
@@ -92,7 +91,7 @@
<group>
<field name="plate" />
<field name="model_id" />
- <field name="employee_id" />
+ <field name="driver_id"/>
<field name="partner_id" />
<field name="insurance_partner_id" />
<field name="chassis_number" />
@@ -106,7 +105,7 @@
<filter string="Leased Cars" icon="terp-personal" domain="[('is_leasing','=',True)]" />
<filter string="Owned Cars" icon="terp-personal" domain="[('is_leasing','=',False)]" />
<separator />
- <filter string="No Driver" icon="terp-personal" domain="[('employee_id','=',False)]" />
+ <filter string="No Driver" icon="terp-personal" />
<separator />
<filter string="Leasing Company"
icon="terp-personal"
@@ -119,7 +118,7 @@
context="{'group_by':'insurance_partner_id'}"
/>
<separator />
- <filter string="My Car" icon="terp-personal" domain="[('employee_id','=',uid)]" />
+ <filter string="My Car" icon="terp-personal" />
</group>
</search>
</field>
@@ -133,8 +132,8 @@
<field name="view_mode">tree,form</field>
</record>
- <menuitem name="Cars" parent="menu_hr_car" id="menu_hr_cars" action="action_hr_car" sequence="1"/>
-
+ <menuitem name="Cars" id="menu_hr_cars" parent="menu_hr_car"/>
+ <menuitem action="action_hr_car" name="Cars" id="menu_cars" parent="menu_hr_cars" sequence="1"/>
<!-- New Car Model Form -->
<record model="ir.ui.view" id="view_hr_car_model_form">
<field name="name">hr.car.model.form</field>
@@ -203,7 +202,8 @@
<field name="view_mode">tree,form</field>
</record>
- <menuitem name="Models" parent="menu_hr_car" id="menu_hr_car_models" action="action_hr_car_model" sequence="2"/>
+ <menuitem name="Models" parent="menu_hr_car" id="menu_hr_car_models"/>
+ <menuitem action="action_hr_car_model" name="Models" parent="menu_hr_car_models" id="menu_car_models" sequence="2"/>
<!-- New Car Log Form View -->
<record id="view_hr_car_log_form" model="ir.ui.view">
@@ -217,7 +217,6 @@
<group>
<group>
<field name="car_id" />
- <field name="employee_id" />
</group>
<group>
<field name="date" />
@@ -241,7 +240,6 @@
<tree string="Car Log List">
<field name="date" />
<field name="car_id" />
- <field name="employee_id" />
<field name="km" />
<!-- <field name="type" /> -->
</tree>
@@ -267,36 +265,5 @@
</field>
</record>
- <!-- Employee -->
- <record id="hr_car_employee_form" model="ir.ui.view">
- <field name="name">hr.car.employee.form</field>
- <field name="model">hr.employee</field>
- <field name="inherit_id" ref="hr.view_employee_form" />
- <field name="arch" type="xml">
- <xpath expr="//group[@name='active_group']" position="before">
- <group>
- <!-- <field name="car_id" /> -->
- <field name="has_company_car" />
- <field name="car_id" attrs="{'invisible':[('has_company_car','=',False)]}"/>
- </group>
- </xpath>
- </field>
- </record>
-
- <!-- Contract -->
- <record id="hr_car_contract_form" model="ir.ui.view">
- <field name="name">hr.car.contract.form</field>
- <field name="model">hr.contract</field>
- <field name="inherit_id" ref="hr_contract.hr_contract_view_form" />
- <field name="arch" type="xml">
- <xpath expr="//field[@name='advantages']" position="after">
- <!-- <field name="car_id" /> -->
- <field name="has_company_car" />
- <field name="car_id" attrs="{'invisible':[('has_company_car','=',False)]}"/>
- <field name="fuel_card_number" attrs="{'invisible':[('has_company_car','=',False)]}" />
- </xpath>
- </field>
- </record>
-
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
