Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
dd575c9
[IMP] Change in announcement view
florent-valeureux Jun 1, 2015
444f93c
[IMP] Change in announcement view
florent-valeureux Jun 1, 2015
3b63a83
[IMP] Change in announcement view
florent-valeureux Jun 8, 2015
e77a2aa
[IMP] Change in annoucment view make available qty visible
florent-valeureux Jun 9, 2015
50f6131
[IMP] Change in annoucment view make available qty visible
florent-valeureux Jun 9, 2015
a5aa4ff
[IMP] Clarification of member list
florent-valeureux Jun 9, 2015
2ddc32d
[IMP] Clarification of member list
florent-valeureux Jun 25, 2015
1a4a5f0
Adding website_event as dependancy for home
welsh-dwarf Jul 9, 2015
41880e5
Ajout de z-index sur tip-content pour peremttre l'affichage par dessu…
welsh-dwarf Jul 9, 2015
eccd117
Blog: Suppression image d'entête
vroy-as Jul 9, 2015
229014f
Correction mise en page compétances
vroy-as Jul 10, 2015
6fef69d
Ajout du module d'instalation de wezer
Yann47 Jul 10, 2015
0d7c633
Création du module de Gestion des langues (Drapeaux)
Yann47 Jul 10, 2015
15ef9cf
Ajout du website_blog dans les dépendances
Yann47 Jul 10, 2015
88a3e47
Desactivation du Footer
Yann47 Jul 10, 2015
a7c3952
Merge branch 'master' of https://github.com/atout-serenite/community-web
Yann47 Jul 10, 2015
9e641fb
Personnalising mobile GSM placeholder
welsh-dwarf Jul 12, 2015
74ae251
Merge branch 'master' of https://github.com/atout-serenite/community-web
welsh-dwarf Jul 12, 2015
c2f4dcb
Cleaning dependancy list
welsh-dwarf Jul 12, 2015
448fc4e
Cleaning up dependancewezer folder
welsh-dwarf Jul 12, 2015
1ca08cb
Fixing dependancy tree
welsh-dwarf Jul 12, 2015
2ea52e2
Fixing translation for passwords
welsh-dwarf Jul 12, 2015
0468e90
Finishing cleanup of dependancewezer
welsh-dwarf Jul 12, 2015
996a9fc
Adding last articles bloc module
welsh-dwarf Jul 13, 2015
6b93727
Finishing translations
welsh-dwarf Jul 13, 2015
cfae14d
Updateing profile formatting
welsh-dwarf Jul 13, 2015
a00aa68
Ajout du Champ "Receive our SMS"
Yann47 Jul 13, 2015
a8831e6
Ajout de la case "receive SMS"
Yann47 Jul 13, 2015
6567409
Adding product price currency
welsh-dwarf Jul 13, 2015
1f81fd9
Create README.md
florent-valeureux Jul 13, 2015
2d2f9d2
Update README.md
florent-valeureux Jul 13, 2015
52fb36c
Initial work on e-commerce
welsh-dwarf Jul 15, 2015
3ef142f
Modification Affichage dernieres pages
Yann47 Jul 15, 2015
a74b321
CONTENU DU CONTROLLERS
Yann47 Jul 15, 2015
7af29fc
Merge from master
Yann47 Jul 15, 2015
b5fd9cb
Removing editibale switch from flag showing
welsh-dwarf Jul 15, 2015
8bf7f31
Removing reduntant field
welsh-dwarf Jul 15, 2015
150d26d
Adding products + exclusive switcher
welsh-dwarf Jul 15, 2015
974fc2c
Fin de l'intégration e-commerce
welsh-dwarf Jul 15, 2015
8c284f8
Fixing master button
welsh-dwarf Jul 16, 2015
17a4757
Corrections des traductions
vroy-as Jul 16, 2015
12eff64
Corrections des traductions
vroy-as Jul 16, 2015
954afe2
Travaux sur le block articles - a finir
Yann47 Jul 16, 2015
9f3e756
Merge branch 'master' of https://github.com/atout-serenite/community-web
Yann47 Jul 16, 2015
01485bb
Fixing last article css
welsh-dwarf Jul 16, 2015
95cbfb7
Code cleanup des images
welsh-dwarf Jul 16, 2015
939be48
Renaming flag module
welsh-dwarf Jul 16, 2015
5b43eaf
Cleaning up variable names
welsh-dwarf Jul 16, 2015
590455a
Adding comments
welsh-dwarf Jul 16, 2015
9d97726
Cleaning up last_articles block
welsh-dwarf Jul 16, 2015
872e148
Cleaning up code
welsh-dwarf Jul 16, 2015
35de328
Code cleanup (renaming module)
welsh-dwarf Jul 16, 2015
0e88b2e
Code cleanup
welsh-dwarf Jul 16, 2015
ce5be93
Adding comments
welsh-dwarf Jul 16, 2015
242472a
Code cleanup
welsh-dwarf Jul 16, 2015
ce60573
Code cleanup
welsh-dwarf Jul 16, 2015
dedfa74
Fixing bug regarding promote
welsh-dwarf Jul 16, 2015
7692386
Cleanup (last)
welsh-dwarf Jul 16, 2015
3337fa9
Finishing frontend
welsh-dwarf Jul 17, 2015
454968a
Removing dead code
welsh-dwarf Jul 17, 2015
fc2e620
Fixing urls
welsh-dwarf Jul 17, 2015
0f4be1f
Modification du Champs
Yann47 Jul 17, 2015
ccaffb2
Merge branch 'master' of https://github.com/atout-serenite/community-web
Yann47 Jul 17, 2015
21c3a52
ModificatioN T-IF
Yann47 Jul 17, 2015
6fbcdc8
Ajout de Code Postal en Fr
Yann47 Jul 20, 2015
76d16ec
Modification ids en valeurid
Yann47 Jul 20, 2015
9a01f0d
Fixing thumbnail url
welsh-dwarf Jul 20, 2015
a792411
Merge branch 'master' of https://github.com/atout-serenite/community-web
welsh-dwarf Jul 20, 2015
378659b
Commencement modification de la recherche d'annonces.
vroy-as Jul 23, 2015
4852f90
Création dossier Stockage Image
Yann47 Jul 23, 2015
e07da2c
New Image pour Type Offer & Want
Yann47 Jul 23, 2015
73dcdf6
Merge branch 'master' of https://github.com/atout-serenite/community-web
Yann47 Jul 23, 2015
c7a8e2e
Erreur : Display None Box par Box
Yann47 Jul 23, 2015
0444c36
4 colonnes : Affichage onmouseover
Yann47 Jul 23, 2015
2e56a4b
Modification de l'affichage place de marché
Yann47 Jul 30, 2015
2b91236
Adding SMS prox to res.partner
welsh-dwarf Aug 9, 2015
bc95e6f
[IMP] New page with only wants
florent-valeureux Aug 9, 2015
d9ae280
Single Item Parent
Yann47 Aug 10, 2015
b4fecfe
Merge branch 'master' of https://github.com/atout-serenite/community-web
welsh-dwarf Aug 10, 2015
5e09bcc
Fixing login
welsh-dwarf Aug 11, 2015
3d463cc
Fixing fields
welsh-dwarf Aug 11, 2015
8e72701
Fixing fields
welsh-dwarf Aug 11, 2015
ba6a1c5
Fixing bugs
welsh-dwarf Aug 11, 2015
17fdb08
Adding images for title
welsh-dwarf Aug 11, 2015
c20752f
Modification Session par default
Yann47 Aug 13, 2015
2e61dfd
Merge branch 'master' into pr/67
florent-valeureux Sep 4, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions dependancewezer/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# -*- coding: utf-8 -*-
43 changes: 43 additions & 0 deletions dependancewezer/__openerp__.py
Original file line number Diff line number Diff line change
@@ -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': [
],
}
661 changes: 661 additions & 0 deletions product_price_currency/LICENSE

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions product_price_currency/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# -*- coding: utf-8 -*-
import product
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

