Merge pull request #5 from savoirfairelinux/8.0-meta

8.0 meta
11 years ago · bf69ae253d
64 changed files with 985 additions and 1501 deletions
--- a/.coveragerc
+++ b/.coveragerc
@ -0,0 +1,17 @@
+# Config file .coveragerc
+
+[report]
+include =
+    */partner-contact/*
+
+omit =
+    */tests/*
+    *__init__.py
+
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about null context checking
+    if context is None:
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,50 @@
+# buildout
+tools/.*
+tools/bin
+tools/develop-eggs
+tools/eggs
+tools/etc
+tools/parts
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Pycharm
+.idea
+
+# Backup files
+*~
+*.swp
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,23 @@
+language: python
+
+python:
+  - "2.7"
+
+env:
+  - VERSION="8.0"
+
+virtualenv:
+  system_site_packages: true
+
+install:
+  - git clone https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
+  - travis_install_nightly ${VERSION}
+  - $HOME/maintainer-quality-tools/travis/travis_install_nightly ${VERSION}
+
+script:
+  - travis_run_flake8
+  - travis_run_tests ${VERSION}
+
+after_success:
+  coveralls
--- a/661
+++ b/661
@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
--- a/README.md
+++ b/README.md
@ -0,0 +1,12 @@
+[![Build Status](https://travis-ci.org/OCA/partner-contact.svg?branch=8.0)](https://travis-ci.org/OCA/partner-contact)
+[![Coverage Status](https://coveralls.io/repos/OCA/partner-contact/badge.png?branch=8.0)](https://coveralls.io/r/OCA/partner-contact?branch=8.0)
+
+Parter and Contact Management
+=============================
+
+This project is meant to gather all community extensions of Odoo's knowledge and document management
+
+Here you should find all community modules that
+
+- implement means to structure knowledge
+- provide access to knowledge/documents
--- a/unported/account_partner_merge/init.py
+++ b/unported/account_partner_merge/init.py
--- a/unported/account_partner_merge/openerp.py
+++ b/unported/account_partner_merge/openerp.py
@ -28,7 +28,7 @@
 'depends': ['account_report_company', 'base_partner_merge'],
 'data': ['account_partner_merge_view.xml'],
 'test': [],
- 'installable': True,
+ 'installable': False,
 'auto_install': True,
 'application': False,
 }
--- a/unported/account_partner_merge/account_partner_merge_view.xml
+++ b/unported/account_partner_merge/account_partner_merge_view.xml
--- a/unported/account_partner_merge/partner_merge.py
+++ b/unported/account_partner_merge/partner_merge.py
@ -18,9 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import osv
+from openerp.osv import orm

-class MergePartnerAutomatic(osv.TransientModel):
+
+class MergePartnerAutomatic(orm.TransientModel):
    _inherit = 'base.partner.merge.automatic.wizard'

    def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
--- a/unported/base_contact/init.py
+++ b/unported/base_contact/init.py
--- a/unported/base_contact/openerp.py
+++ b/unported/base_contact/openerp.py
@ -48,9 +48,7 @@ It lets you define groups of contacts sharing some common information, like:
        'base_contact_demo.xml',
    ],
    'test': [],
-    'installable': True,
+    'installable': False,
    'auto_install': False,
    'images': [],
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/unported/base_contact/base_contact.py
+++ b/unported/base_contact/base_contact.py
--- a/unported/base_contact/base_contact_demo.xml
+++ b/unported/base_contact/base_contact_demo.xml
--- a/unported/base_contact/base_contact_view.xml
+++ b/unported/base_contact/base_contact_view.xml
--- a/unported/base_contact/tests/init.py
+++ b/unported/base_contact/tests/init.py
--- a/unported/base_contact/tests/test_base_contact.py
+++ b/unported/base_contact/tests/test_base_contact.py
--- a/unported/firstname_display_name_trigger/init.py
+++ b/unported/firstname_display_name_trigger/init.py
--- a/unported/firstname_display_name_trigger/openerp.py
+++ b/unported/firstname_display_name_trigger/openerp.py
@ -18,12 +18,14 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name': 'Link module if partner_lastname and account_report_company are installed',
+
+{
+    'name': 'Link module if partner_lastname and account_report_company are installed',
    'version': '1.0',
    'author': 'Camptocamp',
    'maintainer': 'Camptocamp',
    'category': 'Hidden',
- 'complexity': 'normal',  # easy, normal, expert
+    'license': 'AGPL-3',
    'depends': [
        'account_report_company',
        'partner_firstname',
@ -33,9 +35,7 @@ Adapt the computation of display name so that it gets visible in tree and kanban
 """,
    'website': 'http://www.camptocamp.com',
    'data': [],
- 'installable': True,
- 'images': [],
+    'installable': False,
    'auto_install': True,
- 'license': 'AGPL-3',
- 'application': False}
-
+    'application': False,
+}
--- a/unported/firstname_display_name_trigger/res_partner.py
+++ b/unported/firstname_display_name_trigger/res_partner.py
@ -50,7 +50,6 @@ class ResPartner(orm.Model):
            res.append((record.id, name))
        return res

-
    _display_name_store_triggers = {
        'res.partner': (lambda self, cr, uid, ids, context=None: self.search(cr, uid, [('id', 'child_of', ids)]),
                        ['parent_id', 'is_company', 'name', 'firstname', 'lastname'], 10)
--- a/unported/firstname_display_name_trigger/tests/init.py
+++ b/unported/firstname_display_name_trigger/tests/init.py
@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 import test_display_name

 checks = [
--- a/unported/firstname_display_name_trigger/tests/test_display_name.py
+++ b/unported/firstname_display_name_trigger/tests/test_display_name.py
@ -1,31 +1,39 @@
+# -*- coding: utf-8 -*-
 import unittest2

 import openerp.tests.common as common

+
 class test_display_name(common.TransactionCase):

    def setUp(self):
        super(test_display_name, self).setUp()
-        cr, uid = self.cr, self.uid
        self.res_partner = self.registry('res.partner')

-
    def test_00_create_res_partner(self):
        """ Test if the display name has been correctly set """
        cr, uid = self.cr, self.uid
-        partner_id = self.res_partner.create(cr, uid, {'lastname': 'Lastname', 'firstname': 'Firstname', 'is_company': True})
+        partner_id = self.res_partner.create(cr, uid, {
+            'lastname': 'Lastname',
+            'firstname': 'Firstname',
+            'is_company': True,
+        })
        partner_records = self.res_partner.browse(cr, uid, [partner_id])
        p1 = partner_records[0]
-        self.assertEqual(p1.display_name, 'Lastname Firstname', 'Partner display_name incorect')
+        self.assertEqual(p1.display_name, 'Lastname Firstname', 'Partner display_name incorrect')

    def test_01_res_partner_write_lastname(self):
        """ Test if the display name has been correctly set """
        cr, uid = self.cr, self.uid
-        partner_id = self.res_partner.create(cr, uid, {'lastname': 'Lastname', 'firstname': 'Firstname', 'is_company': True})
+        partner_id = self.res_partner.create(cr, uid, {
+            'lastname': 'Lastname',
+            'firstname': 'Firstname',
+            'is_company': True
+        })
        partner_records = self.res_partner.browse(cr, uid, [partner_id])
        p1 = partner_records[0]
        self.res_partner.write(cr, uid, partner_id, {'lastname': 'Last'})
-        self.assertEqual(p1.display_name, 'Last Firstname', 'Partner display_name incorect')
+        self.assertEqual(p1.display_name, 'Last Firstname', 'Partner display_name incorrect')

 if __name__ == '__main__':
    unittest2.main()
--- a/unported/partner_firstname/init.py
+++ b/unported/partner_firstname/init.py
--- a/unported/partner_firstname/openerp.py
+++ b/unported/partner_firstname/openerp.py
@ -18,7 +18,8 @@
 #
 ##############################################################################

-{'name': 'Partner first name, last name',
+{
+    'name': 'Partner first name, last name',
    'description': """
 This module splits first name and last name for non company partners
 ====================================================================
--- a/unported/partner_firstname/i18n/de.po
+++ b/unported/partner_firstname/i18n/de.po
--- a/unported/partner_firstname/i18n/en.po
+++ b/unported/partner_firstname/i18n/en.po
--- a/unported/partner_firstname/i18n/fr.po
+++ b/unported/partner_firstname/i18n/fr.po
--- a/unported/partner_firstname/i18n/nl.po
+++ b/unported/partner_firstname/i18n/nl.po
--- a/unported/partner_firstname/i18n/partner_firstname.pot
+++ b/unported/partner_firstname/i18n/partner_firstname.pot
--- a/unported/partner_firstname/partner.py
+++ b/unported/partner_firstname/partner.py
@ -17,11 +17,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv.orm import Model, fields
+from openerp.osv import orm, fields
 from openerp.tools.translate import _


-class ResPartner(Model):
+class ResPartner(orm.Model):
    """Adds lastname and firstname, name become a stored function field"""

    _inherit = 'res.partner'
@ -83,7 +83,9 @@ class ResPartner(Model):
        default = default or {}
        if not default.get('lastname'):
            default = default.copy()
-            default['lastname'] = _('%s (copy)') % self.read(cr, uid, [_id], ['lastname'], context=context)[0]['lastname']
+            default['lastname'] = (
+                _('%s (copy)') % self.read(cr, uid, [_id], ['lastname'], context=context)[0]['lastname']
+            )
            if default.get('name'):
                del(default['name'])
        return super(ResPartner, self).copy_data(cr, uid, _id, default, context=context)
--- a/unported/partner_firstname/partner_view.xml
+++ b/unported/partner_firstname/partner_view.xml
--- a/unported/partner_firstname/res_user.py
+++ b/unported/partner_firstname/res_user.py
@ -32,7 +32,9 @@ class ResUsers(orm.Model):
        default = default or {}
        if not default.get('lastname'):
            default = default.copy()
-            default['lastname'] = _('%s (copy)') % self.read(cr, uid, [_id], ['lastname'], context=context)[0]['lastname']
+            default['lastname'] = (
+                _('%s (copy)') % self.read(cr, uid, [_id], ['lastname'], context=context)[0]['lastname']
+            )
            if default.get('name'):
                del(default['name'])
        return super(ResUsers, self).copy_data(cr, uid, _id, default, context=context)
--- a/unported/partner_firstname/res_user_view.xml
+++ b/unported/partner_firstname/res_user_view.xml
--- a/unported/partner_firstname/tests/init.py
+++ b/unported/partner_firstname/tests/init.py
@ -33,5 +33,3 @@ import test_partner_firstname
 checks = [
    test_partner_firstname
 ]
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/unported/partner_firstname/tests/test_partner_firstname.py
+++ b/unported/partner_firstname/tests/test_partner_firstname.py
@ -53,8 +53,16 @@ class test_partner_firstname(common.TransactionCase):
        res_id = self.partner_model.copy(cr, uid, res_id, default={}, context=context)
        vals = self.partner_model.read(cr, uid, [res_id], ['name', 'lastname', 'firstname'], context=context)[0]

-        self.assertEqual(vals['name'], _('%s (copy)') % 'lastname' + " firstname", 'Copy of the partner failed with wrong name')
-        self.assertEqual(vals['lastname'], _('%s (copy)') % 'lastname', 'Copy of the partner failed with wrong lastname')
+        self.assertEqual(
+            vals['name'],
+            _('%s (copy)') % 'lastname' + " firstname",
+            'Copy of the partner failed with wrong name'
+        )
+        self.assertEqual(
+            vals['lastname'],
+            _('%s (copy)') % 'lastname',
+            'Copy of the partner failed with wrong lastname'
+        )
        self.assertEqual(vals['firstname'], 'firstname', 'Copy of the partner failed with wrong firstname')

    def test_copy_user(self):
@ -68,7 +76,11 @@ class test_partner_firstname(common.TransactionCase):
        res_id = self.user_model.copy(cr, uid, res_id, default={}, context=context)
        vals = self.user_model.read(cr, uid, [res_id], ['name', 'lastname', 'firstname'], context=context)[0]

-        self.assertEqual(vals['name'], _('%s (copy)') % 'lastname' + ' firstname', 'Copy of the user failed with wrong name')
+        self.assertEqual(
+            vals['name'],
+            _('%s (copy)') % 'lastname' + ' firstname',
+            'Copy of the user failed with wrong name'
+        )
        self.assertEqual(vals['lastname'], _('%s (copy)') % 'lastname', 'Copy of the user failed with wrong lastname')
        self.assertEqual(vals['firstname'], 'firstname', 'Copy of the user failed with wrong firstname')

@ -99,5 +111,3 @@ class test_partner_firstname(common.TransactionCase):
        self.assertEqual(vals['name'], 'lastname other', 'Update of the user firstname failed with wrong name')
        self.assertEqual(vals['lastname'], 'lastname other', 'Update of the user firstname failed with wrong lastname')
        self.assertFalse(vals['firstname'], 'Update of the user firstname failed with wrong firstname')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/base_address_category/init.py
+++ b/base_address_category/init.py
@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010-2013 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import base_address
--- a/base_address_category/openerp.py
+++ b/base_address_category/openerp.py
@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010-2013 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    "name" : "Partner Address Category",
-    "description" : """\
- res.partner.address.category
- ----------------------------
-
- This module is deprecated as of OpenERP 7.0, because that version
- deprecated res.partner.address, and res.partner already has multi
- category support (visible as Tags in the user interface).
-
- The port of this module to OpenERP 7 keeps the model definitions, but
- removes the views (for which the base views are no longer
- available). The migration process should ensure that the
- res.partner.address.category records are migrated to
- res.partner.category records.
- """,
-    "version" : "1.2",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Base",
-    "website": "http://www.camptocamp.com",
-    "depends" : [
-                    "base",
-                ],
-    "data" : [
-        "security/security.xml"
-        'security/ir.model.access.csv',
-        ],
-    "active": False,
-    "installable": True
-}
--- a/base_address_category/base_address.py
+++ b/base_address_category/base_address.py
@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010-2013 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Joel Grand-Guillaume
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
-
-
-from openerp.osv import osv, fields, orm
-
-class ResPartnerAdressCategory(orm.Model):
-    def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return []
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
-        res = []
-        for record in reads:
-            name = record['name']
-            if record['parent_id']:
-                name = '%s / %s ' % (record['parent_id'][1], name)
-            res.append((record['id'], name))
-        return res
-
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res = self.name_get(cr, uid, ids)
-        return dict(res)
-
-    def _check_recursion(self, cr, uid, ids):
-        level = 100
-        while ids:
-            cr.execute('select distinct parent_id '
-                       'from res_partner_address_category '
-                       'where id in %s',  ids)
-            ids = [parent_id for (parent_id,) in cr.fetchall() if parent_id]
-            if not level:
-                return False
-            level -= 1
-        return True
-
-
-
-    _description='Partner address Categories'
-    _name = 'res.partner.address.category'
-    _columns = {
-        'name': fields.char('Category Name', required=True, size=64),
-        'parent_id': fields.many2one('res.partner.address.category',
-                                     'Parent Category',
-                                     select=True),
-        'complete_name': fields.function(_name_get_fnc,
-                                         type="char",
-                                         string='Name'),
-        'child_ids': fields.one2many('res.partner.address.category',
-                                     'parent_id',
-                                     'Children Category'),
-        'active' : fields.boolean('Active'),
-    }
-    _constraints = [
-        (_check_recursion,
-         'Error: you can not create recursive categories.',
-         ['parent_id'])
-    ]
-    _defaults = {
-        'active' : lambda *a: 1,
-    }
-    _order = 'parent_id,name'
-
-
-class ResPartnerAddress(orm.Model):
-    _inherit = "res.partner.address"
-
-    _columns = {
-        'category_id': fields.many2many('res.partner.address.category',
-                                        'res_partner_address_category_rel',
-                                        'adress_id',
-                                        'category_id',
-                                        'Address categories'),
-    }
-
--- a/base_address_category/base_address_view.xml
+++ b/base_address_category/base_address_view.xml
@ -1,4 +0,0 @@
-<openerp>
-    <data>
-    </data>
-</openerp>
--- a/base_address_category/security/ir.model.access.csv
+++ b/base_address_category/security/ir.model.access.csv
@ -1,3 +0,0 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_res_partner_address_category_group_user","res.partner.address.category","model_res_partner_address_category",base.group_user,1,0,0,0
-"access_res_partner_address_category_partner_manager","res.partner.address.category","model_res_partner_address_category","base.group_partner_manager",1,1,1,1
--- a/base_address_category/security/security.xml
+++ b/base_address_category/security/security.xml
@ -1,4 +0,0 @@
-<openerp>
-    <data>
-    </data>
-</openerp>
--- a/base_continent/openerp.py
+++ b/base_continent/openerp.py
@ -36,7 +36,7 @@ adds continent field on partner form
    'data': [
        'base_continent_view.xml',
        'base_continent_data.xml',
-     'security/ir.model.access.csv'],
- 'active': False,
+        'security/ir.model.access.csv',
+    ],
    'installable': True,
 }
--- a/base_partner_merge/base_partner_merge.py
+++ b/base_partner_merge/base_partner_merge.py
@ -1,4 +1,5 @@
-#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 from __future__ import absolute_import
 from email.utils import parseaddr
 import functools
@ -14,7 +15,7 @@ from openerp.tools import mute_logger
 from .validate_email import validate_email

 import openerp
-from openerp.osv import osv, orm
+from openerp.osv import orm
 from openerp.osv import fields
 from openerp.osv.orm import browse_record
 from openerp.tools.translate import _
@ -55,7 +56,7 @@ def is_integer_list(ids):
    return all(isinstance(i, (int, long)) for i in ids)


-class ResPartner(osv.Model):
+class ResPartner(orm.Model):
    _inherit = 'res.partner'

    _columns = {
@ -64,7 +65,7 @@ class ResPartner(osv.Model):
    }


-class MergePartnerLine(osv.TransientModel):
+class MergePartnerLine(orm.TransientModel):
    _name = 'base.partner.merge.line'

    _columns = {
@ -77,7 +78,7 @@ class MergePartnerLine(osv.TransientModel):
    _order = 'min_id asc'


-class MergePartnerAutomatic(osv.TransientModel):
+class MergePartnerAutomatic(orm.TransientModel):
    """
    The idea behind this wizard is to create a list of potential partners to
    merge. We use two objects, the first one is the wizard for the end-user.
@ -326,7 +327,7 @@ class MergePartnerAutomatic(osv.TransientModel):
        if parent_id and parent_id != dst_partner.id:
            try:
                dst_partner.write({'parent_id': parent_id})
-            except (osv.except_osv, orm.except_orm):
+            except (orm.except_orm, orm.except_orm):
                _logger.info('Skip recursive partner hierarchies for '
                             'parent_id %s of partner: %s',
                             parent_id, dst_partner.id)
@ -341,7 +342,7 @@ class MergePartnerAutomatic(osv.TransientModel):
            return

        if len(partner_ids) > 3:
-            raise osv.except_osv(
+            raise orm.except_orm(
                _('Error'),
                _("For safety reasons, you cannot merge more than 3 contacts "
                  "together. You can re-open the wizard several times if "
@ -351,7 +352,7 @@ class MergePartnerAutomatic(osv.TransientModel):
                and len(set(partner.email for partner
                            in proxy.browse(cr, uid, partner_ids,
                                            context=context))) > 1):
-            raise osv.except_osv(
+            raise orm.except_orm(
                _('Error'),
                _("All contacts must have the same email. Only the "
                  "Administrator can merge contacts with different emails."))
@ -378,7 +379,7 @@ class MergePartnerAutomatic(osv.TransientModel):
                                             [partner.id for partner
                                              in src_partners])],
                                           context=context)):
-            raise osv.except_osv(
+            raise orm.except_orm(
                _('Error'),
                _("Only the destination contact may be linked to existing "
                  "Journal Items. Please ask the Administrator if you need to"
@ -399,8 +400,12 @@ class MergePartnerAutomatic(osv.TransientModel):
        dst_partner.message_post(
            body='%s %s' % (
                _("Merged with the following partners:"),
-                ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id)
-                                             for p in src_partners)))
+                ", ".join(
+                    '%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id)
+                    for p in src_partners
+                )
+            )
+        )

        for partner in src_partners:
            partner.unlink()
@ -513,7 +518,7 @@ class MergePartnerAutomatic(osv.TransientModel):
        ]

        if not groups:
-            raise osv.except_osv(_('Error'),
+            raise orm.except_orm(_('Error'),
                                 _("You have to specify a filter for your "
                                   "selection"))

--- a/base_partner_merge/validate_email.py
+++ b/base_partner_merge/validate_email.py
@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # RFC 2822 - style email validation for Python
 # (c) 2012 Syrus Akbary <me@syrusakbary.com>
 # Extended from (c) 2011 Noel Bush <noel@aitools.org>
@ -19,14 +20,15 @@

 import re
 import smtplib
-import socket

 try:
    import DNS
    ServerError = DNS.ServerError
 except:
    DNS = None
-    class ServerError(Exception): pass
+
+    class ServerError(Exception):
+        pass
 # All we are really doing is comparing the input string to one
 # gigantic regular expression.  But building that regexp, and
 # ensuring its correctness, is made much easier by assembling it
@ -44,43 +46,30 @@ WSP = r'[ \t]'                                       # see 2.2.2. Structured Hea
 CRLF = r'(?:\r\n)'                                                        # see 2.2.3. Long Header Fields
 NO_WS_CTL = r'\x01-\x08\x0b\x0c\x0f-\x1f\x7f'                             # see 3.2.1. Primitive Tokens
 QUOTED_PAIR = r'(?:\\.)'                                                  # see 3.2.2. Quoted characters
-FWS = r'(?:(?:' + WSP + r'*' + CRLF + r')?' + \
-            WSP + r'+)'                                    # see 3.2.3. Folding white space and comments
-CTEXT = r'[' + NO_WS_CTL + \
-                r'\x21-\x27\x2a-\x5b\x5d-\x7e]'              # see 3.2.3
-CCONTENT = r'(?:' + CTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.2.3 (NB: The RFC includes COMMENT here
-                                                                                                         # as well, but that would be circular.)
-COMMENT = r'\((?:' + FWS + r'?' + CCONTENT + \
-                    r')*' + FWS + r'?\)'                       # see 3.2.3
-CFWS = r'(?:' + FWS + r'?' + COMMENT + ')*(?:' + \
-             FWS + '?' + COMMENT + '|' + FWS + ')'         # see 3.2.3
+FWS = r'(?:(?:{0}*{1})?{0}+)'.format(WSP, CRLF)                           # see 3.2.3. Folding white space and comments
+CTEXT = r'[{0}\x21-\x27\x2a-\x5b\x5d-\x7e]'.format(NO_WS_CTL)             # see 3.2.3
+# see 3.2.3 (NB: The RFC includes COMMENT here as well, but that would be circular.)
+CCONTENT = r'(?:{0}|{1})'.format(CTEXT, QUOTED_PAIR)
+COMMENT = r'\((?:{0}?{1})*{0}?\)'.format(FWS, CCONTENT)                   # see 3.2.3
+CFWS = r'(?:{0}?{1})*(?:{0}?{1}|{0})'.format(FWS, COMMENT)                # see 3.2.3
 ATEXT = r'[\w!#$%&\'\*\+\-/=\?\^`\{\|\}~]'                                # see 3.2.4. Atom
-ATOM = CFWS + r'?' + ATEXT + r'+' + CFWS + r'?'      # see 3.2.4
-DOT_ATOM_TEXT = ATEXT + r'+(?:\.' + ATEXT + r'+)*'   # see 3.2.4
-DOT_ATOM = CFWS + r'?' + DOT_ATOM_TEXT + CFWS + r'?' # see 3.2.4
-QTEXT = r'[' + NO_WS_CTL + \
-                r'\x21\x23-\x5b\x5d-\x7e]'                   # see 3.2.5. Quoted strings
-QCONTENT = r'(?:' + QTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.2.5
-QUOTED_STRING = CFWS + r'?' + r'"(?:' + FWS + \
-                                r'?' + QCONTENT + r')*' + FWS + \
-                                r'?' + r'"' + CFWS + r'?'
-LOCAL_PART = r'(?:' + DOT_ATOM + r'|' + \
-                         QUOTED_STRING + r')'                    # see 3.4.1. Addr-spec specification
-DTEXT = r'[' + NO_WS_CTL + r'\x21-\x5a\x5e-\x7e]'    # see 3.4.1
-DCONTENT = r'(?:' + DTEXT + r'|' + \
-                     QUOTED_PAIR + r')'                        # see 3.4.1
-DOMAIN_LITERAL = CFWS + r'?' + r'\[' + \
-                                 r'(?:' + FWS + r'?' + DCONTENT + \
-                                 r')*' + FWS + r'?\]' + CFWS + r'?'  # see 3.4.1
-DOMAIN = r'(?:' + DOT_ATOM + r'|' + \
-                 DOMAIN_LITERAL + r')'                       # see 3.4.1
-ADDR_SPEC = LOCAL_PART + r'@' + DOMAIN               # see 3.4.1
+ATOM = r'{0}?{1}+{0}?'.format(CFWS, ATEXT)                                # see 3.2.4
+DOT_ATOM_TEXT = r'{0}+(?:\.{0}+)*'.format(ATEXT)                          # see 3.2.4
+DOT_ATOM = r'{0}?{1}{0}?'.format(CFWS, DOT_ATOM_TEXT)                     # see 3.2.4
+QTEXT = r'[{0}\x21\x23-\x5b\x5d-\x7e]'.format(NO_WS_CTL)                  # see 3.2.5. Quoted strings
+QCONTENT = r'(?:{0}|{1})'.format(QTEXT, QUOTED_PAIR)                      # see 3.2.5
+QUOTED_STRING = r'{0}?"(?:{1}?{2})*{1}?"{0}?'.format(CFWS, FWS, QCONTENT)
+LOCAL_PART = r'(?:{0}|{1})'.format(DOT_ATOM, QUOTED_STRING)               # see 3.4.1. Addr-spec specification
+DTEXT = r'[{0}\x21-\x5a\x5e-\x7e]'.format(NO_WS_CTL)                      # see 3.4.1
+DCONTENT = r'(?:{0}|{1})'.format(DTEXT, QUOTED_PAIR)                      # see 3.4.1
+DOMAIN_LITERAL = r'{0}?\[(?:{1}?{2})*{1}?\]{0}?'.format(CFWS, FWS, DCONTENT)  # see 3.4.1
+DOMAIN = r'(?:{0}|{1})'.format(DOT_ATOM, DOMAIN_LITERAL)                  # see 3.4.1
+ADDR_SPEC = r'{0}@{1}'.format(LOCAL_PART, DOMAIN)                         # see 3.4.1

 # A valid address will match exactly the 3.4.1 addr-spec.
 VALID_ADDRESS_REGEXP = '^' + ADDR_SPEC + '$'

+
 def validate_email(email, check_mx=False, verify=False):

    """Indicate whether the given string is a valid email address
@ -94,7 +83,10 @@ def validate_email(email, check_mx=False,verify=False):
        assert re.match(VALID_ADDRESS_REGEXP, email) is not None
        check_mx |= verify
        if check_mx:
-            if not DNS: raise Exception('For check the mx records or check if the email exists you must have installed pyDNS python package')
+            if not DNS:
+                raise Exception('For check the mx records or check if the '
+                                'email exists you must have installed pyDNS '
+                                'python package')
            DNS.DiscoverNameServers()
            hostname = email[email.find('@') + 1:]
            mx_hosts = DNS.mxlookup(hostname)
@ -102,12 +94,15 @@ def validate_email(email, check_mx=False,verify=False):
                try:
                    smtp = smtplib.SMTP()
                    smtp.connect(mx[1])
-                    if not verify: return True
+                    if not verify:
+                        return True
                    status, _ = smtp.helo()
-                    if status != 250: continue
+                    if status != 250:
+                        continue
                    smtp.mail('')
                    status, _ = smtp.rcpt(email)
-                    if status != 250: return False
+                    if status != 250:
+                        return False
                    break
                except smtplib.SMTPServerDisconnected:  # Server not permits verify user
                    break
--- a/partner_address_ldap/init.py
+++ b/partner_address_ldap/init.py
@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation
-# Contribution : Joel Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import address
-import partner
-import company
-import wizard
--- a/partner_address_ldap/openerp.py
+++ b/partner_address_ldap/openerp.py
@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation
-# Active directory Donor: M. Benadiba (Informatique Assistances.fr)
-# Contribution : Joel Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-{
-    "name" : "Partner synchronization from OpenERP to ldap",
-    "version" : "1.2",
-    "author" : "Camptocamp",
-    "depends" : ["base"],
-    "category" : "Generic Modules/Misc",
-    "website": "http://www.camptocamp.com",
-    "description": """
-
-Live partner address synchronization through a LDAP module (inetOrgPerson).
-OpenERP becomes the master of the LDAP. Each time an address is deleted, created or updated the same is done in the ldap (a new record is pushed).
-The LDAP configuration is done in the company view. There can be one different LDAP per company. Do not forget to activate
-the LDAP link in the configuration.
-The used LDAP depends on the current user company.
-
-This module does not allows bulk batching synchronisation into the LDAP and is thus not suitable for an instant use with an existing LDAP.
-In order to use it with an existing LDAP you have to alter the uid of contact in your LDAP. The uid should be terp_ plus the OpenERP
-contact id (for example terp_10).
-
-N.B:
-The module requires the python-ldap library
-Unicode support --> As python ldap does not support unicode we try to decode string if it fails we transliterate values.
-Active Directory Support for Windows server 2003, try 2008 at your own risk 
-(AD support not tested for Version 6 of OpenERP looking for active dir test infra) 
-
-
-""",
-    "init_xml" : ["security/security.xml"],
-    "update_xml":['company_view.xml',
-                  'address_view.xml',
-                  "wizard.xml"],
-    "demo_xml" : [],
-    "active": False,
-    "installable": False
-}
--- a/partner_address_ldap/address.py
+++ b/partner_address_ldap/address.py
@ -1,459 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010-2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation
-# Active directory Donor: M. Benadiba (Informatique Assistances.fr)
-# Contribution : Joel Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-#TODO FInd why company parameter are cached
-import re
-import unicodedata
-import netsvc
-try:
-    import ldap
-    import ldap.modlist
-except :
-    print 'python ldap not installed please install it in order to use this module'
-
-
-from osv import osv, fields
-from tools.translate import _
-
-logger = netsvc.Logger()
-
-class LdapConnMApper(object):
-    """LdapConnMApper: push specific fields from the Terp Partner_contacts to the
-        LDAP schema inetOrgPerson. Ldap bind options are stored in company.r"""
-    def __init__(self, cursor, uid, osv_obj, context=None):
-        """Initialize connexion to ldap by using parameter set in the current user compagny"""
-        logger.notifyChannel("MY TOPIC", netsvc.LOG_DEBUG,
-                             _('Initalize LDAP CONN'))
-        self.USER_DN = ''
-        self.CONTACT_DN = ''
-        self.LDAP_SERVER = ''
-        self.PASS = ''
-        self.OU = ''
-        self.connexion = ''
-        self.ACTIVDIR = False
-
-        #Reading ldap pref
-        user = osv_obj.pool.get('res.users').browse(cursor, uid, uid, context=context)
-        company = osv_obj.pool.get('res.company').browse(cursor,
-                                                         uid,
-                                                         user.company_id.id,
-                                                         context=context)
-        self.USER_DN = company.base_dn
-        self.CONTACT_DN = company.contact_dn
-        self.LDAP_SERVER = company.ldap_server
-        self.PASS = company.passwd
-        self.PORT = company.ldap_port
-        self.OU = company.ounit
-        self.ACTIVDIR = company.is_activedir
-
-        mand = (self.USER_DN, self.CONTACT_DN, self.LDAP_SERVER , self.PASS, self.OU)
-        if company.ldap_active:
-            for param in mand:
-                if not param:
-                    raise osv.except_osv(_('Warning !'),
-                                         _('An LDAP parameter is missing for company %s') % (company.name,))
-
-    def get_connexion(self):
-        """create a new ldap connexion"""
-        logger.notifyChannel("LDAP Address", netsvc.LOG_DEBUG,
-                             _('connecting to server ldap %s') % (self.LDAP_SERVER,))
-        if self.PORT :
-            self.connexion = ldap.open(self.LDAP_SERVER, self.PORT)
-        else :
-            self.connexion = ldap.open(self.LDAP_SERVER)
-        self.connexion.simple_bind_s(self.USER_DN, self.PASS)
-        return self.connexion
-
-
-class LDAPAddress(osv.osv):
-    """Override the CRUD of the objet in order to dynamically bind to ldap"""
-    _inherit = 'res.partner.address'
-    ldapMapper = None
-
-    def init(self, cr):
-        logger = netsvc.Logger()
-        try:
-            logger.notifyChannel(_('LDAP address init'),
-                                 netsvc.LOG_INFO,
-                                 _('try to ALTER TABLE res_partner_address RENAME '
-                                   'column name to lastname ;'))
-            cr.execute('ALTER TABLE res_partner_address RENAME column name to lastname ;')
-
-        except Exception, e:
-            cr.rollback()
-            logger.notifyChannel(_('LDAP address init'),
-                                 netsvc.LOG_INFO,
-                                 _('Warning ! impossible to rename column name'
-                                   ' into lastname, this is probabely aleready'
-                                   '  done or does not exist'))
-
-    def _compute_name(self, firstname, lastname):
-        firstname = firstname or u''
-        lastname = lastname or u''
-        firstname = (u' '+ firstname).rstrip()
-        return u"%s%s" % (lastname, firstname)
-
-    def _name_get_fnc(self, cursor, uid, ids, name, arg, context=None):
-        """Get the name (lastname + firstname), otherwise ''"""
-        if not ids:
-            return []
-        reads = self.read(cursor, uid, ids, ['lastname', 'firstname'])
-        res = []
-        for record in reads:
-            ## We want to have " firstname" or ""
-            name = self._compute_name(record['firstname'], record['lastname'])
-            res.append((record['id'], name))
-        return dict(res)
-
-#    TODO get the new version of name search not vulnerable to sql injections
-#    def name_search(self, cursor, user, name, args=None, operator='ilike', context=None, limit=100):
-#        if not context: context = {}
-#        prep_name = '.*%s.*' %(name)
-#        cursor.execute(("select id from res_partner_address where"
-#                        " (to_ascii(convert( lastname, 'UTF8', 'LATIN1'),'LATIN-1')  ~* '%s'"
-#                        " or to_ascii(convert( firstname, 'UTF8', 'LATIN1'),'LATIN-1')  ~* '%s')"
-#                        " limit %s") % (prep_name, prep_name, limit))
-#        res = cursor.fetchall()
-#        if res:
-#            res = [x[0] for x in res]
-#        else:
-#            res = []
-#        # search in partner name to know if we are searching partner...
-#        partner_obj=self.pool.get('res.partner')
-#        part_len = len(res)-limit
-#        if part_len > 0:
-#            partner_res = partner_obj.search(cursor, user, [('name', 'ilike', name)],
-#                                             limit=part_len, context=context)
-#            for p in partner_res:
-#                addresses = partner_obj.browse(cursor, user, p).address
-#                # Take each contact and add it to
-#                for add in addresses:
-#                    res.append(add.id)
-#        return self.name_get(cursor, user, res, context)
-
-
-    _columns = {
-        'firstname': fields.char('First name', size=256),
-        'lastname': fields.char('Last name', size=256),
-        'name': fields.function(_name_get_fnc, method=True,
-                                type="char", size=512,
-                                store=True, string='Contact Name',
-                                help='Name generated from the first name and last name',
-                                nodrop=True),
-        'private_phone':fields.char('Private phone', size=128),
-    }
-
-    def create(self, cursor, uid, vals, context={}):
-        self.getconn(cursor, uid, {})
-        ids = None
-        self.validate_entries(vals, cursor, uid, ids)
-        tmp_id = super(LDAPAddress, self).create(cursor, uid,
-                                                 vals, context)
-        if self.ldaplinkactive(cursor, uid, context):
-            self.saveLdapContact(tmp_id, vals, cursor, uid, context)
-        return tmp_id
-
-    def write(self, cursor, uid, ids, vals, context=None):
-        context = context or {}
-        self.getconn(cursor, uid, {})
-        if not isinstance(ids, list):
-            ids = [ids]
-        if ids:
-            self.validate_entries(vals, cursor, uid, ids)
-        if context.has_key('init_mode') and context['init_mode'] :
-            success = True
-        else :
-            success = super(LDAPAddress, self).write(cursor, uid, ids,
-                                                     vals, context)
-        if self.ldaplinkactive(cursor, uid, context):
-            for address_id in ids:
-                self.updateLdapContact(address_id, vals, cursor, uid, context)
-        return success
-
-    def unlink(self, cursor, uid, ids, context=None):
-        if not context: context = {}
-        if ids:
-            self.getconn(cursor, uid, {})
-            if not isinstance(ids, list):
-                ids = [ids]
-            if self.ldaplinkactive(cursor, uid, context):
-                for id in ids:
-                    self.removeLdapContact(id, cursor, uid)
-        return super(LDAPAddress, self).unlink(cursor, uid, ids)
-
-    def validate_entries(self, vals, cursor, uid, ids):
-        """Validate data of an address based on the inetOrgPerson schema"""
-        for val in vals :
-            try :
-                if isinstance(vals[val], basestring):
-                    vals[val] = unicode(vals[val].decode('utf8'))
-            except UnicodeError:
-                logger.notifyChannel('LDAP encode', netsvc.LOG_DEBUG,
-                                     'cannot unicode '+ vals[val])
-                pass
-
-        if ids is not None:
-            if isinstance(ids, (int, long)):
-                ids = [ids]
-            if len(ids) == 1:
-                self.addNeededFields(ids[0],vals,cursor,uid)
-        email = vals.get('email', False)
-        phone = vals.get('phone', False)
-        fax = vals.get('fax', False)
-        mobile = vals.get('mobile', False)
-        lastname = vals.get('lastname', False)
-        private_phone = vals.get('private_phone', False)
-        if email :
-            if re.match("^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$",
-                        email) is None:
-                raise osv.except_osv(_('Warning !'),
-                                     _('Please enter a valid e-mail'))
-        phones = (('phone', phone), ('fax', fax), ('mobile', mobile),
-                  ('private_phone', private_phone))
-        for phone_tuple in phones:
-            phone_number = phone_tuple[1]
-            if phone_number :
-                if not phone_number.startswith('+'):
-                    raise osv.except_osv(_('Warning !'),
-                                         _('Please enter a valid phone number in %s'
-                                           ' international format (i.e. leading +)') % phone_tuple[0])
-
-    def getVals(self, att_name, key, vals, dico, uid, ids, cursor, context=None):
-        """map to values to dict"""
-        if not context: context = {}
-        ## We explicitely test False value
-        if vals.get(key, False) != False:
-            dico[att_name] = vals[key]
-        else :
-            if context.get('init_mode'):
-                return False
-            tmp = self.read(cursor, uid, ids, [key], context={})
-            if tmp.get(key, False) :
-                dico[att_name] = tmp[key]
-
-
-    def _un_unicodize_buf(self, in_buf):
-        if isinstance(in_buf, unicode) :
-            try:
-                return in_buf.encode()
-            except Exception, e:
-                return unicodedata.normalize("NFKD", in_buf).encode('ascii','ignore')
-        return in_buf
-
-    def unUnicodize(self, indict) :
-        """remove unicode data of modlist as unicode is not supported
-            by python-ldap librairy till version 2.7"""
-        for key in indict :
-            if not isinstance(indict[key], list):
-                indict[key] = self._un_unicodize_buf(indict[key])
-            else:
-                nonutfArray = []
-                for val in indict[key] :
-                    nonutfArray.append(self._un_unicodize_buf(val))
-                indict[key] = nonutfArray
-
-    def addNeededFields(self, id, vals, cursor, uid):
-        keys = vals.keys()
-        previousvalue = self.browse(cursor, uid, [id])[0]
-        if not vals.get('partner_id'):
-            vals['partner_id'] = previousvalue.partner_id.id
-        values_to_check = ('email', 'phone', 'fax', 'mobile', 'firstname',
-                           'lastname', 'private_phone', 'street', 'street2')
-        for val in values_to_check:
-            if not vals.get(val):
-                vals[val] = previousvalue[val]
-
-    def mappLdapObject(self, id, vals, cursor, uid, context):
-        """Mapp ResPArtner adress to moddlist"""
-        self.addNeededFields(id, vals, cursor, uid)
-        conn = self.getconn(cursor, uid, {})
-        keys = vals.keys()
-        partner_obj=self.pool.get('res.partner')
-        part_name = partner_obj.browse(cursor, uid, vals['partner_id']).name
-        vals['partner'] = part_name
-        name = self._compute_name(vals.get('firstname'), vals.get('lastname'))
-        if name :
-            cn = name
-        else:
-            cn = part_name
-        if not vals.get('lastname') :
-            vals['lastname'] = part_name
-        contact_obj = {'objectclass' : ['inetOrgPerson'],
-                       'uid': ['terp_'+str(id)],
-                       'ou':[conn.OU],
-                       'cn':[cn],
-                       'sn':[vals['lastname']]}
-        if not vals.get('street'):
-            vals['street'] = u''
-        if not vals.get('street2'):
-            vals['street2'] = u''
-        street_key = 'street'
-        if self.getconn(cursor, uid, {}).ACTIVDIR :
-            # ENTERING THE M$ Realm and it is weird
-            # We manage the address
-            street_key = 'streetAddress'
-            contact_obj[street_key] = vals['street'] + "\r\n" + vals['street2']
-            #we modifiy the class
-            contact_obj['objectclass'] = ['top','person','organizationalPerson','inetOrgPerson','user']
-            #we handle the country
-            if vals.get('country_id') :
-                country =  self.browse(cursor, uid, id).country_id
-                if country :
-                    vals['country_id'] = country.name
-                    vals['c'] = country.code
-                else :
-                    vals['country_id'] = False
-                    vals['c'] = False
-            if vals.get('country_id', False) :
-                self.getVals('co', 'country_id', vals, contact_obj, uid, id, cursor, context)
-                self.getVals('c', 'c', vals, contact_obj, uid, id, cursor, context)
-            # we compute the display name
-            vals['display'] = '%s %s'%(vals['partner'], contact_obj['cn'][0])
-            # we get the title
-            if self.browse(cursor, uid, id).function:
-                contact_obj['description'] = self.browse(cursor, uid, id).function.name
-            # we replace carriage return
-            if vals.get('comment', False):
-                vals['comment'] = vals['comment'].replace("\n","\r\n")
-            # Active directory specific fields
-            self.getVals('company', 'partner' ,vals, contact_obj, uid, id, cursor, context)
-            self.getVals('info', 'comment' ,vals, contact_obj, uid, id, cursor, context)
-            self.getVals('displayName', 'partner' ,vals, contact_obj, uid, id, cursor, context)
-            ## Web site management
-            if self.browse(cursor, uid, id).partner_id.website:
-                vals['website'] = self.browse(cursor, uid, id).partner_id.website
-                self.getVals('wWWHomePage', 'website', vals, contact_obj, uid, id, cursor, context)
-                del(vals['website'])
-            self.getVals('title', 'title', vals, contact_obj, uid, id, cursor, context)
-        else :
-            contact_obj[street_key] = vals['street'] + u"\n" + vals['street2']
-            self.getVals('o','partner' ,vals, contact_obj, uid, id, cursor, context)
-
-        #Common attributes
-        self.getVals('givenName', 'firstname',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('mail', 'email',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('telephoneNumber', 'phone',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('l', 'city',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('facsimileTelephoneNumber', 'fax',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('mobile', 'mobile',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('homePhone', 'private_phone',vals, contact_obj, uid, id, cursor, context)
-        self.getVals('postalCode', 'zip',vals, contact_obj, uid, id, cursor, context)
-        self.unUnicodize(contact_obj)
-        return contact_obj
-
-    def saveLdapContact(self, id, vals, cursor, uid, context=None):
-        """save openerp adress to ldap"""
-        contact_obj = self.mappLdapObject(id,vals,cursor,uid,context)
-        conn = self.connectToLdap(cursor, uid, context=context)
-        try:
-            if self.getconn(cursor, uid, context).ACTIVDIR:
-                conn.connexion.add_s("CN=%s,OU=%s,%s"%(contact_obj['cn'][0], conn.OU, conn.CONTACT_DN),
-                                     ldap.modlist.addModlist(contact_obj))
-            else:
-                conn.connexion.add_s("uid=terp_%s,OU=%s,%s"%(str(id), conn.OU, conn.CONTACT_DN),
-                                        ldap.modlist.addModlist(contact_obj))
-        except Exception, e:
-            raise e
-        conn.connexion.unbind_s()
-
-    def updateLdapContact(self, id, vals, cursor, uid, context):
-        """update an existing contact with the data of OpenERP"""
-        conn = self.connectToLdap(cursor,uid,context={})
-        try:
-            old_contatc_obj = self.getLdapContact(conn,id)
-        except ldap.NO_SUCH_OBJECT:
-            self.saveLdapContact(id,vals,cursor,uid,context)
-            return
-        contact_obj = self.mappLdapObject(id,vals,cursor,uid,context)
-        if conn.ACTIVDIR:
-            modlist = []
-            for key, val in contact_obj.items() :
-                if key in ('cn', 'uid', 'objectclass'):
-                    continue
-                if isinstance(val, list):
-                    val = val[0]
-                modlist.append((ldap.MOD_REPLACE, key, val))
-        else :
-            modlist = ldap.modlist.modifyModlist(old_contatc_obj[1], contact_obj)
-        try:
-            conn.connexion.modify_s(old_contatc_obj[0], modlist)
-            conn.connexion.unbind_s()
-        except Exception, e:
-            raise e
-
-    def removeLdapContact(self, id, cursor, uid):
-        """Remove a contact from ldap"""
-        conn = self.connectToLdap(cursor,uid,context={})
-        to_delete = None
-        try:
-            to_delete = self.getLdapContact(conn,id)
-        except ldap.NO_SUCH_OBJECT:
-            logger.notifyChannel("Warning", netsvc.LOG_INFO,
-                                 _("'no object to delete in ldap' %s") %(id))
-        except Exception, e :
-            raise e
-        try:
-            if to_delete :
-                conn.connexion.delete_s(to_delete[0])
-                conn.connexion.unbind_s()
-        except Exception, e:
-            raise e
-
-    def getLdapContact(self, conn, id):
-        result = conn.connexion.search_ext_s("ou=%s,%s"%(conn.OU,conn.CONTACT_DN),
-                                             ldap.SCOPE_SUBTREE,
-                                             "(&(objectclass=*)(uid=terp_"+str(id)+"))")
-        if not result:
-            raise ldap.NO_SUCH_OBJECT
-        return result[0]
-
-    def ldaplinkactive(self, cursor, uid, context=None):
-        """Check if ldap is activated for this company"""
-        user = self.pool.get('res.users').browse(cursor, uid, uid, context=context)
-        company = self.pool.get('res.company').browse(cursor, uid,user.company_id.id, context=context)
-        return company.ldap_active
-
-    def getconn(self, cursor, uid, context=None):
-        """LdapConnMApper"""
-        if not self.ldapMapper :
-            self.ldapMapper = LdapConnMApper(cursor, uid, self)
-        return self.ldapMapper
-
-    def connectToLdap(self, cursor, uid, context=None):
-        """Reinitialize ldap connection"""
-        #getting ldap pref
-        if not self.ldapMapper :
-            self.getconn(cursor, uid, context)
-        self.ldapMapper.get_connexion()
-        return self.ldapMapper
-
-LDAPAddress()
--- a/partner_address_ldap/address_view.xml
+++ b/partner_address_ldap/address_view.xml
@ -1,115 +0,0 @@
-<openerp>
-    <data>
-        #---------------------------------------------------------------------------------------------------------  
-        # Partner form->contact  and tree view of address
-        #---------------------------------------------------------------------------------------------------------
-        <record model="ir.ui.view" id="base.view_partner_address_tree">
-            <field name="name">res.partner.address.tree</field>
-            <field name="model">res.partner.address</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Partner contacts">
-                    <field name="partner_id" />
-                    <field name="firstname" />
-                    <field name="lastname" />
-                    <field name="phone"/>
-                    <field name="email"/>
-                    <field name="zip"/>
-                    <field name="city"/>
-                    <field name="country_id"/>
-                    <field name="type"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_partner_address_form1_inherit_ldap2">
-            <field name="name">res.partner.address.form1.c2c_partner_adress</field>
-            <field name="model">res.partner.address</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_address_form1" />
-            <field name="priority" eval="16" />
-            <field name="arch" type="xml">
-                <field name="name" position="replace">
-                    <field name="name" invisible="1" select="2"/>
-                    <field name="firstname"/>
-                    <field name="lastname"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        
-        <record model="ir.ui.view" id="view_partner_address_form1_inherit_ldap">
-            <field name="name">res.partner.address.form1.c2c_partner_adress</field>
-            <field name="model">res.partner.address</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_address_form1" />
-            <field name="priority" eval="17" />
-            <field name="arch" type="xml">
-                <field name="mobile"  position="after">
-                    <field name="private_phone"/>
-                </field>
-            </field>
-        </record>
-        
-        
-        <!--
-            =========================================
-            the short form used in the partner form
-            =========================================
-        -->
-        
-        <record model="ir.ui.view" id="view_partner_address_form_inerit_ldap">
-            <field name="name">res.partner.address.form2_c2c_partner_address</field>
-            <field name="model">res.partner.address</field>
-            <field name="type">form</field>
-            <field name="priority" eval="16" />
-            <field name="inherit_id" ref="base.view_partner_address_form2" />
-            <field name="arch" type="xml">
-                <field name="name" select="1" position="replace">
-                    <field name="name" invisible="1" select="2"/>
-                    <field name="firstname"/>
-                    <field name="lastname"/>
-                    <newline/>
-                </field>
-            </field>
-        </record>
-        
-        
-        <record model="ir.ui.view" id="view_partner_address_form2_inerit_ldap">
-            <field name="name">res.partner.address.form2_c2c_partner_address</field>
-            <field name="model">res.partner.address</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_address_form2" />
-            <field name="priority" eval="17" />
-            <field name="arch" type="xml">
-                <field name="mobile" position="after">
-                    <field name="private_phone"/>
-                </field>
-            </field>
-        </record>
-        
-        
-        <!--
-            =========================================
-            the short form used in the res_partner standard form
-            =========================================
-        -->
-        <record model="ir.ui.view" id="view_partner_form_inherite_contact_ldap">
-            <field name="name">res.partner.form2_partner_address</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form" />
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page/field[@name='address']/form/group/field[@name='mobile']" position="after">
-                    <field name="private_phone"/>
-                </xpath>
-                <xpath expr="/form/notebook/page/field[@name='address']/form/group/field[@name='name']" position="replace">
-                        <field name="firstname"/>
-                        <field name="lastname"/>
-                    <newline/>
-                </xpath>
-            </field>
-        </record>
-
-    </data>
-</openerp>
--- a/partner_address_ldap/company.py
+++ b/partner_address_ldap/company.py
@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation
-# Active directory Donor: M. Benadiba (Informatique Assistances.fr)
-# Contribution : Joel Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from osv import osv, fields
-
-class Res_company(osv.osv):
-    """Defin ldap connexion parameters"""
-
-    _inherit = 'res.company'
-    _columns = {
-        'base_dn': fields.char(
-            'User dn',
-            size=128,
-            help="Exemple: cn=contacts_admin,dc=ldap,dc=dcc2c"
-        ),
-        'contact_dn': fields.char(
-            'Bind dn',
-            size=128,
-            help="Exemple: dc=ldap,dc=dcc2c -- watchout" +\
-                 " the OU will be automatically included inside"
-        ),
-        'ounit': fields.char(
-            'Contact Organizational unit of the contacts',
-            size=128,
-            help="Exemple: Contacts"
-        ),
-        'ldap_server': fields.char(
-            'Server address',
-            size=128,
-            help="Exemple: ldap.camptocamp.com"
-        ),
-        'passwd': fields.char('ldap password', size=128, help="Exemple: Mypassword1234"),
-        'ldap_active': fields.boolean(
-            'Activate ldap link for this company',
-            help='If not check nothing will be reported into the ldap'
-        ),
-        'is_activedir': fields.boolean(
-            'Active Directory ?',
-            help='The ldap is part of an Active Directory'
-        ),
-        'ldap_port': fields.integer('LDAP Port',
-                                     help="If not specified, the default port" 
-                                     "(389), will be used")
-    }
-
-Res_company()
--- a/partner_address_ldap/company_view.xml
+++ b/partner_address_ldap/company_view.xml
@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_company_for_ldap">
-            <field name="name">res.company.form</field>
-            <field name="model">res.company</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <page string="Configuration" position="after">
-                    <page string="LDAP">
-                        <field name="ldap_active" />
-                        <field name="is_activedir" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="ldap_server" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="ldap_port" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="base_dn" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="contact_dn" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="ounit" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                        <field name="passwd" attrs="{'readonly':[('ldap_active', '=', False)]}"/>
-                    </page>
-                </page>
-            </field>
-        </record>
-    </data>
-</openerp>
--- a/partner_address_ldap/i18n/fr_FR.po
+++ b/partner_address_ldap/i18n/fr_FR.po
@ -1,82 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* c2c_contact_to_ldap
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.7\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-02-01 15:06:40+0000\n"
-"PO-Revision-Date: 2010-02-01 15:06:40+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: c2c_contact_to_ldap
-#: field:res.company,is_activedir:0
-msgid "Active Directory ?"
-msgstr ""
-
-#. module: c2c_contact_to_ldap
-#: model:ir.actions.wizard,name:c2c_contact_to_ldap.ldap_import_adresses
-msgid "Export addresses to company LDAP"
-msgstr "Exporte les adresses de OpenERP vers LDAP"
-
-#. module: c2c_contact_to_ldap
-#: wizard_field:ldap.import_adresses,importadd,errors:0
-msgid "Error report"
-msgstr "Rapport d'erreur"
-
-#. module: c2c_contact_to_ldap
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: c2c_contact_to_ldap
-#: wizard_button:ldap.import_adresses,init,importadd:0
-msgid "Export adresses into company LDAP"
-msgstr "Exportation des adresses vers le ldap spécifié dans la société"
-
-#. module: c2c_contact_to_ldap
-#: wizard_view:ldap.import_adresses,importadd:0
-msgid "Export log"
-msgstr "Log d'exportation"
-
-#. module: c2c_contact_to_ldap
-#: wizard_view:ldap.import_adresses,importadd:0
-msgid "Clic on 'Save as' to save the log file :"
-msgstr "Cliquez sur save as pour sauvegarder le fichier"
-
-#. module: c2c_contact_to_ldap
-#: help:res.company,is_activedir:0
-msgid "The ldap is part of an Active Directory"
-msgstr "Le ldap est un ldap Active Directory"
-
-#. module: c2c_contact_to_ldap
-#: wizard_button:ldap.import_adresses,importadd,end:0
-msgid "OK"
-msgstr ""
-
-#. module: c2c_contact_to_ldap
-#: wizard_view:ldap.import_adresses,init:0
-msgid "Export adresses to ldap"
-msgstr "Exporter les adresses dans le ldap"
-
-#. module: c2c_contact_to_ldap
-#: wizard_button:ldap.import_adresses,init,end:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: c2c_contact_to_ldap
-#: field:res.company,ounit:0
-msgid "Contact Organizational unit of the contacts"
-msgstr "OU (organizational unit des adresses)"
-
-#. module: c2c_contact_to_ldap
-#: help:res.company,ounit:0
-msgid "Exemple: Contacts"
-msgstr ""
-
--- a/partner_address_ldap/partner.py
+++ b/partner_address_ldap/partner.py
@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp), Thanks to Laurent Lauden for his code adaptation
-# Active directory Donor: M. Benadiba (Informatique Assistances.fr)
-# Contribution : Joel Grand-Guillaume
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from osv import osv, fields
-        
-class LdapPartner(osv.osv):
-    """Ensure that when deleting a partner unlink function is called on all
-    related addresses"""
-    _inherit = 'res.partner'
-    
-    def unlink(self, cursor, uid, ids, context=None):
-        context = context or {}
-        addr_obj = self.pool.get('res.partner.address')
-        if not isinstance(ids, list):
-            ids = [ids]
-        addr_ids = addr_obj.search(cursor, uid, [('partner_id', 'in', ids)])
-        addr_obj.unlink(cursor, uid, addr_ids, context=context)
-        return super(LdapPartner, self).unlink(cursor, uid, ids, context=context)
-
-LdapPartner()
--- a/partner_address_ldap/security/security.xml
+++ b/partner_address_ldap/security/security.xml
@ -1,4 +0,0 @@
-<openerp>
-    <data>
-    </data>
-</openerp>
--- a/partner_address_ldap/wizard.xml
+++ b/partner_address_ldap/wizard.xml
@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <wizard
-            string="Export addresses to company LDAP"
-            model="res.company"
-            name="ldap.import_adresses"
-            id="ldap_import_adresses"/>
-</data>
-</openerp>
--- a/partner_address_ldap/wizard/init.py
+++ b/partner_address_ldap/wizard/init.py
@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Vincent Renaville
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import wiz_import_adresses
--- a/partner_address_ldap/wizard/wiz_import_adresses.py
+++ b/partner_address_ldap/wizard/wiz_import_adresses.py
@ -1,159 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Vincent Renaville
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-#  init_import.py
-#
-#  Created by Nicolas Bessi on 28.04.09.
-#  Copyright (c) 2009 CamptoCamp. All rights reserved.
-#
-
-import wizard
-import pooler
-import base64
-import unicodedata
-import netsvc
-import re
-_FORM = '''<?xml version="1.0"?>
-<form string="Export adresses to ldap">
-</form>'''
-
-
-_FORM1 = """<?xml version="1.0"?>
-<form string="Export log">
-<separator colspan="4" string="Clic on 'Save as' to save the log file :" />
-    <field name="errors"/>
-</form>
-"""
-
-_FIELDS = {
-    'errors': {
-        'string': 'Error report',
-        'type': 'binary',
-        'readonly': True,
-    },
-}
-
-### As this is a bulck batch wizzard the performance process was not reallay taken in account ###
-##The ideal way of doing would be to modify the  connexion settings in order to have a connexion singelton
-## in the file partner.py it will avoid connexion renegotiation for each partner.
-def _action_import_adresses(self, cr, uid, data, context):
-    """ This function create or update each adresses present in the database.
-    It will also genreate an error report"""
-    logger = netsvc.Logger()
-    error_report = [u'Error report']
-    add_obj = pooler.get_pool(cr.dbname).get('res.partner.address')
-    add_ids = add_obj.search(cr,uid,[])
-    addresses = add_obj.browse(cr, uid, add_ids)
-    phone_fields = ['phone','fax','mobile','private_phone']
-    for add in addresses :
-        vals = {}
-        vals['partner_id'] = add.partner_id.id
-        vals['email'] = add.email
-        vals['phone'] = add.phone
-        vals['fax'] = add.fax
-        vals['mobile'] = add.mobile
-        vals['firstname'] = add.firstname
-        vals['lastname'] = add.lastname
-        vals['private_phone'] = add.private_phone
-        vals['street'] = add.street
-        vals['street2'] = add.street2
-        vals['city'] = add.city
-        # Validating the mail
-        if add.email :
-            if re.match(
-                    "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$", add.email) is None or\
-               re.search(u"[éèàêöüäï&]", add.email) is not None:
-                msg=u'Addresse %s for partner  %s has email that is invalid %s'%(
-                    unicode(vals['firstname']) +' '+ unicode(vals['lastname']),
-                    add.partner_id.name,
-                    unicode(add.email)
-                    )
-                logger.notifyChannel('ldap export', netsvc.LOG_INFO, msg)
-                error_report.append(msg)
-                vals['email'] = False
-        # Validating the Phone
-        for key in phone_fields :
-            if not unicode(vals[key]).startswith('+')  or unicode(vals[key]).find("\n") != -1\
-            or re.search(u"[éèàêöüä#&]", unicode(vals[key])) is not None:
-                vals[key] = False
-                msg = u'Addresse %s for partner  %s has %s that is invalid '%(
-                    unicode(vals['firstname']) +' '+ unicode(vals['lastname']),
-                    add.partner_id.name,
-                    key
-                    )
-                logger.notifyChannel('ldap export', netsvc.LOG_INFO, msg)
-                error_report.append(msg)
-        # Validating the CN
-        if not add.lastname and add.firstname:
-            msg = u'!!! Addresse %s for partner  %s has no last name and first name that is valid partner name was used'%(
-                unicode(add.id),
-                add.partner_id.name,
-                )
-            logger.notifyChannel('ldap export', netsvc.LOG_INFO, msg)
-            error_report.append(msg)
-        # We save to LDAP
-        add.write(vals, {'init_mode':True})
-    #we by pass the encoding errors
-    map(lambda x: unicodedata.normalize("NFKD",x).encode('ascii','ignore'), error_report)
-    error_report = "\n".join(error_report)
-    logger.notifyChannel("MY TOPIC", netsvc.LOG_ERROR, error_report)
-    try:
-        data= base64.encodestring(error_report.encode())
-    except Exception, e:
-        data= base64.encodestring("Could not generate report file. Please look in the log for details")
-
-    return {'errors': data}
-
-class Wiz_import_addresses(wizard.interface):
-    states = {
-        'init': {
-            'actions': [],
-            'result': {
-                        'type': 'form',
-                        'arch':_FORM,
-                        'fields':{},
-                        'state':[
-                                    ('end','Cancel'),
-                                    ('importadd','Export adresses into company LDAP')
-                                ]
-                        }
-        },
-        'importadd': {
-            'actions': [_action_import_adresses],
-            'result': {
-                        'state':[('end', 'OK', 'gtk-ok', True)],
-                        'arch' : _FORM1,
-                        'fields' : _FIELDS,
-                        'type':'form'
-                    }
-        }
-    }
-Wiz_import_addresses('ldap.import_adresses')
--- a/partner_contact_address_detailed/init.py
+++ b/partner_contact_address_detailed/init.py
@ -17,4 +17,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
--- a/partner_contact_address_detailed/openerp.py
+++ b/partner_contact_address_detailed/openerp.py
@ -18,7 +18,8 @@
 #
 ##############################################################################

-{'name': 'All address data in summarized contact form',
+{
+    'name': 'All address data in summarized contact form',
    'description': """Show all informations of partner address
 in summarized partner contact form when creating a new partner""",
    'version': '1.0',
@ -31,5 +32,5 @@ in summarized partner contact form when creating a new partner""",
    'test': [],
    'auto_install': False,
    'installable': True,
- 'images': []
+    'images': [],
 }
--- a/passport/tests/test_passport.py
+++ b/passport/tests/test_passport.py
@ -21,7 +21,7 @@
 ##############################################################################

 from openerp.tests.common import TransactionCase
-from openerp.osv.orm import browse_record
+from openerp.models import BaseModel
 from datetime import date


@ -59,7 +59,7 @@ class Base_Test_passport(TransactionCase):
        passport_obj = res_passport.browse(self.cr, self.uid, self.passport_id, context=None)
        for field in self.vals:
            val = passport_obj[field]
-            if type(val) == browse_record:
+            if isinstance(val, BaseModel):
                self.assertEquals(self.vals[field], val.id,
                                  "IDs for %s don't match: (%i != %i)" %
                                  (field, self.vals[field], val.id))
@ -96,7 +96,7 @@ class Test_passport_bad(Base_Test_passport):
        passport_obj = res_passport.browse(self.cr, self.uid, self.passport_id, context=None)
        for field in self.vals:
            val = passport_obj[field]
-            if type(val) == browse_record:
+            if isinstance(val, BaseModel):
                self.assertNotEqual(self.vals[field], val.id,
                                    "IDs for %s don't match: (%i != %i)" %
                                    (field, self.vals[field], val.id))
--- a/portal_partner_merge/wizard/portal_wizard.py
+++ b/portal_partner_merge/wizard/portal_wizard.py
@ -19,10 +19,11 @@
 #
 ##############################################################################

-from openerp.osv import osv
+from openerp.osv import orm
 from openerp.tools.translate import _

-class wizard_user(osv.TransientModel):
+
+class wizard_user(orm.TransientModel):
    _inherit = 'portal.wizard.user'

    def get_error_messages(self, cr, uid, ids, context=None):
@ -35,5 +36,3 @@ class wizard_user(osv.TransientModel):
                  "Merge wizard, available in the More menu after selecting "
                  "several contacts in the Customers list"))
        return error_msg
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/res_partner_affiliate/openerp.py
+++ b/res_partner_affiliate/openerp.py
@ -18,25 +18,22 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{'name': 'Partner Affilates',
+{
+    'name': 'Partner Affiliates',
    'version': '1.0',
    'author': 'Camptocamp',
    'maintainer': 'Camptocamp',
    'category': 'CRM',
- 'complexity': 'normal',  # easy, normal, expert
+    'license': 'AGPL-3',
    'depends': ['base'],
    'description': """Allows to use parent_id in company partner to refer to a parent company
    Plus will show a tab in parent company of affiliated companies""",
    'website': 'http://www.camptocamp.com',
- 'init_xml': [],
- 'update_xml': [
+    'data': [
        'res_partner_view.xml',
    ],
- 'demo_xml': [],
- 'tests': [],
+    'demo': [],
    'installable': True,
- 'images': [],
    'auto_install': False,
- 'license': 'AGPL-3',
- 'application': True}
-
+    'application': True
+}
--- a/res_partner_affiliate/res_partner.py
+++ b/res_partner_affiliate/res_partner.py
@ -18,8 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from openerp.osv import orm, fields

+
 class ResPartner(orm.Model):
    """
    Add relation affiliate_ids