Skip to content
Extraits de code Groupes Projets

Comparer les révisions

Les modifications sont affichées comme si la révision source était fusionnée avec la révision cible. En savoir plus sur la comparaison des révisions.

Source

Sélectionner le projet cible
No results found
Sélectionner une révision Git
  • 12.0
  • 12.0-lm-00
  • 13.0
  • 14.0
  • 14.0-2507-inpi
5 résultats

Cible

Sélectionner le projet cible
  • lefilament/cgscop/cgscop_partner
  • hsilvant/cgscop_partner
2 résultats
Sélectionner une révision Git
  • 12-RV-Bug_ecrasement_date_radiation
  • 12-RV-Correctif-open-instagram
  • 12-RV-Tree-Coop-Ajout-effectif
  • 12-RV-copadev
  • 12-RV-revision-staff
  • 12.0
  • 12.0-RV-Abonnements
  • 12.0-RV-Instagram
  • 12.0-RV-segment_visibility
  • 12.0-evo-202003
  • 14-RV-20231222
  • 14-RV-20240830
  • 14-RV-20250324
13 résultats
Afficher les modifications
Affichage de
avec 369 ajouts et 2810 suppressions
"id","id_riga","name"
"riga_14397",14397,"Cotisation CG SCOP"
"riga_14398",14398,"Cotisation Fédération"
"riga_14399",14399,"Cotisation UR"
"riga_14400",14400,"Droits d'adhésion (adhésion forfaitaire)"
"riga_14461",14461,"Toutes les cotisations CG SCOP "
id,name,id_riga
riga_16352,"Saisie par scan",16352
id,name
liasse_type_1,"Prévisionnelle"
liasse_type_2,"Liste Ministère"
id,name
reason_end_membership_1,Radiation demandée par l’adhérent
reason_end_membership_2,Fin de statuts coopératif
reason_end_membership_3,Sortie du mouvement
reason_end_membership_4,Radiation demandée par le mouvement
id,name
membership_type_1,Confédération générale des SCOP
membership_type_2,Fédération des SCOP de la communication
membership_type_3,Fédération des SCOP de l’industrie
membership_type_4,Fédération des SCOP du BTP
membership_type_5,Fédération des CAE
id,name
questionnaire_type_1,Inscription
questionnaire_type_2,"Liste Ministère"
<?xml version="1.0" ?>
<odoo>
<!-- TODO: Déplacer dans scop_cotisation-->
<data noupdate="1">
<record id="te001" model="scop.action.te">
<field name="name">Agriculture et Alimentation résilientes</field>
</record>
<record id="te002" model="scop.action.te">
<field name="name">Accompagnement à la transformation écologique</field>
</record>
<record id="te003" model="scop.action.te">
<field name="name">Bâtiment durable</field>
</record>
<record id="te004" model="scop.action.te">
<field name="name">Protection environnement et biodiversité</field>
</record>
<record id="te005" model="scop.action.te">
<field name="name">Communication et numérique responsables</field>
</record>
<record id="te006" model="scop.action.te">
<field name="name">Education à l'environnement</field>
</record>
<record id="te007" model="scop.action.te">
<field name="name">Gestion des ressources et déchets</field>
</record>
<record id="te008" model="scop.action.te">
<field name="name">Energies</field>
</record>
<record id="te009" model="scop.action.te">
<field name="name">Mobilité responsable</field>
</record>
</data>
</odoo>
<?xml version="1.0" ?>
<odoo>
<!-- TODO: Déplacer dans scop_cotisation-->
<data noupdate="1">
<record id="riga_14397" model="scop.contribution.type">
<field name="name">Cotisation CG SCOP</field>
</record>
<record id="riga_14398" model="scop.contribution.type">
<field name="name">Cotisation Fédération de la communication</field>
</record>
<record id="cotiz_fede_cae" model="scop.contribution.type">
<field name="name">Cotisation Fédération CAE</field>
</record>
<record id="cotiz_fede_indus" model="scop.contribution.type">
<field name="name">Cotisation Fédération Industrie</field>
</record>
<record id="riga_14399" model="scop.contribution.type">
<field name="name">Cotisation UR</field>
</record>
<record id="riga_14400" model="scop.contribution.type">
<field name="name">Droits d'adhésion (adhésion forfaitaire)</field>
</record>
<record id="riga_14461" model="scop.contribution.type">
<field name="name">Toutes les cotisations CG SCOP </field>
</record>
</data>
</odoo>
<?xml version="1.0" ?>
<odoo>
<data noupdate="1">
<record id="reason_end_membership_1" model="scop.membership.reason.end">
<field name="name">Radiation demandée par l’adhérent</field>
</record>
<record id="reason_end_membership_2" model="scop.membership.reason.end">
<field name="name">Fin de statuts coopératif</field>
</record>
<record id="reason_end_membership_3" model="scop.membership.reason.end">
<field name="name">Sortie du mouvement</field>
</record>
<record id="reason_end_membership_4" model="scop.membership.reason.end">
<field name="name">Radiation demandée par le mouvement</field>
</record>
<record id="reason_end_membership_5" model="scop.membership.reason.end">
<field name="name">Mort économique</field>
</record>
</data>
</odoo>
<?xml version="1.0" ?>
<odoo>
<data noupdate="1">
<record id="membership_type_1" model="scop.membership.type">
<field name="name">Confédération générale des SCOP</field>
</record>
<record id="membership_type_2" model="scop.membership.type">
<field name="name">Fédération des SCOP de la communication</field>
</record>
<record id="membership_type_3" model="scop.membership.type">
<field name="name">Fédération des SCOP de l’industrie</field>
</record>
<record id="membership_type_4" model="scop.membership.type">
<field name="name">Fédération des SCOP du BTP</field>
</record>
<record id="membership_type_5" model="scop.membership.type">
<field name="name">Fédération des CAE</field>
</record>
</data>
</odoo>
id,id_riga,long_name,name
riga_14231,14231,"UNION REGIONALE DES SCOP ILE DE FRANCE CENTRE VAL DE LOIRE DOM-TOM","IdF, Val de Loire, Dom Tom"
riga_14232,14232,"UNION REGIONALE DES SCOP HAUTS DE FRANCE","Hauts-de-France"
riga_14233,14233,"UNION REGIONALE DES SCOP BOURGOGNE FRANCHE COMTE","Bourgogne"
riga_14234,14234,"UNION REGIONALE DES SCOP GRAND EST","Est"
riga_14353,14353,"UNION REGIONALE DES SCOP AUVERGNE RHONE ALPES","AURA"
riga_14237,14237,"UNION REGIONALE DES SCOP PROVENCE ALPES COTE D'AZUR CORSE","Paca"
riga_14238,14238,"UNION REGIONALE DES SCOP D'OCCITANIE POLE PYRENEES","Occitanie pole Pyrénées"
riga_14239,14239,"UNION REGIONALE DES SCOP LIMOUSIN","Limousin Berry"
riga_14240,14240,"UNION REGIONALE DES SCOP POITOU CHARENTES","Poitou Charentes"
riga_14241,14241,"UNION REGIONALE DES SCOP OUEST","Ouest"
riga_14242,14242,"UNION REGIONALE DES SCOP AQUITAINE","Aquitaine"
riga_14243,14243,"UNION REGIONALE DES SCOP D'OCCITANIE POLE MEDITERRANEE","Occitanie pole Méditérranée"
<?xml version="1.0" ?>
<odoo>
<data noupdate="1">
<record id="riga_14231" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP ILE DE FRANCE CENTRE VAL DE LOIRE DOM-TOM</field>
<field name="name">IdF, Val de Loire, Dom Tom</field>
</record>
<record id="riga_14232" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP HAUTS DE FRANCE</field>
<field name="name">Hauts-de-France</field>
</record>
<record id="riga_14233" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP BOURGOGNE FRANCHE COMTE</field>
<field name="name">Bourgogne</field>
</record>
<record id="riga_14234" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP GRAND EST</field>
<field name="name">Est</field>
</record>
<record id="riga_14353" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP AUVERGNE RHONE ALPES</field>
<field name="name">AURA</field>
</record>
<record id="riga_14237" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP PROVENCE ALPES COTE D'AZUR CORSE</field>
<field name="name">Paca</field>
</record>
<record id="riga_14238" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP D'OCCITANIE POLE PYRENEES</field>
<field name="name">Occitanie pole Pyrénées</field>
</record>
<record id="riga_14239" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP LIMOUSIN</field>
<field name="name">Limousin Berry</field>
</record>
<record id="riga_14240" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP POITOU CHARENTES</field>
<field name="name">Poitou Charentes</field>
</record>
<record id="riga_14241" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP OUEST</field>
<field name="name">Ouest</field>
</record>
<record id="riga_14242" model="union.regionale">
<field name="long_name">UNION REGIONALE DES SCOP AQUITAINE</field>
<field name="name">Aquitaine</field>
</record>
<record id="riga_14243" model="union.regionale">
<field
name="long_name"
>UNION REGIONALE DES SCOP D'OCCITANIE POLE MEDITERRANEE</field>
<field name="name">Occitanie pole Méditérranée</field>
</record>
<record id="ur_dom_tom" model="union.regionale">
<field
name="long_name"
>PROGRAMME OUTRE MER</field>
<field name="name">POM</field>
</record>
</data>
</odoo>
Ce diff est replié.
# © 2022 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
import logging
from openupgradelib import openupgrade
_logger = logging.getLogger(__name__)
def update_status_project_accompagnement(env):
openupgrade.logged_query(
env.cr,
"""
UPDATE res_partner rsp
SET project_status = '4_suivi', membership_status='adhesion'
WHERE rsp.project_status = '4_adhesion'
""",
)
def update_status_project_soumis_cg(env):
openupgrade.logged_query(
env.cr,
"""
UPDATE res_partner rsp
SET project_status = '4_suivi', membership_status='soumis_cg'
WHERE rsp.project_status = '5_cg'
""",
)
def update_with_new_status(env):
openupgrade.logged_query(
env.cr,
"""
UPDATE res_partner rsp
SET project_status = (
CASE
WHEN rsp.dissolution_date IS NOT NULL THEN '6_decede'
WHEN rsp.project_status = '6_suivi' THEN '4_suivi'
WHEN rsp.project_status = '7_abandonne' AND rsp.siret is null THEN '5_abandonne'
WHEN rsp.project_status = '7_abandonne' AND rsp.siret is not null THEN '4_suivi'
ELSE project_status
END
)
""",
)
@openupgrade.migrate()
def migrate(env, version):
update_status_project_accompagnement(env)
update_status_project_soumis_cg(env)
update_with_new_status(env)
---Fields in module 'cgscop_partner'---
cgscop_partner / res.partner / project_status (selection) : selection_keys is now '['1_information','2_pre-diagnostic','3_accompagnement', '4_suivi', '5_abandonne', '6_decede'] ('['1_information','2_pre-diagnostic','3_accompagnement', '4_adhesion', '5_cg', '6_suivi', '7_abandonne']')
cgscop_partner / res.partner / membership_status (selection) : selection_keys is now '['not_member', 'adhesion', 'soumis_cg', 'member', 'out'] ('['not_member', 'adhesion', 'soumis_cg', 'member', 'out']')
# © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from . import ir_http
from . import res_company
from . import mail_activity
from . import mail_activity_type
from . import res_partner
from . import scop_revision
from . import scop_membership
from . import scop_period
from . import scop_partner_staff
from . import scop_federation_activity
from . import res_department
from . import res_partner_lists
from . import res_partner_newsletter
from . import res_partner
from . import res_users
from . import scop_contribution
from . import scop_liasse_fiscale
from . import scop_membership
from . import scop_period
from . import scop_questionnaire
from . import scop_revision
from . import scop_action_rse
from . import scop_action_te
from . import union_regionale
# © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import models
class IrHttp(models.AbstractModel):
_inherit = "ir.http"
def session_info(self):
"""
Ajoute l'ur_id dans le contexte
"""
result = super(IrHttp, self).session_info()
user = self.env.user
result["ur_id"] = user.company_id.ur_id.id
result["ur_company"] = dict(
user.company_ids.mapped(lambda c: (c.id, c.ur_id.id))
)
return result
# © 2019 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
class MailActivity(models.Model):
_inherit = "mail.activity"
activity_type_id = fields.Many2one(
domain="""[
'|', ('res_model_id', '=', False), ('res_model_id', '=', res_model_id),
'|', ('ur_id','=',False), ('ur_id','=',context.get('current_ur_id', False))
]
""",
)
@api.model
def get_activity_data(self, res_model, domain):
"""
Surcharge la fonction parente pour n'afficher que les activités liées à l'UR
dans la vue Activité
"""
result = super(MailActivity, self).get_activity_data(res_model, domain)
activity_type_infos = []
activity_type_ids = self.env["mail.activity.type"].search(
[
"|",
("res_model_id.model", "=", res_model),
("res_model_id", "=", False),
"|",
("ur_id", "=", False),
("ur_id", "=", self.env.context.get("current_ur_id", False)),
]
)
for elem in sorted(activity_type_ids, key=lambda item: item.sequence):
mail_template_info = []
for mail_template_id in elem.mail_template_ids:
mail_template_info.append(
{"id": mail_template_id.id, "name": mail_template_id.name}
)
activity_type_infos.append([elem.id, elem.name, mail_template_info])
result["activity_types"] = activity_type_infos
return result
......@@ -8,11 +8,12 @@ class MailActivityType(models.Model):
_inherit = "mail.activity.type"
def _default_ur(self):
return self.env['res.company']._ur_default_get()
return self.env["res.company"]._ur_default_get()
ur_id = fields.Many2one(
'union.regionale',
string='Union Régionale',
"union.regionale",
string="Union Régionale",
index=True,
on_delete='restrict',
default=_default_ur)
ondelete="restrict",
default=_default_ur,
)
# © 2019 Le Filament (<http://www.le-filament.com>)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
from odoo import fields, models, api
from odoo import api, fields, models
class ResCompany(models.Model):
......@@ -10,6 +10,6 @@ class ResCompany(models.Model):
@api.model
def _ur_default_get(self):
# Renvoie l'UR de l'utlisateur courant
return self.env['res.users']._get_ur()
return self.env["res.users"]._get_ur()
ur_id = fields.Many2one('union.regionale', string='UR')
ur_id = fields.Many2one("union.regionale", string="UR")