lp:~vrt-openerp/openobject-addons/6.1-trunk-bug-923440

Created by Stuart Longland and last modified
Get this branch:
bzr branch lp:~vrt-openerp/openobject-addons/6.1-trunk-bug-923440
Members of VRT Systems OpenERP Contributions can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

6750. By Stuart Longland

Rebase off upstream tree

6749. By Stuart Longland

base_contact: Add support for private addresses

This patch adds support for private contact addresses and allows for the UI to
pick out addresses of a given type by default based on the context.

Credit: Etienne Hirt

6748. By Stuart Longland

Rebase and merge with upstream

6747. By Stuart Longland

base_contact: Make contact_id OR partner_id required

Source and credit: Etienne Hirt
https://bugs.launchpad.net/openobject-addons/+bug/940264/comments/4

This patch mandates that at least one of contact_id OR partner_id (or both)
must be filled in for the object to be valid.

6746. By Stuart Longland

base_contact: Tweak order of address "names"

Tweak name_get so that it returns a string of the form:
 FirstName LastName, Partner, City, Country
rather than the default:
 Partner, FirstName, LastName, City, Country

IMO this should be locale dependent.

6745. By Stuart Longland

base_contact: Remove erronious security/base_contact_security.xml

Seems this is one of many rabbit droppings from the 6.0-branch of OpenERP.

6744. By Stuart Longland

Rebase and merge with upstream 6.1 branch

Credit goes to Etienne Hirt for putting the contributions together. Please see
https://code.launchpad.net/~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1

for the original commit log.

I tried to add these changes individually, but ran into numerous snags due to
the way the original branch was constructed (bzr merge won't work as the
branches do not share a common ancestor).

So all changes have been folded into one commit here, with the updates to .po
files filtered out as these seemed to be mostly noise.

6743. By Xavier ALT

[MERGE] report_webkit: handle more gracefull remove of 'lib_path' + fix test in l10n_ch

6742. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

6741. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:openobject-addons
This branch contains Public information 
Everyone can see this information.