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

[update] rename scop_cotisation into scop_cotisation_cg

parent 1fefa363
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -15,7 +15,7 @@
"security/security_rules.xml",
"security/ir.model.access.csv",
"views/res_config_settings.xml",
"views/scop_cotisation.xml",
"views/scop_cotisation_cg.xml",
"views/union_regionale.xml",
]
}
......@@ -4,5 +4,5 @@
from . import account_invoice
from . import res_company
from . import res_config_settings
from . import scop_cotisation
from . import scop_cotisation_cg
from . import union_regionale
......@@ -8,8 +8,8 @@ class ScopAccountInvoiceCG(models.Model):
_inherit = "account.invoice"
cotisation_cg_id = fields.Many2one(
comodel_name='scop.cotisation',
string='Base de cotisation')
comodel_name='scop.cotisation.cg',
string='Base de cotisation CG Scop')
partner_ur_id = fields.Many2one(
comodel_name='union.regionale',
string='UR Adhérent',
......
......@@ -53,7 +53,7 @@ class CotisationsConfigSettings(models.TransientModel):
res = super(CotisationsConfigSettings, self).execute()
menu_cotiz_cg = self.env.ref(
'cgscop_cotisation_cg.menu_scop_cotisation_calcul')
'cgscop_cotisation_cg.menu_scop_cotisation_cg_calcul')
bool_condition = self.is_contribution_cg
self.add_company_to_menu(menu_cotiz_cg, bool_condition)
......
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_scop_cotisation,access_scop_cotisation,model_scop_cotisation,account.group_account_manager,1,1,1,0
admin_access_scop_cotisation,admin_access_scop_cotisation,model_scop_cotisation,cgscop_partner.group_cg_administrator,1,1,1,1
access_scop_cotisation_cg,access_scop_cotisation_cg,model_scop_cotisation_cg,account.group_account_manager,1,1,1,0
admin_access_scop_cotisation_cg,admin_access_scop_cotisation_cg,model_scop_cotisation_cg,cgscop_partner.group_cg_administrator,1,1,1,1
......@@ -7,7 +7,7 @@
<record id="cg_cotisation_cg_rule" model="ir.rule">
<field name="name">Cotisations consultables que pour sa société</field>
<field name="model_id" ref="cgscop_cotisation_cg.model_scop_cotisation"/>
<field name="model_id" ref="cgscop_cotisation_cg.model_scop_cotisation_cg"/>
<field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
<field name="perm_read" eval="True"/>
<field name="perm_write" eval="True"/>
......
......@@ -6,9 +6,9 @@
<data>
<!-- Tree view -->
<record id="view_scop_cotisation_tree" model="ir.ui.view">
<field name="name">scop.cotisation.tree</field>
<field name="model">scop.cotisation</field>
<record id="view_scop_cotisation_cg_tree" model="ir.ui.view">
<field name="name">scop.cotisation.cg.tree</field>
<field name="model">scop.cotisation.cg</field>
<field name="arch" type="xml">
<tree string="Cotisations">
<field name="year"/>
......@@ -23,9 +23,9 @@
</record>
<!-- Form view -->
<record id="view_scop_cotisation_form" model="ir.ui.view">
<field name="name">scop.cotisation.form</field>
<field name="model">scop.cotisation</field>
<record id="view_scop_cotisation_cg_form" model="ir.ui.view">
<field name="name">scop.cotisation.cg.form</field>
<field name="model">scop.cotisation.cg</field>
<field name="arch" type="xml">
<form string="Cotisations">
<header>
......@@ -72,18 +72,18 @@
</record>
<!-- Action -->
<record id="action_scop_cotisation" model="ir.actions.act_window">
<field name="name">Base de cotisations</field>
<field name="res_model">scop.cotisation</field>
<record id="action_scop_cotisation_cg" model="ir.actions.act_window">
<field name="name">Base de cotisations CG</field>
<field name="res_model">scop.cotisation.cg</field>
<field name="view_mode">tree,form</field>
<field name="help">Affiche les bases de calcul des cotisations</field>
</record>
<!-- MENUS -->
<menuitem id="menu_scop_cotisation_calcul"
<menuitem id="menu_scop_cotisation_cg_calcul"
parent="cgscop_cotisation.menu_scop_cotisation"
action="action_scop_cotisation"
action="action_scop_cotisation_cg"
sequence="10"/>
</data>
</odoo>
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