From 1e55fbcb10b96c51a5503bd758083ff1fa5c0bf4 Mon Sep 17 00:00:00 2001 From: Remi <remi@le-filament.com> Date: Fri, 9 Aug 2019 16:24:14 +0200 Subject: [PATCH] Fix coding rules and remove UTF-8 --- LICENSE | 42 ------------------------------------- README.rst | 1 - __init__.py | 1 - __manifest__.py | 3 --- models/contribution.py | 3 +-- models/effectif.py | 1 - models/financial_tools.py | 1 - models/legal_event.py | 3 +-- models/liasse_fiscale.py | 3 +-- models/membership_period.py | 3 +-- models/ministry_list.py | 3 +-- models/partner_info.py | 19 ++++++++--------- models/questionnaire.py | 3 +-- models/res_partner.py | 31 +++++++++++++-------------- models/revision.py | 3 +-- models/table_cg_scop.py | 3 +-- 16 files changed, 32 insertions(+), 91 deletions(-) diff --git a/LICENSE b/LICENSE index 3ffc567..eb37caf 100644 --- a/LICENSE +++ b/LICENSE @@ -617,45 +617,3 @@ Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file diff --git a/README.rst b/README.rst index 4c898f9..c5d091a 100644 --- a/README.rst +++ b/README.rst @@ -32,4 +32,3 @@ Maintainer :target: https://le-filament.com This module is maintained by Le Filament - diff --git a/__init__.py b/__init__.py index b44d765..31660d6 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/__manifest__.py b/__manifest__.py index 9d26dab..c6499cf 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -# Copyright <YEAR(S)> <AUTHOR(S)> -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { "name": "CG SCOP - Gestion Contacts", "summary": "CG SCOP - Gestion des contacts", diff --git a/models/contribution.py b/models/contribution.py index 379ff0a..48c8913 100644 --- a/models/contribution.py +++ b/models/contribution.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -39,4 +38,4 @@ class ContributionType(models.Model): _name = "contribution.type" _description = "Contribution type" - name = fields.Char('Contribution type') \ No newline at end of file + name = fields.Char('Contribution type') diff --git a/models/effectif.py b/models/effectif.py index 000ace6..3637695 100644 --- a/models/effectif.py +++ b/models/effectif.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/models/financial_tools.py b/models/financial_tools.py index 5c01439..a02afd7 100644 --- a/models/financial_tools.py +++ b/models/financial_tools.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/models/legal_event.py b/models/legal_event.py index 52b8c5f..cf55cc0 100644 --- a/models/legal_event.py +++ b/models/legal_event.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -26,4 +25,4 @@ class EventType(models.Model): _name = "event.type" _description = "Event type" - name = fields.Char('Event type') \ No newline at end of file + name = fields.Char('Event type') diff --git a/models/liasse_fiscale.py b/models/liasse_fiscale.py index fdf4c27..7514c12 100644 --- a/models/liasse_fiscale.py +++ b/models/liasse_fiscale.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -33,4 +32,4 @@ class LiassesFiscales(models.Model): pension_fund = fields.Integer("Caisse retraite/solidarité") others = fields.Integer("Autres") social_capital = fields.Integer("Capital social") - equity = fields.Integer("Capitaux propres") \ No newline at end of file + equity = fields.Integer("Capitaux propres") diff --git a/models/membership_period.py b/models/membership_period.py index 3fad2a2..7389f9a 100644 --- a/models/membership_period.py +++ b/models/membership_period.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -20,7 +19,7 @@ class MembershipPeriod(models.Model): start = fields.Date('Début d’adhésion', default='2019-01-01') end = fields.Date('Fin d’adhésion') end_reason_membership = fields.Many2one( - 'reason.end.membership', + 'reason.end.membership', string='Motif de fin d’adhésion') membership_number = fields.Char("No adhérent") membership_status = fields.Selection("Statut adhésion") diff --git a/models/ministry_list.py b/models/ministry_list.py index a85a933..d3a003d 100644 --- a/models/ministry_list.py +++ b/models/ministry_list.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -30,4 +29,4 @@ class MinistryList(models.Model): ('reserve', 'Réserve') ], string="Avis") motivational_advice = fields.Text( - "Motivation de l’avis") \ No newline at end of file + "Motivation de l’avis") diff --git a/models/partner_info.py b/models/partner_info.py index 44c896c..9b664cc 100644 --- a/models/partner_info.py +++ b/models/partner_info.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -19,11 +18,11 @@ class PartnerInfo(models.Model): start = fields.Date('Début de validité', default='2019-01-01') end = fields.Date('Fin de validitié') end_reason_period = fields.Many2one( - 'reasons.periods', + 'reasons.periods', string='Motif de fin de validité') comments = fields.Text('Commentaires') cooperative_form = fields.Many2one( - 'cooperative.form', + 'cooperative.form', string="Cooperative form") cae = fields.Boolean("CAE") scop_priming = fields.Boolean("Scop d'amorçage Oui/Non") @@ -35,9 +34,9 @@ class PartnerInfo(models.Model): zip = fields.Char(change_default=True) city = fields.Char() state_id = fields.Many2one( - "res.country.state", - string='State', - ondelete='restrict', + "res.country.state", + string='State', + ondelete='restrict', domain="[('country_id', '=?', country_id)]") country_id = fields.Many2one( 'res.country', string='Country', ondelete='restrict') @@ -53,11 +52,11 @@ class PartnerInfo(models.Model): string='Statut juridique') capital = fields.Integer('Capital social') naf = fields.Many2one( - 'code.naf', + 'code.naf', string='Code NAF') agrement = fields.Many2one( - 'agrement', + 'agrement', string='Agrement') sector = fields.Many2one( - 'sector.activity', - string='Secteur d’activité') \ No newline at end of file + 'sector.activity', + string='Secteur d’activité') diff --git a/models/questionnaire.py b/models/questionnaire.py index ffcd781..b8ef9e3 100644 --- a/models/questionnaire.py +++ b/models/questionnaire.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -18,4 +17,4 @@ class Questionnaire(models.Model): date_issue = fields.Date("Date d'émission", default="2019-01-01") date_receipt = fields.Date("Date d'émission") workforce = fields.Integer("Effectif") - workforce_societary = fields.Integer("Effectif sociétaire") \ No newline at end of file + workforce_societary = fields.Integer("Effectif sociétaire") diff --git a/models/res_partner.py b/models/res_partner.py index cfd686a..3146dfc 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -53,13 +52,13 @@ class ScopPartner(models.Model): ('transmission', 'Transmission'), ('reprise', 'reprise')], string='Origine création en coop') - project_status = fields.Selection([ - ('information', 'Phase dinformation'), - ('pre-diagnostic', 'Phase de pré-diagnostic'), - ('accompagnement', 'Phase d accompagnement'), - ('adhesion', 'Phase d adhésion'), - ('suivi', 'Phase de suivi'), - ('abandoonne', 'Projet abandonné')], + project_status = fields.Selection( + [('information', 'Phase dinformation'), + ('pre-diagnostic', 'Phase de pré-diagnostic'), + ('accompagnement', 'Phase d accompagnement'), + ('adhesion', 'Phase d adhésion'), + ('suivi', 'Phase de suivi'), + ('abandoonne', 'Projet abandonné')], string='Statut projet') creation_delegate = fields.Many2one( 'res.partner', @@ -88,7 +87,7 @@ class ScopPartner(models.Model): 'res.partner', string='Coord. Expert-Comptable', domain=[('is_company', '=', True)]) - + # Informations fiscales/financières first_closeout = fields.Date( 'Date clôture 1er bilan', default='2019-01-01') @@ -136,7 +135,7 @@ class ScopPartner(models.Model): questionnaire_ids = fields.One2many( comodel_name='questionnaire', inverse_name='partner_id', - string='Questionnaire') + string='Questionnaire') # Liasse fiscale liasse_fiscale_ids = fields.One2many( @@ -154,13 +153,13 @@ class ScopPartner(models.Model): revision_ids = fields.One2many( comodel_name='revision', inverse_name='partner_id', - string='Liste des Révisions') + string='Liste des Révisions') # Evènements juridiques legal_event_ids = fields.One2many( comodel_name='legal.event', inverse_name='partner_id', - string='Evènements juridiques') + string='Evènements juridiques') # Outils financiers financial_tools_ids = fields.One2many( @@ -170,9 +169,9 @@ class ScopPartner(models.Model): # Contacts # contacts_list = fields.One2many( - # comodel_name='res.partner', - # string='Liste des contacts') - + # comodel_name='res.partner', + # string='Liste des contacts') + # Champs pour contacts year_birthday = fields.Integer("Année de naissance") level_study = fields.Selection([ @@ -189,7 +188,7 @@ class ScopPartner(models.Model): 'origin', string="Origine du contact") legality_contact = fields.Char("Licéité du contact") - + class Subscription(models.Model): _name = "subscription" diff --git a/models/revision.py b/models/revision.py index 7b52d16..9662685 100644 --- a/models/revision.py +++ b/models/revision.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -24,4 +23,4 @@ class Revision(models.Model): 'res.partner', string='Organisme de révision', domain=[('is_company', '=', True)]) - comment = fields.Text("Commentaire") \ No newline at end of file + comment = fields.Text("Commentaire") diff --git a/models/table_cg_scop.py b/models/table_cg_scop.py index 1452f40..7fda681 100644 --- a/models/table_cg_scop.py +++ b/models/table_cg_scop.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # © 2019 Le Filament (<http://www.le-filament.com>) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -51,4 +50,4 @@ class CodeNaf(models.Model): _name = "code.naf" _description = "Code Naf" - name = fields.Char('Code Naf') \ No newline at end of file + name = fields.Char('Code Naf') -- GitLab