From 89df895d17dfaef0c4bb55116b98ef405167c3f4 Mon Sep 17 00:00:00 2001 From: Remi <remi@le-filament.com> Date: Mon, 1 Apr 2019 14:33:16 +0200 Subject: [PATCH] Fix according to coding rules --- __init__.py | 2 +- __manifest__.py | 37 +++++++++++----------- models/__init__.py | 2 +- models/lefilament_cheque.py | 25 ++++++++------- views/lefilament_cheque_view.xml | 54 +++++++++++++++----------------- 5 files changed, 59 insertions(+), 61 deletions(-) diff --git a/__init__.py b/__init__.py index a5e7e1d..cde864b 100644 --- a/__init__.py +++ b/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -import models \ No newline at end of file +from . import models diff --git a/__manifest__.py b/__manifest__.py index 58376d1..89fde4a 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -4,28 +4,27 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { - 'name': 'Le Filament - Chèques', + 'name': 'Le Filament - Chèques', - 'summary': """Suivi chèques""", + 'summary': """Suivi chèques""", - 'version': '10.0.1.0', - 'license': 'AGPL-3', - 'description': """ - Liste et statut des chèques émis - """, - - 'author': 'LE FILAMENT', - 'category': 'Account', - 'depends': ['account'], - 'contributors': [ + 'version': '10.0.1.0', + 'license': 'AGPL-3', + 'description': """ + Liste et statut des chèques émis + """, + 'author': 'LE FILAMENT', + 'category': 'Account', + 'depends': ['account'], + 'contributors': [ 'Benjamin Rivier <benjamin@le-filament.com>', ], - 'website': 'http://www.le-filament.com', - 'data': [ - 'security/ir.model.access.csv', - 'views/lefilament_cheque_view.xml', - ], - 'qweb': [ + 'website': 'http://www.le-filament.com', + 'data': [ + 'security/ir.model.access.csv', + 'views/lefilament_cheque_view.xml', + ], + 'qweb': [ 'static/src/xml/*.xml', ], -} \ No newline at end of file +} diff --git a/models/__init__.py b/models/__init__.py index e4a3ec2..a8afbe1 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -import lefilament_cheque \ No newline at end of file +from . import lefilament_cheque diff --git a/models/lefilament_cheque.py b/models/lefilament_cheque.py index b76ef42..9141728 100644 --- a/models/lefilament_cheque.py +++ b/models/lefilament_cheque.py @@ -3,18 +3,21 @@ # © 2017 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import fields, models class LefilamentCheque(models.Model): - _name = 'lefilament.cheque' - _order = 'name desc' + _name = 'lefilament.cheque' + _order = 'name desc' - - name = fields.Char("Numéro", required=True,) - date_issue = fields.Date("Date d'émission", required=True,) - date_collection = fields.Date("Date d'encaissement") - partner_id = fields.Many2one("res.partner", string="Parteraire") - description =fields.Char("Détail", required=True,) - amount = fields.Float("Montant", required=True,) - status = fields.Selection([("current", "en cours"), ("collected","encaissé"), ("cancel", "annulé")], string="Statut", default="current") \ No newline at end of file + name = fields.Char("Numéro", required=True,) + date_issue = fields.Date("Date d'émission", required=True,) + date_collection = fields.Date("Date d'encaissement") + partner_id = fields.Many2one("res.partner", string="Parteraire") + description = fields.Char("Détail", required=True,) + amount = fields.Float("Montant", required=True,) + status = fields.Selection([("current", "en cours"), + ("collected", "encaissé"), + ("cancel", "annulé")], + string="Statut", + default="current") diff --git a/views/lefilament_cheque_view.xml b/views/lefilament_cheque_view.xml index a0de7dd..c548476 100644 --- a/views/lefilament_cheque_view.xml +++ b/views/lefilament_cheque_view.xml @@ -1,44 +1,44 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <data> - <!-- Event Form View --> - <record id="lefilament_cheque_view_form" model="ir.ui.view"> - <field name="name">lefilament.cheque.form</field> - <field name="model">lefilament.cheque</field> - <field name="arch" type="xml"> - <form string="Cheques"> - <sheet> + <data> + <!-- Event Form View --> + <record id="lefilament_cheque_view_form" model="ir.ui.view"> + <field name="name">lefilament.cheque.form</field> + <field name="model">lefilament.cheque</field> + <field name="arch" type="xml"> + <form string="Cheques"> + <sheet> <h3><field name='name' /></h3> - <group> - <group> + <group> + <group> <field name='date_issue' /> - <field name='partner_id' /> + <field name='partner_id' /> <field name='description' /> - </group> - <group> + </group> + <group> <field name='amount' /> - <field name='status' /> - <field name='date_collection' /> - </group> - </group> - </sheet> - </form> - </field> - </record> + <field name='status' /> + <field name='date_collection' /> + </group> + </group> + </sheet> + </form> + </field> + </record> - <record model="ir.ui.view" id="lefilament_cheque_view_tree"> + <record model="ir.ui.view" id="lefilament_cheque_view_tree"> <field name="name">lefilament.cheque.tree</field> <field name="model">lefilament.cheque</field> <field name="arch" type="xml"> <tree string="Cheques" editable="top" decoration-primary="status=='collected'" decoration-danger="status=='cancel'" decoration-it="status=='cancel'"> - <field name='date_issue' /> + <field name='date_issue' /> <field name='name' /> <field name='description' /> <field name='partner_id' /> <field name='amount' /> <field name='status' /> - <field name='date_collection' /> + <field name='date_collection' /> </tree> </field> </record> @@ -67,7 +67,6 @@ <!-- ###################################### ACTIONS ########################################### --> - <record model="ir.actions.act_window" id="lefilament_cheque_action"> <field name="name">Chèques</field> <field name="res_model">lefilament.cheque</field> @@ -75,12 +74,9 @@ <field name="view_mode">tree,form</field> </record> - <!-- ###################################### MENUS ########################################### --> - <menuitem id="menu_lefilament_cheque" name="Les Chèques" parent="account.menu_finance_entries" sequence="5" action="lefilament_cheque_action" /> - - </data> + </data> </odoo> \ No newline at end of file -- GitLab