Merge lp:~hirt/ocb-addons/6.1_base_contact_finalize into lp:ocb-addons/6.1

[Etienne Hirt]

Finalising the base contact 6.1 desig by adding the missing fields as described in https://bugs.launchpad.net/openobject-addons/+bug/923440

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Etienne, thank you for making again the MP properly. I will check it, but it's a huge diff for only a bugfix. I'm not sure if this is going to fit into OCB project and goals.

Let's see what others reviewers say.

Regards.

[Etienne Hirt (hirt)]

Dear Pedro,

Thanks for your offer to check it.

Somehow the redesign of the base_contact module for 6.1 was never
finished as it was abandoned by openerp. I prepared the fixes some time
ago to have the function available at Art of Technology. This
functionality is also the main reason for us not considering Version 7
(yet).

The effort now is to have others being able to profit from it, too and
also to profit from the community.

Best Regards

Etienne

On 05.11.2013 17:09, Pedro Manuel Baeza wrote:
> Hi, Etienne, thank you for making again the MP properly. I will check it, but it's a huge diff for only a bugfix. I'm not sure if this is going to fit into OCB project and goals.
>
> Let's see what others reviewers say.
>
> Regards.

[Omar (Pexego) (omar7r)]

At first sight, you should remove pdb import and the commented lines, on the other hand, you convert the partner_id field, from related to function field without search function, this field could be used in several addons as filter, with function field will not work anymore at least without search function.
IMHO I prefer name_search as works now, because your way don't support, for example, with compound first names or more than one last name, this is applyable to view_init function too.

It's a huge diff as Pedro said and I think that isn't the best way to complete this addon but we can wait for opinion of other reviewers, for now, I will mark it as needs fixing, for the up things.

Regards

review: Needs Fixing (code review, no test)

[Etienne Hirt (hirt)]

Dear Omar,

thanks for the review and your valuable comments. Please check my
answers below.

Best Regards

Etienne

On 20.11.2013 01:19, Omar (Pexego) wrote:
> Review: Needs Fixing code review, no test
>
> At first sight, you should remove pdb import and the commented lines, on the other hand,
mostly done
> you convert the partner_id field, from related to function field without search function, this field could be used in several addons as filter, with function field will not work anymore at least without search function.
With the related field you have no real control what partner is selected
as main partner.
Originally I wanted to have conditional storage but this somehow did not
work. I removed it then because contacts are nowhere searched for
partners as far as I know. Also IMHO the related fields can not be
searched if not stored.
What do you propose?
> IMHO I prefer name_search as works now, because your way don't support, for example, with compound first names or more than one last name, this is applyable to view_init function too.
Please check again the proposed search function. Because it's intention
is to extend the original function instead of limit it. Should we also
consider one lastname with multiple/compound first names?

Without the view_init function all newly entered contacts are filled
into lastname only. Thus the proposed function is an extension but not
perfect as it can not guess that multiple Firstnames are used.
>
> It's a huge diff as Pedro said and I think that isn't the best way to complete this addon but we can wait for opinion of other reviewers, for now, I will mark it as needs fixing, for the up things.
>
> Regards

[Omar (Pexego) (omar7r)]

Hi Etienne,

Thanks for updating. Related fields can not be grouped but, searched yes. Other solution, you could have a search function defined in your function field.

At Spain for example, everyone have two last names and one or two first names, like Jose Antonio or Diego Armando, we could not have limitation in that.

Regards

[Etienne Hirt (hirt)]

Hi Omar,

Thanks for insisting. With your inputs I found now a solution that supports any number of first and lastname for all searches. This was not the case in the baseline I started with.

Also the partner_id I could change back to related as the sorting of the address_id fits the requirements for the main job.

The view_init is a helper function that is a 90% solution but helps the user even if the remaining 10% when there is more than one firstname.

The partner_contact class is ready for re-reviewing. But the partner_address requires some further work. I therefore set the state to WIP.

Best Regards

[lp:~hirt/ocb-addons/6.1_base_contact_finalize]

6817. By Etienne Hirt on 2013-11-23

remove the executable flag that wrongly added in last commit

6818. By Etienne Hirt on 2014-01-05

* store partner_id in location directly to solve usability issue of having
  locations assigned to partners if any and to view it while using.
  Attention: this commit does not store the partner_ids yet at updating
             but for install the module it is added.
* override copy method for res.partner.location to avoid copying the
  related addresses's

6819. By Etienne Hirt on 2014-01-05

add auto_init for partner_id in res_partner_location

6820. By Etienne Hirt on 2014-01-18

* streamline location editing
* enhance and streamline search

6821. By Etienne Hirt on 2014-01-18

delete action as menu deletion did not work for upgrade contact/address with new action

6822. By Etienne Hirt on 2014-01-18

*further streamlining location editing
*restrict deletion of partner when there are assigned addresses

6823. By Etienne Hirt on 2014-01-19

* changes of partner of address does still not fully update the location partner_id
to be continued

6824. By Etienne Hirt on 2014-01-19

* use storage triggers for partner_id in res_partner_location
* minor UI adjustments:
** group extended for location menu but not addresses
** add partner to functions/addresses in contact form

6825. By Etienne Hirt on 2014-01-20

* enhance contact and location search
* fix length of name in contact to allow full lenght of last_name + first_name

6826. By Etienne Hirt on 2014-01-24

void delection of assigned locations

6827. By Etienne Hirt on 2014-05-29

commit files no longer executable

