odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[ADD]Distinction in contracts for generated costs and activation costs 

bzr revid: dle@openerp.com-20121023135901-cpsrbry9uwl84bg2
This commit is contained in:
Denis Ledoux dle@openerp.com 2012-10-23 15:59:01 +02:00
parent ceec3ec123
commit 5a929ccd14
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/fleet/demo.xml
View File

@ -731,7 +731,8 @@
<record id="log_contract_1" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_2" />
<field name="amount">450</field>
<field name="amount">0</field>
<field name="cost_generated">450</field>
<field name="cost_frequency">monthly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
@ -768,7 +769,8 @@
<record id="log_contract_2" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_1" />
<field name="amount">400</field>
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">weekly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
@ -805,7 +807,8 @@
<record id="log_contract_3" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_3" />
<field name="amount">400</field>
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">daily</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
@ -842,7 +845,8 @@
<record id="log_contract_4" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_4" />
<field name="amount">400</field>
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">yearly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>
@ -879,7 +883,8 @@
<record id="log_contract_5" model="fleet.vehicle.log.contract" >
<field name="vehicle_id" ref="vehicle_5" />
<field name="amount">400</field>
<field name="amount">0</field>
<field name="cost_generated">400</field>
<field name="cost_frequency">monthly</field>
<field name="cost_type" ref="type_service_56"/>
<field name="date">2012-01-01</field>

6
addons/fleet/fleet.py
View File

@ -878,7 +878,7 @@ class fleet_vehicle_log_contract(osv.Model):
if not nbr:
contract = self.pool.get('fleet.vehicle.log.contract').browse(cr,uid,contract_id,context=context)
data = {'amount' : contract.amount,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id}
data = {'amount' : contract.cost_generated,'date' : d,'vehicle_id' : contract.vehicle_id.id,'cost_type' : contract.cost_type.id,'contract_id' : contract_id}
cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context)
return True
@ -1026,9 +1026,6 @@ class fleet_vehicle_log_contract(osv.Model):
_order='state,expiration_date'
_columns = {
'name' : fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True),
#'name' : fields.char('Name',size=64),
#'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('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)'),
@ -1044,6 +1041,7 @@ 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_generated': fields.float('Generated costs amount'),
'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'),
}

5
addons/fleet/fleet_view.xml
View File

@ -419,9 +419,10 @@
<group string="Contract details">
<field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
<field name="cost_type" string="Contract Type" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
<label for="amount"/>
<field name="amount" string="Activation Cost"/>
<label for="cost_generated"/>
<div>
<field name="amount" string="Invoice Amount" class="oe_inline"/>
<field name="cost_generated" class="oe_inline"/>
<field name="cost_frequency" class="oe_inline"/>
</div>
</group>