X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fbase_contact%2Fbase_contact_view.xml;h=59894ab55d0aca7091c9c27242817986db0f9f8d;hb=7f8e5e2799e31dbbe1b02a5b260617249dbb54b0;hp=15379928d942ef82b2f72620ec12d3c59baacbf1;hpb=8e6746a79422a59046f314bba5be6ba5e8634bc1;p=odoo%2Fodoo.git

diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 1537992..59894ab 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
 
-    <!-- Views for Contacts -->
+    <!-- Views for Contacts Tree View -->
+
     <record model="ir.ui.view" id="view_partner_contact_tree">
         <field name="name">res.partner.contact.tree</field>
         <field name="model">res.partner.contact</field>
@@ -15,52 +16,64 @@
                 <field name="email"/>
                 <field name="lang_id"/>
                 <field name="partner_id"/>
-                <field name="function_id"/>
+                <field name="function"/>
             </tree>
         </field>
     </record>
 
+<!-- Views for Contacts Form View -->
+
     <record model="ir.ui.view" id="view_partner_contact_form">
         <field name="name">res.partner.contact.form</field>
         <field name="model">res.partner.contact</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Partner Contact">
-                <field name="name" select="1"/>
-                <field name="first_name" select="1"/>
+                <group colspan="4" col="6">
+                    <field name="title" select="1" widget="selection" domain="[('domain', '=', 'contact')]" size="0"/>
+                    <field name="name" select="1"/>
+                    <field name="first_name" select="1"/>
+                </group>
                 <notebook colspan="4" >
-                    <page string="General">
-                        <newline/>
-                        <separator string="General Information" colspan="4"/>
-                        <field name="mobile" select="2"/>
-                        <field name="title" select="1" />
-                        <field name="website"/>
-                        <field name="email"/>
-                        <field name="lang_id"/>
-                        <field name="active"/>
-                        <field name="partner_id" invisible="1" select="2"/>
-                        <field name="function_id" invisible="1" select="2"/>
-                        <field name="job_id" invisible="1" select="2" />
-                        <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
+                    <page string="General">                        
+                       <group colspan="4" col="4">
+                            <group colspan="2" col="4">
+                                <separator string="Communication" colspan="4"/>
+                                <field name="mobile"/>
+                                <field name="email"  widget="email"/>
+                                <field name="website"/>
+                            </group>
+                            <group colspan="2" col="1">
+                                <separator string="Photo" colspan="4"/>
+                                <field name="photo" widget='image' nolabel="1"/>
+                            </group>
+                       </group> 
+                       <field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
                             <form string="Functions and Addresses">
-                                <field name="function_id"/>
-                                <field name="address_id" context="{'address_partner_id': name}"/>
-                                <field name="name"/>
-                                <field name="sequence_contact"/>
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="extension"/>
-                                <field name="other"/>
-                                <field name="email" widget="email"/>
-                                <field name="date_start" />
-                                <field name="date_stop" />
-                                <field name="state" />
+                               <group colspan="4" col="4">
+                                   <field name="sequence_contact" />
+                                   <field name="function"/>
+                                   <field name="name" on_change="onchange_name(name,address_id)"/> 
+                                   <field name="address_id"/>                                   
+                                   <field name="date_start" />
+                                   <field name="date_stop" />
+                                   <field name="state" />
+                                   
+                               </group>
+                                <separator string="Communication" colspan="4"/>
+                               <group colspan="4" col="4">
+                                   <field name="phone"/>
+                                   <field name="fax"/>
+                                   <field name="email" widget="email"/>
+                                   <field name="extension"/>
+                                   <field name="other"/>
+                               </group>
                             </form>
                             <tree string="Functions and Addresses">
                                 <field name="sequence_contact" string="Seq."/>
-                                <field name="function_id"/>
-                                <field name="name"/>
-                                <field name="address_id"/>
+                                <field name="function"/>
+                                <field name="name" on_change="onchange_partner(name)"/> 
+								<field name="address_id" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
@@ -70,27 +83,63 @@
                             </tree>
                         </field>
                     </page>
-                    <page string="Extra Information">
+                    <page string="Extra Information">                        
+                        <field name="active"/>
+                        <field name="lang_id" widget="selection"/>
+                        <field name="partner_id" invisible="1" select="1"/>                                
+                        <field name="function" invisible="1" />  
                         <field name="country_id"/>
-                        <field name="birthdate" select="1" />
+                        <field name="birthdate"/>
+                    </page>
+                    <page string="Notes">
+                        <field name="comment" nolabel="1"/>
                     </page>
+                    
                 </notebook>
             </form>
         </field>
     </record>
 