6828. By Etienne Hirt on 2014-05-29

do merge

6829. By Etienne Hirt on 2014-07-19

add street to res_partner_address displayname

6830. By Etienne Hirt on 2014-11-17

add other phone to address tree and form

6831. By Etienne Hirt on 2015-01-16

* store all related fields from location if one changes
* add trigger on change_location_id also because the on_change function does not store all changes!

Unmerged revisions

6831. By Etienne Hirt on 2015-01-16

* store all related fields from location if one changes
* add trigger on change_location_id also because the on_change function does not store all changes!

6830. By Etienne Hirt on 2014-11-17

add other phone to address tree and form

6829. By Etienne Hirt on 2014-07-19

add street to res_partner_address displayname

6828. By Etienne Hirt on 2014-05-29

do merge

6827. By Etienne Hirt on 2014-05-29

commit files no longer executable

6826. By Etienne Hirt on 2014-01-24

void delection of assigned locations

6825. By Etienne Hirt on 2014-01-20

* enhance contact and location search
* fix length of name in contact to allow full lenght of last_name + first_name

6824. By Etienne Hirt on 2014-01-19

* use storage triggers for partner_id in res_partner_location
* minor UI adjustments:
** group extended for location menu but not addresses
** add partner to functions/addresses in contact form

6823. By Etienne Hirt on 2014-01-19

* changes of partner of address does still not fully update the location partner_id
to be continued

6822. By Etienne Hirt on 2014-01-18

*further streamlining location editing
*restrict deletion of partner when there are assigned addresses

=== modified file 'account_asset/i18n/ca.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/de.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/es.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/es_CR.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/fr.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/fr_BE.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/pl.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/pt.po' (properties changed: +x to -x)
=== modified file 'account_asset/i18n/sv.po' (properties changed: +x to -x)
=== modified file 'account_asset/security/ir.model.access.csv' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/__init__.py' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/account_asset_change_duration.py' (properties changed: +x to -x)
=== modified file 'account_asset/wizard/wizard_asset_compute.py' (properties changed: +x to -x)
=== modified file 'base_contact/__openerp__.py'
--- base_contact/__openerp__.py	2012-01-31 13:36:57 +0000
+++ base_contact/__openerp__.py	2015-01-16 20:04:03 +0000
@@ -21,7 +21,7 @@
 
 {
     'name': 'Contacts Management',
-    'version': '1.0',
+    'version': '1.1',
     'category': 'Customer Relationship Management',
     'complexity': "expert",
     'description': """
@@ -35,12 +35,17 @@
 
 It also adds new menu items located in
     Purchases / Address Book / Contacts
-    Sales / Address Book / Contacts
-
-Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
+    Sales / Address Book / Contacts and Locations
+
+Pay attention that this module converts the existing addresses into "addresses + contacts". 
+It means that some fields of the addresses will be missing (the contact name is copied into 
+addresses to be compatible with other modules contact name). Others are supposed to be defined in an other object.
+
+All UI work with lastname(s) firstname(s) but the order has to be observed.
+When entering a new contact only one firstname is assumed. You migh add the additional firstname(s) later  
     """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA, Art of Technology AG',
+    'website': 'http://www.openerp.com, http://www.aotag.ch',
     'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
 
=== modified file 'base_contact/base_contact.py'
--- base_contact/base_contact.py	2013-09-10 15:12:35 +0000
+++ base_contact/base_contact.py	2015-01-16 20:04:03 +0000
@@ -27,31 +27,36 @@
 
     _name = "res.partner.contact"
     _description = "Contact"
-
+    
     def _name_get_full(self, cr, uid, ids, prop, unknow_none, context=None):
         result = {}
         for rec in self.browse(cr, uid, ids, context=context):
-            result[rec.id] = rec.last_name+' '+(rec.first_name or '')
+            if(rec.first_name):
+                #last_name is a required field. Therefore always available
+                result[rec.id] = rec.last_name+' '+rec.first_name
+            else:
+                result[rec.id] = rec.last_name
+            
         return result
 
     _columns = {
-        'name': fields.function(_name_get_full, string='Name', size=64, type="char", store=True, select=True),
+        'name': fields.function(_name_get_full, string='Name', size=128, type="char", store=True, select=True),
         'last_name': fields.char('Last Name', size=64, required=True),
         'first_name': fields.char('First Name', size=64),
         'mobile': fields.char('Mobile', size=64),
-        'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')]),
-        'website': fields.char('Website', size=120),
+        'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')], required=True),
+        'website': fields.char('Private Website', size=120),
         'lang_id': fields.many2one('res.lang', 'Language'),
         'job_ids': fields.one2many('res.partner.address', 'contact_id', 'Functions and Addresses'),
         'country_id': fields.many2one('res.country','Nationality'),
         'birthdate': fields.char('Birthdate', size=64),
         'active': fields.boolean('Active', help="If the active field is set to False,\
-                 it will allow you to hide the partner contact without removing it."),
+                 it will allow you to hide the partner contact without removing it."),   
         'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
                          relation='res.partner', string='Main Employer'),
         'function': fields.related('job_ids', 'function', type='char', \
                                  string='Main Function'),
-        'email': fields.char('E-Mail', size=240),
+        'email': fields.char('Private E-Mail', size=240),
         'comment': fields.text('Notes', translate=True),
         'photo': fields.binary('Photo'),
     }
@@ -67,17 +72,6 @@
 
     _order = "name"
 
