diff --git a/models/scop_greffe.py b/models/scop_greffe.py index 0f3fc456f494ab2edfb1962fa7b694a5a12a2c8e..c6b3c4039c3fe616de45987189cbc5b9e91b699b 100644 --- a/models/scop_greffe.py +++ b/models/scop_greffe.py @@ -9,6 +9,7 @@ class ScopGreffe(models.Model): _name = "scop.greffe" _description = "Mise à jours greffe" _inherit = ["bodacc.mixin", "mail.thread", "mail.activity.mixin"] + _order = "date_parution desc" # ------------------------------------------------------ # Fields declaration @@ -16,7 +17,7 @@ class ScopGreffe(models.Model): name = fields.Char("Nom") status = fields.Selection( [("new", "à traiter"), ("saved", "traité")], - string="Status", + string="Statut", default="new", tracking=True ) @@ -170,10 +171,10 @@ class ScopGreffe(models.Model): # ------------------------------------------------------ # CRON # ------------------------------------------------------ - def update_greffe_from_bodacc(self, init_year=2022): + def update_greffe_from_bodacc(self, init_year=2025): """ Update list from bodacc API. - If no data get all from 01/01/2023 else from yesterday + If no data get all from 01/01/2025 else from yesterday """ if self.env["scop.greffe"].search([]): since_days = 1 diff --git a/static/description/icon_greffe.png b/static/description/icon_greffe.png index f07442840c8c56b1332143158ee0193d2065e3e0..2b29d65d9046d173158c4e18fe76c1c140be8963 100644 Binary files a/static/description/icon_greffe.png and b/static/description/icon_greffe.png differ diff --git a/views/menus.xml b/views/menus.xml index ae4107a3da58ff0f734fa3109a1671e50de4a9d7..8aa88d1041e671305c6de76699ace4fef13d0354 100644 --- a/views/menus.xml +++ b/views/menus.xml @@ -1,12 +1,10 @@ <?xml version="1.0" encoding="utf-8" ?> <odoo> <data> - -<!-- ROOT--> <menuitem id="scop_greffe_menu_root" name="Greffe" - sequence="35" + sequence="29" web_icon="cgscop_greffe,static/description/icon_greffe.png" action="scop_greffe_act_window" /> diff --git a/views/scop_greffe_views.xml b/views/scop_greffe_views.xml index fda1b2596d0f26cb856a084e955796bda79cc2e8..1be95c3e6d6d1e8f4837c9590c60f223126890eb 100644 --- a/views/scop_greffe_views.xml +++ b/views/scop_greffe_views.xml @@ -58,44 +58,47 @@ /> </header> - <group> + <sheet> <group> - <field - name="status" - widget="badge" - decoration-warning="status == 'new'" - decoration-success="status == 'saved'" + <group name="coop" string="Coopérative"> + <field + name="status" + widget="badge" + decoration-warning="status == 'new'" + decoration-success="status == 'saved'" - /> - <field name="date_parution" /> - <field name="partner_id" /> - <field name="partner_ur_id" optional="show" /> - <field - name="partner_followup_delegate_id" - optional="show" - /> - <field name="siren" /> - </group> + /> + <field name="date_parution" /> + <field name="partner_id" /> + <field name="partner_ur_id" optional="show" /> + <field + name="partner_followup_delegate_id" + optional="show" + /> + <field name="siren" /> + </group> - <group> - <field name="famille_avis" /> - <field name="modifications_generales" /> - <button - type="object" - name="action_show_coop" - string="Voir la coopérative" - class="btn-sm btn-outline-primary" - /> - <button - name="action_announce" - type="object" - icon="fa-external-link" - string="Voir l'annonce" - class="btn-sm btn-link" - /> + <group name="announce" string="Annonce"> + <field name="numero_annonce" /> + <field name="famille_avis" /> + <field name="modifications_generales" /> + <button + type="object" + name="action_show_coop" + string="Voir la coopérative" + class="btn-sm btn-outline-primary" + /> + <button + name="action_announce" + type="object" + icon="fa-external-link" + string="Voir l'annonce" + class="btn-sm btn-link" + /> - </group> - </group> + </group> + </group> + </sheet> <div class="oe_chatter"> <field name="message_follower_ids" widget="mail_followers" /> <field name="activity_ids" widget="mail_activity" /> @@ -116,7 +119,7 @@ <field name="partner_ur_id" optional="show" /> <field name="partner_followup_delegate_id" optional="show" /> <field name="siren" /> - <field name="famille_avis" /> + <field name="famille_avis" optional="hide" /> <field name="modifications_generales" /> <field name="status"