+<!-- Views for Contacts Search View -->
+
+    <record model="ir.ui.view" id="view_partner_contact_search">
+        <field name="name">res.partner.contact.search</field>
+        <field name="model">res.partner.contact</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Partner Contact">
+                <field name="name" select="1"/>
+                <field name="first_name" select="1"/>
+                <field name="partner_id" select="1" string="Partner"/>
+            </search>
+        </field>
+    </record>
+
+<!-- Views for Contacts Action -->
+
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
         <field name="res_model">res.partner.contact</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_partner_contact_tree"/>
+        <field name="search_view_id" ref="view_partner_contact_search"/>
     </record>
-    <menuitem name="Partners/" id="menu_partner_contact_form" action="action_partner_contact_form"/>
-    <menuitem name="Partners/Addresses"  id="base.menu_partner_address_form"/>
+    <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
+    
+    <!--    
+    Contacts for Suppliers
+    -->
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases"
+             sequence="3"/>
+    <menuitem id="base.menu_procurement_management_supplier" name="Address Book"
+            parent="base.menu_purchase_root" sequence="3"/>
+    <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers"
+            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
+    <menuitem name="Contacts" id="menu_purchases_partner_contact_form" action="action_partner_contact_form" 
+            parent = "base.menu_procurement_management_supplier" sequence="2"/>
 
-
-    <!-- Views for Partners -->
+    <!-- Views for Partners Form View -->
 
     <record model="ir.ui.view" id="view_partner_form_inherit">
         <field name="name">Partner form inherited</field>
@@ -101,26 +150,27 @@
             <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1" position="replace">
                 <field name="address" mode="form,tree" colspan="4" nolabel="1" select="1">
                     <form string="Address">
-                        <field name="type" select="2" colspan="4"/>
-                        <newline/>
-                        <field name="street" select="2"/>
-                        <field name="street2"/>
-                        <newline/>
-                        <field name="zip" select="2"/>
-                        <field name="city" select="2"/>
-                        <newline/>
-                        <field name="country_id" select="2" completion="1"/>
-                        <field name="state_id" select="2"/>
-                        <newline/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="email" widget="email"/>
-                        <newline/>
+                       <group  colspan="2" col="2">
+                           <separator string="Postal Address" colspan="2" col="2"/>
+                           <field name="type" />
+                           <field name="street"/>
+                           <field name="street2"/>
+                           <field name="zip"/>
+                           <field name="city"/>
+                           <field name="country_id" completion="1"/>
+                           <field name="state_id"/>
+                        </group>
+                        <group colspan="2" col="2">
+                           <separator string="Communication" colspan="2" col="2"/>
+                           <field name="phone"/>
+                           <field name="fax"/>
+                           <field name="email" widget="email"/>
+                        </group>
                         <field name="job_ids" mode="tree,form" nolabel="1" colspan="4">
                             <tree string="Contacts" editable="top">
                                 <field name="sequence_partner"/>
                                 <field name="contact_id"/>
-                                <field name="function_id"/>
+                                <field name="function"/>
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
@@ -128,15 +178,19 @@
                                 <field name="email"/>
                             </tree>
                             <form string="Contacts">
-                                <field name="name"/>
+                            <group colspan="4" col="4">
                                 <field name="sequence_partner"/>
                                 <field name="contact_id"/>
-                                <field name="function_id"/>
+                                <field name="function"/>
+                            </group>
+                            <separator string="Communication" colspan="4"/>
+                            <group colspan="4" col="4">
                                 <field name="phone"/>
                                 <field name="fax"/>
                                 <field name="extension"/>
                                 <field name="other"/>
                                 <field name="email" widget="email"/>
+                            </group>
                             </form>
                         </field>
                     </form>
@@ -153,7 +207,9 @@
         </field>
     </record>
 
+
 <!-- don't display the categories, since it is displayed in an other tab-->
+
         <record model="ir.ui.view" id="view_partner_form_inherit2">
             <field name="name">res.partner.form</field>
             <field name="type">form</field>
@@ -166,6 +222,7 @@
         </record>
 
 <!-- don't display the categories label-->
+
         <record model="ir.ui.view" id="view_partner_form_inherit2bis">
             <field name="name">res.partner.form</field>
             <field name="type">form</field>
@@ -185,7 +242,7 @@
                 <notebook position="inside">
                     <page string="Categories">
                         <separator colspan="4" string="Categories"/>
-                        <field colspan="4" name="category_id" nolabel="1" select="2"/>
+                        <field colspan="4" name="category_id" nolabel="1"/>
                     </page>
                 </notebook>
             </field>
@@ -193,6 +250,7 @@
 
 
     <!-- Views for Addresses -->
+
     <record model="ir.ui.view" id="view_partner_address_tree_inherited1">
         <field name="name">Partner addresses inherited</field>
         <field name="model">res.partner.address</field>
@@ -269,42 +327,25 @@
             <field name="partner_id" position="replace">
                 <field name='partner_id' select='1'/>
                 <field name='type' select='2'/>