-    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
-        if not args:
-            args = []
-        if context is None:
-            context = {}
-        if name:
-            ids = self.search(cr, uid, ['|',('name', operator, name),('first_name', operator, name)] + args, limit=limit, context=context)
-        else:
-            ids = self.search(cr, uid, args, limit=limit, context=context)
-        return self.name_get(cr, uid, ids, context=context)
-
     def name_get(self, cr, uid, ids, context=None):
         result = {}
         for obj in self.browse(cr, uid, ids, context=context):
@@ -85,6 +79,32 @@
             if obj.partner_id:
                 result[obj.id] = result[obj.id] + ', ' + obj.partner_id.name
         return result.items()
+    
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function shall fill the last_name and first_name if empty from context default_name
+        It assumes entry of lastnames Firstname or lastname only. Entry of multiple
+        firstnames has to be adjusted afterwards
+        """
+        
+        if context is None:
+            context = {}
+        else:
+            default_name = context.get('default_name')
+            if default_name:
+                split = default_name.split(' ')
+                length = len(split)
+                if length > 1:
+                    context.update({'default_first_name': split[length-1]})
+                    #join again
+                    default_name = split[0]
+                    for i in range(1,length-1):
+                        default_name = default_name + ' ' + split[i]
+                
+                #either fill joined rest or original text into context for last name        
+                context.update({'default_last_name': default_name})
+        pass 
+        
 
     def _auto_init(self, cr, context=None):
         def table_exists(view_name):
@@ -99,9 +119,9 @@
             cr.execute("""
                 INSERT INTO
                     res_partner_contact
-                    (id,name,last_name,title,active,email,mobile,birthdate)
+                    (id,name, last_name,first_name,title,active,email,mobile,birthdate)
                 SELECT
-                    id,COALESCE(name, '/'),COALESCE(name, '/'),title,true,email,mobile,birthdate
+                    id,name, COALESCE(name, '/'),COALESCE(name, '/'),title,true,email,mobile,birthdate
                 FROM
                     res_partner_address""")
             cr.execute("alter table res_partner_address add contact_id int references res_partner_contact")
@@ -115,6 +135,14 @@
 class res_partner_location(osv.osv):
     _name = 'res.partner.location'
     _rec_name = 'street'
+    
+    def _get_location_from_address_ids(self, cr, uid, ids, context=None):
+        result = {}
+        
+        for location in self.pool.get('res.partner.location').search(cr, uid, [('job_ids','in',ids)]):
+                result[location] = True          
+            
+        return result.keys()
     _columns = {
         'street': fields.char('Street', size=128),
         'street2': fields.char('Street2', size=128),
@@ -123,13 +151,55 @@
         'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
         'country_id': fields.many2one('res.country', 'Country'),
         'company_id': fields.many2one('res.company', 'Company',select=1),
-        'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
+        'job_ids': fields.one2many('res.partner.address', 'location_id', 'Addresses'),
+        #storage triggers are important if an address is changed to another partner etc.
         'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
-                         relation='res.partner', string='Main Partner'),
+                    relation='res.partner', string='Main Partner', 
+                    store = {
+                'res.partner.location': (lambda self,cr,uid,ids,c=None: ids, ['job_ids'], 10),
+                'res.partner.address': (_get_location_from_address_ids, ['partner_id'], 10),
+                    }),
+        'contact_id': fields.related('job_ids', 'contact_id', type='many2one',\
+                         relation='res.partner.contact', string='First Contact'),         
     }
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'res.partner.address', context=c),
     }
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        """
+        Overrides orm copy method in order to avoid copying of related objects such as
+            * job_ids
+        @param self: the object pointer
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param id: Id of crm_lead
+        @param default: Dictionary of default values for copy.
+        @param context: A standard dictionary for contextual values
+        """
+        if context is None:
+            context = {}
+        if default is None:
+            default = {}
+
+        default.update({
+                    'job_ids': [],
+                })
+        return super(osv.osv, self).copy(cr, uid, id, default, context=context)
+    
+    def view_init(self, cr, uid, fields, context=None):
+        """
+        This function shall fill the street from the entry
+        """
+        
+        if context is None:
+            context = {}
+        else:
+            default_name = context.get('default_name')
+            if default_name:
+                context.update({'default_street': default_name})
+        pass 
+    
     def _auto_init(self, cr, context=None):
         def table_exists(view_name):
             cr.execute('SELECT count(relname) FROM pg_class WHERE relname = %s', (view_name,))
@@ -144,21 +214,32 @@
                 INSERT INTO
                     res_partner_location
                     (id,street,street2,zip,city,
-                     state_id,country_id,company_id)
+                     state_id,country_id,company_id,partner_id)
                 SELECT
                     id,street,street2,zip,city,
-                    state_id,country_id,company_id
+                    state_id,country_id,company_id,partner_id
                 FROM
                     res_partner_address""")
             cr.execute("alter table res_partner_address add location_id int references res_partner_location")
             cr.execute("update res_partner_address set location_id=id")
             cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner_address))")
+        else:
+            cr.execute("""
+                UPDATE 
+                    res_partner_location l
+                SET 
+                    partner_id = addr.partner_id
+                FROM
+                    res_partner_address addr INNER JOIN res_partner_location loc ON (loc.id = addr.location_id)
+                WHERE
+                    l.id = loc.id and l.partner_id is null and addr.partner_id is not null  """)    
+                   
 
     def name_get(self, cr, uid, ids, context=None):
         result = {}
         for obj in self.browse(cr, uid, ids, context=context):
             res = []
