diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py index 369c7f372c6..a09fca549ce 100644 --- a/addons/fleet/__init__.py +++ b/addons/fleet/__init__.py @@ -1,3 +1,2 @@ # import the hr_car code -import fleet -import wizard \ No newline at end of file +import fleet \ No newline at end of file diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index 74f1df2e336..953b63ae82f 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -21,7 +21,6 @@ Vehicle, leasing, insurances, cost 'fleet_view.xml', 'data.xml', 'board_fleet_view.xml', - 'wizard/renew_contract_view.xml', ], 'update_xml' : ['security/ir.model.access.csv'], diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py index a8d0370408e..e912066c669 100644 --- a/addons/fleet/fleet.py +++ b/addons/fleet/fleet.py @@ -232,7 +232,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the service log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_services', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_services_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -243,7 +243,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the contract log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_contract', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_contract_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -254,7 +254,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the fuel log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_fuel', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_log_fuel_act', context) res['context'] = { 'default_vehicle_id': ids[0] } @@ -265,9 +265,10 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the costs log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_cost', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_costs_act', context) res['context'] = { - 'default_vehicle_id': ids[0] + 'default_vehicle_id': ids[0], + 'search_default_parent_false' : True } res['domain']=[('vehicle_id','=', ids[0])] return res @@ -276,7 +277,7 @@ class fleet_vehicle(osv.Model): """ This opens log view to view and add new log for this vehicle @return: the odometer log view """ - res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_show_log_odometer', context) + res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_odometer_act', context) res['context'] = { 'default_vehicle_id': ids[0] } diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 462c201c7ff..b978a3f7f8a 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -334,96 +334,6 @@ - - - - Services Logs - fleet.vehicle.log.services - fleet.vehicle - form - tree,form - -

- Click to create a new service entry. -

- OpenERP helps you keeping track of all the services done - on your vehicle. Services can be of many type, occasional - repair, fixed maintenance, etc. -

- - - - - Fuel Logs - fleet.vehicle.log.fuel - fleet.vehicle - form - tree,form,graph - -

- Click to create a new fuel log. -

- Here you can add refuelling entries for all vehicles. - You can also show the log for a particular vehicle using - the search field. -

- - - - - Contract - fleet.vehicle.log.contract - fleet.vehicle - form - tree,form - -

- Click to create a new contract. -

- OpenERP helps you managing all the contracts for your - vehicle, leasing, insurance, or any other type of contract. -

- The contract form includes all sort of details, like the - activation cost, recurrent cost, the services included in - the contract, beginning and possibly ending date, etc. -

- - - - - Costs - fleet.vehicle.cost - fleet.vehicle - form - tree,form,graph - {"search_default_parent_false" : True} - -

- Click to create a new cost. -

- OpenERP helps you managing the costs for your different vehicles - Costs are generally created from services and contract and appears here. -

- Thanks to the different filters, OpenERP can only print the effective - costs, sort them by type and by vehicle. -

- - - - - Odometer - fleet.vehicle.odometer - fleet.vehicle - form - tree,form,graph - -

- Here you can add various odometer entries for all vehicles. - You can also show odometer value for a particular vehicle using - the search field. -

