diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7ac6c82
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# community-web is Wezer front-end dedicated to odoo cooperation tools
+
+WeZer is an open source cooperation platform built to make businesses and communities more effective. It is a product of Valeureux, “The
+Factory of Common goods Wealth Actualisation Tools”, which is studying, designing and teaching for many years about cooperation and sharing value.
+
+As a software product, WeZer aims to bring many tools normally found separately into one environment, where they will be more effective, more
+integrated, and easier to use. As a platform, and a distribution of Odoo (ex Open ERP), anyone is invited to contribute plugins. As a tool, WeZer supports the latest
+thinking in organisational management and collective intelligence. WeZer is more than a tool, it’s a full device composed by a web app, an
+‘implementation journey’, a community and a research program. WeZer is a systemic solution to boost cooperation, to dynamise the We!
+
+More information about the platform on http://wezer.org
+
+On wezer.org you can post your announcement and share your development proposition through our dedicated forum:
+https://www.wezer.org/forum/technical-development-5/
+
+You can read our technical forum:
+https://www.wezer.org/forum/help-1
+
+You can also look at English users Q&A:
+https://www.wezer.org/forum/english-user-q-a-2
+
+More information about valeureux on http://valeureux.org
diff --git a/dependancewezer/__init__.py b/dependancewezer/__init__.py
new file mode 100644
index 0000000..40a96af
--- /dev/null
+++ b/dependancewezer/__init__.py
@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-
diff --git a/dependancewezer/__openerp__.py b/dependancewezer/__openerp__.py
new file mode 100644
index 0000000..52b4ecf
--- /dev/null
+++ b/dependancewezer/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+{
+ 'name': "Dependance Wezer",
+
+ 'summary': """
+ Installation des dependances pour wezer
+ """,
+
+ 'description': """
+ Installation des dependances pour wezer
+ """,
+
+ 'author': "Yann LE GOFF",
+ 'website': "http://www.atout-serenite.com",
+
+ # Categories can be used to filter modules in modules listing
+ # Check https://github.com/odoo/odoo/blob/master/openerp/addons/base/module/module_data.xml
+ # for the full list
+ 'category': 'Uncategorized',
+ 'version': '0.1',
+
+ # any module necessary for this one to work correctly
+ 'depends': [
+ 'marketplace',
+ 'website',
+ 'website_community_home',
+ 'disable_openerp_online',
+ 'website_community_template',
+ 'website_membership_users',
+ 'website_marketplace',
+ 'website_last_articles_snippet',
+ 'website_language_flags',
+ 'website_event',
+ 'website_forum'
+ ],
+
+ # always loaded
+ 'data': [
+ ],
+ # only loaded in demonstration mode
+ 'demo': [
+ ],
+}
\ No newline at end of file
diff --git a/product_price_currency/LICENSE b/product_price_currency/LICENSE
new file mode 100644
index 0000000..3ffc567
--- /dev/null
+++ b/product_price_currency/LICENSE
@@ -0,0 +1,661 @@
+GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ 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.
+
+
+ Copyright (C)
+
+ 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 .
+
+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
+.
\ No newline at end of file
diff --git a/product_price_currency/__init__.py b/product_price_currency/__init__.py
new file mode 100755
index 0000000..ab31229
--- /dev/null
+++ b/product_price_currency/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+import product
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/product_price_currency/__openerp__.py b/product_price_currency/__openerp__.py
new file mode 100755
index 0000000..b599c7d
--- /dev/null
+++ b/product_price_currency/__openerp__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+{
+ 'name': 'Product Price Currency',
+ 'version': '1.0',
+ 'category': 'Product',
+ 'sequence': 14,
+ 'summary': '',
+ 'description': """
+Product Price Currency
+======================
+ """,
+ 'author': 'Ingenieria ADHOC',
+ 'website': 'www.ingadhoc.com',
+ 'images': [
+ ],
+ 'depends': [
+ 'sale',
+ ],
+ 'data': [
+ 'product_view.xml',
+ ],
+ 'demo': [
+ ],
+ 'test': [
+ ],
+ 'installable': True,
+ 'auto_install': False,
+ 'application': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/product_price_currency/i18n/es_AR.po b/product_price_currency/i18n/es_AR.po
new file mode 100644
index 0000000..f2b92c3
--- /dev/null
+++ b/product_price_currency/i18n/es_AR.po
@@ -0,0 +1,44 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_price_currency
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-29 17:15+0000\n"
+"PO-Revision-Date: 2014-01-29 15:50-0300\n"
+"Last-Translator: Juan Jose Scarafia \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: product_price_currency
+#: help:product.template,currency_list_price:0
+msgid "List Price on selected currency."
+msgstr "Precio de Lista en la moneda seleccionada"
+
+#. module: product_price_currency
+#: model:ir.model,name:product_price_currency.model_res_currency
+#: field:product.template,currency_id:0
+#: field:product.template,sale_price_currency_id:0
+msgid "Currency"
+msgstr "Moneda"
+
+#. module: product_price_currency
+#: field:product.template,currency_list_price:0
+msgid "Currency List Price"
+msgstr "Precio de Lista en Divisa"
+
+#. module: product_price_currency
+#: help:product.template,currency_id:0
+msgid "Currency used for the Currency List Price."
+msgstr "Moneda utilizada para el Precio de Lista en Divisa"
+
+#. module: product_price_currency
+#: model:ir.model,name:product_price_currency.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
diff --git a/product_price_currency/i18n/product_price_currency.pot b/product_price_currency/i18n/product_price_currency.pot
new file mode 100644
index 0000000..7a2b0b0
--- /dev/null
+++ b/product_price_currency/i18n/product_price_currency.pot
@@ -0,0 +1,44 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * product_price_currency
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-29 17:14+0000\n"
+"PO-Revision-Date: 2014-01-29 17:14+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: product_price_currency
+#: help:product.template,currency_list_price:0
+msgid "List Price on selected currency."
+msgstr ""
+
+#. module: product_price_currency
+#: model:ir.model,name:product_price_currency.model_res_currency
+#: field:product.template,currency_id:0
+#: field:product.template,sale_price_currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: product_price_currency
+#: field:product.template,currency_list_price:0
+msgid "Currency List Price"
+msgstr ""
+
+#. module: product_price_currency
+#: help:product.template,currency_id:0
+msgid "Currency used for the Currency List Price."
+msgstr ""
+
+#. module: product_price_currency
+#: model:ir.model,name:product_price_currency.model_product_template
+msgid "Product Template"
+msgstr ""
+
diff --git a/product_price_currency/product.py b/product_price_currency/product.py
new file mode 100755
index 0000000..4774fad
--- /dev/null
+++ b/product_price_currency/product.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+from openerp import fields, models, api
+import openerp.addons.decimal_precision as dp
+
+
+class product_template(models.Model):
+ _inherit = 'product.template'
+ _name = 'product.template'
+
+ @api.model
+ def get_currency_id(self):
+ price_type_obj = self.env['product.price.type']
+ price_type_ids = price_type_obj.search([('field', '=', 'list_price')])
+ if not price_type_ids.currency_id:
+ return self.env.user.company_id.currency_id
+ return price_type_ids.currency_id
+
+ sale_price_currency_id = fields.Many2one(
+ 'res.currency', 'Sale Price Currency',
+ required=True, default=get_currency_id,
+ help="Currency used for the Currency List Price."
+ )
+ cia_currency_list_price = fields.Float(
+ 'Company Currency Sale Price',
+ digits=dp.get_precision('Product Price'),
+ compute='get_cia_currency_list_price',
+ help="Base price on company currency at actual exchange rate",
+ )
+
+ @api.multi
+ @api.depends('list_price', 'sale_price_currency_id')
+ def get_cia_currency_list_price(self):
+ company_currency = self.env.user.company_id.currency_id
+ for product in self:
+ if product.sale_price_currency_id != company_currency:
+ cia_currency_list_price = product.sale_price_currency_id.compute(
+ product.list_price, company_currency)
+ else:
+ cia_currency_list_price = product.list_price
+ product.cia_currency_list_price = cia_currency_list_price
+
+
+ def _price_get(self, cr, uid, products, ptype='list_price', context=None):
+ if not context:
+ context = {}
+ res = super(product_template, self)._price_get(
+ cr, uid, products, ptype=ptype, context=context)
+ if ptype == 'list_price':
+ pricetype_obj = self.pool.get('product.price.type')
+ price_type_id = pricetype_obj.search(
+ cr, uid, [('field', '=', ptype)])[0]
+ price_type_currency_id = pricetype_obj.browse(
+ cr, uid, price_type_id).currency_id.id
+ for product in products:
+ if product.sale_price_currency_id.id != price_type_currency_id:
+ res[product.id] = self.pool.get('res.currency').compute(
+ cr, uid, product.sale_price_currency_id.id,
+ price_type_currency_id, res[product.id],
+ context=context)
+ return res
diff --git a/product_price_currency/product_view.xml b/product_price_currency/product_view.xml
new file mode 100755
index 0000000..2b21516
--- /dev/null
+++ b/product_price_currency/product_view.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+ product_price_currency.form
+ product.product
+
+
+
+
+
+
+
+
+ product_price_currency.tree
+ product.product
+
+
+
+
+
+
+
+
+ product_price_currency.kanban
+ product.product
+
+
+
diff --git a/website_membership_users/__init__.py b/website_membership_users/__init__.py
index b5398ec..8f138ad 100644
--- a/website_membership_users/__init__.py
+++ b/website_membership_users/__init__.py
@@ -22,5 +22,6 @@
import controllers
from models import marketplace
+from models import partner_sms
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/website_membership_users/__openerp__.py b/website_membership_users/__openerp__.py
index dabbcfc..20ff78a 100644
--- a/website_membership_users/__openerp__.py
+++ b/website_membership_users/__openerp__.py
@@ -29,16 +29,20 @@
'author': 'Author Name • WebByBrains , Igor Krivonos ',
'depends': [
'website',
+ 'product_price_currency',
+ 'website_sale',
'association',
'membership_users',
'membership',
'website_marketplace'
],
'data': [
+ 'views/assets.xml',
'views/templates/profile_edit_template.xml',
'views/templates/profile_view_template.xml',
'views/templates/member_list_view.xml',
'views/templates/single_member_view.xml',
+ 'views/templates/user_notify_sms.xml',
],
'installable': True
}
diff --git a/website_membership_users/controllers/member_list.py b/website_membership_users/controllers/member_list.py
index dbec095..4409c26 100644
--- a/website_membership_users/controllers/member_list.py
+++ b/website_membership_users/controllers/member_list.py
@@ -107,7 +107,7 @@ def __build_search_query(self, cr, uid, registry, data, limit=None, offset=None,
params = dict()
if data.get('search_name'):
- sql += ' AND a.name ILIKE %(search_name)s'
+ sql += ' AND a.name ILIKE %(search_name)s OR a.ref ILIKE %(search_name)s'
params.update({'search_name': '%' + data.get('search_name') + '%'})
if data.get('location'):
diff --git a/website_membership_users/controllers/profile.py b/website_membership_users/controllers/profile.py
index aa1a539..16b6115 100644
--- a/website_membership_users/controllers/profile.py
+++ b/website_membership_users/controllers/profile.py
@@ -37,7 +37,7 @@
class profile_controller(http.Controller):
PARTNER_FIELDS = ['name', 'title', 'street', 'street2', 'zip', 'city', 'state_id',
- 'country_id', 'birthdate', 'email', 'phone', 'mobile', 'image']
+ 'country_id', 'birthdate', 'email', 'notify_email','notify_sms', 'phone', 'mobile', 'image', 'ref']
LAST_EXCHANGES_LIMIT = 3
ANNOUNCEMENT_LIMIT = 3
PARTNER_GROUP_LIMIT = 3
@@ -61,9 +61,12 @@ def profile_parse_partner(self, partner):
'country_id': partner.country_id.id,
'zip': partner.zip,
'email': partner.email,
+ 'notify_email': partner.notify_email,
+ 'notify_sms': partner.notify_sms,
'phone': partner.phone,
'mobile': partner.mobile,
'birthdate': '' if not partner.birthdate else format_date(partner.birthdate, True),
+ 'ref':partner.ref
},
'limits': {
'new': [],
@@ -137,6 +140,11 @@ def profile_parse_data(self, data):
values['partner'][k] = base64.encodestring(val.read())
else:
values['partner'].update({k: val})
+ #
+ # Get the selected product data from the frontend
+ #
+ elif k.startswith('products'):
+ values['products'] = val
elif k.startswith('skills'):
for key in ['new', 'existing']:
skill_number = re.search('skills\[%s\]\[(\d+)\]' % key, k)
@@ -411,30 +419,24 @@ def profile_save(self, partner, data):
'partner_id': partner.id,
}, context=context)
- # Assign membership
- if 'membership' in data:
- membership_product = product_pool.browse(cr, uid, int(data['membership']), context=context)
- inv_ids = partner_pool.create_membership_invoice(cr, SUPERUSER_ID, [partner.id], \
- int(data['membership']),
- {'amount': membership_product.lst_price},
- context=context)
- if inv_ids:
- invoice = invoice_pool.browse(cr, SUPERUSER_ID, inv_ids[0], context=context)
- balance_found = False
- for balance in partner.wallet_balance_ids:
- if balance.currency_id.id == invoice.currency_id.id:
- balance.write({
- 'available': balance.available-membership_product.lst_price
- })
- balance_found = True
- break
- if not balance_found:
- balance_pool.create(cr, uid, {
- 'partner_id': partner.id,
- 'available': -membership_product.lst_price,
- 'currency_id': invoice.currency_id.id
- }, context=context)
+ #
+ # Handle membership, adding products to the e-commerce cart as needed,
+ # and redirecting to the checkout page
+ #
+ if 'products' in data:
+ product_ids = data['products'].split(',')
+ #if (len(product_ids) > 0 and isinstance(product_ids[0],(int, long))):
+ sale_order = request.website.sale_get_order(force_create=1)
+ redirect_checkout = False
+ for product_id in product_ids:
+ try:
+ sale_order._cart_update(product_id=int(product_id), set_qty=1)
+ redirect_checkout = True
+ except ValueError:
+ pass
+ if redirect_checkout:
+ return request.redirect("/shop/checkout")
@http.route('/marketplace/profile/edit/', type='http', auth="user", website=True)
@@ -454,13 +456,39 @@ def profile_edit(self, partner, **kw):
values = self.profile_values(partner, user.partner_id.id == partner.id, kw)
values['errors'] = self.profile_form_validate(values['profile'])
if not values['errors']:
- self.profile_save(partner, values['profile'])
+ result = self.profile_save(partner, values['profile'])
request.session['profile_saved'] = True
+ if result != None:
+ return result
return request.redirect("/marketplace/profile/%s" % partner.id)
else:
values = self.profile_values(partner, user.partner_id.id == partner.id)
values['images'] = self.profile_images(partner)
values['format_text'] = format_text
+ values['memberships'] = {}
+ #
+ # Display memberships that the user can buy
+ #
+ product_pool = registry.get('product.product')
+ product_ids = product_pool.search(cr, uid,[
+ ('membership', '=', True),
+ ('membership_date_to', '>=', datetime.today())])
+ for product in product_pool.browse(cr, uid, product_ids):
+ categories = product.public_categ_ids
+ #
+ # Handle the case where we need a default categorie
+ #
+ if len(categories) == 0:
+ from collections import namedtuple
+ CollectionStruct = namedtuple('CollectionStruct', 'id complete_name')
+ categories = [CollectionStruct(id= 0, complete_name= 'default')]
+ for category in categories:
+ try:
+ values['memberships'][category.id]['products'].append(product)
+ except KeyError:
+ values['memberships'][category.id] = {}
+ values['memberships'][category.id]['name'] = category.complete_name
+ values['memberships'][category.id]['products'] = [product]
return request.website.render("website_membership_users.profile_edit", values)
@http.route('/marketplace/profile/edit', type='http', auth="user", website=True)
diff --git a/website_membership_users/i18n/fr.po b/website_membership_users/i18n/fr.po
index e1e6a8b..a563036 100644
--- a/website_membership_users/i18n/fr.po
+++ b/website_membership_users/i18n/fr.po
@@ -301,6 +301,12 @@ msgstr "Etat"
msgid "Street"
msgstr "Rue"
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Born :"
+msgstr "Né :"
+
#. module: website_membership_users
#: view:website:website_membership_users.profile_edit_general
#: view:website:website_membership_users.profile_view
@@ -369,3 +375,38 @@ msgstr "Avec qui"
#: view:website:website_membership_users.profile_edit_general
msgid "your@email.com"
msgstr "votre@email.com"
+
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Receive our news"
+msgstr "Recevoir les informations"
+
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Receive our sms"
+msgstr "Recevoir les SMS"
+
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Yes"
+msgstr "Oui"
+
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "No"
+msgstr "Non"
+
+#. module: website_membership_users
+#: field:res.partner,notify_sms:0,
+msgid "Receive Inbox Notifications by Sms"
+msgstr "Recevoir les notifications par SMS"
+
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Postalcode"
+msgstr "Code postal"
\ No newline at end of file
diff --git a/website_membership_users/i18n/website_membership_users.pot b/website_membership_users/i18n/website_membership_users.pot
index 68b6b3d..d594a8e 100644
--- a/website_membership_users/i18n/website_membership_users.pot
+++ b/website_membership_users/i18n/website_membership_users.pot
@@ -301,6 +301,12 @@ msgstr ""
msgid "Street"
msgstr ""
+#. module: website_membership_users
+#: view:website:website_membership_users.profile_edit_general
+#: view:website:website_membership_users.profile_view
+msgid "Born :"
+msgstr ""
+
#. module: website_membership_users
#: view:website:website_membership_users.profile_edit_general
#: view:website:website_membership_users.profile_view
diff --git a/website_membership_users/models/partner_sms.py b/website_membership_users/models/partner_sms.py
new file mode 100644
index 0000000..bcfb81e
--- /dev/null
+++ b/website_membership_users/models/partner_sms.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+from openerp.tools.translate import _
+from openerp.osv import fields, orm
+
+class res_partner_sms(orm.Model):
+ """ Update partner to add a field about notification preferences """
+ _name = "res.partner"
+ _inherit = 'res.partner'
+
+ _columns = {
+ 'notify_sms': fields.selection([
+ ('yes', 'Oui'),
+ ('no', 'Non'),
+ ], 'Receive Inbox Notifications by Sms', required=True,
+ ),
+ }
+
+ _defaults = {
+ 'notify_sms': lambda *args: 'yes'
+ }
\ No newline at end of file
diff --git a/website_membership_users/static/src/css/custom.css b/website_membership_users/static/src/css/custom.css
new file mode 100644
index 0000000..43becc1
--- /dev/null
+++ b/website_membership_users/static/src/css/custom.css
@@ -0,0 +1,19 @@
+div.list-item:not(:first-child) > div.row > div > .list-add.on-first
+{
+ /**/
+ display: none;
+}
+
+div.memberships {
+ text-align: center;
+}
+
+div.memberships button {
+ float: none !important;
+}
+
+button.submit {
+ float: none !important;
+ margin: 0 auto;
+ display: block;
+}
\ No newline at end of file
diff --git a/website_membership_users/static/src/css/el_admin.css b/website_membership_users/static/src/css/el_admin.css
new file mode 100644
index 0000000..d1f3d87
--- /dev/null
+++ b/website_membership_users/static/src/css/el_admin.css
@@ -0,0 +1,16 @@
+.float-left-el input,.float-left-el span {
+ float: left!important;
+ margin-left:5px;
+ margin-right: 0px;
+}
+.float-left-el input {
+ display: block;
+ width: 10px;
+}
+.float-left-el span {
+ margin-top:8px;
+ margin-right: 10px;
+}
+.test-left {
+ text-align: left!important;
+}
\ No newline at end of file
diff --git a/website_membership_users/static/src/img/femme.png b/website_membership_users/static/src/img/femme.png
new file mode 100644
index 0000000..8190014
Binary files /dev/null and b/website_membership_users/static/src/img/femme.png differ
diff --git a/website_membership_users/static/src/img/homme.png b/website_membership_users/static/src/img/homme.png
new file mode 100644
index 0000000..ac9a4b8
Binary files /dev/null and b/website_membership_users/static/src/img/homme.png differ
diff --git a/website_membership_users/static/src/img/societe.jpg b/website_membership_users/static/src/img/societe.jpg
new file mode 100644
index 0000000..9590434
Binary files /dev/null and b/website_membership_users/static/src/img/societe.jpg differ
diff --git a/website_membership_users/static/src/js/views/website_membership_users.profile_edit.js b/website_membership_users/static/src/js/views/website_membership_users.profile_edit.js
new file mode 100644
index 0000000..ef456b0
--- /dev/null
+++ b/website_membership_users/static/src/js/views/website_membership_users.profile_edit.js
@@ -0,0 +1,49 @@
+openerp.website.theme.views['website_membership_users.profile_edit'] = openerp.Class.extend({
+
+ init: function() {
+ /*
+ * Make sure the user can only select one product of each categorie,
+ * but has the option of de-selecting
+ */
+ $('.container.memberships button').on('click',function(e){
+ checkedState = $(this).hasClass('active');
+ $(this).parents('.container.memberships').find('button').each(function () {
+ if ($(this).hasClass('active'))
+ {
+ $(this).removeClass('active');
+ }
+ });
+ if (!checkedState)
+ {
+ $(this).addClass('active');
+ }
+ else
+ {
+ $(this).removeClass('active');
+ }
+ });
+
+ /*
+ * Collect selected product data to send to server
+ */
+ $('form button[type=submit]').on('click', function(e){
+ var hidden = $('');
+
+ var ids = Array();
+
+ $('.container.memberships button.active').each(function()
+ {
+ var id=$(this).attr('data-id');
+ if (ids.indexOf(id) == -1)
+ {
+ ids.push(id)
+ };
+ });
+
+ hidden.attr('value', ids.join());
+
+ $('form button[type=submit]').parent().append(hidden);
+ });
+
+ }
+});
diff --git a/website_membership_users/views/assets.xml b/website_membership_users/views/assets.xml
new file mode 100644
index 0000000..ae80f4f
--- /dev/null
+++ b/website_membership_users/views/assets.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/website_membership_users/views/templates/profile_edit_template.xml b/website_membership_users/views/templates/profile_edit_template.xml
index cb784b0..ec1388e 100644
--- a/website_membership_users/views/templates/profile_edit_template.xml
+++ b/website_membership_users/views/templates/profile_edit_template.xml
@@ -1,9 +1,14 @@
+
+
+
+
+
-
+
Upload new image
@@ -18,89 +23,61 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -112,8 +89,8 @@
-
-
+
+
@@ -138,6 +115,17 @@
+
+
+
+
+
+ Yes
+
+
+ No
+
+
@@ -145,7 +133,18 @@
-
+
+
+
+
+
+
+
+
+ Yes
+
+
+ No
@@ -157,6 +156,7 @@
+
@@ -188,13 +188,14 @@
+
+
-
@@ -212,88 +213,71 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
Balance
-
-
-
-
+
+
+
-
-
+
Balance
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -417,26 +401,54 @@
-
-
-
Profile information
-
-
+
+
\ No newline at end of file
diff --git a/website_membership_users/views/templates/profile_view_template.xml b/website_membership_users/views/templates/profile_view_template.xml
index 6c94694..e03a08f 100644
--- a/website_membership_users/views/templates/profile_view_template.xml
+++ b/website_membership_users/views/templates/profile_view_template.xml
@@ -15,15 +15,22 @@