diff --git a/fleet_car_workshop/__openerp__.py b/fleet_car_workshop/__openerp__.py index 9d37f9e92..f02b38fda 100644 --- a/fleet_car_workshop/__openerp__.py +++ b/fleet_car_workshop/__openerp__.py @@ -22,8 +22,8 @@ ############################################################################## { 'name': 'Car Workshop', - 'version': '9.0.1.0.0', - 'summary': 'Vehicle Workshop Operations', + 'version': '9.0.2.0.0', + 'summary': 'Vehicle Workshop Operations & Reports', 'description': 'Vehicle workshop operations & Its reports', 'category': 'Industries', 'author': 'Cybrosys Techno Solutions', diff --git a/fleet_car_workshop/models/car_workshop.py b/fleet_car_workshop/models/car_workshop.py index ff7b89b44..39856f9d4 100644 --- a/fleet_car_workshop/models/car_workshop.py +++ b/fleet_car_workshop/models/car_workshop.py @@ -28,6 +28,7 @@ from openerp.exceptions import UserError class CarWorkshop(models.Model): _name = 'car.workshop' + _description = "Car Workshop" _inherit = ['mail.thread'] name = fields.Char(string='Title', track_visibility='onchange', required=True) @@ -55,7 +56,7 @@ class CarWorkshop(models.Model): progress = fields.Integer(string="Working Time Progress(%)", copy=False, readonly=True) date_last_stage_update = fields.Datetime(string='Last Stage Update', select=True, copy=False, readonly=True) id = fields.Integer('ID', readonly=True) - company_id = fields.Many2many('res.company', string='Company Name') + company_id = fields.Many2many('res.company', string='Company Name', default=lambda self: self.env['res.company']._company_default_get('car.workshop')) color = fields.Integer(string='Color Index') stage_id = fields.Many2one('worksheet.stages', string='Stage', track_visibility='onchange', copy=False) state = fields.Selection([ @@ -94,9 +95,6 @@ class CarWorkshop(models.Model): 'sequence': 10, 'active': True, 'user_id': lambda obj, cr, uid, ctx=None: uid, - 'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, - 'car.workshop', - context=ctx), 'partner_id': lambda self, cr, uid, ctx=None: self._get_default_vehicle(cr, uid, context=ctx), 'date_start': fields.datetime.now(), } @@ -165,6 +163,11 @@ class CarWorkshop(models.Model): inv_line_obj.create(inv_line_data) for records in self.materials_used: + if records.material.id : + income_account = records.material.property_account_income_id.id + if not income_account: + raise UserError(_('There is no income account defined for this product: "%s".') % + (records.material.name,)) inv_line_data = { 'name': records.material.name, diff --git a/fleet_car_workshop/models/dashboard.py b/fleet_car_workshop/models/dashboard.py index 7ae783955..707922a43 100644 --- a/fleet_car_workshop/models/dashboard.py +++ b/fleet_car_workshop/models/dashboard.py @@ -26,6 +26,7 @@ from openerp.osv import fields, osv class CarVehicle(osv.osv): _name = 'car.car' + _description = "Vechicles" _inherit = ['mail.thread'] def _get_visibility_selection_id(self, cr, uid, context=None): diff --git a/fleet_car_workshop/static/description/index.html b/fleet_car_workshop/static/description/index.html index 6337dbdd0..15ae419ed 100644 --- a/fleet_car_workshop/static/description/index.html +++ b/fleet_car_workshop/static/description/index.html @@ -111,7 +111,7 @@ great ease. Keep track of everything, like vehicle owner details,
-