Skip to content
Extraits de code Groupes Projets
Valider 764e8d61 rédigé par Benjamin - Le Filament's avatar Benjamin - Le Filament
Parcourir les fichiers

Merge branch '14.0-QG' into '14.0'

14.0 qg

See merge request !1
parents 45d7ae41 b35163c7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!114.0 qg
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
"data/contributor_cron.xml", "data/contributor_cron.xml",
# views # views
"views/assets.xml", "views/assets.xml",
"views/afac_category.xml",
"views/afac_partner_list.xml", "views/afac_partner_list.xml",
"views/afac_project.xml", "views/afac_project.xml",
"views/afac_project_partner.xml", "views/afac_project_partner.xml",
......
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record id="view_partner_category_tree" model="ir.ui.view">
<field name="name">res.partner.category.tree</field>
<field name="model">res.partner.category</field>
<field name="arch" type="xml">
<tree string="Liste des étiquettes">
<field name="name"/>
</tree>
</field>
</record>
<record id="action_afac_category" model="ir.actions.act_window">
<field name="name">Étiquette</field>
<field name="res_model">res.partner.category</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="afac_partner.view_partner_category_tree"/>
</record>
<menuitem
name="Etiquettes"
id="menu_afac_category"
sequence="10"
parent="contacts.menu_contacts"
action="action_afac_category"
groups="afac_partner.group_afac_list_manager"
/>
</data>
</odoo>
...@@ -109,72 +109,72 @@ ...@@ -109,72 +109,72 @@
<xpath expr="//group[@name='group_by']" position="after"> <xpath expr="//group[@name='group_by']" position="after">
<searchpanel class="afac-partner-panel"> <searchpanel class="afac-partner-panel">
<field <field
name="water_agency_id" name="region_id"
select="multi" select="multi"
icon="fa-users" icon="fa-map-signs"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="college_id" name="org_type_id"
select="multi" select="multi"
icon="fa-users" icon="fa-building"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="thematic_id" name="agroforestry_involvement_id"
select="multi" select="multi"
icon="fa-users" icon="fa-building"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="region_id" name="legal_status_id"
select="multi" select="multi"
icon="fa-map-signs" icon="fa-building"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="action_area" name="legal_status_detail_id"
select="multi" select="multi"
icon="fa-users" icon="fa-building"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="org_type_id" name="college_id"
select="multi" select="multi"
icon="fa-building" icon="fa-users"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="release_receipt_id" name="thematic_id"
select="multi" select="multi"
icon="fa-building" icon="fa-users"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="agroforestry_involvement_id" name="release_receipt_id"
select="multi" select="multi"
icon="fa-building" icon="fa-building"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="legal_status_id" name="action_area"
select="multi" select="multi"
icon="fa-building" icon="fa-users"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
<field <field
name="legal_status_detail_id" name="water_agency_id"
select="multi" select="multi"
icon="fa-building" icon="fa-users"
enable_counters="1" enable_counters="1"
filters="1" filters="1"
/> />
...@@ -402,6 +402,9 @@ ...@@ -402,6 +402,9 @@
>Adresse</b> >Adresse</b>
</span> </span>
</xpath> </xpath>
<xpath expr="//field[@name='category_id']" position="attributes">
<attribute name="options">{'no_create':1}</attribute>
</xpath>
<xpath expr="//field[@name='vat']" position="after"> <xpath expr="//field[@name='vat']" position="after">
<field <field
name="is_contributor" name="is_contributor"
...@@ -448,7 +451,7 @@ ...@@ -448,7 +451,7 @@
<xpath expr="//field[@name='child_ids']" position="attributes"> <xpath expr="//field[@name='child_ids']" position="attributes">
<attribute <attribute
name="context" name="context"
>{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact', 'default_thematic_id': thematic_id, 'default_org_type_id': org_type_id, 'default_college_id': college_id, 'default_region_id': region_id, 'default_website': website, 'default_short_name': short_name}</attribute> >{'default_parent_id': active_id, 'default_street': street, 'default_street2': street2, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_lang': lang, 'default_user_id': user_id, 'default_type': 'contact', 'default_thematic_id': thematic_id, 'default_org_type_id': org_type_id, 'default_college_id': college_id, 'default_region_id': region_id, 'default_website': website, 'default_short_name': short_name, 'default_legal_status_id': legal_status_id, 'default_legal_status_detail_id': legal_status_detail_id}</attribute>
</xpath> </xpath>
<xpath <xpath
expr="//field[@name='child_ids']/kanban/field[@name='display_name']" expr="//field[@name='child_ids']/kanban/field[@name='display_name']"
...@@ -463,6 +466,9 @@ ...@@ -463,6 +466,9 @@
<field name="college_id" /> <field name="college_id" />
<field name="region_id" /> <field name="region_id" />
<field name="website" /> <field name="website" />
<field name="legal_status_id" invisible="1"/>
<field name="legal_status_detail_id" invisible="1"/>
<field name="short_name" invisble="1"/>
</xpath> </xpath>
<xpath expr="//div[@t-if='record.mobile.raw_value']" position="after"> <xpath expr="//div[@t-if='record.mobile.raw_value']" position="after">
<t t-if="record.mandate_id.raw_value"> <t t-if="record.mandate_id.raw_value">
......
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