From 63f67de14ed658272aa366ea9f85afa36d5fcc97 Mon Sep 17 00:00:00 2001 From: "Denis Ledoux dle@openerp.com" <> Date: Mon, 24 Sep 2012 16:49:27 +0200 Subject: [PATCH] [ADD]demo file, + openchatter fixes bzr revid: dle@openerp.com-20120924144927-ukw5wbvpazj4a4ea --- addons/fleet/__openerp__.py | 1 + addons/fleet/demo.xml | 67 +++++++++++++++++++++++++++++++++++++ addons/fleet/fleet.py | 18 +++++++--- 3 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 addons/fleet/demo.xml diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 34cc89514a9..36294c4086b 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -6,6 +6,7 @@ 'base', 'hr', ], + 'demo': ['demo.xml'], 'author' : 'OpenERP S.A.', 'description' : """ I'm a good module and I will handle the cars of your company ! diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml new file mode 100644 index 00000000000..e2cb94a18aa --- /dev/null +++ b/addons/fleet/demo.xml @@ -0,0 +1,67 @@ + + + + + + Opel + + + + BMW + + + + Audi + + + + Mercedes + + + + Corsa + + + + + Astra + + + + + 1-ACK-205 + 5454541 + + Black + Grand-Rosiere + 5 + + + + + + 1-SYN-404 + 1337 + + Red + Grand-Rosiere + 5 + + + + + + Oil change + + + + + + + Services + 500.0 + + + + + diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index 425c1d4db00..c3dffa41f0a 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -48,6 +48,12 @@ class fleet_vehicle(osv.Model): _inherit = 'mail.thread' + def create_send_note(self, cr, uid, ids, context=None): + for id in ids: + message = _("%s has been created.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context)) + self.message_post(cr, uid, [id], body=message, context=context) + return True + def name_get(self, cr, uid, ids, context=None): if context is None: context = {} @@ -137,7 +143,9 @@ class fleet_vehicle_log(osv.Model): class fleet_vehicle_log_fuel(osv.Model): - _inherit = 'fleet.vehicle.log' + + _inherit = ['fleet.vehicle.log','mail.thread'] + def _get_price(self, cr, uid, ids, fields, args, context=None): result = {} @@ -185,15 +193,16 @@ class service_type(osv.Model): } class fleet_vehicle_log_services(osv.Model): - _inherit = 'fleet.vehicle.log' + _inherit = ['fleet.vehicle.log'] + _name = 'fleet.vehicle.log.services' _columns = { - 'vehicle_id' :fields.many2one('fleet.vehicle', 'Vehicle', required=True), 'vendor_id' :fields.many2one('res.partner', 'Vendor', domain="[('supplier','=',True)]"), 'amount' :fields.float('Amount', help="Total cost of the service"), 'reference' :fields.char('Reference',size=128), 'service_ids' :fields.many2many('fleet.service.type','vehicle_service_type_rel','vehicle_service_type_id','service_id','Services completed'), } + _defaults = {'type': 'Services'} class hr_employee(osv.Model): _inherit = 'hr.employee' @@ -201,4 +210,5 @@ class hr_employee(osv.Model): _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 + } +