diff --git a/i18n/fr.po b/i18n/fr.po index 73c4f2f88d427063ac8e3e9a7046c55661bfadab..df7929722de51137116923c4af8fdc2a9ba5910b 100644 --- a/i18n/fr.po +++ b/i18n/fr.po @@ -2,6 +2,7 @@ # This file contains the translation of the following modules: # * base_geolocalize # * contacts +# * web # msgid "" msgstr "" @@ -25,3 +26,10 @@ msgstr "Personnes" #: model_terms:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form msgid "Partner Assignment" msgstr "Géolocalisation" + +#. module: web +#: code:addons/web/static/src/xml/base.xml:0 +#: code:addons/web/static/src/xml/base.xml:0 +#, python-format +msgid "Copy Text" +msgstr "Copier" \ No newline at end of file diff --git a/models/res_partner.py b/models/res_partner.py index 0581b50591ec76e29730b2801661e58574ff7f74..40bf8088bfa455522a4b5c2d63a3f9886d7ee1c2 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -882,11 +882,13 @@ class ScopPartner(models.Model): ): args = args or [] domain = [ + "|", "|", "|", ("name", operator, name), ("member_number", "ilike", name), ("nickname", operator, name), + ("nickname", operator, name), ] return self._search(domain + args, limit=limit, access_rights_uid=name_get_uid) diff --git a/views/res_partner.xml b/views/res_partner.xml index 0a11fd3b6a9d9afd1edaf6e4c9c61f03ee60d887..c6a6fd0231247e00e9c207d88aff8913ab904670 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -842,6 +842,38 @@ modifiers="{'readonly':[['project_status', '=', '4_suivi']]}" /> </div> + <label for='postal_street' string="Adresse Postale" class="my-2" /> + <!-- Adresse postale --> + <div class="o_address_format mt-2"> + <field + name="postal_street" + class="o_address_street" + placeholder="Rue..." + /> + <field + name="postal_street2" + class="o_address_street" + placeholder="Rue 2..." + /> + <field + name="postal_street3" + class="o_address_street" + placeholder="Rue 3..." + /> + <field + name="postal_zip" + placeholder="Code postal" + class="o_address_city" + /> + <field + name="postal_city" + placeholder="Ville" + /> + <field + name="postal_cedex" + placeholder="Cedex" + /> + </div> <field name="zip_departement" string="N° de département" /> <field name="region" /> <field @@ -958,37 +990,6 @@ attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic'))]}" /> </div> - <label for='postal_street' string="Adresse Postale" class="mt-2" /> - <div class="o_address_format mt-2"> - <field - name="postal_street" - class="o_address_street" - placeholder="Rue..." - /> - <field - name="postal_street2" - class="o_address_street" - placeholder="Rue 2..." - /> - <field - name="postal_street3" - class="o_address_street" - placeholder="Rue 3..." - /> - <field - name="postal_zip" - placeholder="Code postal" - class="o_address_city" - /> - <field - name="postal_city" - placeholder="Ville" - /> - <field - name="postal_cedex" - placeholder="Cedex" - /> - </div> </group> <!-- Suivi UR --> <group string="Suivi UR"> @@ -1124,16 +1125,6 @@ help="L'activité renseignée ici apparaitra sur l'annuaire des coopératives." /> <field name="activity_customers" /> - <field - name="certification_ids" - widget="many2many_tags" - options="{'color_field': 'color', 'no_create': True}" - attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" - /> - <field - name="other_certification" - attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" - /> <label for='siret' string="SIRET" @@ -1159,16 +1150,14 @@ <field name="formatted_siret" class="oe_read_only" + widget="CopyClipboardChar" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" /> </div> <field name="siren" readonly="1" - attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" - /> - <field - name="vat" + widget="CopyClipboardChar" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" /> <field @@ -1190,23 +1179,10 @@ name="seed_end" attrs="{'invisible': [('is_seed_scop', '!=', True)], 'required':[('project_status','=','4_suivi'),('is_seed_scop', '=', True)]}" /> - <field - name="is_incubated" - attrs="{'invisible': [('project_status', '=', '1_information')]}" - /> - <field - name="incubator_id" - attrs="{'invisible': [('is_incubated', '!=', True)]}" - options="{'no_create': True}" - /> <field name="staff_last" attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}" /> - <field - name="staff_last_date" - attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}" - /> </group> </group> </xpath> @@ -1480,6 +1456,54 @@ </kanban> </field> </page> + <page + name='scop_other_infos' + string="Infos Coopérative" + attrs="{'invisible': [('is_cooperative', '!=', True)]}" + > + <group> + <group> + <field + name="capital" + attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))],}" + widget="monetary" + /> + <field + name="vat" + attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" + /> + <field + name="certification_ids" + widget="many2many_tags" + options="{'color_field': 'color', 'no_create': True}" + attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" + /> + <field + name="other_certification" + attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))]}" + /> + <field + name="staff_last_date" + attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic', '3_accompagnement'))]}" + /> + <field + name="is_incubated" + attrs="{'invisible': [('project_status', '=', '1_information')]}" + /> + <field + name="incubator_id" + attrs="{'invisible': [('is_incubated', '!=', True)]}" + options="{'no_create': True}" + /> + </group> + <group> + <field + name="social_object" + readonly="1" + /> + </group> + </group> + </page> <page name='scop_revision' string="Révisions" @@ -1651,23 +1675,6 @@ </tree> </field> </page> - <page - name='scop_other_infos' - string="Infos coopératives" - attrs="{'invisible': [('is_cooperative', '!=', True)]}" - > - <group> - <field - name="capital" - attrs="{'invisible': [('project_status', 'in', ('1_information', '2_pre-diagnostic',))],}" - widget="monetary" - /> - <field - name="social_object" - readonly="1" - /> - </group> - </page> <page name='scop_membership' string="Périodes d'adhésion"