diff --git a/__manifest__.py b/__manifest__.py index 7874a887372bf0d2e28a68e16e8ae09311ff5d4f..02b6152e3cbfcf113d8f525279acb34aea9e0504 100644 --- a/__manifest__.py +++ b/__manifest__.py @@ -50,8 +50,6 @@ "datas/res_partner_rgpd_origin_data.xml", "datas/res_partner_segment1_data.xml", "datas/scop_contribution_type_data.xml", - "datas/scop_liasse_fiscale_source_data.xml", - "datas/scop_liasse_fiscale_type_data.xml", "datas/scop_membership_reason_end_data.xml", "datas/scop_membership_type_data.xml", "datas/scop_questionnaire_type_data.xml", diff --git a/datas/scop_liasse_fiscale_source_data.xml b/datas/scop_liasse_fiscale_source_data.xml deleted file mode 100644 index c9c596cfea1097fe02681f74f0412f509013edab..0000000000000000000000000000000000000000 --- a/datas/scop_liasse_fiscale_source_data.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0"?> -<odoo> - <data noupdate="1"> - <record id="riga_16352" model="scop.liasse.fiscale.source"> - <field name="id_riga" eval="16352"/> - <field name="name">Saisie par scaniche</field> - </record> - </data> -</odoo> \ No newline at end of file diff --git a/datas/scop_liasse_fiscale_type_data.xml b/datas/scop_liasse_fiscale_type_data.xml deleted file mode 100644 index 9e1e6c5628c8926060578f3e9f09f69c9706680c..0000000000000000000000000000000000000000 --- a/datas/scop_liasse_fiscale_type_data.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<odoo> - <data noupdate="1"> - <record id="liasse_type_1" model="scop.liasse.fiscale.type"> - <field name="name">Prévisionnelle</field> - </record> - - <record id="liasse_type_2" model="scop.liasse.fiscale.type"> - <field name="name">Liste Ministère</field> - </record> - </data> -</odoo> diff --git a/i18n/fr.po b/i18n/fr.po index ea33e53e03855059cca5a210dae42ebcbae678f6..6a7f55a7595bd46d6d0dfb47e714af9225e95570 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -21,41 +21,6 @@ msgstr "" msgid "Contacts" msgstr "Personnes" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__revenue_cg -msgid "'CA' sens CGSCOP" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__revenue_cgsubv -msgid "'CA' sens CGSCOP-Subv" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__margin_cg -msgid "'Marge' sens CGSCOP" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__margin_cgsubv -msgid "'Marge' sens CGSCOP-Subv" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__wage_cg -msgid "'Salaires' sens CGSCOP" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__av_cgsubv -msgid "'VA BDF' sens CGSCOP-Subv" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__av_cg -msgid "'VABDF' sens CGSCOP" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__quarter_1 msgid "1er Trim." @@ -238,7 +203,6 @@ msgstr "" #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__year -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__year #: model:ir.model.fields,field_description:cgscop_partner.field_scop_questionnaire__year msgid "Année" msgstr "" @@ -276,7 +240,6 @@ msgid "Aucune" msgstr "" #. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__others #: selection:scop.period,end_reason:0 #: selection:scop.period.wizard,end_reason:0 msgid "Autres" @@ -324,11 +287,6 @@ msgstr "" msgid "CAE" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__revenue_sub -msgid "CA_SUB" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__zip #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__zip @@ -351,11 +309,6 @@ msgstr "" msgid "CP/Ville autocomplétion" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__pension_fund -msgid "Caisse retraite/solidarité" -msgstr "" - #. module: cgscop_partner #: model:ir.model,name:cgscop_partner.model_res_partner_prescriber_canal msgid "Canal de Prescription" @@ -367,11 +320,6 @@ msgstr "" msgid "Capital (en €)" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__capital_cae -msgid "Capital détenu (CAE)" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__organization_type_id #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__organization_type_id @@ -449,11 +397,6 @@ msgstr "" msgid "Close" msgstr "Fermer" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__flexible_keys -msgid "Clés flexible" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__naf_id #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__naf_id @@ -642,9 +585,6 @@ msgstr "Pays" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__create_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__create_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__create_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__create_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__create_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__create_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__create_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__create_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__create_uid @@ -677,9 +617,6 @@ msgstr "Créé par" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__create_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__create_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__create_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__create_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__create_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__create_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__create_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__create_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__create_date @@ -742,11 +679,6 @@ msgstr "" msgid "Date calcul cotisation" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__effective_date -msgid "Date d'effet de la liasse" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_questionnaire__effective_date msgid "Date d'effet du questionnaire" @@ -826,9 +758,6 @@ msgstr "" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__display_name #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__display_name #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__display_name -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__display_name -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__display_name -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__display_name #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__display_name #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__display_name #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__display_name @@ -869,16 +798,6 @@ msgstr "Affiche et gère la liste des Origines de Création en coop." msgid "Display and manage the list of Dissolution Reasons." msgstr "Affiche et gère la liste des Motifs de Décès." -#. module: cgscop_partner -#: model_terms:ir.actions.act_window,help:cgscop_partner.action_view_scop_liasse_fiscale_type_tree -msgid "Display and manage the list of Liasse Fiscale Types." -msgstr "Affiche et gère la liste des Types de Liasses Fiscales." - -#. module: cgscop_partner -#: model_terms:ir.actions.act_window,help:cgscop_partner.action_view_scop_liasse_fiscale_source_tree -msgid "Display and manage the list of Liasses Fiscales Sources." -msgstr "Affiche et gère la liste des Sources de Liasses Fiscales." - #. module: cgscop_partner #: model_terms:ir.actions.act_window,help:cgscop_partner.action_view_scop_membership_type_tree msgid "Display and manage the list of Membership Types." @@ -932,11 +851,6 @@ msgstr "Motifs de Décès" msgid "Dossier créé CG" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__duration -msgid "Durée de l’exercice" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_period__start #: model:ir.model.fields,field_description:cgscop_partner.field_scop_period_wizard__start @@ -1072,11 +986,6 @@ msgstr "" msgid "Est une coopérative" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__closing_date -msgid "Exercice clos le" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_revision__revision_result_year msgid "Exercice révisé" @@ -1127,11 +1036,6 @@ msgstr "Typologie de Financement" msgid "Financial tools" msgstr "Outils de Financement" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__dvpt_fund -msgid "Fond de développement" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__revision_format_id #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__revision_format_id @@ -1191,9 +1095,6 @@ msgstr "" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__id @@ -1230,8 +1131,6 @@ msgstr "" #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner_segment4__id_riga #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__id_riga #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__id_riga -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__id_riga -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__id_riga #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__id_riga #: model:ir.model.fields,field_description:cgscop_partner.field_scop_period__id_riga #: model:ir.model.fields,field_description:cgscop_partner.field_scop_questionnaire__id_riga @@ -1325,9 +1224,6 @@ msgstr "" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution____last_update #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type____last_update #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard____last_update -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale____last_update -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source____last_update -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type____last_update #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard____last_update #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period____last_update #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard____last_update @@ -1365,9 +1261,6 @@ msgstr "Dernière Période" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__write_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__write_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__write_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__write_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__write_uid -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__write_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__write_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__write_uid #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__write_uid @@ -1400,9 +1293,6 @@ msgstr "Dernière mise à jour par" #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__write_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution_type__write_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_deces_wizard__write_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__write_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__write_date -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__write_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_out_wizard__write_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__write_date #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period_wizard__write_date @@ -1436,32 +1326,6 @@ msgstr "Statut Juridique" msgid "Legal event" msgstr "Évènement Juridique" -#. module: cgscop_partner -#: model:ir.model,name:cgscop_partner.model_scop_liasse_fiscale -msgid "Liasse Fiscale" -msgstr "" - -#. module: cgscop_partner -#: model:ir.actions.act_window,name:cgscop_partner.action_view_scop_liasse_fiscale_source_tree -#: model:ir.ui.menu,name:cgscop_partner.menu_scop_liasse_fiscale_source -#: model_terms:ir.ui.view,arch_db:cgscop_partner.view_scop_liasse_fiscale_source_tree -msgid "Liasse Fiscale Sources" -msgstr "Sources de Liasses Fiscales" - -#. module: cgscop_partner -#: model:ir.actions.act_window,name:cgscop_partner.action_view_scop_liasse_fiscale_type_tree -#: model:ir.ui.menu,name:cgscop_partner.menu_scop_liasse_fiscale_type -#: model_terms:ir.ui.view,arch_db:cgscop_partner.view_scop_liasse_fiscale_type_tree -msgid "Liasse Fiscale Types" -msgstr "Types de Liasses Fiscales" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__liasse_fiscale_ids -#: model:ir.model.fields,field_description:cgscop_partner.field_res_users__liasse_fiscale_ids -#: model_terms:ir.ui.view,arch_db:cgscop_partner.view_partner_cooperative_form -msgid "Liasses Fiscales" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__contact_legality #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__contact_legality @@ -1498,11 +1362,6 @@ msgstr "" msgid "Logo" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__margin -msgid "MARGE" -msgstr "" - #. module: cgscop_partner #: model_terms:ir.ui.view,arch_db:cgscop_partner.view_partner_cooperative_form msgid "Madame" @@ -1528,11 +1387,6 @@ msgstr "" msgid "Mandats" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__margin2ca -msgid "Marge*2 > CA" -msgstr "" - #. module: cgscop_partner #: selection:res.partner,closeout_month:0 msgid "Mars" @@ -1618,11 +1472,6 @@ msgstr "Mobile :" msgid "Modification de la forme juridique" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__status_update -msgid "Modification des statuts" -msgstr "" - #. module: cgscop_partner #: model:res.groups,name:cgscop_partner.group_edit_period msgid "Modification période" @@ -1737,11 +1586,6 @@ msgstr "" msgid "Nom de famille" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__key_name -msgid "Nom de la clé" -msgstr "" - #. module: cgscop_partner #: selection:res.partner,membership_status:0 msgid "Non Adhérent" @@ -1793,7 +1637,6 @@ msgstr "" #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_scop_contribution__partner_id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__partner_id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_membership_period__partner_id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_period__partner_id #: model:ir.model.fields,field_description:cgscop_partner.field_scop_questionnaire__partner_id @@ -1860,26 +1703,6 @@ msgstr "" msgid "Parent Path" msgstr "Chemin parent" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__share_capital -msgid "Part capital" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__share_ass_work -msgid "Part des entrepreneurs salariés associés" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__share_ass_perm -msgid "Part des permanents associés" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__share_work -msgid "Part travail" -msgstr "" - #. module: cgscop_partner #: model:ir.actions.act_window,name:cgscop_partner.action_companies_only #: model:ir.ui.menu,name:cgscop_partner.res_partner_menu_companies @@ -2175,21 +1998,11 @@ msgstr "" msgid "Région" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__distribution -msgid "Répartition statutaire des excédents nets de gestion" -msgstr "" - #. module: cgscop_partner #: model_terms:ir.ui.view,arch_db:cgscop_partner.view_partner_cooperative_form msgid "Réseaux sociaux" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__reserve -msgid "Réserve légale" -msgstr "" - #. module: cgscop_partner #: selection:scop.revision,revision_followup:0 msgid "Réserves" @@ -2219,11 +2032,6 @@ msgstr "" msgid "SA" msgstr "" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__sal -msgid "SAL" -msgstr "" - #. module: cgscop_partner #: model:res.partner.company.type,shortcut:cgscop_partner.riga_14669 msgid "SARL" @@ -2451,13 +2259,6 @@ msgstr "" msgid "Soumis CGScop" msgstr "" -#. module: cgscop_partner -#: model:ir.model,name:cgscop_partner.model_scop_liasse_fiscale_source -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__source_id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_source__name -msgid "Source de Liasse Fiscale" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner_creation_origin__child_ids msgid "Sous origines" @@ -2588,13 +2389,6 @@ msgstr "" msgid "Type d'adhésion" msgstr "" -#. module: cgscop_partner -#: model:ir.model,name:cgscop_partner.model_scop_liasse_fiscale_type -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__type_id -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale_type__name -msgid "Type de Liasse Fiscale" -msgstr "" - #. module: cgscop_partner #: model:ir.model,name:cgscop_partner.model_scop_questionnaire_type #: model:ir.model.fields,field_description:cgscop_partner.field_scop_questionnaire_type__name @@ -2674,16 +2468,6 @@ msgstr "" msgid "Users" msgstr "Utilisateurs" -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__av_lf -msgid "VA indiquée sur LF" -msgstr "" - -#. module: cgscop_partner -#: model:ir.model.fields,field_description:cgscop_partner.field_scop_liasse_fiscale__is_av_lf -msgid "VA sur LF" -msgstr "" - #. module: cgscop_partner #: model:ir.model.fields,field_description:cgscop_partner.field_res_partner__city #: model:ir.model.fields,field_description:cgscop_partner.field_res_users__city diff --git a/models/__init__.py b/models/__init__.py index 8b663677ce3dff1888cd4cd5344bce5f5b589790..13c9b782516f8d80212a4be4bb76db2bac7aba04 100644 --- a/models/__init__.py +++ b/models/__init__.py @@ -9,7 +9,6 @@ from . import res_partner_newsletter from . import res_users from . import scop_contribution from . import scop_federation_activity -from . import scop_liasse_fiscale from . import scop_membership from . import scop_partner_staff from . import scop_period diff --git a/models/res_partner.py b/models/res_partner.py index f0690c58d6ca15daf77e6f8a013b1e32c2ed8c80..98e2046b0bee7ff9e23943b33eb2084560294047 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -342,10 +342,6 @@ class ScopPartner(models.Model): domain=[('active', '=', True), ('is_company', '=', True), ('organization_subtype_id', '=', 'DIRECCTE')], on_delete='restrict') - questionnaire_ids = fields.One2many( - comodel_name='scop.questionnaire', - inverse_name='partner_id', - string='Listes Ministère') staff_last = fields.Integer( string="Dernier effectif connu", compute="_compute_last_effective", @@ -355,12 +351,6 @@ class ScopPartner(models.Model): compute="_compute_last_effective", store=True) - # Liasse fiscale - liasse_fiscale_ids = fields.One2many( - comodel_name='scop.liasse.fiscale', - inverse_name='partner_id', - string='Liasses Fiscales') - # Champs pour personnes birthyear = fields.Integer("Année de naissance") subscription_ids = fields.One2many( diff --git a/models/scop_liasse_fiscale.py b/models/scop_liasse_fiscale.py deleted file mode 100644 index a29c9b5dca4041d90ec4d9f7c15e38637c00fbff..0000000000000000000000000000000000000000 --- a/models/scop_liasse_fiscale.py +++ /dev/null @@ -1,70 +0,0 @@ -# © 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, fields - - -class ScopLiasseFiscale(models.Model): - _name = "scop.liasse.fiscale" - _description = "Liasse Fiscale" - - id_riga = fields.Integer("ID RIGA", index=True) - partner_id = fields.Many2one( - comodel_name='res.partner', - string='Organisme', - domain=[('is_company', '=', True)], - ondelete='restrict', index=True) - year = fields.Char("Année", index=True) - type_id = fields.Many2one( - 'scop.liasse.fiscale.type', - string="Type de Liasse Fiscale", - ondelete='restrict', index=True) - effective_date = fields.Date("Date d'effet de la liasse") - duration = fields.Integer("Durée de l’exercice") - closing_date = fields.Date("Exercice clos le") - source_id = fields.Many2one( - 'scop.liasse.fiscale.source', - string="Source de Liasse Fiscale", - ondelete='restrict') - revenue_cg = fields.Float("'CA' sens CGSCOP") - margin_cg = fields.Float("'Marge' sens CGSCOP") - av_cg = fields.Float("'VABDF' sens CGSCOP") - wage_cg = fields.Float("'Salaires' sens CGSCOP") - margin2ca = fields.Float("Marge*2 > CA") - margin_cgsubv = fields.Float("'Marge' sens CGSCOP-Subv") - av_cgsubv = fields.Float("'VA BDF' sens CGSCOP-Subv") - revenue_cgsubv = fields.Float("'CA' sens CGSCOP-Subv") - is_av_lf = fields.Boolean("VA sur LF") - av_lf = fields.Float("VA indiquée sur LF") - revenue_sub = fields.Float("CA_SUB") - sal = fields.Float("SAL") - margin = fields.Float("MARGE") - distribution = fields.Float( - "Répartition statutaire des excédents nets de gestion") - capital_cae = fields.Float("Capital détenu (CAE)") - flexible_keys = fields.Boolean("Clés flexible") - reserve = fields.Float("Réserve légale") - share_ass_perm = fields.Float("Part des permanents associés") - dvpt_fund = fields.Float("Fond de développement") - share_ass_work = fields.Float("Part des entrepreneurs salariés associés") - share_capital = fields.Float("Part capital") - share_work = fields.Float("Part travail") - pension_fund = fields.Float("Caisse retraite/solidarité") - others = fields.Float("Autres") - key_name = fields.Float("Nom de la clé") - status_update = fields.Date("Modification des statuts") - - -class ScopLiasseFiscaleType(models.Model): - _name = "scop.liasse.fiscale.type" - _description = "Type de Liasse Fiscale" - - name = fields.Char('Type de Liasse Fiscale') - - -class ScopLiasseFiscaleSource(models.Model): - _name = "scop.liasse.fiscale.source" - _description = "Source de Liasse Fiscale" - - name = fields.Char('Source de Liasse Fiscale') - id_riga = fields.Integer("ID RIGA") diff --git a/models/scop_partner_staff.py b/models/scop_partner_staff.py index 641740d3c9fb5a125fe62c0db332897dad2d50ed..ed1d7eac2a76dbf38dc5146de81c6daff74668cf 100644 --- a/models/scop_partner_staff.py +++ b/models/scop_partner_staff.py @@ -14,7 +14,7 @@ class ScopPartnerStaff(models.Model): partner_id = fields.Many2one( comodel_name='res.partner', string='Organisme', - domain=[('is_coopeartive', '=', True)], + domain=[('is_cooperative', '=', True)], ondelete='restrict', required=True, index=True) diff --git a/models/union_regionale.py b/models/union_regionale.py index 927c4bd5b4ee736bddba001ed7d2562e3c75680f..66f9e890cf40d5b9d7384910ef99f227cb2ccd92 100644 --- a/models/union_regionale.py +++ b/models/union_regionale.py @@ -10,6 +10,7 @@ class UnionRegionale(models.Model): long_name = fields.Char("Nom", required=True, index=True) name = fields.Char("Abbréviation", required=True, index=True) + code_ur = fields.Char("Code UR") id_riga = fields.Integer("Identifiant RIGA", index=True) _sql_constraints = [('name_uniq', 'unique (name)', diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv index 90c11ae838121f1d286f869cd381eae00aa7a4a3..7fa50bb86076eec843511f9c1f99e8ac6652ddf5 100644 --- a/security/ir.model.access.csv +++ b/security/ir.model.access.csv @@ -1,6 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_contribution_group_user,access_contribution_group_user,model_scop_contribution,base.group_user,1,0,0,0 -access_liasse_fiscale_group_user,access_liasse_fiscale_group_user,model_scop_liasse_fiscale,base.group_user,1,0,0,0 access_questionnaire_group_user,access_questionnaire_group_user,model_scop_questionnaire,base.group_user,1,0,0,0 access_res_partner_certification,access_res_partner_certification,model_res_partner_certification,base.group_user,1,0,0,0 access_res_partner_company_type,access_res_partner_company_type,model_res_partner_company_type,base.group_user,1,0,0,0 @@ -19,8 +18,6 @@ access_res_partner_segment3,access_res_partner_segment3,model_res_partner_segmen access_res_partner_segment4,access_res_partner_segment4,model_res_partner_segment4,base.group_user,1,0,0,0 access_revision_group_user,access_revision_group_user,model_scop_revision,base.group_user,1,1,1,0 access_scop_contribution_type,access_scop_contribution_type,model_scop_contribution_type,base.group_user,1,0,0,0 -access_scop_liasse_fiscale_source,access_scop_liasse_fiscale_source,model_scop_liasse_fiscale_source,base.group_user,1,0,0,0 -access_scop_liasse_fiscale_type,access_scop_liasse_fiscale_type,model_scop_liasse_fiscale_type,base.group_user,1,0,0,0 access_scop_membership_period,access_scop_membership_period,model_scop_membership_period,base.group_user,1,0,0,0 access_scop_membership_reason_end,access_scop_membership_reason_end,model_scop_membership_reason_end,base.group_user,1,0,0,0 access_scop_membership_type,access_scop_membership_type,model_scop_membership_type,base.group_user,1,0,0,0 @@ -31,7 +28,6 @@ access_union_regionale,access_union_regionale,model_union_regionale,base.group_u add_scop_membership_period,add_scop_membership_period,model_scop_membership_period,group_add_period,1,1,1,0 add_scop_period,add_scop_period,model_scop_period,group_add_period,1,1,1,0 admin_contribution_group_user,access_contribution_group_user,model_scop_contribution,group_cg_administrator,1,1,1,1 -admin_liasse_fiscale_group_user,access_liasse_fiscale_group_user,model_scop_liasse_fiscale,group_cg_administrator,1,1,1,1 admin_res_partner,admin_res_partner,model_res_partner,group_cg_administrator,1,1,1,1 admin_res_partner_certification,admin_res_partner_certification,model_res_partner_certification,group_cg_administrator,1,1,1,1 admin_res_partner_company_type,admin_res_partner_company_type,model_res_partner_company_type,group_cg_administrator,1,1,1,1 @@ -50,8 +46,6 @@ admin_res_partner_segment3,admin_res_partner_segment3,model_res_partner_segment3 admin_res_partner_segment4,admin_res_partner_segment4,model_res_partner_segment4,group_cg_administrator,1,1,1,1 admin_revision_group_user,access_revision_group_user,model_scop_revision,group_cg_administrator,1,1,1,1 admin_scop_contribution_type,admin_scop_contribution_type,model_scop_contribution_type,group_cg_administrator,1,1,1,1 -admin_scop_liasse_fiscale_source,admin_scop_liasse_fiscale_source,model_scop_liasse_fiscale_source,group_cg_administrator,1,1,1,1 -admin_scop_liasse_fiscale_type,admin_scop_liasse_fiscale_type,model_scop_liasse_fiscale_type,group_cg_administrator,1,1,1,1 admin_scop_membership_period,admin_scop_membership_period,model_scop_membership_period,group_cg_administrator,1,1,1,1 admin_scop_membership_reason_end,admin_scop_membership_reason_end,model_scop_membership_reason_end,group_cg_administrator,1,1,1,1 admin_scop_membership_type,admin_scop_membership_type,model_scop_membership_type,group_cg_administrator,1,1,1,1 diff --git a/views/res_partner.xml b/views/res_partner.xml index 335116e7d1ed04ab605c582abf0355c43150c398..c2000c38739303e0cf572924f083e27de413879b 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -68,18 +68,12 @@ <xpath expr="//form/sheet/group" position="attributes"> <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> </xpath> - <xpath expr="//field[@name='image']" position="attributes"> - <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> - </xpath> <xpath expr="//div[hasclass('oe_title')]" position="attributes"> <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> </xpath> <xpath expr="//form/sheet/group" position="attributes"> <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> </xpath> - <xpath expr="//notebook" position="attributes"> - <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> - </xpath> <!-- Affiche les champs de la vue partenaire --> <field name="parent_id" position="before"> @@ -139,7 +133,7 @@ <field name="segment_4_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible':[('segment_4_nb', '=', 0)]}"/> <field name="organization_subtype_id" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}" domain="[('child_ids', '=', False)]" options="{'no_create': True, 'no_open': True}"/> <field name="organization_type_id" readonly="1" attrs="{'invisible': ['|', ('is_company', '=', False), ('type', '!=', 'contact')]}" options="{'no_create': True, 'no_open': True}"/> - <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}"/> + <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': ['|', ('is_company','=', False), ('type', '!=', 'contact')]}"/> </group> <group name="contact_segment_info" attrs="{'invisible': ['|', ('is_company', '=', True), ('type', '!=', 'contact')]}"> <field name="title" options='{"no_create": True, "no_open": True}' attrs="{'invisible': [('is_company','=', True)]}"/> @@ -151,7 +145,7 @@ <field name="birthyear" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="contact_origin_id" attrs="{'invisible': [('is_company','=', True)]}" options="{'no_create': True, 'no_open': True}"/> <field name="contact_legality" readonly="True" attrs="{'invisible': [('is_company','=', True)]}"/> - <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/> + <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]"/> </group> </xpath> <xpath expr='//form/sheet/group' position="after"> @@ -196,11 +190,9 @@ <xpath expr="//field[@name='child_ids']//form//field[@name='state_id']" position="attributes"> <attribute name="placeholder">Région</attribute> </xpath> - <xpath expr="//field[@name='child_ids']//form//field[@name='mobile']" position="after"> <field name="category_id" options='{"no_open": True, "no_create": True}' widget="many2many_tags" attrs="{'invisible': [('type', '!=', 'contact')]}"/> </xpath> - <xpath expr="//field[@name='child_ids']//form//field[@name='title']" position="attributes"> <attribute name="options">{'no_open': True, 'no_create': True}</attribute> </xpath> @@ -239,8 +231,17 @@ <field name="category_id" options='{"no_open": True, "no_create": True}' widget="many2many_tags" attrs="{'invisible': ['|', ('is_company', '=', True), ('type', '!=', 'contact')]}"/> <field name="lang" invisible="1"/> </field> + <xpath expr="//notebook/page" position="attributes"> + <attribute name="attrs">{'invisible': [('is_cooperative','=', True)]}</attribute> + </xpath> + <xpath expr="//notebook/page[@name='internal_notes']" position="attributes"> + <attribute name="string">Commentaires</attribute> + </xpath> + <xpath expr="//field[@name='comment']" position="attributes"> + <attribute name="placeholder">Commentaires...</attribute> + </xpath> <xpath expr="//notebook/page[@name='sales_purchases']" position="attributes"> - <attribute name="invisible">True</attribute> + <attribute name="groups">cgscop_partner.group_cg_administrator</attribute> </xpath> <!-- @@ -263,26 +264,26 @@ <field name="project_status" widget="statusbar" clickable="True" statusbar_visible="1_information,2_pre-diagnostic,3_accompagnement,4_adhesion" attrs="{'invisible':[('project_status','in',('6_suivi'))]}"/> </header> </xpath> - + <!-- Masque le bouton Archiver --> <xpath expr="//button[@name='toggle_active']" position="attributes"> <attribute name="attrs">{'invisible': ['&', ('is_cooperative','=', True), ('project_status', '!=', '7_abandonne')]}</attribute> </xpath> - <!-- Affiche les champs des organismes --> - <xpath expr='//form/sheet' position="inside"> - <div name="cooperative" attrs="{'invisible': [('is_cooperative', '=', False)]}"> - <div class="oe_button_box" name="button_box"> - <h3> - <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le</span> - <field name="dissolution_date" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> - </h3> - <h3> - <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Raison :</span> - <field options="{'no_open': True}" name="dissolution_reason_id" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> - </h3> - </div> - <field name="image" widget='image' class="oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/> - <div class="oe_title oe_title_cgscop"> + <!-- Titre, logo & status --> + <field name="image" position="before"> + <div class="oe_button_box" name="button_box" attrs="{'invisible': [('is_cooperative', '!=', True)]}"> + <h3> + <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Décédée le</span> + <field name="dissolution_date" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> + </h3> + <h3> + <span class="o_field_header o_field_widget o_readonly_modifier" attrs="{'invisible':[('dissolution_reason_id','=', False)]}">Raison :</span> + <field options="{'no_open': True}" name="dissolution_reason_id" readonly="1" attrs="{'invisible':[('dissolution_reason_id','=', False)]}"/> + </h3> + </div> + </field> + <field name="image" position="after"> + <div class="oe_title oe_title_cgscop" attrs="{'invisible': [('is_cooperative', '!=', True)]}"> <field name="is_cooperative" invisible="1"/> <field name="write_date" invisible="1"/> <h1> @@ -316,7 +317,11 @@ </div> </div> </div> - <group col="3" string="Informations Générales"> + </field> + + <!-- Partie statique avant Notebook --> + <xpath expr="//form/sheet/group" position="after"> + <group col="3" string="Informations Générales" name="scop_general_infos" attrs="{'invisible': [('is_cooperative','=', False)]}"> <group string="Contact"> <field name="sigle" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}"/> <label for='street' string="Adresse du siège social"/> @@ -342,7 +347,7 @@ attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}" modifiers="{'readonly':[['project_status', '=', '6_suivi']]}"/> </div> <field name="zip_departement" string="N° de département" /> - <field name="region" /> + <field name="region" /> <field name="phone" widget="phone" string="Téléphone 1" attrs="{'required':['|', ('project_status','in',('4_adhesion', '5_cg')), '&', ('write_date', '=', False), ('project_status', '=', '6_suivi')]}"/> <field name="mobile" widget="phone" string="Téléphone 2" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/> <field name="email" widget="email" string="E-mail"/> @@ -375,10 +380,10 @@ </group> <group string="Suivi UR"> <field name="ur_id" required="True" options="{'no_open': True, 'no_create': True}"/> - <field name="creation_delegate_id" widget="res_partner_many2one" + <field name="creation_delegate_id" attrs="{'required':[('project_status','in',('3_accompagnement','4_adhesion', '5_cg'))], 'invisible':[('project_status', 'in', '6_suivi')]}" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/> - <field name="followup_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/> - <field name="support_delegate_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" /> + <field name="followup_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}"/> + <field name="support_delegate_id" options="{'no_open': True, 'no_create': True}" domain="[('active', '=', True),('ur_id', '=', ur_id)]" /> <field name="segment_1_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_1_nb', '=', 0)]}"/> <field name="segment_2_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_2_nb', '=', 0)]}"/> <field name="segment_3_id" widget="many2many_tags" options="{'color_field': 'color', 'no_create': True}" domain="[('ur_id', '=', ur_id)]" attrs="{'invisible': ['|',('project_status', 'in', ('1_information')),('segment_3_nb', '=', 0)]}"/> @@ -412,290 +417,261 @@ <field name="is_seed_scop" attrs="{'invisible': [('project_status', '=', '1_information')]}"/> <field name="seed_end" attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','in',('4_adhesion', '5_cg', '6_suivi')),('is_seed_scop', '=', True)]}"/> <field name="is_incubated" attrs="{'invisible': [('project_status', '=', '1_information')]}"/> - <field name="incubator_id" widget="res_partner_many2one" attrs="{'invisible': [('is_incubated', '!=', True)]}" options="{'no_create': True}"/> + <field name="incubator_id" attrs="{'invisible': [('is_incubated', '!=', True)]}" options="{'no_create': True}"/> <field name="staff_last" attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"/> <field name="staff_last_date" attrs="{'invisible': [('project_status', 'not in', ('6_suivi'))]}"/> </group> </group> - <notebook colspan="4"> - <page name="scop_contacts" string="Contacts & Addresses"> - <!-- Directeurs et mandataires --> - <label for="director_ids" string="Dirigeants et mandataires"/> - <p> - <button name="add_director" type="object" class="btn-info" string="Ajouter un dirigeant"></button> - </p> - <field name="director_ids" readonly="1"> - <kanban> - <field name="id"/> - <field name="color"/> - <field name="name"/> - <field name="title"/> - <field name="type"/> - <field name="email"/> - <field name="parent_id"/> - <field name="is_company"/> - <field name="mandate_id"/> - <field name="function"/> - <field name="phone"/> - <field name="street"/> - <field name="street2"/> - <field name="street3"/> - <field name="zip_id"/> - <field name="zip"/> - <field name="city"/> - <field name="city_id"/> - <field name="cedex"/> - <field name="country_id"/> - <field name="mobile"/> - <field name="state_id"/> - <field name="image_small"/> - <field name="lang"/> - <field name="comment"/> - <field name="customer"/> - <field name="display_name"/> - <field name="supplier"/> - <field name="ur_id"/> - <field name="category_id"/> - <templates> - <t t-name="kanban-box"> - <t t-set="color" t-value="kanban_color(record.color.raw_value)"/> - <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"> - <a t-if="!read_only_mode" name="partner_archive" type="object" class="fa fa-times pull-right"/> - <a name="edit_director" type="object" class="fa fa-2x fa-edit text-info pull-right"/> - <div class="o_kanban_image"> - <img alt="" t-if="record.image_small.raw_value" t-att-src="kanban_image('res.partner', 'image_small', record.id.raw_value)"/> - <t t-if="!record.image_small.raw_value"> - <img alt="Avatar" t-att-src='_s + "/base/static/img/avatar.png"'/> - </t> - </div> - <div class="oe_kanban_details"> - <field name="name"/> - <div t-if="record.mandate_id.raw_value"><field name="mandate_id"/></div> - <div t-if="record.function.raw_value"><field name="function"/></div> - <div t-if="record.email.raw_value"><field name="email" widget="email"/></div> - <div t-if="record.phone.raw_value">Téléphone: <field name="phone" widget="phone"/></div> - <div t-if="record.mobile.raw_value">Mobile: <field name="mobile" widget="phone"/></div> - <div t-if="record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div> - </div> - </div> - </t> - </templates> - </kanban> - </field> - <!-- Autres contacts --> - <label for="other_child_ids" string="Autres Contacts / Adresses"/> - <p> - <button name="add_contact" type="object" class="btn-info" string="Ajouter un contact"></button> - </p> - <field name="other_child_ids" mode="kanban" readonly="1"> - <kanban> - <field name="id"/> - <field name="color"/> - <field name="name"/> - <field name="title"/> - <field name="type"/> - <field name="email"/> - <field name="parent_id"/> - <field name="is_company"/> - <field name="mandate_id"/> - <field name="function"/> - <field name="phone"/> - <field name="street"/> - <field name="street2"/> - <field name="street3"/> - <field name="zip"/> - <field name="zip_id"/> - <field name="city"/> - <field name="city_id"/> - <field name="cedex"/> - <field name="country_id"/> - <field name="mobile"/> - <field name="state_id"/> - <field name="image_small"/> - <field name="lang"/> - <field name="comment"/> - <field name="customer"/> - <field name="display_name"/> - <field name="supplier"/> - <field name="ur_id"/> - <field name="category_id"/> - <templates> - <t t-name="kanban-box"> + </xpath> + + <!-- Notebook organismes --> + <xpath expr="//notebook/page" position="after"> + <page name="scop_contacts" string="Contacts & Addresses" attrs="{'invisible': [('is_cooperative', '!=', True)]}"> + <!-- Directeurs et mandataires --> + <label for="director_ids" string="Dirigeants et mandataires"/> + <p> + <button name="add_director" type="object" class="btn-info" string="Ajouter un dirigeant"></button> + </p> + <field name="director_ids" readonly="1"> + <kanban> + <field name="id"/> + <field name="color"/> + <field name="name"/> + <field name="title"/> + <field name="type"/> + <field name="email"/> + <field name="parent_id"/> + <field name="is_company"/> + <field name="mandate_id"/> + <field name="function"/> + <field name="phone"/> + <field name="street"/> + <field name="street2"/> + <field name="street3"/> + <field name="zip_id"/> + <field name="zip"/> + <field name="city"/> + <field name="city_id"/> + <field name="cedex"/> + <field name="country_id"/> + <field name="mobile"/> + <field name="state_id"/> + <field name="image_small"/> + <field name="lang"/> + <field name="comment"/> + <field name="customer"/> + <field name="display_name"/> + <field name="supplier"/> + <field name="ur_id"/> + <field name="category_id"/> + <templates> + <t t-name="kanban-box"> <t t-set="color" t-value="kanban_color(record.color.raw_value)"/> - <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"> - <a name="edit_contact" type="object" class="fa fa-2x fa-edit text-info pull-right"/> - <a t-if="!read_only_mode" name="partner_archive" type="object" class="fa fa-times pull-right"/> - <div class="o_kanban_image"> - <img alt="" t-if="record.image_small.raw_value" t-att-src="kanban_image('res.partner', 'image_small', record.id.raw_value)"/> - <t t-if="!record.image_small.raw_value"> - <img alt="Delivery" t-if="record.type.raw_value === 'delivery'" t-att-src='_s + "/base/static/img/truck.png"'/> - <img alt="Invoice" t-if="record.type.raw_value === 'invoice'" t-att-src='_s + "/base/static/img/money.png"'/> - <t t-if="record.type.raw_value !== 'invoice' && record.type.raw_value !== 'delivery'"> - <img alt="Logo" t-if="record.is_company.raw_value === true" t-att-src='_s + "/base/static/img/company_image.png"'/> - <img alt="Avatar" t-if="record.is_company.raw_value === false" t-att-src='_s + "/base/static/img/avatar.png"'/> - </t> + <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"> + <a t-if="!read_only_mode" name="partner_archive" type="object" class="fa fa-times pull-right"/> + <a name="edit_director" type="object" class="fa fa-2x fa-edit text-info pull-right"/> + <div class="o_kanban_image"> + <img alt="" t-if="record.image_small.raw_value" t-att-src="kanban_image('res.partner', 'image_small', record.id.raw_value)"/> + <t t-if="!record.image_small.raw_value"> + <img alt="Avatar" t-att-src='_s + "/base/static/img/avatar.png"'/> + </t> + </div> + <div class="oe_kanban_details"> + <field name="name"/> + <div t-if="record.mandate_id.raw_value"><field name="mandate_id"/></div> + <div t-if="record.function.raw_value"><field name="function"/></div> + <div t-if="record.email.raw_value"><field name="email" widget="email"/></div> + <div t-if="record.phone.raw_value">Téléphone: <field name="phone" widget="phone"/></div> + <div t-if="record.mobile.raw_value">Mobile: <field name="mobile" widget="phone"/></div> + <div t-if="record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div> + </div> + </div> + </t> + </templates> + </kanban> + </field> + <!-- Autres contacts --> + <label for="other_child_ids" string="Autres Contacts / Adresses"/> + <p> + <button name="add_contact" type="object" class="btn-info" string="Ajouter un contact"></button> + </p> + <field name="other_child_ids" mode="kanban" readonly="1"> + <kanban> + <field name="id"/> + <field name="color"/> + <field name="name"/> + <field name="title"/> + <field name="type"/> + <field name="email"/> + <field name="parent_id"/> + <field name="is_company"/> + <field name="mandate_id"/> + <field name="function"/> + <field name="phone"/> + <field name="street"/> + <field name="street2"/> + <field name="street3"/> + <field name="zip"/> + <field name="zip_id"/> + <field name="city"/> + <field name="city_id"/> + <field name="cedex"/> + <field name="country_id"/> + <field name="mobile"/> + <field name="state_id"/> + <field name="image_small"/> + <field name="lang"/> + <field name="comment"/> + <field name="customer"/> + <field name="display_name"/> + <field name="supplier"/> + <field name="ur_id"/> + <field name="category_id"/> + <templates> + <t t-name="kanban-box"> + <t t-set="color" t-value="kanban_color(record.color.raw_value)"/> + <div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '') + ' oe_kanban_global_click'"> + <a name="edit_contact" type="object" class="fa fa-2x fa-edit text-info pull-right"/> + <a t-if="!read_only_mode" name="partner_archive" type="object" class="fa fa-times pull-right"/> + <div class="o_kanban_image"> + <img alt="" t-if="record.image_small.raw_value" t-att-src="kanban_image('res.partner', 'image_small', record.id.raw_value)"/> + <t t-if="!record.image_small.raw_value"> + <img alt="Delivery" t-if="record.type.raw_value === 'delivery'" t-att-src='_s + "/base/static/img/truck.png"'/> + <img alt="Invoice" t-if="record.type.raw_value === 'invoice'" t-att-src='_s + "/base/static/img/money.png"'/> + <t t-if="record.type.raw_value !== 'invoice' && record.type.raw_value !== 'delivery'"> + <img alt="Logo" t-if="record.is_company.raw_value === true" t-att-src='_s + "/base/static/img/company_image.png"'/> + <img alt="Avatar" t-if="record.is_company.raw_value === false" t-att-src='_s + "/base/static/img/avatar.png"'/> </t> - </div> - <div class="oe_kanban_details"> - <field name="name"/> - <div t-if="record.function.raw_value"><field name="function"/></div> - <div t-if="record.email.raw_value"><field name="email" widget="email"/></div> - <div t-if="record.type.raw_value != 'contact'"> - <div> - <field name="zip"/> - <field name="city"/> - <field name="cedex"/> - </div> - <field t-if="record.state_id.raw_value" name="state_id"/> - <field name="country_id"/> + </t> + </div> + <div class="oe_kanban_details"> + <field name="name"/> + <div t-if="record.function.raw_value"><field name="function"/></div> + <div t-if="record.email.raw_value"><field name="email" widget="email"/></div> + <div t-if="record.type.raw_value != 'contact'"> + <div> + <field name="zip"/> + <field name="city"/> + <field name="cedex"/> </div> - <div t-if="record.phone.raw_value">Phone: <field name="phone"/></div> - <div t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></div> - <div t-if="record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div> + <field t-if="record.state_id.raw_value" name="state_id"/> + <field name="country_id"/> </div> + <div t-if="record.phone.raw_value">Phone: <field name="phone"/></div> + <div t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></div> + <div t-if="record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div> </div> - </t> - </templates> - </kanban> - </field> - </page> - <page name='scop_revision' string="Révisions" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <group string="Informations de révision"> - <group> - <field name="revision_contract"/> - <field name="revision_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="revision_backup_company_id" widget="res_partner_many2one" options="{'no_create': True}"/> - <field name="revision_person_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}"/> - <field name="revision_certified_person_id" widget="res_partner_many2one" options="{'no_open': True, 'no_create': True}"/> - <field name="revision_person_assign_date"/> - </group> - <group> - <field name="revision_type"/> - <field name="revision_next_date"/> - <field name="revision_format_id" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/> - </group> - </group> - <field name="revision_ids" widget="one2many"> - <tree string="Révisions" editable="top"> - <field name="date"/> - <field name="delegate_id" options="{'no_open': True, 'no_create': True}" /> - <field name="revision_result_year"/> - <field name="revision_staff"/> - <field name="revision_format_id" options="{'no_open': True, 'no_create': True}"/> - <field name="revision_followup"/> - <field name="note"/> - </tree> - </field> - </page> - <page name="scop_periods" string="Historique" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="scop_period_ids" mode="tree" - context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_naf_id': naf_id, 'default_cae': cae}" style="pointer-events:none;"> - <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> - <field name="partner_id" invisible="1"/> - <field name="start"/> - <field name="end"/> - <field name="end_reason"/> - <field name="dissolution_reason_id"/> - <field name="comments"/> - <field name="name"/> - <field name="cooperative_form_id"/> - <field name="partner_company_type_id"/> - <field name="siret"/> - <field name="street"/> - <field name="street2"/> - <field name="street3"/> - <field name="zip"/> - <field name="zip_id" invisible="1"/> - <field name="city"/> - <field name="cedex"/> - <field name="state_id" invisible="1"/> - <field name="country_id" invisible="1"/> - <field name="naf_id"/> - <field name="cae"/> - </tree> - </field> - </page> - <page name='scop_internal_notes' string="Commentaires"> - <field name="comment" placeholder="Commentaires..."/> - </page> - <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="membership_period_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false" default_order="start desc"> - <field name="start"/> - <field name="type_id"/> - <field name="number"/> - <field name="start_stat"/> - <field name="end"/> - <field name="end_reason_id"/> - <field name="note"/> - </tree> - </field> - </page> - <page name='scop_contribution' string="Cotisations" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="contribution_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false" default_order="calculation_date desc"> - <field name="type_id"/> - <field name="year"/> - <field name="calculation_date"/> - <field name="amount_calculated" widget="monetary"/> - <field name="amount_called" widget="monetary"/> - <field name="amount_paid" widget="monetary"/> - <field name="amount_remaining" widget="monetary"/> - <field name="amount_remaining_previous" widget="monetary"/> - <field name="amount_paid_late" widget="monetary"/> - <field name="loss"/> - <field name="spreading"/> - <field name="quarter_1"/> - <field name="quarter_2"/> - <field name="quarter_3"/> - <field name="quarter_4"/> - </tree> - </field> - </page> - <page name='scop_staff' string="Effectifs" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="staff_ids" mode="tree" context="{'default_partner_id': active_id, 'default_type_entry': 'regul_ur'}"> - <tree delete="false" default_order="effective_date desc" editable="top"> - <field name="effective_date" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> - <field name="type_entry" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> - <field name="staff_count" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> - <field name="staff_shareholder_count" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> - <field name="staff_average" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> - <field name="comment" /> - <field name="user_id" readonly="1"/> - </tree> - </field> - </page> - <page name='scop_questionnaire' string="Listes Ministère" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <group> - <field name="direccte_id" widget="res_partner_many2one" options="{'no_create': True}"/> - </group> - <field name="questionnaire_ids" mode="tree" style="pointer-events:none;"> - <tree create="false" edit="false" delete="false" default_order="effective_date desc"> - <field name="year"/> - <field name="type_id"/> - <field name="effective_date"/> - <field name="staff_count"/> - <field name="staff_shareholder_count"/> - <field name="staff_average"/> - </tree> - </field> - </page> - <page name='scop_liasse_fiscale' string="Liasses Fiscales" attrs="{'invisible': [('project_status', '!=', '6_suivi')]}"> - <field name="liasse_fiscale_ids" mode="tree"> - <tree create="false" edit="false" delete="false" default_order="effective_date desc"> - <field name="year"/> - <field name="type_id"/> - <field name="effective_date"/> - <field name="duration"/> - <field name="closing_date"/> - <field name="source_id"/> - </tree> - <form readonly="1"/> - </field> - </page> - </notebook> - </div> + </div> + </t> + </templates> + </kanban> + </field> + </page> + <page name='scop_revision' string="Révisions" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"> + <group string="Informations de révision"> + <group> + <field name="revision_contract"/> + <field name="revision_company_id" options="{'no_create': True}"/> + <field name="revision_backup_company_id" options="{'no_create': True}"/> + <field name="revision_person_id" options="{'no_open': True, 'no_create': True}"/> + <field name="revision_certified_person_id" options="{'no_open': True, 'no_create': True}"/> + <field name="revision_person_assign_date"/> + </group> + <group> + <field name="revision_type"/> + <field name="revision_next_date"/> + <field name="revision_format_id" options="{'no_open': True, 'no_create': True}" domain="[('ur_id', '=', ur_id)]"/> + </group> + </group> + <field name="revision_ids" widget="one2many"> + <tree string="Révisions" editable="top"> + <field name="date"/> + <field name="delegate_id" options="{'no_open': True, 'no_create': True}" /> + <field name="revision_result_year"/> + <field name="revision_staff"/> + <field name="revision_format_id" options="{'no_open': True, 'no_create': True}"/> + <field name="revision_followup"/> + <field name="note"/> + </tree> + </field> + </page> + <page name="scop_periods" string="Historique" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"> + <field name="scop_period_ids" mode="tree" + context="{'default_partner_id': active_id, 'default_name': name, 'default_cooperative_form_id': cooperative_form_id, 'default_partner_company_type_id': partner_company_type_id, 'default_siret': siret, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_cedex': cedex, 'default_state_id': state_id, 'default_zip': zip, 'default_zip_id': zip_id, 'default_country_id': country_id, 'default_naf_id': naf_id, 'default_cae': cae}" style="pointer-events:none;"> + <tree string="Périodes" decoration-muted="end_reason!=False" create="false" edit="false" delete="false"> + <field name="partner_id" invisible="1"/> + <field name="start"/> + <field name="end"/> + <field name="end_reason"/> + <field name="dissolution_reason_id"/> + <field name="comments"/> + <field name="name"/> + <field name="cooperative_form_id"/> + <field name="partner_company_type_id"/> + <field name="siret"/> + <field name="street"/> + <field name="street2"/> + <field name="street3"/> + <field name="zip"/> + <field name="zip_id" invisible="1"/> + <field name="city"/> + <field name="cedex"/> + <field name="state_id" invisible="1"/> + <field name="country_id" invisible="1"/> + <field name="naf_id"/> + <field name="cae"/> + </tree> + </field> + </page> + <page name='scop_membership' string="Périodes d'adhésion" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"> + <field name="membership_period_ids" mode="tree" style="pointer-events:none;"> + <tree create="false" edit="false" delete="false" default_order="start desc"> + <field name="start"/> + <field name="type_id"/> + <field name="number"/> + <field name="start_stat"/> + <field name="end"/> + <field name="end_reason_id"/> + <field name="note"/> + </tree> + </field> + </page> + <page name='scop_contribution' string="Cotisations" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"> + <field name="contribution_ids" mode="tree" style="pointer-events:none;"> + <tree create="false" edit="false" delete="false" default_order="calculation_date desc"> + <field name="type_id"/> + <field name="year"/> + <field name="calculation_date"/> + <field name="amount_calculated" widget="monetary"/> + <field name="amount_called" widget="monetary"/> + <field name="amount_paid" widget="monetary"/> + <field name="amount_remaining" widget="monetary"/> + <field name="amount_remaining_previous" widget="monetary"/> + <field name="amount_paid_late" widget="monetary"/> + <field name="loss"/> + <field name="spreading"/> + <field name="quarter_1"/> + <field name="quarter_2"/> + <field name="quarter_3"/> + <field name="quarter_4"/> + </tree> + </field> + </page> + <page name='scop_staff' string="Effectifs" attrs="{'invisible': ['|', ('is_cooperative', '!=', True), ('project_status', '!=', '6_suivi')]}"> + <field name="staff_ids" mode="tree" context="{'default_partner_id': active_id, 'default_type_entry': 'regul_ur'}"> + <tree delete="false" default_order="effective_date desc" editable="top"> + <field name="effective_date" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> + <field name="type_entry" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> + <field name="staff_count" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> + <field name="staff_shareholder_count" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> + <field name="staff_average" attrs="{'readonly':[('type_entry','in',('questionnaire', 'questionnaire_inscription'))]}"/> + <field name="comment" /> + <field name="user_id" readonly="1"/> + </tree> + </field> + </page> </xpath> + </field> </record> diff --git a/views/scop_config_lists_views.xml b/views/scop_config_lists_views.xml index 5ee6451dc97bf08643afc581ea34b8b2d668c660..45633dae805b9033c92cd82fc0e2d6846a335166 100644 --- a/views/scop_config_lists_views.xml +++ b/views/scop_config_lists_views.xml @@ -23,44 +23,6 @@ <field name="help">Display and manage the list of Contribution Types.</field> </record> - - <!-- Liasse Fiscale Source --> - <record id="view_scop_liasse_fiscale_source_tree" model="ir.ui.view"> - <field name="name">scop.liasse.fiscale.source.tree</field> - <field name="model">scop.liasse.fiscale.source</field> - <field name="arch" type="xml"> - <tree string="Liasse Fiscale Sources" editable="top"> - <field name="name"/> - </tree> - </field> - </record> - - <record id="action_view_scop_liasse_fiscale_source_tree" model="ir.actions.act_window"> - <field name="name">Liasse Fiscale Sources</field> - <field name="res_model">scop.liasse.fiscale.source</field> - <field name="view_mode">tree</field> - <field name="help">Display and manage the list of Liasses Fiscales Sources.</field> - </record> - - - <!-- Liasse Fiscale Type --> - <record id="view_scop_liasse_fiscale_type_tree" model="ir.ui.view"> - <field name="name">scop.liasse.fiscale.type.tree</field> - <field name="model">scop.liasse.fiscale.type</field> - <field name="arch" type="xml"> - <tree string="Liasse Fiscale Types" editable="top"> - <field name="name"/> - </tree> - </field> - </record> - - <record id="action_view_scop_liasse_fiscale_type_tree" model="ir.actions.act_window"> - <field name="name">Liasse Fiscale Types</field> - <field name="res_model">scop.liasse.fiscale.type</field> - <field name="view_mode">tree</field> - <field name="help">Display and manage the list of Liasse Fiscale Types.</field> - </record> - <!-- Membership Type --> <record id="view_scop_membership_type_tree" model="ir.ui.view"> <field name="name">scop.membership.type.tree</field> @@ -151,10 +113,7 @@ parent="menu_scop_lists" action="action_view_scop_membership_reason_end_tree" sequence="10"/> - <menuitem id="menu_scop_liasse_fiscale_source" - parent="menu_scop_lists" - action="action_view_scop_liasse_fiscale_source_tree" - sequence="30"/> + <menuitem id="menu_scop_membership_type" parent="menu_scop_lists" action="action_view_scop_membership_type_tree" @@ -163,10 +122,6 @@ parent="menu_scop_lists" action="action_view_scop_contribution_type_tree" sequence="50"/> - <menuitem id="menu_scop_liasse_fiscale_type" - parent="menu_scop_lists" - action="action_view_scop_liasse_fiscale_type_tree" - sequence="70"/> <menuitem id="menu_scop_questionnaire_type" parent="menu_scop_lists" action="action_view_scop_questionnaire_type_tree" diff --git a/views/scop_config_views.xml b/views/scop_config_views.xml index 4917df4a060ef0a6282f4572063d3f35138a5190..b6df225e9ea21b95de68b92d5e3ed25aca630270 100644 --- a/views/scop_config_views.xml +++ b/views/scop_config_views.xml @@ -290,6 +290,7 @@ <tree string="Unions Régionales" editable="top"> <field name="long_name"/> <field name="name"/> + <field name="code_ur"/> <field name="id_riga"/> </tree> </field>