30 changes: 30 additions & 0 deletions product_price_currency/__openerp__.py
Original file line number Diff line number Diff line change
@@ -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:
44 changes: 44 additions & 0 deletions product_price_currency/i18n/es_AR.po
Original file line number Diff line number Diff line change
@@ -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 <scarafia.juanjose@gmail.com>\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"

44 changes: 44 additions & 0 deletions product_price_currency/i18n/product_price_currency.pot
Original file line number Diff line number Diff line change
@@ -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 ""

60 changes: 60 additions & 0 deletions product_price_currency/product.py
Original file line number Diff line number Diff line change
@@ -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
85 changes: 85 additions & 0 deletions product_price_currency/product_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<!-- Product Product Views -->
<record id="product_normal_form_view" model="ir.ui.view">
<field name="name">product_price_currency.form</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_normal_form_view" />
<field name="arch" type="xml">
<field name="lst_price" position="after">
<field name="sale_price_currency_id"/>
</field>
</field>
</record>
<record id="product_price_currency_tree_view" model="ir.ui.view">
<field name="name">product_price_currency.tree</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_product_tree_view" />
<field name="arch" type="xml">
<field name="lst_price" position="after">
<field name="sale_price_currency_id" />
</field>
</field>
</record>
<record id="product_kanban_view" model="ir.ui.view">
<field name="name">product_price_currency.kanban</field>
<field name="model">product.product</field>
<field name="inherit_id" ref="product.product_kanban_view" />
<field name="arch" type="xml">
<li position="inside">
<field name="sale_price_currency_id"/>
</li>
</field>
</record>