-            if obj.partner_id: res.append(obj.partner_id.name_get()[0][1])
+            if obj.street: res.append(obj.street)
             if obj.city: res.append(obj.city)
             if obj.country_id: res.append(obj.country_id.name_get()[0][1])
             result[obj.id] = ', '.join(res)
@@ -168,15 +249,83 @@
 
 class res_partner_address(osv.osv):
     _inherit = 'res.partner.address'
+    
+    def _get_address_from_location_ids(self, cr, uid, ids, context=None):
+        result = {}
+        
+        for addr in self.pool.get('res.partner.address').search(cr, uid, [('location_id','in',ids)]):
+                result[addr] = True          
+            
+        return result.keys()
+    
+    def _get_address_from_contact_ids(self, cr, uid, ids, context=None):
+        result = {}
+        for addr in self.pool.get('res.partner.address').search(cr, uid, [('contact_id','in',ids)]):
+            result[addr] = True
+        return result.keys()
+    
+    def _get_own_addresses(self, cr, uid, ids, context=None):
+        result = {}
+        for id in ids:
+            result[id] = True
+        return result.keys()
+        
 
     def _default_location_id(self, cr, uid, context=None):
         if context is None:
             context = {}
         if not context.get('default_partner_id',False):
             return False
-        ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
+        #if a default location is available than this is the default location
+        address_pool = self.pool.get('res.partner.address')
+        address_ids = address_pool.search(cr, uid, [('partner_id','=',context['default_partner_id']),('type','=','default')], context=context)
+        ids=[]
+        if address_ids:
+            addresses = address_pool.browse(cr, uid, address_ids)
+            for address in addresses:
+                if address and address.location_id:
+                    ids.append(address.location_id.id)
+                    break 
+        if not ids:
+            ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
+                
         return ids and ids[0] or False
+    
+    def onchange_partner_id(self,cr, uid, ids, partner_id=False, context={}):
+        #if this address is the only one that points to its location then keep the location
+        if ids:
+            address = self.pool.get('res.partner.address').browse(cr, uid, ids[0], context=context)
+            if address.location_id:
+                location = self.pool.get('res.partner.location').browse(cr, uid, address.location_id.id, context=context)
+                if len(location.job_ids) <=1:
+                    return {}
+                   
+        if partner_id:
+            context['default_partner_id'] = partner_id
+            location_id = self._default_location_id(cr, uid, context)
+        else:
+            location_id = False     
+        return {'value':{
+                         'location_id': location_id,
+                         }
+                }
 
+    def onchange_contact_id(self,cr, uid, ids, contact_id=False, context={}): 
+        if not contact_id:
+            return {'value':{
+                             'mobile': False,
+                             #setting of name is not required. If no contact_id it is set to False by the relation
+                             'title': False,
+                             }
+                    }
+        contact = self.pool.get('res.partner.contact').browse(cr, uid, contact_id, context=context)
+        return {'value':{
+            'mobile': contact.mobile,
+            'name': contact.name,
+            'title': contact.title and contact.title.id or False,        
+        }}
+        
+        
     def onchange_location_id(self,cr, uid, ids, location_id=False, context={}):
         if not location_id:
             return {}
@@ -191,37 +340,73 @@
         }}
 
     _columns = {
-        'location_id' : fields.many2one('res.partner.location', 'Location'),
+        #do not allow to delete a partner as long as jobs are related to it
+        'partner_id': fields.many2one('res.partner', 'Partner Name', ondelete='restrict', select=True, help="Keep empty for a private address, not related to partner."),        
+        'location_id' : fields.many2one('res.partner.location', 'Location', ondelete='restrict',),
         'contact_id' : fields.many2one('res.partner.contact', 'Contact'),
+        
+        #add private type
+        'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other'), ('private', 'Private') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
+
+        
+        #field for administer functions
+        'sequence_contact': fields.integer('Contact Seq.',help='Order of\
+                     importance of this address in the list of addresses of the linked contact'),
+        'date_start': fields.date('Date Start',help="Start date of job(Joining Date)"),
+        'date_stop': fields.date('Date Stop', help="Last date of job"),
+        'state': fields.selection([('past', 'Past'),('current', 'Current')], \
+                                'State', required=True, help="Status of Address"),
 
         # fields from location
