Date: Thu, 18 Oct 2012 09:56:08 +0200
Subject: [PATCH 151/348] [Conflict resolved after pull]
bzr revid: csn@openerp.com-20121018075608-9huwnmd0kev5193n
---
addons/account/report/account_print_overdue.rml | 2 +-
addons/event/event_view.xml | 2 +-
addons/product/product_view.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 8b8238030fe..577cb9142a2 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -129,7 +129,7 @@
[[ o.title.name or '' ]] [[ o.name ]]
- [[ display_address(o.partner_id) ]]
+ [[ display_address(o.partner_id)] ]]
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ccac74086ff..68742754166 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -133,7 +133,7 @@
-
+
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index b7fbcd560f7..748d6c5d7cf 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -13,7 +13,7 @@
-
+
From 00e90b7dc732254cae93b57d0f4e9361be695581 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 11:09:35 +0200
Subject: [PATCH 152/348] [FIX]Fuel Log graph amount key error
bzr revid: dle@openerp.com-20121018090935-xca9tneigzw8zowl
---
addons/fleet/fleet.py | 1 +
addons/fleet/fleet_view.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index cd277f208c5..c9901f425fb 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -626,6 +626,7 @@ class fleet_vehicle_log_fuel(osv.Model):
'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',store=False),
'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
+ 'amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index b6ed757f73d..10347b8bcd4 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -614,7 +614,7 @@
-
+
From 49ba1fa338de9ced1269541af58a481153a9fa50 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 11:11:36 +0200
Subject: [PATCH 153/348] [FIX]Services Log graph amount key error
bzr revid: dle@openerp.com-20121018091136-3gdxzn2ghu1js8uw
---
addons/fleet/fleet.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index c9901f425fb..ddd327835d9 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -697,6 +697,7 @@ class fleet_vehicle_log_services(osv.Model):
'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),
'odometer_unit': fields.related('vehicle_id','odometer_unit',type="char",string="Unit",store=False, readonly=True),
+ 'amount': fields.related('cost_id','amount',type="float",string="Amount",store=True, readonly=True),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
From 911ae7fef17dfdef3657a6f973ae49d0eb8de332 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 17:00:17 +0200
Subject: [PATCH 154/348] [ADD]Dashboard. Fuel logs graph and services logs
graph
bzr revid: dle@openerp.com-20121018150017-h8bgz1yb6ghksw3l
---
addons/fleet/__openerp__.py | 2 ++
addons/fleet/fleet_view.xml | 15 ++++++++++-----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 36b3c4cbb47..73a3f08ce0f 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -21,10 +21,12 @@ Add insurance and services reminder that will help you by sending you a mail whe
'depends' : [
'base',
'mail',
+ 'board'
],
'data' : [
'fleet_view.xml',
'data.xml',
+ 'board_fleet_view.xml'
],
'update_xml' : ['security/ir.model.access.csv'],
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 10347b8bcd4..894d103b314 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -154,9 +154,8 @@
-
-
-
+
+
@@ -369,7 +368,7 @@
-
+
@@ -854,6 +853,12 @@
-->
-
+
+ Fuel Costs by Month
+ fleet.vehicle.log.fuel
+
+ form
+ tree
+
From 16717bffdc8218f5ae9def0d73281e15a9c4e447 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 17:20:05 +0200
Subject: [PATCH 155/348] [ADD]Costs graph and vehicle tree in dashboard
bzr revid: dle@openerp.com-20121018152005-3xle90olcnt4vfba
---
addons/fleet/fleet.py | 2 +-
addons/fleet/fleet_view.xml | 19 ++++++++++++-------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index ddd327835d9..f4bff2f07c0 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -358,7 +358,7 @@ class fleet_vehicle(osv.Model):
_name = 'fleet.vehicle'
_description = 'Fleet Vehicle'
#_order = 'contract_renewal_overdue desc, contract_renewal_due_soon desc'
- _order= 'name asc'
+ _order= 'license_plate asc'
_columns = {
'name' : fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 894d103b314..b6665ab1646 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -818,6 +818,18 @@
+
+ fleet.vehicle.cost.graph
+ fleet.vehicle.cost
+
+
+
+
+
+
+
+
+
Vehicle Costs
fleet.vehicle.cost
@@ -853,12 +865,5 @@
-->
-
- Fuel Costs by Month
- fleet.vehicle.log.fuel
-
- form
- tree
-
From 910799a8a297515df0e485d2d6d18dfa932ba477 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Thu, 18 Oct 2012 17:20:05 +0200
Subject: [PATCH 156/348] [ADD]default state when creating vehicle, and change
in domain for driver
bzr revid: csn@openerp.com-20121018152005-r6wf49gfr2gtpm88
---
addons/fleet/__openerp__.py | 8 +-------
addons/fleet/demo.xml | 10 +++++-----
addons/fleet/fleet.py | 13 ++++++++++---
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 73a3f08ce0f..3689040bef4 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -5,18 +5,12 @@
'author' : 'OpenERP S.A.',
'category': 'Vehicle, leasing, insurances, costs',
'website' : 'http://www.openerp.com',
- 'summary' : 'Manage your fleet of vehicle',
+ 'summary' : 'Manage all your vehicles and contracts',
'description' : """
Vehicle, leasing, insurances, cost
==================================
-With this easy to use module, you can in a few clicks manage your entire vehicle fleet.
-Managing a single vehicle or thousands of them has never been easier.
-
-Encode your vehicle, group them with tags, view the ones that interest you with the search function.
-
-Add insurance and services reminder that will help you by sending you a mail when you need to renew the insurance of a vehicle or do the next maintenance.
""",
'depends' : [
'base',
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 029da406753..de7291c0c65 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -58,7 +58,7 @@
kilometers
20000
- 450
+
@@ -73,7 +73,7 @@
kilometers
16000
- 400
+
@@ -88,7 +88,7 @@
kilometers
20000
- 450
+
@@ -103,7 +103,7 @@
kilometers
20000
- 450
+
@@ -118,7 +118,7 @@
kilometers
18000
- 425
+
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index ddd327835d9..1c7a4f7d6b0 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -88,6 +88,8 @@ class fleet_vehicle_state(osv.Model):
'sequence': fields.integer('Order',help="Used to order the note stages")
}
_order = 'sequence asc'
+ _sql_constraints = [('fleet_state_name_unique','unique(name)','State name already exists')]
+
############################
############################
@@ -365,20 +367,20 @@ class fleet_vehicle(osv.Model):
'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)'),
'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', domain="['|',('customer','=',True),('employee','=',True)]"),
+ 'driver' : fields.many2one('res.partner', 'Driver',required=False, help='Driver of the vehicle', domain="[('employee','=',True)]"),
'model_id' : fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
'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_contracts' : fields.one2many('fleet.vehicle.log.contract','vehicle_id', 'Contracts'),
'acquisition_date' : fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
'color' : fields.char('Color',size=32, help='Color of the vehicle'),
- 'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ),
+ 'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle'),
'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'),
'doors' : fields.integer('Doors Number', help='Number of doors of the vehicle'),
'tag_ids' :fields.many2many('fleet.vehicle.tag','fleet_vehicle_vehicle_tag_rel','vehicle_tag_id','tag_id','Tags'),
'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.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the odometer ',required=False),
+ 'odometer_unit': fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the odometer ',required=True),
'transmission' : fields.selection([('manual', 'Manual'),('automatic','Automatic')], 'Transmission', help='Transmission Used by the vehicle',required=False),
'fuel_type' : fields.selection([('gasoline', 'Gasoline'),('diesel','Diesel'),('electric','Electric'),('hybrid','Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle',required=False),
@@ -401,8 +403,13 @@ class fleet_vehicle(osv.Model):
_defaults = {
'doors' : 5,
'odometer_unit' : 'kilometers',
+ 'state' : lambda s,cr,uid,c:s.get_state(cr,uid,'Active',context=c),
}
+ def get_state(self,cr,uid,state_name,context=None):
+ states=self.pool.get('fleet.vehicle.state').search(cr,uid,[('name','=',state_name)],context=context,limit=1)
+ return states
+
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
From 5e3fd05affd1ce6af45af00f920711bb33119c0d Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 17:20:57 +0200
Subject: [PATCH 157/348] [REM]Leasing value from demos
bzr revid: dle@openerp.com-20121018152057-tzuqnxux3qsvapea
---
addons/fleet/demo.xml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 029da406753..56a9e291543 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -58,7 +58,6 @@
kilometers
20000
- 450
@@ -73,7 +72,6 @@
kilometers
16000
- 400
@@ -88,7 +86,6 @@
kilometers
20000
- 450
@@ -103,7 +100,6 @@
kilometers
20000
- 450
@@ -118,7 +114,6 @@
kilometers
18000
- 425
From 288e0aab72de52c567996edce299c47072bc1ed3 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 17:38:16 +0200
Subject: [PATCH 158/348] [FIX]Vehicle state remove
bzr revid: dle@openerp.com-20121018153816-7tqo9s7rlokly00x
---
addons/fleet/fleet.py | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index c441b135e21..eff982720b9 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -374,7 +374,7 @@ class fleet_vehicle(osv.Model):
'log_contracts' : fields.one2many('fleet.vehicle.log.contract','vehicle_id', 'Contracts'),
'acquisition_date' : fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
'color' : fields.char('Color',size=32, help='Color of the vehicle'),
- 'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle'),
+ 'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle',ondelete="set null"),
'location' : fields.char('Location',size=32, help='Location of the vehicle (garage, ...)'),
'doors' : fields.integer('Doors Number', help='Number of doors of the vehicle'),
'tag_ids' :fields.many2many('fleet.vehicle.tag','fleet_vehicle_vehicle_tag_rel','vehicle_tag_id','tag_id','Tags'),
@@ -450,12 +450,25 @@ class fleet_vehicle(osv.Model):
changes = []
if 'driver' in vals:
value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
- changes.append('Driver: from \'' + self.browse(cr, uid, ids, context)[0].driver.name + '\' to \'' + value+'\'')
+ olddriver = self.browse(cr, uid, ids, context)[0].driver
+ if olddriver:
+ olddriver = olddriver.name
+ else:
+ olddriver = 'None'
+ changes.append('Driver: from \'' + olddriver + '\' to \'' + value+'\'')
if 'state' in vals:
value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
- changes.append('State: from \'' + self.browse(cr, uid, ids, context)[0].state.name + '\' to \'' + value+'\'')
+ oldstate = self.browse(cr, uid, ids, context)[0].state
+ if oldstate:
+ oldstate=oldstate.name
+ else:
+ oldstate = 'None'
+ changes.append('State: from \'' + oldstate + '\' to \'' + value+'\'')
if 'license_plate' in vals:
- changes.append('License Plate: from \'' + self.browse(cr, uid, ids, context)[0].license_plate + '\' to \'' + vals['license_plate']+'\'')
+ old_license_plate = self.browse(cr, uid, ids, context)[0].license_plate
+ if not old_license_plate:
+ old_license_plate = 'None'
+ changes.append('License Plate: from \'' + old_license_plate + '\' to \'' + vals['license_plate']+'\'')
vehicle_id = super(fleet_vehicle,self).write(cr, uid, ids, vals, context)
From 646f2ca2c2a6418c2ed7091ea4950057f9fd0138 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Thu, 18 Oct 2012 18:06:00 +0200
Subject: [PATCH 159/348] [IMP]Dashboard view
bzr revid: dle@openerp.com-20121018160600-t7istc3de8mw8j7o
---
addons/fleet/fleet.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index eff982720b9..cfb7464437b 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -393,8 +393,8 @@ class fleet_vehicle(osv.Model):
'image_medium': fields.related('model_id','image_medium',type="binary",string="Logo",store=False),
'image_small': fields.related('model_id','image_small',type="binary",string="Logo",store=False),
- 'contract_renewal_due_soon' : fields.function(get_next_contract_reminder,type="integer",string='Contract Renewal Due Soon',store=False),
- 'contract_renewal_overdue' : fields.function(get_overdue_contract_reminder,type="integer",string='Contract Renewal Overdue',store=False),
+ 'contract_renewal_due_soon' : fields.function(get_next_contract_reminder,type="integer",string='Contracts to renew',store=False),
+ 'contract_renewal_overdue' : fields.function(get_overdue_contract_reminder,type="integer",string='Contracts Overdued',store=False),
'car_value': fields.float('Car value', help='Value of the bought vehicle'),
#'leasing_value': fields.float('Leasing value',help='Value of the leasing(Monthly, usually'),
From 14810cc807c7a680e6e63b081c6b78b3bd6e3218 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Fri, 19 Oct 2012 09:25:37 +0200
Subject: [PATCH 160/348] [ADD]Board file ...
bzr revid: dle@openerp.com-20121019072537-3exx8fg2vbwbe3gk
---
addons/fleet/board_fleet_view.xml | 103 ++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
create mode 100644 addons/fleet/board_fleet_view.xml
diff --git a/addons/fleet/board_fleet_view.xml b/addons/fleet/board_fleet_view.xml
new file mode 100644
index 00000000000..01bc041477e
--- /dev/null
+++ b/addons/fleet/board_fleet_view.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+ fleet.vehicle.tree
+ fleet.vehicle
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Fuel Costs by Month
+ fleet.vehicle.log.fuel
+
+ form
+ tree
+
+
+
+ Fuel Costs by Month
+ fleet.vehicle.log.services
+
+ form
+ tree
+
+
+
+ Costs by Month
+ fleet.vehicle.cost
+
+ form
+ tree
+
+
+
+ Vehicles
+ fleet.vehicle
+
+ form
+ tree
+
+
+
+ board.fleet.form
+ board.board
+
+
+
+
+
+
+ Fleet
+ board.board
+ form
+ form
+ menu
+
+
+
+
+ Fleet dashboard is empty.
+
+ To add your first report into this dashboard, go to any
+ menu, switch to list or graph view, and click 'Add to
+ Dashboard' in the extended search options.
+
+ You can filter and group data before inserting into the
+ dashboard using the search options.
+
+
Click to create a new contract.
@@ -522,7 +535,7 @@
fleet.vehicle.odometer
-
+
@@ -610,7 +623,7 @@
fleet.vehicle.log.fuel
-
+
@@ -705,7 +718,7 @@
fleet.vehicle.log.services.graph
fleet.vehicle.log.services
-
+
From e7d66873d27dcd356cc41edf50784f6ec07177df Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Fri, 19 Oct 2012 11:22:35 +0200
Subject: [PATCH 163/348] [ADD]buttons in vehicle form and change of fields
name in contracts form view
bzr revid: csn@openerp.com-20121019092235-9t5f9f65ewq9c0bc
---
addons/fleet/fleet.py | 30 +++++++++++++++++++----
addons/fleet/fleet_view.xml | 47 +++++++++++++++++++++++++++----------
2 files changed, 60 insertions(+), 17 deletions(-)
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index fce4ffab400..b5b995d7d8e 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -252,6 +252,28 @@ class fleet_vehicle(osv.Model):
res['domain']=[('vehicle_id','=', ids[0])]
return res
+ def act_show_log_cost(self, cr, uid, ids, context=None):
+ """ 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['context'] = {
+ 'default_vehicle_id': ids[0]
+ }
+ res['domain']=[('vehicle_id','=', ids[0])]
+ return res
+
+ def act_show_log_odometer(self, cr, uid, ids, context=None):
+ """ 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['context'] = {
+ 'default_vehicle_id': ids[0]
+ }
+ res['domain']=[('vehicle_id','=', ids[0])]
+ return 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):
@@ -367,7 +389,7 @@ class fleet_vehicle(osv.Model):
'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)'),
'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', domain="[('employee','=',True)]"),
+ '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'),
'log_fuel' : fields.one2many('fleet.vehicle.log.fuel','vehicle_id', 'Fuel Logs'),
'log_services' : fields.one2many('fleet.vehicle.log.services','vehicle_id', 'Services Logs'),
@@ -855,11 +877,11 @@ class fleet_vehicle_log_contract(osv.Model):
#'cost_type': fields.many2one('fleet.service.type', 'Service type', required=False, help='Service type purchased with this cost', domain="[('category','=','contract')]"),
- 'start_date' : fields.date('Start Date', required=False, help='Date when the coverage of the contract begins'),
- 'expiration_date' : fields.date('Expiration Date', required=False, help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
+ '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', 'Insurer', domain="[('supplier','=',True)]"),
+ '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'),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index abe63d014ce..44d622728bc 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -184,8 +184,10 @@
-
-
+
+
+
+
@@ -322,7 +324,7 @@
+
+
+
+
@@ -383,8 +404,8 @@
-
-
+
+
@@ -396,7 +417,7 @@
-
+
@@ -406,11 +427,11 @@
-
-
-
+
+
+
-
+
-
-
@@ -454,6 +457,17 @@
+
+
+
fleet.vehicle.log.contract.tree
fleet.vehicle.log.contract
@@ -467,7 +481,6 @@
-
From 183646f3df0ab079686d91c77beff441cba7ef61 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Mon, 22 Oct 2012 17:27:19 +0200
Subject: [PATCH 172/348] [ADD]wizard for renewing contracts
bzr revid: csn@openerp.com-20121022152719-jywhocuqj9sxnv5x
---
addons/fleet/__init__.py | 3 ++-
addons/fleet/__openerp__.py | 3 ++-
addons/fleet/fleet.py | 42 ++++++++++++++++++++++++-------------
3 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py
index a09fca549ce..369c7f372c6 100644
--- a/addons/fleet/__init__.py
+++ b/addons/fleet/__init__.py
@@ -1,2 +1,3 @@
# import the hr_car code
-import fleet
\ No newline at end of file
+import fleet
+import wizard
\ No newline at end of file
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 3689040bef4..74f1df2e336 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -20,7 +20,8 @@ Vehicle, leasing, insurances, cost
'data' : [
'fleet_view.xml',
'data.xml',
- 'board_fleet_view.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 59af1d77d79..66e8cfcfe48 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -944,21 +944,35 @@ class fleet_vehicle_log_contract(osv.Model):
def act_renew_contract(self,cr,uid,ids,context=None):
contracts = self.browse(cr,uid,ids,context=context)
- res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract', context)
+ res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','act_renew_contract_wizard', context)
for element in contracts:
- print '--------------------------'
- print element.vehicle_id.id
- print element.cost_type.id
- print element.amount
- print element.odometer
- print element.insurer_id
- res['context'] = {
- 'default_vehicle_id': element.vehicle_id.id,
- 'default_cost_type': element.cost_type.id,
- 'default_amount': element.amount,
- 'default_odometer': element.odometer,
- #'default_insurer_id': element.insurer_id,
- }
+ temp = []
+ temp.append(('default_vehicle_id',element.vehicle_id.id))
+ temp.append(('default_cost_type',element.cost_type.id))
+ temp.append(('default_amount',element.amount))
+ temp.append(('default_odometer_id',element.odometer_id.id))
+ temp.append(('default_odometer_unit',element.odometer_unit))
+ temp.append(('default_insurer_id',element.insurer_id.id))
+ cost_temp = []
+ for costs in element.cost_ids:
+ cost_temp.append(costs.id)
+ temp.append(('default_cost_ids',cost_temp))
+ temp.append(('default_date',time.strftime('%Y-%m-%d')))
+ temp.append(('default_start_date',element.expiration_date))
+ temp.append(('default_purchaser_id',element.purchaser_id.id))
+ temp.append(('default_ins_ref',element.ins_ref))
+ temp.append(('default_state','open'))
+ temp.append(('default_notes',element.notes))
+
+ res['context'] = dict(temp)
+ #res['context']['default_vehicle_id'] = element.vehicle_id.id
+ #res['context'] = {
+ # 'default_vehicle_id': element.vehicle_id.id,
+ # 'default_cost_type': element.cost_type.id,
+ # 'default_amount': element.amount,
+ # 'default_odometer': element.odometer,
+ # 'default_insurer_id': element.insurer_id.id,
+ #}
#res['domain']=[('vehicle_id','=', ids[0])]
return res
#return None
From a1da4c7fad24dfdc4faceb1f0dcc5d00a5e0d246 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert
Date: Mon, 22 Oct 2012 17:27:36 +0200
Subject: [PATCH 173/348] [ADD]wizard for renewing contracts
bzr revid: csn@openerp.com-20121022152736-fiqiyp2sh1pr3lbw
---
addons/fleet/wizard/__init__.py | 1 +
addons/fleet/wizard/renew_contract.py | 140 ++++++++++++++++++++
addons/fleet/wizard/renew_contract_view.xml | 70 ++++++++++
3 files changed, 211 insertions(+)
create mode 100644 addons/fleet/wizard/__init__.py
create mode 100644 addons/fleet/wizard/renew_contract.py
create mode 100644 addons/fleet/wizard/renew_contract_view.xml
diff --git a/addons/fleet/wizard/__init__.py b/addons/fleet/wizard/__init__.py
new file mode 100644
index 00000000000..bc7dae97d56
--- /dev/null
+++ b/addons/fleet/wizard/__init__.py
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..04f21227eb3
--- /dev/null
+++ b/addons/fleet/wizard/renew_contract.py
@@ -0,0 +1,140 @@
+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
new file mode 100644
index 00000000000..9113ebb595e
--- /dev/null
+++ b/addons/fleet/wizard/renew_contract_view.xml
@@ -0,0 +1,70 @@
+
+
+
+
+ fleet.vehicle.contract.wizard.form
+ fleet.vehicle.contract.renew
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 36fabd70a06bf53611211acdb932bf4554c15755 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)"
Date: Tue, 23 Oct 2012 11:57:41 +0530
Subject: [PATCH 174/348] [IMP] purchase : string changed
bzr revid: rpr@tinyerp.com-20121023062741-piioezk25796h9jf
---
addons/purchase/res_config.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 19b059d4d5b..75e42d14905 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,7 +43,7 @@ class purchase_config_settings(osv.osv_memory):
'group_costing_method':fields.boolean("Compute product cost price based on average cost",
implied_group='product.group_costing_method',
help="""Allows you to compute product cost price based on average cost."""),
- 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicings",
+ 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
implied_group='purchase.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier",
From a519d96aa9713574144340c6548032bfbf03178f Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)"
Date: Tue, 23 Oct 2012 12:26:10 +0530
Subject: [PATCH 175/348] [IMP] sale : string changed from plugin to plug-in
bzr revid: rpr@tinyerp.com-20121023065610-41a67irfmb0t4tpn
---
addons/base_setup/res_config.py | 4 ++--
addons/plugin_outlook/plugin_outlook.xml | 2 +-
addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 0dc4a0f0794..e7898395d62 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -60,14 +60,14 @@ class sale_config_settings(osv.osv_memory):
'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
'module_crm': fields.boolean('CRM'),
- 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plugin',
+ 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in',
help="""The plugin allows you archive email and its attachments to the selected
OpenERP objects. You can select a partner, or a lead and
attach the selected mail as a .eml file in
the attachment of a selected record. You can create documents for CRM Lead,
Partner from the selected emails.
This installs the module plugin_thunderbird."""),
- 'module_plugin_outlook': fields.boolean('Enable Outlook plugin',
+ 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in',
help="""The Outlook plugin allows you to select an object that you would like to add
to your email and its attachments from MS Outlook. You can select a partner,
or a lead object and archive a selected
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index e99fbf72b6d..6ecbd14b31a 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -51,7 +51,7 @@
-
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 5ea5fc38219..cf30bdf0e9b 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -57,7 +57,7 @@
-
From 23d286ef524c7993c8416bcea52a1a80b62e5616 Mon Sep 17 00:00:00 2001
From: "Denis Ledoux dle@openerp.com" <>
Date: Tue, 23 Oct 2012 09:53:28 +0200
Subject: [PATCH 176/348] [ADD]Generated costs for contracts
bzr revid: dle@openerp.com-20121023075328-63q25k9iqigc1izf
---
addons/fleet/demo.xml | 5 +++++
addons/fleet/fleet.py | 9 +++++++++
addons/fleet/fleet_view.xml | 40 ++++++++++++++++++++++++++-----------
3 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/addons/fleet/demo.xml b/addons/fleet/demo.xml
index 7c6e1c5ab0a..1603c2ee654 100644
--- a/addons/fleet/demo.xml
+++ b/addons/fleet/demo.xml
@@ -732,6 +732,7 @@
450
+ monthly
2012-01-01
@@ -768,6 +769,7 @@
400
+ monthly
2012-01-01
@@ -804,6 +806,7 @@
400
+ monthly
2012-01-01
@@ -840,6 +843,7 @@
400
+ monthly
2012-01-01
@@ -876,6 +880,7 @@
400
+ monthly
2012-01-01
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 66e8cfcfe48..7fed70f6752 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -48,6 +48,8 @@ class fleet_vehicle_cost(osv.Model):
'cost_ids' : fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'),
'date' :fields.date('Date',help='Date when the cost has been executed'),
+
+ 'contract_id' : fields.many2one('fleet.vehicle.log.contract', 'Contract', required=False, help='Contract attached to this cost'),
}
_default ={
@@ -60,6 +62,11 @@ class fleet_vehicle_cost(osv.Model):
if 'parent_id' in data and data['parent_id']:
data['vehicle_id'] = self.browse(cr, uid, data['parent_id'], context=context).vehicle_id.id
data['date'] = self.browse(cr, uid, data['parent_id'], context=context).date
+ if 'contract_id' in data and data['contract_id']:
+ print str(data)
+ data['vehicle_id'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).vehicle_id.id
+ data['cost_type'] = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context).cost_type.id
+ print 'Contract : '+ str(data['contract_id']) + ' Add generated cost for vehicle ' + str(data['vehicle_id']) + ' with cost type : ' + str(data['cost_type'])
cost_id = super(fleet_vehicle_cost, self).create(cr, uid, data, context=context)
return cost_id
@@ -999,6 +1006,8 @@ class fleet_vehicle_log_contract(osv.Model):
'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),
+ 'cost_frequency': fields.selection([('daily', 'Daily'),('weekly','Weekly'),('monthly','Monthly'),('yearly','Yearly')], 'Cost Frequency', help='Frequency of the costs',required=True),
+ 'generated_cost_ids' : fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs',ondelete='cascade'),
}
_defaults = {
'purchaser_id': lambda self, cr, uid, ctx: uid,
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index e58ed5bb5d5..9b172e9904c 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -419,7 +419,11 @@
-
+
+
+
+
+
@@ -441,14 +445,28 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -481,6 +499,7 @@
+
@@ -719,11 +738,8 @@
-
-
-
From 0696aa196d473ba2049f6f90b1b825f164bc8d5a Mon Sep 17 00:00:00 2001
From: "Ajay Chauhan (OpenERP)"
Date: Tue, 23 Oct 2012 14:19:49 +0530
Subject: [PATCH 177/348] [IMP] portal_sale: change help text for menus
bzr revid: cha@tinyerp.com-20121023084949-vn1fz0axxqbj1oyt
---
addons/portal_sale/portal_sale_view.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 6b25d87b791..b46175f7feb 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -45,7 +45,7 @@
kanban,tree,form
- No public products.
+ There are no public products.
@@ -65,7 +65,7 @@
{'type':'receipt'}
current
- You don't have any payment.
+ You don't have any refunds or payments.
|