<!-- Product Template Views -->
<record id="product_template_kanban_view" model="ir.ui.view">
<field name="name">product_price_currency.kanban</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_kanban_view" />
<field name="arch" type="xml">
<li position="inside">
<field name="sale_price_currency_id"/>
</li>
<li>
<!-- <li invisible="not context.get('pricelist',False)"> -->
<li>Pricelist Price: <field name="price"></field></li>
</li>
</field>
</record>
<record id="product_template_only_form_view" model="ir.ui.view">
<field name="name">product_price_currency.form</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_only_form_view" />
<field name="arch" type="xml">
<field name="list_price" position="after">
<field name="sale_price_currency_id"/>
<field name="cia_currency_list_price"/>
</field>
</field>
</record>
<record id="product_template_search_view" model="ir.ui.view">
<field name="name">product_price_currency.search</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_search_view" />
<field name="arch" type="xml">
<field name="company_id" position="after">
<field name="sale_price_currency_id"/>
</field>
</field>
</record>
<record id="product_template_tree_view" model="ir.ui.view">
<field name="name">product.template.product.tree</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_tree_view" />
<field name="arch" type="xml">
<tree>
<field name="lst_price"/>
<field name="sale_price_currency_id" string="Currency"/>
<field name="price" string="Pricelist Price" invisible="not context.get('pricelist',False)"/>
</tree>
</field>
</record>
</data>
</openerp>
1 change: 1 addition & 0 deletions website_community_home/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
'depends': [
'auth_signup',
'website_marketplace',
'website_event',
],
'data': [
'views/templates/home.xml',
Expand Down
2 changes: 1 addition & 1 deletion website_community_template/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
#
##############################################################################


import controllers
4 changes: 3 additions & 1 deletion website_community_template/__openerp__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
'depends': [
'auth_signup',
'website',
'website_marketplace'
'website_marketplace',
'website_blog'
],
'data': [
'views/assets.xml',
Expand All @@ -42,6 +43,7 @@
'views/templates/signup.xml',
'views/templates/signup_fields.xml',
'views/templates/register_template.xml',
'views/templates/blog_template.xml',
],
'installable': True
}
1 change: 1 addition & 0 deletions website_community_template/controllers/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import main
Loading