-        'street': fields.related('location_id', 'street', string='Street', type="char", store=True, size=128),
-        'street2': fields.related('location_id', 'street2', string='Street2', type="char", store=True, size=128),
-        'zip': fields.related('location_id', 'zip', string='Zip', type="char", store=True, change_default=True, size=24),
-        'city': fields.related('location_id', 'city', string='City', type="char", store=True, size=128),
-        'state_id': fields.related('location_id', 'state_id', relation="res.country.state", string='Fed. State', type="many2one", store=True, domain="[('country_id','=',country_id)]"),
-        'country_id': fields.related('location_id', 'country_id', type='many2one', string='Country', store=True, relation='res.country'),
+        #Trigger for change of location id of self seems not required because this is handled by onchange_location_id
+        # triggered in the form, but this does not properly store the values!. None looks at any fields for change
+        'street': fields.related('location_id', 'street', string='Street', 
+                                 type="char", size=128, readonly=True,
+                store = { 'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}),
+        'street2': fields.related('location_id', 'street2', string='Street2',
+                                  type="char", size=128, readonly=True,
+                store = {'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}),                  
+        'zip': fields.related('location_id', 'zip', string='Zip', 
+                              type="char", change_default=True, size=24, readonly=True,
+                store = {'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}),
+        'city': fields.related('location_id', 'city', string='City', 
+                               type="char", size=128, readonly=True,
+                store = {'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}),
+        'state_id': fields.related('location_id', 'state_id', relation="res.country.state", 
+                            string='Fed. State', type="many2one", 
+                            domain="[('country_id','=',country_id)]", readonly=True,
+                store = {'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}), 
+        'country_id': fields.related('location_id', 'country_id', type='many2one', 
+                            string='Country', relation='res.country', readonly=True,
+                store = {'res.partner.address': (lambda self, cr, uid, ids, c={}: ids, ['location_id'], 5),
+                         'res.partner.location': (_get_address_from_location_ids, None, 10),}),
 
-        'phone': fields.char('Phone', size=64),
-        'fax': fields.char('Fax', size=64),
-        'email': fields.char('E-Mail', size=240),
+        #this field is missing compared to 6.0 implementation
+        'other': fields.char('Other Phone', size=64, help='Additional phone field'),
 
         # fields from contact
         'mobile' : fields.related('contact_id', 'mobile', type='char', size=64, string='Mobile'),
-        'name' : fields.related('contact_id', 'name', type='char', size=64, string="Contact Name", store=True),
-        'title' : fields.related('contact_id', 'title', type='many2one', relation='res.partner.title', string="Title", store=True),
+                #store = {'res.partner.contact': (_get_address_from_contact_ids, ['mobile'], 10),
+                #         'res.partner.address': (_get_own_addresses,['contact_id'], 20)}), @bug: query wants to store in crm_lead!!!!
+        'name' : fields.related('contact_id', 'name', type='char', size=64, string="Contact Name",
+                store = {'res.partner.contact': (_get_address_from_contact_ids, ['last_name', 'first_name'], 10),
+                         'res.partner.address': (_get_own_addresses,['contact_id'], 20)}),
+        'title' : fields.related('contact_id', 'title', type='many2one', relation='res.partner.title', string="Title"),
     }
     def create(self, cr, uid, data, context={}):
-        if not data.get('location_id', False):
-            loc_id = self.pool.get('res.partner.location').create(cr, uid, {
-                'street': data.get('street',''),
-                'street2': data.get('street2',''),
-                'zip': data.get('zip',''),
-                'city': data.get('city',''),
-                'country_id': data.get('country_id',False),
-                'state_id': data.get('state_id',False)
-            }, context=context)
-            data['location_id'] = loc_id
+        if data.get('location_id', False):
+            location = self.pool.get('res.partner.location').browse(cr, uid, [data['location_id']])[0]
+            data['street'] = location.street or False
+            data['street2'] = location.street2 or False
+            data['zip'] = location.zip or False
+            data['city'] = location.city or False
+            data['country_id'] = location.country_id and location.country_id.id or False
+            data['state_id'] = location.state_id and location.state_id.id or False
         result = super(res_partner_address, self).create(cr, uid, data, context=context)
         return result
 
@@ -229,26 +414,82 @@
         result = {}
         for rec in self.browse(cr,uid, ids, context=context):
             res = []
+            if rec.contact_id and rec.contact_id.name:
+                res.append(rec.contact_id.name)
             if rec.partner_id:
                 res.append(rec.partner_id.name_get()[0][1])
-            if rec.contact_id and rec.contact_id.name:
-                res.append(rec.contact_id.name)
             if rec.location_id:
+                if rec.location_id.street: res.append(rec.location_id.street)
                 if rec.location_id.city: res.append(rec.location_id.city)
                 if rec.location_id.country_id: res.append(rec.location_id.country_id.name_get()[0][1])
             result[rec.id] = ', '.join(res)
         return result.items()
 
     _defaults = {
-        'location_id': _default_location_id
+        'location_id': _default_location_id,
+        'sequence_contact' : lambda *a: 0,
+        'state': lambda *a: 'current',
     }
+    
+    def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
+        """
+        Search function searches in (contact) name and partner_id depending on context
+        while using otherwise the standard implementation
+        """
+        if not args:
+            args = []
+        if context is None:
+            context = {}
+        
+        if name and context.get('contact_display', 'contact') == 'partner':    
+            ids = self.search(cr, uid, ['|',('name', operator, name),('partner_id', operator, name)] + args, limit=limit, context=context)
+            return self.name_get(cr, uid, ids, context=context)                    
+        else:
+            return super(res_partner_address, self).name_search(cr, uid, name, args, operator, context, limit)
+    
+    
+    
+    #order by name. default addresses are assumed to have no name = empty -> are last entry! 
+    _order='state, name, sequence_contact'
+
+  
 
     def default_get(self, cr, uid, fields=[], context=None):
         if context is None:
             context = {}
-        if 'default_type' in context:
-            del context['default_type']
+        #if 'default_type' in context:
+        #    del context['default_type']
         return super(res_partner_address, self).default_get(cr, uid, fields, context)
 
 res_partner_address()
 
+class res_partner(osv.osv):
+    _inherit = 'res.partner'
+    
+    def _default_address_id(self, cr, uid, ids, prop, unknow_none, context=None):
+        
+        res = dict.fromkeys(ids, False)
+        
+        all_ids = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','in',ids), ('type','=','default')])
+        
+        addresses = self.pool.get('res.partner.address').browse(cr, uid, all_ids)
+        for addr in addresses:
+            if(res[addr.partner_id.id] == False):
+                res[addr.partner_id.id] = addr.id
+                                              
+        return res
+       
+    
+    _columns = {#default_address_id has to be stored to enable search of the related fields!!! Somehow trigger is not required!
+                'default_address_id': fields.function(_default_address_id, type='many2one', obj='res.partner.address', string='address_id', store = True),
+                'phone': fields.related('default_address_id', 'phone', type='char', string='Phone'),
+                'fax': fields.related('default_address_id', 'fax', type='char', string='Fax', store = False),
+                'email': fields.related('default_address_id', 'email', type='char', size=240, string='E-mail', store = False),
+                'street': fields.related('default_address_id', 'street', type='char', string='Street', store = False),
+                'city': fields.related('default_address_id', 'city', type='char', string='City', store = False),
+                'country': fields.related('default_address_id','country_id', type='many2one', relation='res.country', string='Country'),
+                  }
+  
+res_partner()    
+    
+
 
=== modified file 'base_contact/base_contact_view.xml'
--- base_contact/base_contact_view.xml	2012-01-31 13:36:57 +0000
+++ base_contact/base_contact_view.xml	2015-01-16 20:04:03 +0000
@@ -1,6 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+	
+	<!-- Address views -->
+	
+ 	<record id="view_partner_address_tree" model="ir.ui.view">
+            <field name="name">res.partner.address.tree</field>
+            <field name="model">res.partner.address</field>
+            <field name="inherit_id" ref="base.view_partner_address_tree"/>
+            <field name="type">tree</field>
+            <field name="context">{"search_default_state": "current"}</field>  
+            <field name="arch" type="xml">
+                <tree string="Partner Addresses" position="replace"> 
+					<tree string="Addresses" colors="gray:state in ('past')">
+						<field name="name"/>         
+	                    <field name="partner_id"/>
+	                    <field name="function"/>
+	                    <field name="email"/>
+	                    <field name="phone"/>
+	                    <field name="mobile"/>
+	                    <field name="other" />
+	                    <field name="country_id"/>
+	                    <field name="type"/>
+	                    <field name="state" />
+	                </tree>
+                </tree>
+            </field>
+        </record>
+	
+	 <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="inherit_id" ref="base.view_res_partner_address_filter"/> 
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Contact" position="replace" >
+	                <search string="Search Address">
+	                    <group>
+	                        <field name="partner_id" string="Partner"/>
+	                        <field name="name" string="Contact (Lastname(s) Firstname(s))" />
+	                        <field name="function"/>
+	                        <field name="street" />
+	                        <field name="city" />
+	                        <field name="country_id" />
+	                        <field name="type" />
+	                        <field name="state" />
+	                    </group>
+	                    <newline/>
+	                    <group expand="0" string="Group By...">
+	                       <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by' : 'partner_id'}" /> 
+	                       <filter string="Function" icon="terp-go-home" domain="[]" context="{'group_by' : 'function'}" />
+	                       <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'type'}" />
+	                       <filter string="State" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by' : 'state'}" />
+	                   </group>
+	                 </search>
+                 </search>
+            </field>
+        </record>
+	
+	<!-- Address Tree view for Contact -->
+    <record id="view_partner_address_tree_contact" model="ir.ui.view">
+        <field name="name">res.partner.address.tree.contact</field>
+        <field name="model">res.partner.address</field>
+        <field name="type">tree</field>
+        <field eval="17" name="priority"/>
+        <field name="arch" type="xml">
+            <tree string="Functions and Addresses" colors="gray:state in ('past')">
+                <field name="partner_id"/>        
+                <field name="location_id"/>
+                <field name="function"/>
+                <field name="email" widget="email"/>
+                <field name="phone"/>
+                <field name="other" />
+                <field name="fax"/>
+                <field name="type"/>
+                <field name="state" />
+                <field name="sequence_contact" string="Seq."/>
+            </tree>
+        </field>
+    </record>
+    
+    	<!-- Adress Tree view for Partner -->
+    <record id="view_partner_address_tree_partner" model="ir.ui.view">
+        <field name="name">res.partner.address.tree.partner</field>
+        <field name="model">res.partner.address</field>
+        <field name="type">tree</field>
+        <field eval="18" name="priority"/>
+        <field name="arch" type="xml">
+    		<tree string="Functions and Addresses" colors="gray:state in ('past')" >
+                <field name="name"/>
+                <field name="location_id"/>
+                <field name="function"/>
+                <field name="email" widget="email"/>
+                <field name="phone"/>
+                <field name="mobile"/>
+                <field name="other" />
+                <field name="fax"/>
+                <field name="type"/>
+                <field name="state" />
+           	</tree>
+        </field>
+    </record>
 
     <!-- Views for Contacts Tree View -->
 
@@ -9,8 +109,8 @@
         <field name="model">res.partner.contact</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Partner Contact">
-                <field name="name"/>
+            <tree string="Contact">
+                <field name="last_name"/>
                 <field name="first_name"/>
                 <field name="mobile"/>
                 <field name="email"/>
@@ -28,7 +128,7 @@
         <field name="model">res.partner.contact</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Partner Contact">
+            <form string="Contact">
                 <group colspan="4" col="6">
                     <field name="last_name" select="1"/>
                     <field name="first_name" select="1"/>
@@ -48,22 +148,7 @@
                                 <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="partner_id" />
-                                <field name="location_id" domain="[('partner_id', '=', partner_id)]"/>
-                                <field name="function" />
-                                <separator string="Professional Info" colspan="4"/>
-                                <field name="phone"/>
-                                <field name="fax"/>
-                                <field name="email" widget="email"/>
-                            </form>
-                            <tree string="Functions and Addresses">
-                                <field name="location_id"/>
-                                <field name="function"/>
-                                <field name="phone"/>
-                                <field name="email"/>
-                            </tree>
+                       <field name="job_ids" colspan="4" nolabel="1" mode="tree,form" context="{'tree_view_ref' : 'base_contact.view_partner_address_tree_contact', 'default_contact_id': active_id, 'default_type': 'contact'}">
                         </field>
                     </page>
                     <page string="Extra Information">
@@ -90,15 +175,15 @@
         <field name="model">res.partner.contact</field>
         <field name="type">search</field>
         <field name="arch" type="xml">
-            <search string="Partner Contact">
-                <field name="name" string="First/Lastname"
-                    filter_domain="['|', ('first_name','ilike', self), ('last_name', 'ilike', self)]"/>
+            <search string="Contact">
+                <field name="last_name" />
+                <field name="first_name" />
                 <field name="partner_id" string="Partner"/>
             </search>
         </field>
     </record>
 
-<!-- Views for Contacts Action -->
+	<!-- Views for Contacts Action and menu -->
 
     <record model="ir.actions.act_window" id="action_partner_contact_form">
         <field name="name">Contacts</field>
@@ -110,11 +195,27 @@
     </record>
     <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/>
 
-    <!-- Rename menuitem for partner addresses -->
-    <record model="ir.ui.menu" id="base.menu_partner_address_form">
-        <field name="name">Addresses</field>
+	<!-- Views for Address Action and menu -->
+	 <record id="action_partner_address_form" model="ir.actions.act_window">
+            <field name="name">Addresses</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.address</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,kanban</field>
+            <field name="context"> {"search_default_state": "current"}</field>
+            <field name="search_view_id" ref="view_res_partner_address_filter"/>
+            <field name="help">Address helps you manage your contacts jobs wether they are private, main/switchboard or contacts.</field>
     </record>
-
+    
+    <!-- Replace menuitem with new action 
+    delete action window as menu deletion did not work -->
+    <delete model="ir.actions.act_window" id="base.action_partner_address_form" />
+
+    <menuitem action="action_partner_address_form" id="menu_partner_address_form"
+            name="Addresses"
+            parent="base.menu_address_book" sequence="30"/>
+
+    
     <!--
     Contacts for Suppliers
     -->
@@ -126,8 +227,13 @@
             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"/>
+    
+	<menuitem action="action_partner_address_form" id="menu_purchase_partner_address_form"
+            name="Addresses"
+            parent="base.menu_procurement_management_supplier" sequence="30"/>
+    
 
-    <!-- Views for Partners Form View -->
+    <!-- Views for Partner -->
 
     <record model="ir.ui.view" id="view_partner_form_inherit">
         <field name="name">Partner form inherited</field>
@@ -135,17 +241,50 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <separator string="Postal Address" position="after">
-                <field name="location_id" on_change="onchange_location_id(location_id)" domain="[('partner_id', '=', parent.id)]"/>
-            </separator>
-            <xpath expr="//field[@string='Contact Name']" position="replace">
-                <field name="contact_id"/>
-            </xpath>
-            <field name="title" position="replace"/>
+        	<field name="address" position="replace" >
+        	 	<field colspan="4" mode="tree,form" name="address" nolabel="1" select="1" height="260" context="{'tree_view_ref' : 'base_contact.view_partner_address_tree_partner', 'default_partner_id': active_id, 'default_type': 'contact'}">
+        	    </field>
+        	</field>
+        
         </field>
     </record>
-
-    <!-- Views for Addresses -->
+    
+    <record id="view_partner_tree" model="ir.ui.view">
+            <field name="name">res.partner.tree</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+               
+                    <field name="phone" position="after" >
+                    	<field name="fax"/>       
+                    </field>
+                    
+                    <field name="city" position="before" >
+                    	<field name="street"/>       
+                    </field>
+                    
+            </field>
+        </record>
+        
+    <record id="view_res_partner_filter" model="ir.ui.view">
+            <field name="name">res.partner.select</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter"/>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+              
+                        
+                        <field name="country" position="before">
+                        	<field name="street" select="1"/>
+                        	<field name="city" select="1"/>           
+                        </field>
+                        
+            </field>
+        </record>     
+    
+ 
+    <!-- Views for Location -->
 
     <record model="ir.ui.view" id="view_partner_location_form">
         <field name="name">res.partner.location.form</field>
@@ -153,12 +292,24 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Locations">
+				<field name="partner_id" readonly="1" />
                 <field name="street" colspan="4"/>
                 <field name="street2" colspan="4"/>
                 <field name="zip"/>
                 <field name="city"/>
                 <field name="country_id" />
                 <field name="state_id"/>
+                <newline />
+                <separator string="Addresses" colspan="4" />
+                <field name="job_ids" nolabel="1" colspan="4" readonly="1" mode="tree">
+                  	<tree string="Address">
+  	                  	<field name = "contact_id" />
+  	                  	<field name = "partner_id" />
+  	                  	<field name = "function" />
+  	                  	<field name = "type" />
+  	                  	<field name = "state" />           
+                	</tree>   
+                </field> 
             </form>
         </field>
     </record>
@@ -170,6 +321,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Locations">
+				<field name="partner_id" string="Partner" />
+				<field name="contact_id" />
+				<field name="street" />
                 <field name="city"/>
                 <field name="country_id" />
                 <field name="state_id"/>
@@ -177,19 +331,77 @@
         </field>
     </record>
 
+   <record model="ir.ui.view" id="view_partner_location_search">
+        <field name="name">res.partner.location.search</field>
+        <field name="model">res.partner.location</field>
+        <field name="type">search</field>
+        <field name="arch" type="xml">
+            <search string="Partner Location">
+                <field name="partner_id" string="Partner"/>
+                <field name="job_ids" />
+				<field name="street" />
+				<field name="city" />
+	            <field name="country_id" />
+            </search>
+        </field>
+    </record>
+
+
+    <record model="ir.actions.act_window" id="action_partner_location_form">
+        <field name="name">Locations</field>
+        <field name="res_model">res.partner.location</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_partner_location_tree"/>
+        <field name="search_view_id" ref="view_partner_location_search"/>
+    </record>
+	<!-- sequence=30 is because 11 is not enough for beeing below addresses to be checked further -->
+    <menuitem name="Locations" id="menu_partner_location_form" action="action_partner_location_form" 
+    	parent = "base.menu_address_book" groups="base.group_extended" sequence="40"/>
+    <menuitem name="Locations" id="menu_purchase_partner_location_form" action="action_partner_location_form"
+    	 parent = "base.menu_procurement_management_supplier" groups="base.group_extended" sequence="40"/>
+
+
+    <!-- Update default address view -->
+
     <record model="ir.ui.view" id="view_partner_address_form_inherited0">
         <field name='name'>res.partner.address.form.inherited0</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="partner_id" position="replace">
+        		<field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required':[('contact_id','=', False)]}"/>
+        	</field> 
+        	   
             <field name="name" position="replace">
-                <field name="contact_id"/>
-            </field>
+                <field name="contact_id" on_change="onchange_contact_id(contact_id)" attrs="{'required':[('partner_id','=', False)]}"/>
+                <!-- <field name="name" string="use this field for initial name only" /> would require adaption of create-->
+            </field>
+            
+            <field name="type" position="replace">
+            	<field name="type" required="1"/>
+            </field>
+            <field name="mobile" position="after">
+            	<field name="other" />
+            	
+			</field>            	
             <separator string="Postal Address" position="after">
-                <field name="location_id" on_change="onchange_location_id(location_id)"/>
+                <field name="location_id" required="1" 
+                	on_change="onchange_location_id(location_id)" 
+                	domain="[('partner_id', '=', partner_id)]" 
+                	context="{'default_partner_id': partner_id}"/>
             </separator>
             <field name="title" position="replace"/>
+            <field name="function" position="after">
+               	<separator string="Status" colspan="6"/>
+               	<field name="state" />
+               	<field name="date_start" />
+        		<field name="date_stop" />
+               	<separator string="Sequence" colspan="6" col="2"/> 
+                <field name="sequence_contact" string="Contact Seq."/>
+             </field>
         </field>
     </record>
 
 
=== modified file 'base_contact/security/ir.model.access.csv'
--- base_contact/security/ir.model.access.csv	2012-01-31 13:36:57 +0000
+++ base_contact/security/ir.model.access.csv	2015-01-16 20:04:03 +0000
@@ -1,7 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1
 "access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0
-"access_res_partner_location","res.partner.location","model_res_partner_location","base.group_user",1,0,0,0
+"access_res_partner_location_manager","res.partner.location","model_res_partner_location","base.group_partner_manager",1,1,1,1
+"access_res_partner_location_all","res.partner.location","model_res_partner_location","base.group_user",1,0,0,0
 "access_res_partner_location_sale_salesman","res.partner.location","model_res_partner_location","base.group_sale_salesman",1,1,1,0
 "access_res_partner_address_sale_salesman","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
 "access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0
 
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh' (properties changed: +x to -x)
=== modified file 'document/odt2txt.py' (properties changed: +x to -x)
=== modified file 'document/test_cindex.py' (properties changed: +x to -x)
=== modified file 'document_ftp/ftpserver/ftpserver.py' (properties changed: +x to -x)
=== modified file 'document_webdav/test_davclient.py' (properties changed: +x to -x)
=== modified file 'email_template/html2text.py' (properties changed: +x to -x)
=== modified file 'l10n_ch/report/ocrbb.ttf' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test.v11' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test_part_1.v11' (properties changed: +x to -x)
=== modified file 'l10n_ch/test/test_part_2.v11' (properties changed: +x to -x)
=== modified file 'mail/static/scripts/openerp_mailgate.py' (properties changed: +x to -x)
=== modified file 'plugin_thunderbird/static/thunderbird_plugin/install.sh' (properties changed: +x to -x)
=== modified file 'purchase/purchase.py' (properties changed: +x to -x)
=== modified file 'purchase/wizard/purchase_line_invoice.py' (properties changed: +x to -x)
=== modified file 'purchase_double_validation/test/purchase_double_validation_test.yml' (properties changed: +x to -x)
=== modified file 'purchase_requisition/test/purchase_requisition_demo.yml' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/Readme.md' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/autogit.sh' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/index.html' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/input_complete' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/jquery-1.4.2.min.js' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/wiky.css' (properties changed: +x to -x)
=== modified file 'wiki/static/src/lib/wiky/wiky.js' (properties changed: +x to -x)