diff --git a/datas/res.country.csv b/datas/res.country.csv index c1c956d7c70ae29237135ec48a93a67807e86008..adbfe480579de90c181e706008574ca84b654696 100644 --- a/datas/res.country.csv +++ b/datas/res.country.csv @@ -1,2 +1,2 @@ -id,address_view_id:id -base.fr,view_partner_address_french +id,address_format +base.fr,"%(street)s\n%(street2)s\n%(zip)s %(city)s %(cedex)s\n%(country_name)s" diff --git a/views/res_partner.xml b/views/res_partner.xml index 4e620361040ecf9edaad505d07035301d1623651..46fb745717d8f7884cafc6909cdf385428adcb68 100644 --- a/views/res_partner.xml +++ b/views/res_partner.xml @@ -66,54 +66,7 @@ </field> </record> - <record id="view_partner_address_french" model="ir.ui.view"> - <field name="name">french.address</field> - <field name="model">res.partner</field> - <field name="arch" type="xml"> - <form string="Partner"> - <div class="o_address_format" modifiers="{}"> - <field name="type" invisible="1" modifiers="{'invisible':true}"/> - <field name="city_id" invisible="1" modifiers="{'invisible':true}"/> - <div attrs="{'invisible': ['|', ('parent_id', '=', False), ('type', '!=', 'contact')]}" class="oe_edit_only" modifiers="{'invisible':['|',['parent_id','=',false],['type','!=','contact']]}"> - <b modifiers="{}"> - Adresse de la société: - </b> - </div> - <field name="street" placeholder="Rue..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="street2" placeholder="Rue 2..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="street3" placeholder="Rue 3..." class="o_address_street" attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="zip_id" options="{'create_name_field': 'city', 'no_open': True, 'no_create': True}" placeholder="CP / Ville autocomplétion..." class="oe_edit_only" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="parent_id" invisible="1" on_change="1" can_create="true" can_write="true" modifiers="{'invisible':true}"/> - <field name="zip" placeholder="Code postal" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" on_change="1" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="city" placeholder="Ville" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="cedex" placeholder="Cedex" class="o_address_city" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="state_id" class="o_address_zip" placeholder="État" options="{'no_open': True}" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - context="{'country_id': country_id, 'zip': zip}" - on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - <field name="country_id" placeholder="Pays" class="o_address_country" options="{'no_open': True, 'no_create': True}" - attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" - on_change="1" can_create="true" can_write="true" - modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> - </div> - </form> - </field> - </record> - - <record id="scop_contact_view_form" model="ir.ui.view"> + <record id="scop_contact_view_form" model="ir.ui.view"> <field name="name">add scop fields in form view</field> <field name="model">res.partner</field> <field name="inherit_id" ref="base.view_partner_form"/> @@ -122,8 +75,19 @@ <xpath expr="//div[hasclass('oe_title')]" position="attributes"> <attribute name="class">oe_title oe_title_cgscop</attribute> </xpath> - <field name="title" position="replace"/> - <xpath expr='//form/sheet/group/group[2]' position="replace"> + <field name="title" position="replace"/> + <field name="zip" position="replace"/> + <field name="city" position="before"> + <field name="zip" placeholder="Code postal" class="o_address_city" + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" on_change="1" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> + </field> + <field name="city" position="after"> + <field name="cedex" placeholder="Cedex" class="o_address_city" + attrs="{'readonly': ['|', '&', ('type', '=', 'contact'), ('parent_id', '!=', False)]}" + modifiers="{'readonly':['|','&',['type','=','contact'],['parent_id','!=',false]]}"/> + </field> + <xpath expr='//form/sheet/group/group[2]' position="replace"> <group name="Infos activités" attrs="{'invisible': [('is_company','=', False)]}"> <field name="certification_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" attrs="{'invisible': [('is_company','=', False)]}"/> <field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Territoire Rattaché..." can_create="true" can_write="true" modifiers="{}" attrs="{'invisible': [('is_company','=', False)]}" domain="[('ur_id', '=', ur_id)]"/> @@ -142,8 +106,8 @@ <field name="contact_legality" readonly="True" attrs="{'invisible': [('is_company','=', True)]}"/> <field name="category_id" string="Segmentation" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}" placeholder="Territoire Rattaché..." can_create="true" can_write="true" modifiers="{}" attrs="{'invisible': [('is_company','=', False)]}" domain="[('ur_id', '=', ur_id)]"/> </group> - </xpath> - <xpath expr='//form/sheet/group' position="after"> + </xpath> + <xpath expr='//form/sheet/group' position="after"> <field name="subscription_ids" attrs="{'invisible': [('is_company','=', True)]}"> <tree string="Subscriptions" editable="bottom"> <field name="newsletter_id" domain="[]"/> diff --git a/views/res_partner_cooperative.xml b/views/res_partner_cooperative.xml index 6c03ae9c78bddc220161c6ded8f96c4c29379a57..38097e8350748ece4b7ed1e44de2213623f36fef 100644 --- a/views/res_partner_cooperative.xml +++ b/views/res_partner_cooperative.xml @@ -14,6 +14,7 @@ <filter name="type_company" position="replace"> <filter string="Mon UR" name="my_ur" domain="[('current_user_ur_id', '=', 'ur_id')]"/> </filter> + <filter name="type_otherpositions" position="replace"></filter> <filter name="customer" position="replace"></filter> <filter name="supplier" position="replace"></filter> </field> @@ -130,7 +131,7 @@ <group col="3" string="Informations Générales"> <group string="Contact"> <label for='street' string="Adresse Administrative"/> - <div> + <div class="o_address_format"> <field name="street" placeholder="Rue..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"/> <field name="street2" placeholder="Rue 2..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"/> <field name="street3" placeholder="Rue 3..." class="o_address_street" attrs="{'readonly': [('write_date', '!=', False), ('project_status', '=', '6_suivi')]}"/> @@ -486,7 +487,7 @@ <group attrs="{'invisible': [('type','=', 'contact')]}"> <label for="street" string="Address"/> <div> - <div name="div_address"> + <div name="div_address" class="o_address_format"> <field name="street" placeholder="Rue..." class="o_address_street"/> <field name="street2" placeholder="Rue 2..." class="o_address_street"/> <field name="street3" placeholder="Rue 3..." class="o_address_street"/>