- - diff --git a/addons/fleet/wizard/__init__.py b/addons/fleet/wizard/__init__.py deleted file mode 100644 index bc7dae97d56..00000000000 --- a/addons/fleet/wizard/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import renew_contract \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract.py b/addons/fleet/wizard/renew_contract.py deleted file mode 100644 index 04f21227eb3..00000000000 --- a/addons/fleet/wizard/renew_contract.py +++ /dev/null @@ -1,140 +0,0 @@ -from osv import osv, fields -import datetime - -class renew_contract(osv.TransientModel): - _name = "fleet.vehicle.contract.renew" - _description = "wizard to renew a contract" - - def name_get(self, cr, uid, ids, context=None): - if context is None: - context = {} - if not ids: - return [] - reads = self.browse(cr, uid, ids, context=context) - res = [] - for record in reads: - if record.vehicle_id.name: - name = str(record.vehicle_id.name) - if record.cost_type.name: - name = name+ ' / '+ str(record.cost_type.name) - if record.date: - name = name+ ' / '+ record.date - res.append((record.id, name)) - return res - - def _vehicle_contract_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None): - res = self.name_get(cr, uid, ids, context=context) - return dict(res) - - def _get_odometer(self, cr, uid, ids, odometer_id, arg, context): - res = dict.fromkeys(ids, False) - for record in self.browse(cr,uid,ids,context=context): - if record.odometer_id: - res[record.id] = record.odometer_id.value - return res - - def _set_odometer(self, cr, uid, id, name, value, args=None, context=None): - if value: - try: - value = float(value) - except ValueError: - #_logger.exception(value+' is not a correct odometer value. Please, fill a float for this field') - raise except_orm(_('Error!'), value+' is not a correct odometer value. Please, fill a float for this field') - - date = self.browse(cr, uid, id, context=context).date - if not(date): - date = time.strftime('%Y-%m-%d') - vehicle_id = self.browse(cr, uid, id, context=context).vehicle_id - data = {'value' : value,'date' : date,'vehicle_id' : vehicle_id.id} - odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context) - self.write(cr, uid, id, {'odometer_id': odometer_id}) - return value - self.write(cr, uid, id, {'odometer_id': ''}) - return False - - def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None): - - if not vehicle_id: - return {} - - odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit - - return { - 'value' : { - 'odometer_unit' : odometer_unit, - } - } - - def compute_next_year_date(self, strdate): - oneyear=datetime.timedelta(days=365) - curdate = self.str_to_date(strdate) - nextyear=curdate+oneyear#int(strdate[:4])+1 - return str(nextyear)#+strdate[4:] - - #def on_change_start_date(self, cr, uid, ids, strdate, context=None): - # if (strdate): - - # return {'value' : {'expiration_date' : self.compute_next_year_date(strdate),}} - # else: - # return {} - - def str_to_date(self,strdate): - return datetime.datetime(int(strdate[:4]),int(strdate[5:7]),int(strdate[8:])) - - def get_warning_date(self,cr,uid,ids,prop,unknow_none,context=None): - if context is None: - context={} - if not ids: - return dict([]) - reads = self.browse(cr,uid,ids,context=context) - res=[] - for record in reads: - #if (record.reminder==True): - if (record.expiration_date and record.state=='open'): - today=self.str_to_date(time.strftime('%Y-%m-%d')) - renew_date = self.str_to_date(record.expiration_date) - diff_time=int((renew_date-today).days) - if (diff_time<=0): - res.append((record.id,0)) - else: - res.append((record.id,diff_time)) - else: - res.append((record.id,-1)) - #else: - # res.append((record.id,-1)) - return dict(res) - - _columns = { - 'name' : fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True), - 'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this fuel log'), - 'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost'), - 'amount': fields.float('Total Price'), - - 'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', required=False, help='Parent cost to this current cost'), - 'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'), - - 'date' :fields.date('Date',help='Date when the cost has been executed'), - - 'start_date' : fields.date('Contract Start Date', required=False, help='Date when the coverage of the contract begins'), - 'expiration_date' : fields.date('Contract Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'), - 'warning_date' : fields.function(get_warning_date,type='integer',string='Warning Date',store=False), - - 'insurer_id' :fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"), - 'purchaser_id' : fields.many2one('res.partner', 'Contractor',domain="['|',('customer','=',True),('employee','=',True)]",help='Person to which the contract is signed for'), - 'ins_ref' : fields.char('Contract Reference', size=64), - 'state' : fields.selection([('open', 'In Progress'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'), - #'reminder' : fields.boolean('Renewal Reminder', help="Warn the user a few days before the expiration date of this contract"), - 'notes' : fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'), - 'odometer_id' : fields.many2one('fleet.vehicle.odometer', 'Odometer', required=False, help='Odometer measure of the vehicle at the moment of this log'), - 'odometer' : fields.function(_get_odometer,fnct_inv=_set_odometer,type='char',string='Odometer Value',store=False,help='Odometer measure of the vehicle at the moment of this log'), - 'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True), - #'cost_amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True), - } - - - - def renew(self, cr, uid, ids, context=None): - print '-------------------------------' - print 'renew contract' - print '-------------------------------' - return {} \ No newline at end of file diff --git a/addons/fleet/wizard/renew_contract_view.xml b/addons/fleet/wizard/renew_contract_view.xml deleted file mode 100644 index 9113ebb595e..00000000000 --- a/addons/fleet/wizard/renew_contract_view.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - fleet.vehicle.contract.wizard.form - fleet.vehicle.contract.renew - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - \ No newline at end of file