-                <field name='job_id' invisible="1" select="2"/>
+                <field name='job_id' invisible="1"/>
             </field>
         </field>
     </record>
 
-
-    <record id='view_partner_address_form_inherited5' model='ir.ui.view'>
-        <field name='name'>res.partner.address.form.inherited5</field>
-        <field name='model'>res.partner.address</field>
-        <field name="inherit_id" ref="base.view_partner_address_form1"/>
-        <field name='type'>form</field>
-        <field name='arch' type='xml'>
-            <field name="email" position="after">
-                <field name="job_ids" mode="tree,form" colspan="4">
-                    <tree string="Contacts" editable="top">
-                        <field name="contact_id"/>
-                        <field name="function_id"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="email"/>
-                    </tree>
-                    <form string="Contacts">
-                        <field name="contact_id"/>
-                        <field name="function_id"/>
-                        <field name="phone"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="email" widget="email"/>
-                    </form>
-                </field>
-            </field>
+    <record id="view_res_partner_address_filter" model="ir.ui.view">
+        <field name="name">res.partner.address.select</field>
+        <field name="model">res.partner.address</field>
+        <field name="type">search</field>
+        <field name="inherit_id" ref="base.view_res_partner_address_filter"/>
+        <field name="arch" type="xml">
+            <search string="Search Contact">
+                   <field name="job_ids" select='1'/>
+            </search>
         </field>
     </record>
 
-    <!-- Views for res.partner.job -->
+    <!-- Views for partner job Tree view  -->
+
     <record model="ir.ui.view" id="view_partner_job_tree">
         <field name="name">res.partner.job.tree</field>
         <field name="model">res.partner.job</field>
@@ -312,7 +353,7 @@
         <field name="arch" type="xml">
             <tree string="Contact Functions">
                 <field name="contact_id"/>
-                <field name="function_id"/>
+                <field name="function"/>
                 <field name="name"/>
                 <field name="address_id"/>
                 <field name="email"/>
@@ -324,52 +365,55 @@
         </field>
     </record>
 
+<!-- Views for partner job Form view  -->
+
     <record model="ir.ui.view" id="view_partner_job_form">
         <field name="name">res.partner.job.form</field>
         <field name="model">res.partner.job</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Contact Functions">
-                <notebook>
-                    <page string="General">
-                        <field name="name" select="1"/>
-                        <field name="address_id" select="1" context="{'address_partner_id': name}"/>
-                        <field name="contact_id" select="1"/>
-                        <field name="function_id" select="1"/>
-                        <field name="email" select="2" widget="email"/>
-                        <field name="phone" select="2"/>
-                        <field name="fax"/>
-                        <field name="extension"/>
-                        <field name="sequence_contact" select="2" groups="base.group_user"/>
-                        <field name="sequence_partner" select="2" groups="base.group_user"/>
-                        <field name="date_start" groups="base.group_user"/>
-                        <field name="date_stop" groups="base.group_user"/>
-                        <field name="state" select="2" />
-                    </page>
-                </notebook>
+	             <field name="name" select="1" on_change="onchange_partner(name)"/>
+	             <field name="address_id" select="1" attrs="{'required': [('name', '!=', False)]}" on_change="onchange_address(address_id)"/>
+	             <field name="contact_id" select="1"/>
+	             <field name="function" select="1"/>
+	             <field name="email" widget="email"/>
+	             <field name="phone"/>
+	             <field name="fax"/>
+	             <field name="extension"/>
+	             <field name="sequence_contact" groups="base.group_user"/>
+	             <field name="sequence_partner" groups="base.group_user"/>
+	             <field name="date_start" groups="base.group_user"/>
+	             <field name="date_stop" groups="base.group_user"/>
+	             <field name="state" />
             </form>
         </field>
     </record>
 
     <!-- Menuitem for res.partner.job -->
+
     <record model="ir.actions.act_window" id="action_res_partner_job">
         <field name="name">Contact's Jobs</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">res.partner.job</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem
-        name="Partners/Contact's Jobs"
-        action="action_res_partner_job"
-        id="menu_action_res_partner_job"
-        groups="base.group_extended"/>
 
-    <!-- Act window defining a shorcut on partners to open all his contacts -->
     <act_window domain="[('name', '=', active_id)]"
         id="act_res_partner_jobs" name="Partner Contacts"
         res_model="res.partner.job"
         src_model="res.partner"
         />
 
+    <!-- Act window defining a shorcut on partner address to open all his jobs -->
+
+    <act_window
+        id="act_res_partner_jobs" 
+        name="Open Jobs"
+        context="{'search_default_address_id': [active_id]}"
+        res_model="res.partner.job"
+        src_model="res.partner.address"
+        />
+
 </data>
 </openerp>