pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] fleet: Rename action methods according to guidelines

Browse Source 
closes odoo/odoo#71915

Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
This commit is contained in:
Yannick Tivisse
2021-06-15 03:54:33 +00:00
parent f9ae3fdc18
commit 77a27c574d
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/fleet/models/fleet_vehicle_log_contract.py
+16 -18
View File
@@ -84,35 +84,33 @@ class FleetVehicleLogContract(models.Model):
def write(self, vals):
res = super(FleetVehicleLogContract, self).write(vals)
if 'start_date' in vals or 'expiration_date' in vals:
date_today = fields.Date.from_string(fields.Date.today())
futur_contracts = self.env[self._name]
running_contracts = self.env[self._name]
expired_contracts = self.env[self._name]
date_today = fields.Date.today()
future_contracts, running_contracts, expired_contracts = self.env[self._name], self.env[self._name], self.env[self._name]
for contract in self.filtered(lambda c: c.start_date and c.state != 'closed'):
if date_today < contract.start_date:
futur_contracts |= contract
elif not contract.expiration_date or contract.start_date < date_today < contract.expiration_date:
future_contracts |= contract
elif not contract.expiration_date or contract.start_date <= date_today < contract.expiration_date:
running_contracts |= contract
else:
expired_contracts |= contract
futur_contracts.write({'state': 'futur'})
running_contracts.write({'state': 'open'})
expired_contracts.write({'state': 'expired'})
future_contracts.action_draft()
running_contracts.action_open()
expired_contracts.action_expire()
if vals.get('expiration_date') or vals.get('user_id'):
self.activity_reschedule(['fleet.mail_act_fleet_contract_to_renew'], date_deadline=vals.get('expiration_date'), new_user_id=vals.get('user_id'))
return res
def contract_close(self):
for record in self:
record.state = 'closed'
def action_close(self):
self.write({'state': 'closed'})
def contract_draft(self):
for record in self:
record.state = 'futur'
def action_draft(self):
self.write({'state': 'futur'})
def contract_open(self):
for record in self:
record.state = 'open'
def action_open(self):
self.write({'state': 'open'})
def action_expire(self):
self.write({'state': 'expired'})
@api.model
def scheduler_manage_contract_expiration(self):
addons/fleet/views/fleet_vehicle_cost_views.xml
+4 -4
View File
@@ -6,10 +6,10 @@
<field name="arch" type="xml">
<form string="Contract logs">
<header>
<button name="contract_open" states="futur" type="object" string="Start Contract" class="oe_highlight" groups="fleet.fleet_group_manager"/>
<button name="contract_close" states="futur" type="object" string="Cancel" groups="fleet.fleet_group_manager"/>
<button name="contract_close" states="open,expired,futur" type="object" class="oe_highlight" string="Close Contract" groups="fleet.fleet_group_manager"/>
<button name="contract_draft" states="closed" type="object" string="Reset To Draft" groups="fleet.fleet_group_manager"/>
<button name="action_open" states="futur" type="object" string="Start Contract" class="oe_highlight" groups="fleet.fleet_group_manager"/>
<button name="action_close" states="futur" type="object" string="Cancel" groups="fleet.fleet_group_manager"/>
<button name="action_close" states="open,expired,futur" type="object" class="oe_highlight" string="Close Contract" groups="fleet.fleet_group_manager"/>
<button name="action_draft" states="closed" type="object" string="Reset To Draft" groups="fleet.fleet_group_manager"/>
<field name="state" widget="statusbar" />
</header>
<sheet>