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

[update] add journal and account in config cotiz cg

parent 2cc0c03a
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -20,18 +20,49 @@ class ScopCotisationCGCompany(models.Model):
string='Article de cotisation Fédé de la Com',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_fede_com_id = fields.Many2one(
comodel_name='account.account',
string="Compte de tiers Fédération de la com",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_fede_cae_id = fields.Many2one(
comodel_name='product.product',
string='Article de cotisation Fédé CAE',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_fede_cae_id = fields.Many2one(
comodel_name='account.account',
string="Compte de tiers Fédération CAE",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_hdf_id = fields.Many2one(
comodel_name='product.product',
string='Article de cotisation UR HDF',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_ur_hdf_id = fields.Many2one(
comodel_name='account.account',
string="Compte de tiers UR HDF",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_med_id = fields.Many2one(
comodel_name='product.product',
string='Article de cotisation UR Méditerranée',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_ur_med_id = fields.Many2one(
comodel_name='account.account',
string="Compte de tiers UR Med",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_default_payment_term_id = fields.Many2one(
comodel_name='account.payment.term',
string="Conditions de paiement par défaut pour les cotisations CG",
domain=[('is_contribution', '=', True)],
)
contribution_ur_or_fede_journal_id = fields.Many2one(
comodel_name='account.journal',
string='Journal des cotisations UR ou Fédérations',
domain="[('type', '=', 'sale')]",
)
......@@ -25,6 +25,13 @@ class CotisationsConfigSettings(models.TransientModel):
string='Article de cotisation Fédé de la Com',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_fede_com_id = fields.Many2one(
comodel_name='account.account',
related="company_id.receivable_account_fede_com_id",
readonly=False,
string="Compte de tiers Fédération de la com",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_fede_cae_id = fields.Many2one(
comodel_name='product.product',
related="company_id.contribution_fede_cae_id",
......@@ -32,6 +39,13 @@ class CotisationsConfigSettings(models.TransientModel):
string='Article de cotisation Fédé CAE',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_fede_cae_id = fields.Many2one(
comodel_name='account.account',
related="company_id.receivable_account_fede_cae_id",
readonly=False,
string="Compte de tiers Fédération CAE",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_hdf_id = fields.Many2one(
comodel_name='product.product',
related="company_id.contribution_hdf_id",
......@@ -39,6 +53,13 @@ class CotisationsConfigSettings(models.TransientModel):
string='Article de cotisation UR HDF',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_ur_hdf_id = fields.Many2one(
comodel_name='account.account',
related="company_id.receivable_account_ur_hdf_id",
readonly=False,
string="Compte de tiers UR HDF",
domain="[('internal_type', '=', 'receivable')]",
)
contribution_med_id = fields.Many2one(
comodel_name='product.product',
related="company_id.contribution_med_id",
......@@ -46,6 +67,27 @@ class CotisationsConfigSettings(models.TransientModel):
string='Article de cotisation UR Méditerranée',
domain="[('sale_ok', '=', True), ('company_id', '=', company_id)]"
)
receivable_account_ur_med_id = fields.Many2one(
comodel_name='account.account',
related="company_id.receivable_account_ur_med_id",
readonly=False,
string="Compte de tiers UR Med",
domain="[('internal_type', '=', 'receivable')]",
)
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 CG",
domain=[('is_contribution', '=', True)],
)
contribution_ur_or_fede_journal_id = fields.Many2one(
comodel_name='account.journal',
related="company_id.contribution_ur_or_fede_journal_id",
readonly=False,
string='Journal des cotisations UR ou Fédération',
domain="[('type', '=', 'sale')]")
@api.onchange('is_contribution')
def _onchange_is_contribution_cg(self):
......
......@@ -449,10 +449,15 @@ class ScopCotisation(models.Model):
invoice_cotiz_cg.recalcul_cotiz_cg()
invoice_cotiz_cg.env.cr.commit()
# Invoice UR et Fédé
type_cotisation_ur = self.env.ref('cgscop_partner.riga_14399').id
journal_ur_or_fede = self.company_id.contribution_ur_or_fede_journal_id
# Invoice cotiz Fede Com
#
if partner.is_federation_com:
product_fede_com_id = self.company_id.contribution_fede_com_id
account_id = self.company_id.receivable_account_fede_com_id
type_cotisation_fede_com = self.env.ref(
'cgscop_partner.riga_14398').id
......@@ -462,7 +467,7 @@ class ScopCotisation(models.Model):
, 4)
invoice_cotiz_fede_com = self.create_contribution(
product_fede_com_id, partner, type_cotisation_fede_com,
liasse, amount_fede_com, date)
liasse, amount_fede_com, date, journal_ur_or_fede, account_id)
invoice_cotiz_fede_com.write({
'cotisation_cg_id': self.id,
'bordereau_id': bordereau.id,
......@@ -477,6 +482,7 @@ class ScopCotisation(models.Model):
#
if partner.cae:
product_fede_cae_id = self.company_id.contribution_fede_cae_id
account_id = self.company_id.receivable_account_fede_cae_id
type_cotisation_fede_cae = self.env.ref(
'cgscop_partner.cotiz_fede_cae').id
......@@ -484,7 +490,7 @@ class ScopCotisation(models.Model):
self.get_cotiz_fede_cae(), 4)
invoice_cotiz_fede_cae = self.create_contribution(
product_fede_cae_id, partner, type_cotisation_fede_cae,
liasse, amount_fede_cae, date)
liasse, amount_fede_cae, date, journal_ur_or_fede, account_id)
invoice_cotiz_fede_cae.write({
'cotisation_cg_id': self.id,
'bordereau_id': bordereau.id,
......@@ -495,21 +501,19 @@ class ScopCotisation(models.Model):
invoice_cotiz_fede_cae.recalcul_cotiz_cg()
invoice_cotiz_fede_cae.env.cr.commit()
# Invoice UR
type_cotisation_ur = self.env.ref('cgscop_partner.riga_14399').id
# Invoice cotiz UR HDF
#
ur_hdf = self.env.ref('cgscop_partner.riga_14232').id
if partner.ur_id.id == ur_hdf:
product_hdf_id = self.company_id.contribution_hdf_id
account_id = self.company_id.receivable_account_ur_hdf_id
amount_hdf = self.round_to_closest_multiple(
self.get_cotiz_hdf(wage_cg)
, 4)
invoice_cotiz_hdf = self.create_contribution(
product_hdf_id, partner, type_cotisation_ur,
liasse, amount_hdf, date)
liasse, amount_hdf, date, journal_ur_or_fede, account_id)
invoice_cotiz_hdf.write({
'cotisation_cg_id': self.id,
'bordereau_id': bordereau.id,
......@@ -525,6 +529,7 @@ class ScopCotisation(models.Model):
ur_med = self.env.ref('cgscop_partner.riga_14243').id
if partner.ur_id.id == ur_med:
product_med_id = self.company_id.contribution_med_id
account_id = self.company_id.receivable_account_ur_med_id
amount_med = self.round_to_closest_multiple(
self.get_cotiz_med(amount_cg, net_results,
......@@ -533,7 +538,7 @@ class ScopCotisation(models.Model):
, 4)
invoice_cotiz_med = self.create_contribution(
product_med_id, partner, type_cotisation_ur,
liasse, amount_med, date)
liasse, amount_med, date, journal_ur_or_fede, account_id)
invoice_cotiz_med.write({
'cotisation_cg_id': self.id,
'bordereau_id': bordereau.id,
......@@ -544,8 +549,6 @@ class ScopCotisation(models.Model):
invoice_cotiz_med.recalcul_cotiz_cg()
invoice_cotiz_med.env.cr.commit()
return bordereau
# ------------------------------------------------------
# Calcul des cotisations
# ------------------------------------------------------
......
......@@ -19,27 +19,57 @@
Activer la gestion des cotisations de la CG Scop
</div>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_default_payment_term_id"/></div>
<field name="contribution_default_payment_term_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_cg_id"/></div>
<field name="contribution_cg_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_ur_or_fede_journal_id"/></div>
<field name="contribution_ur_or_fede_journal_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_fede_com_id"/></div>
<field name="contribution_fede_com_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="receivable_account_fede_com_id"/></div>
<field name="receivable_account_fede_com_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_fede_cae_id"/></div>
<field name="contribution_fede_cae_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="receivable_account_fede_cae_id"/></div>
<field name="receivable_account_fede_cae_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_hdf_id"/></div>
<field name="contribution_hdf_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="receivable_account_ur_hdf_id"/></div>
<field name="receivable_account_ur_hdf_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<hr attrs="{'invisible': [('is_contribution_cg', '=', False)]}"/>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="contribution_med_id"/></div>
<field name="contribution_med_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
<div class="o_setting_right_pane" attrs="{'invisible': [('is_contribution_cg', '=', False)]}">
<div><label for="receivable_account_ur_med_id"/></div>
<field name="receivable_account_ur_med_id" options="{'no_open': True, 'no_create': True}" attrs="{'required': [('is_contribution_cg', '=', True)]}"/>
</div>
</div>
</xpath>
</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