diff --git a/__manifest__.py b/__manifest__.py
index 3def71d28e7fc0fa430df7cba1f888815665c0e5..2f7efcd22c929accdb6d1d82b742201b82fc6f5a 100755
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -19,7 +19,6 @@
"security/ir.model.access.csv",
"views/account_invoice.xml",
"views/account_move.xml",
- "views/account_payment_term.xml",
"views/account_payment_order.xml",
"views/account_payment_line.xml",
"views/res_config_settings.xml",
diff --git a/models/__init__.py b/models/__init__.py
index 796e1a90e000ad97359e122f24ed12b32c2a0aa0..1a0bf4d8dc8f0d671c7079b0fa32e101d572f6f7 100755
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -3,7 +3,6 @@
from . import account_invoice
from . import account_payment_order
-from . import account_payment_term
from . import chart_template
from . import res_company
from . import res_config_settings
diff --git a/models/account_invoice.py b/models/account_invoice.py
index c7a13a6872cb2c04aae94ff34535b10f7ce0ddd4..16c9033bad0656caeb6ce5001b49d05ac5defe78 100755
--- a/models/account_invoice.py
+++ b/models/account_invoice.py
@@ -75,18 +75,6 @@ class ScopAccountInvoice(models.Model):
# ------------------------------------------------------
# Override Parent
# ------------------------------------------------------
- # @api.multi
- # def action_invoice_open(self):
- # """
- # Création d'une ligne dans scop.contribution
- # quand une facture cotisation devient valide
- # """
- # results = super(ScopAccountInvoice, self).action_invoice_open()
- # # for inv in self:
- # # if inv.is_contribution:
- # # inv.set_scop_contribution()
- # return results
-
@api.one
def _get_outstanding_info_JSON(self):
super(ScopAccountInvoice, self)._get_outstanding_info_JSON()
@@ -119,48 +107,3 @@ class ScopAccountInvoice(models.Model):
'invoice': line.invoice_id.number
})
self.outstanding_credits_debits_widget = json.dumps(info)
-
- # ------------------------------------------------------
- # Common Function
- # ------------------------------------------------------
- # @api.multi
- # def set_scop_contribution(self):
- # """
- # Création d'une ligne dans scop.contribution
- # """
- # self.ensure_one()
- # if self.is_contribution:
- # year = self.year
- # # Get existing contribution for this year
- # contrib_id = self.env['scop.contribution'].search([
- # ('partner_id', '=', self.partner_id.id),
- # ('year', '=', year),
- # ('type_id', '=', self.type_contribution_id.id)
- # ])
- #
- # # Create scop.contribution line if not exists
- # # for year, partner and type
- # if not contrib_id:
- # contrib_line = self.env['scop.contribution'].create({
- # 'partner_id': self.partner_id.id,
- # 'type_id': self.type_contribution_id.id,
- # 'year': self.year,
- # 'calculation_date': fields.Datetime.now(),
- # 'amount_calculated': self.amount_total,
- # 'amount_called': self.amount_total,
- # 'spreading': self.nb_quarter,
- # 'invoice_id': self.id,
- # })
- # else:
- # contrib_line = self.set_scop_contribution_hook(contrib_id)
- # self.contribution_id = contrib_line.id
- # return contrib_line
- # return False
-
- # def set_scop_contribution_hook(self, contrib_id):
- # """
- # Function that can be inherited if a contrib line already exists
- # :param contrib_id: scop.contribution line
- # :return: scop.contribution
- # """
- # return contrib_id
diff --git a/models/account_payment_term.py b/models/account_payment_term.py
deleted file mode 100644
index f0cc0f550551feac54aa82aca435ca56b354ae59..0000000000000000000000000000000000000000
--- a/models/account_payment_term.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2020 Le Filament
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
-from odoo import fields, models
-
-
-class AccountPaymentTerm(models.Model):
- _inherit = 'account.payment.term'
-
- is_contribution = fields.Boolean('Conditions de paiement des cotisations')
\ No newline at end of file
diff --git a/models/res_company.py b/models/res_company.py
index f3466180e9f570be6977378f3d5db8be9859241c..96f63c04070421d104eb92937429a0cc301f530b 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -14,12 +14,6 @@ class ScopCotisationCompany(models.Model):
domain="[('type', '=', 'sale')]"
)
- contribution_default_payment_term_id = fields.Many2one(
- comodel_name='account.payment.term',
- string="Conditions de paiement par défaut pour les cotisations",
- domain=[('is_contribution', '=', True)],
- )
-
tag_cotiz_id = fields.Many2one(
comodel_name='res.partner.category',
string='Etiquette de cotisation',
diff --git a/models/res_config_settings.py b/models/res_config_settings.py
index c4835c285115b75d245988583a52deae58676fec..61cb183a9fce0277fbeb904b72d40f3c27c40e23 100644
--- a/models/res_config_settings.py
+++ b/models/res_config_settings.py
@@ -18,14 +18,6 @@ class CotisationsConfigSettings(models.TransientModel):
string='Journal des cotisations',
domain="[('type', '=', 'sale')]")
- contribution_default_payment_term_id = fields.Many2one(
- comodel_name='account.payment.term',
- related="company_id.contribution_default_payment_term_id",
- readonly=False,
- string="Conditions de paiement par défaut pour les cotisations",
- domain=[('is_contribution', '=', True)],
- )
-
tag_cotiz_id = fields.Many2one(
comodel_name='res.partner.category',
related="company_id.tag_cotiz_id",
diff --git a/models/scop_cotisation.py b/models/scop_cotisation.py
index da07bb3b8ca336f021ef8745632e548e3178eb36..34489624a65d5d9c11bbff5cb574b6bd92742505 100644
--- a/models/scop_cotisation.py
+++ b/models/scop_cotisation.py
@@ -37,12 +37,6 @@ class ScopCotisation(models.AbstractModel):
company_currency_id = fields.Many2one(
comodel_name='res.currency', related='company_id.currency_id',
string="Company Currency", readonly=True)
- payment_term_id = fields.Many2one(
- comodel_name='account.payment.term',
- string="Conditions de paiement",
- domain=[('is_contribution', '=', True)],
- required=True,
- )
date_cotisation = fields.Date(
string="Date calcul cotisation",
help="Date de calcul qui apparaitra sur le bordereau de cotisation"
diff --git a/views/account_payment_term.xml b/views/account_payment_term.xml
deleted file mode 100644
index 926975d35503140dc179961186dbd57f571e5261..0000000000000000000000000000000000000000
--- a/views/account_payment_term.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
- <!-- Copyright 2020 Le Filament
- License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
- <data>
-
- <record id="view_payment_term_form_inherited" model="ir.ui.view">
- <field name="name">account.payment.term.form</field>
- <field name="model">account.payment.term</field>
- <field name="inherit_id" ref="account.view_payment_term_form"/>
- <field name="arch" type="xml">
- <xpath expr="//group" position="after">
- <group name="schedule">
- <field name="is_contribution" widget="boolean_toggle"/>
- </group>
- </xpath>
- </field>
- </record>
-
- </data>
-</odoo>
\ No newline at end of file
diff --git a/views/res_config_settings.xml b/views/res_config_settings.xml
index 3cd000f26b42bf369c2f52e148ec125fe2dd6de2..f97b36ad4962d78d1d9b9c34cb8c4f2cad56bcc7 100644
--- a/views/res_config_settings.xml
+++ b/views/res_config_settings.xml
@@ -29,13 +29,6 @@
</div>
<field name="contribution_journal_id" options="{'no_open': True, 'no_create': True}"/>
</div>
- <div class="o_setting_right_pane">
- <label for="contribution_default_payment_term_id"/>
- <div class="text-muted">
- Conditions de paiement par défault
- </div>
- <field name="contribution_default_payment_term_id" options="{'no_open': True, 'no_create': True}"/>
- </div>
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<label for="tag_cotiz_id"/>