Skip to content
Extraits de code Groupes Projets
Valider 84eb7e94 rédigé par jordan's avatar jordan
Parcourir les fichiers

[update] remove payment_term_id in cotiz_cg and use "échéancier" to generate invoices

parent 100a3e14
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!112.0 refactor cotiz
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
"views/res_config_settings.xml", "views/res_config_settings.xml",
"views/scop_cotisation_aura.xml", "views/scop_cotisation_aura.xml",
"views/account_invoice.xml", "views/account_invoice.xml",
"views/account_payment_term.xml",
"views/report_cotisation_aura.xml", "views/report_cotisation_aura.xml",
"views/report_cotisation_aura_refund.xml", "views/report_cotisation_aura_refund.xml",
"wizard/scop_cotisation_aura_wizard.xml", "wizard/scop_cotisation_aura_wizard.xml",
......
...@@ -193,24 +193,6 @@ class ScopAuraAccountInvoice(models.Model): ...@@ -193,24 +193,6 @@ class ScopAuraAccountInvoice(models.Model):
inv.write(vals) inv.write(vals)
return True return True
# @api.multi
# def set_scop_contribution(self):
# contrib_id = super(ScopAuraAccountInvoice, self).set_scop_contribution()
# if self.cotisation_aura_id:
# i = 4 - self.nb_quarter
# schedule = {
# 'quarter_1': self.cotisation_aura_id.trimester_1,
# 'quarter_2': self.cotisation_aura_id.trimester_2,
# 'quarter_3': self.cotisation_aura_id.trimester_3,
# 'quarter_4': self.cotisation_aura_id.trimester_4,
# }
# while i != 0:
# key = 'quarter_' + str(i)
# schedule.pop(key, None)
# i -= 1
# contrib_id.update(schedule)
# return contrib_id
# ------------------------------------------------------ # ------------------------------------------------------
# Global functions # Global functions
# ------------------------------------------------------ # ------------------------------------------------------
......
...@@ -7,6 +7,8 @@ from odoo import fields, models ...@@ -7,6 +7,8 @@ from odoo import fields, models
class AccountPaymentTerm(models.Model): class AccountPaymentTerm(models.Model):
_inherit = 'account.payment.term' _inherit = 'account.payment.term'
is_contribution = fields.Boolean('Conditions de paiement des cotisations')
def compute(self, value, date_ref=False, invoice=None): def compute(self, value, date_ref=False, invoice=None):
""" """
Override la fonction compute du modèle account.payment.term Override la fonction compute du modèle account.payment.term
......
...@@ -15,3 +15,9 @@ class ScopCotisationAuraCompany(models.Model): ...@@ -15,3 +15,9 @@ class ScopCotisationAuraCompany(models.Model):
string='Article de cotisation AURA', string='Article de cotisation AURA',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]" domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
) )
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)],
)
...@@ -19,6 +19,14 @@ class CotisationsAuraConfigSettings(models.TransientModel): ...@@ -19,6 +19,14 @@ class CotisationsAuraConfigSettings(models.TransientModel):
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]" domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
) )
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)],
)
@api.onchange('is_contribution') @api.onchange('is_contribution')
def _onchange_is_contribution_aura(self): def _onchange_is_contribution_aura(self):
if not self.is_contribution: if not self.is_contribution:
......
...@@ -39,6 +39,13 @@ class ScopCotisationAura(models.Model): ...@@ -39,6 +39,13 @@ class ScopCotisationAura(models.Model):
compute='_compute_state', compute='_compute_state',
store=True) store=True)
payment_term_id = fields.Many2one(
comodel_name='account.payment.term',
string="Conditions de paiement",
domain=[('is_contribution', '=', True)],
required=True,
)
amount_total = fields.Monetary( amount_total = fields.Monetary(
string="Montant total", compute='_compute_amount_total', string="Montant total", compute='_compute_amount_total',
store=True, store=True,
......
<?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
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
<div><label for="contribution_aura_id"/></div> <div><label for="contribution_aura_id"/></div>
<field name="contribution_aura_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_aura', '=', True)]}"/> <field name="contribution_aura_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_aura', '=', True)]}"/>
</div> </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> </div>
</xpath> </xpath>
</field> </field>
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter