From 6a8ce774264ed52f47cc1f3601bd85ba81412bd8 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 09:03:31 +0100
Subject: [PATCH 01/19] [FIX] res.partner: prevent `show_email` context option
 from polluting display_name

bzr revid: odo@openerp.com-20140212080331-diit15a9sz7do4cu
---
 openerp/addons/base/res/res_partner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 9115ccae481..e9573088680 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -209,6 +209,7 @@ class res_partner(osv.osv, format_address):
         context = dict(context or {})
         context.pop('show_address', None)
         context.pop('show_address_only', None)
+        context.pop('show_email', None)
         return dict(self.name_get(cr, uid, ids, context=context))
 
     # indirections to avoid passing a copy of the overridable method when declaring the function field

From ac03ba3095fe6154e8bf369ede63be3cfc6d8c9f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 11:28:05 +0100
Subject: [PATCH 02/19] [FIX] website: pager don't keep searches

bzr revid: chm@openerp.com-20140212102805-5khiv3cgslci9che
---
 addons/website/views/website_templates.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d43d8c45443..383c27514c1 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -383,13 +383,13 @@
 <template id="pager" name="Pager">
     <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
         <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
+            <a t-att-href="'%s?%s' % (pager['page_previous']['url'],keep_query('*')) if pager['page']['num'] != 1 else ''">Prev</a>
         </li>
         <t t-foreach="pager['pages']" t-as="page">
-            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
+            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="'%s?%s' % (page['url'],keep_query('*'))" t-raw="page['num']"></a></li>
         </t>
         <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-            <a t-att-href=" pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+            <a t-att-href="'%s?%s' % (pager['page_next']['url'],keep_query('*')) if pager['page']['num'] != pager['page_count'] else ''">Next</a>
         </li>
     </ul>
 </template>

From ed785f07838fbda6a2eacc2e8e249da9dfcc7518 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 12:55:16 +0100
Subject: [PATCH 03/19] [FIX] website_sale: pager and breadcrum keep search and
 filter. Filter keep search and category. Links for category

bzr revid: chm@openerp.com-20140212115516-3izdv7cszgh2n3l4
---
 addons/website/models/website.py           |  2 +-
 addons/website/views/website_templates.xml |  6 +--
 addons/website_sale/controllers/main.py    | 48 ++++++++++++---------
 addons/website_sale/views/website_sale.xml | 49 +++++++++++-----------
 4 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index e43efa6f0a3..ea095c04fe3 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -248,7 +248,7 @@ class website(osv.osv):
             pmin = pmax - scope if pmax - scope > 0 else 1
 
         def get_url(page):
-            _url = "%spage/%s/" % (url, page)
+            _url = "%spage/%s/" % (url, page) if page > 1 else url
             if url_args:
                 _url = "%s?%s" % (_url, werkzeug.url_encode(url_args))
             return _url
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 383c27514c1..846ff17fd1e 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -383,13 +383,13 @@
 <template id="pager" name="Pager">
     <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
         <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-            <a t-att-href="'%s?%s' % (pager['page_previous']['url'],keep_query('*')) if pager['page']['num'] != 1 else ''">Prev</a>
+            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else ''">Prev</a>
         </li>
         <t t-foreach="pager['pages']" t-as="page">
-            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="'%s?%s' % (page['url'],keep_query('*'))" t-raw="page['num']"></a></li>
+            <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' "> <a t-att-href="page['url']" t-raw="page['num']"></a></li>
         </t>
         <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' ">
-            <a t-att-href="'%s?%s' % (pager['page_next']['url'],keep_query('*')) if pager['page']['num'] != pager['page_count'] else ''">Next</a>
+            <a t-att-href="pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else ''">Next</a>
         </li>
     </ul>
 </template>
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 5e02def1494..b3a93b63148 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -7,6 +7,7 @@ from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
+from openerp.addons.website.models.website import slug
 
 PPG = 20                        # Products Per Page
 PPR = 4                         # Products Per Row
@@ -143,8 +144,8 @@ class Ecommerce(http.Controller):
                 return key_val
         return False
 
-    @http.route(['/shop/filters/'], type='http', auth="public", website=True, multilang=True)
-    def filters(self, **post):
+    @http.route(['/shop/filters/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    def filters(self, category=None, **post):
         index = []
         filters = []
         for key, val in post.items():
@@ -169,11 +170,16 @@ class Ecommerce(http.Controller):
                     filters[index.index(cat_id)].append( cat[2] )
             post.pop(key)
 
-        return request.redirect("/shop/?filters=%s%s%s" % (
-                simplejson.dumps(filters),
-                post.get("search") and ("&search=%s" % post.get("search")) or "",
-                post.get("category") and ("&category=%s" % post.get("category")) or ""
-            ))
+        url = "/shop/"
+        if category:
+            category_obj = request.registry.get('product.public.category')
+            url = "%scategory/%s/" % (url, slug(category_obj.browse(request.cr, request.uid, int(category), context=request.context)))
+        if filters:
+            url = "%s?filters=%s" % (url, simplejson.dumps(filters))
+        if post.get("search"):
+            url = "%s%ssearch=%s" % (url, filters and "&" or "?", post.get("search"))
+
+        return request.redirect(url)
 
     def attributes_to_ids(self, attributes):
         obj = request.registry.get('product.attribute.line')
@@ -209,15 +215,24 @@ class Ecommerce(http.Controller):
                 ('name', 'ilike', search),
                 ('description', 'ilike', search)]
         if category:
-            domain.append(('product_variant_ids.public_categ_id', 'child_of', category.id))
+            domain.append(('product_variant_ids.public_categ_id', 'child_of', int(category)))
+            if isinstance(category, (int,str,unicode)):
+                category = request.registry.get('product.public.category').browse(cr, uid, int(category), context=context)
         if filters:
             filters = simplejson.loads(filters)
             if filters:
                 ids = self.attributes_to_ids(filters)
                 domain.append(('id', 'in', ids or [0]))
 
+        url = "/shop/"
         product_count = product_obj.search_count(cr, uid, domain, context=context)
-        pager = request.website.pager(url="/shop/", total=product_count, page=page, step=PPG, scope=7, url_args=post)
+        if search:
+            post["search"] = search
+        if filters:
+            post["filters"] = filters
+        if category:
+            url = "/shop/category/%s/" % slug(category)
+        pager = request.website.pager(url=url, total=product_count, page=page, step=PPG, scope=7, url_args=post)
 
         request.context['pricelist'] = self.get_pricelist()
 
@@ -244,11 +259,12 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category and category.id,
+                'category': category,
                 'filters': filters,
             },
             'pager': pager,
             'styles': styles,
+            'category': category,
             'categories': categs,
             'Ecommerce': self,   # TODO fp: Should be removed
             'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids],
@@ -257,26 +273,20 @@ class Ecommerce(http.Controller):
 
     @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, search='', category='', filters='', **kwargs):
-        category_obj = request.registry.get('product.public.category')
-
-        category_ids = category_obj.search(request.cr, request.uid, [], context=request.context)
-        category_list = category_obj.name_get(request.cr, request.uid, category_ids, context=request.context)
-        category_list = sorted(category_list, key=lambda category: category[1])
-
         if category:
+            category_obj = request.registry.get('product.public.category')
             category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
 
         request.context['pricelist'] = self.get_pricelist()
 
         values = {
             'Ecommerce': self,
-            'category': category,
-            'category_list': category_list,
             'main_object': product,
             'product': product,
+            'category': category,
             'search': {
                 'search': search,
-                'category': category and str(category.id),
+                'category': category,
                 'filters': filters,
             }
         }
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index bd51d35cc14..1c616a3d1f7 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -32,10 +32,10 @@
 <!-- List of categories -->
 
 <template id="categories_recursive" name="Category list">
-  <li t-att-class="category.id == search.get('category') and 'active' or ''">
-      <a t-attf-href="/shop/category/#{ slug(category) }/" t-field="category.name"></a>
-      <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
-          <t t-foreach="category.child_id" t-as="category">
+  <li t-att-class="int(categ) == int(category or 0) and 'active' or ''">
+      <a t-attf-href="/shop/category/#{ slug(categ) }/" t-field="categ.name"></a>
+      <ul t-if="categ.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="categ.child_id" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -45,14 +45,15 @@
 <!-- Product list -->
 
 <template id="search" name="Search hidden fields">
-  <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
-  <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
-  <div class="input-group">
-    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
-    <span class="input-group-btn">
-      <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
-    </span>
-  </div>
+  <form t-attf-action="/shop/{{'category/%s/' % slug(category) if category else ''}}" method="get" t-att-class="search_class">
+    <input t-if="search.get('filters')" type="hidden" name="filters" t-att-value="search.get('filters')"/>
+    <div class="input-group">
+      <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
+      <span class="input-group-btn">
+        <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
+      </span>
+    </div>
+  </form>
 </template>
 
 <template id="products_cart" name="Shopping cart">
@@ -60,12 +61,12 @@
     <div class="ribbon btn btn-danger">Sale</div>
   </div>
   <div class="oe_product_image">
-      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}">
+      <a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}">
           <span t-field="product.image" t-field-options='{"widget": "image"}'/>
       </a>
   </div>
   <section>
-      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('category', 'search', 'filters') }}" t-field="product.name"/></strong></h5>
+      <h5><strong><a t-attf-href="/shop/product/{{ slug(product) }}/?{{ keep_query('search', 'filters', category=(category and int(category)), page=(pager['page']['num'] if pager['page']['num']>1 else None)) }}" t-field="product.name"/></strong></h5>
       <div class="product_price" t-if="product.product_variant_ids">
           <b>
               <t t-if="abs(product.product_variant_ids[0].lst_price - product.product_variant_ids[0].price) &gt; 0.2">
@@ -99,9 +100,8 @@
         <div class="container oe_website_sale">
           <div class="products_pager">
             <div class="row">
-              <form action="/shop/" method="get" class="pagination form-inline col-md-3">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pagination form-inline col-md-3</t>
+              <t t-call="website_sale.search"/>
               <t t-call="website.pager"/>
             </div>
           </div>
@@ -278,15 +278,14 @@
           <div class="row">
             <div class="col-sm-4">
                 <ol class="breadcrumb">
-                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters') }}" onclick="history.go(-1); return false;">Products</a></li>
-                    <li t-if="search.get('category')"><a t-attf-href="/shop/?{{ keep_query('search', 'filters', 'category') }}" t-field="category.name"/></li>
+                    <li><a t-attf-href="/shop?{{ keep_query('search', 'filters', 'page') if not category else keep_query('search', 'filters') }}">Products</a></li>
+                    <li t-if="category"><a t-attf-href="/shop/category/{{ slug(category) }}/?{{ keep_query('search', 'filters', 'page') }}" t-field="category.name"/></li>
                     <li class="active"><span t-field="product.name"/></li>
                 </ol>
             </div>
             <div class="col-sm-3">
-              <form action="/shop/" method="get" class="pull-right">
-                  <t t-call="website_sale.search" />
-              </form>
+              <t t-set="search_class">pull-right</t>
+              <t t-call="website_sale.search"/>
             </div>
             <div class="col-sm-4" groups="base.group_sale_manager">
                 <t t-call="website.publish_management">
@@ -569,8 +568,8 @@
 <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
       <ul class="nav nav-pills nav-stacked mt16">
-          <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
-          <t t-foreach="categories" t-as="category">
+          <li t-att-class=" '' if category else 'active' "><a href="/shop/">All Products</a></li>
+          <t t-foreach="categories" t-as="categ">
               <t t-call="website_sale.categories_recursive"/>
           </t>
       </ul>
@@ -585,7 +584,7 @@
 
 <template id="products_attributes" inherit_id="website_sale.products" inherit_option_id="website_sale.products" name="Product attribute's Filters" groups="product.group_product_attributes">
   <xpath expr="//div[@id='products_grid_before']" position="inside">
-      <form t-attf-action="/shop/filters/?{{ keep_query('category', 'search') }}" class="attributes" method="post">
+      <form t-attf-action="/shop/filters/?{{ keep_query('search', category=(category and int(category))) }}" class="attributes" method="post">
           <ul class="nav nav-pills nav-stacked mt16">
               <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
               <t t-foreach="attribute_ids" t-as="attribute_id">

From 2223ba5600875eb1d92ec1c70feacd60ebe6a96b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 15:13:46 +0100
Subject: [PATCH 04/19] [FIX] search view: slightly more readable error when
 search filters fail to evaluate

Prints the error details instead of:
  Uncaught TypeError: Cannot read property 'length' of undefined' addons/web/static/src/js/views.js

bzr revid: odo@openerp.com-20140212141346-hpw05sv3ctr243db
---
 addons/web/static/src/js/views.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 82a2095bace..eed98f9fc31 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -815,6 +815,11 @@ instance.web.ViewManager =  instance.web.Widget.extend({
             contexts: [action_context].concat(contexts || []),
             group_by_seq: groupbys || []
         }).done(function (results) {
+            if (results.error) {
+                throw new Error(
+                        _.str.sprintf(_t("Failed to evaluate search criterions")+": \n%s",
+                                      JSON.stringify(results.error)));
+            }
             self.dataset._model = new instance.web.Model(
                 self.dataset.model, results.context, results.domain);
             var groupby = results.group_by.length

From 5a134745e804d43dd6eb3cf43a3f019251068564 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 15:17:13 +0100
Subject: [PATCH 05/19] [FIX] website_sale: search category with int for saas
 updating without -u

bzr revid: chm@openerp.com-20140212141713-j9cagak2z2j4s20x
---
 addons/website_sale/controllers/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b3a93b63148..3531853227c 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -259,7 +259,7 @@ class Ecommerce(http.Controller):
             'range': range,
             'search': {
                 'search': search,
-                'category': category,
+                'category': category and int(category),
                 'filters': filters,
             },
             'pager': pager,
@@ -286,7 +286,7 @@ class Ecommerce(http.Controller):
             'category': category,
             'search': {
                 'search': search,
-                'category': category,
+                'category': category and int(category),
                 'filters': filters,
             }
         }

From 6a29b0ae0fcfc23136fcbbd0e8097116ee60d779 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 15:19:59 +0100
Subject: [PATCH 06/19] [FIX] Layout was broken in the debugging `View Logs`
 (perm_read) popup, fixed + boostrapified

bzr revid: odo@openerp.com-20140212141959-w2s4f960jwbknzx4
---
 addons/web/static/src/css/base.css  | 14 ----------
 addons/web/static/src/css/base.sass | 12 --------
 addons/web/static/src/xml/base.xml  | 43 +++++++++++++++++------------
 3 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index bf9362a1e09..35b6fcc582d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3021,20 +3021,6 @@
   font-size: 95%;
   line-height: 1.2em;
 }
-.openerp .oe_debug_view_log label {
-  display: block;
-  width: 49%;
-  text-align: right;
-  float: left;
-  font-weight: bold;
-  color: #000099;
-}
-.openerp .oe_debug_view_log span {
-  display: block;
-  width: 49%;
-  float: right;
-  color: #333333;
-}
 .openerp .navbar {
   min-height: 32px;
   margin-bottom: 0px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c79deecddb5..5021644a062 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2419,18 +2419,6 @@ $sheet-padding: 16px
     .oe_debug_view_log
         font-size: 95%
         line-height: 1.2em
-    .oe_debug_view_log label
-        display: block
-        width: 49%
-        text-align: right
-        float: left
-        font-weight: bold
-        color: #009
-    .oe_debug_view_log span
-        display: block
-        width: 49%
-        float: right
-        color: #333
     // }}}
     // Bootstrap HACKS {{{
     .navbar
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fc9c2154d01..80b82c1f40b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -536,23 +536,32 @@
 </t>
 <t t-name="ViewManagerDebugViewLog">
     <div class="oe_debug_view_log">
-        <label>ID:</label>
-        <span><t t-esc="perm.id"/></span>
-
-        <label>XML ID:</label>
-        <span><t t-esc="perm.xmlid"/></span>
-
-        <label>Creation User:</label>
-        <span><t t-esc="format(perm.create_uid, { 'type' : 'many2one' }, '/')"/></span>
-
-        <label>Creation Date:</label>
-        <span><t t-esc="format(perm.create_date, { 'type' : 'datetime' }, '/')"/></span>
-
-        <label>Latest Modification by:</label>
-        <span><t t-esc="format(perm.write_uid, { 'type' : 'many2one' }, '/')"/></span>
-
-        <label>Latest Modification Date:</label>
-        <span><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></span>
+        <table class="table table-condensed table-striped">
+            <tr>
+                <th>ID:</th>
+                <td><t t-esc="perm.id"/></td>
+            </tr>
+            <tr>
+                <th>XML ID:</th>
+                <td><t t-esc="perm.xmlid or '/'"/></td>
+            </tr>
+            <tr>
+                <th>Creation User:</th>
+                <td><t t-esc="format(perm.create_uid, { 'type' : 'many2one' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Creation Date:</th>
+                <td><t t-esc="format(perm.create_date, { 'type' : 'datetime' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Latest Modification by:</th>
+                <td><t t-esc="format(perm.write_uid, { 'type' : 'many2one' }, '/')"/></td>
+            </tr>
+            <tr>
+                <th>Latest Modification Date:</th>
+                <td><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></td>
+            </tr>
+        </table>
     </div>
 </t>
 <t t-name="ViewPager">

From e1b37a897d65cff40dc4b3106019304179d6e7ee Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 15:39:16 +0100
Subject: [PATCH 07/19] [FIX] website: remove alert snippets_modal

bzr revid: chm@openerp.com-20140212143916-tqf8d8n1hhod5l4v
---
 .../static/src/js/website.snippets.editor.js  |  8 +---
 .../static/src/xml/website.snippets.xml       | 37 -------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index e45bee9685b..f6e958341ae 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -139,9 +139,6 @@
 
             this.$el.addClass("hidden");
 
-            this.$modal = $(openerp.qweb.render('website.snippets_modal'));
-            this.$modal.appendTo("body");
-
             $(document).on('click', '.dropdown-submenu a[tabindex]', function (e) {
                 e.preventDefault();
             });
@@ -375,7 +372,7 @@
                     });
                 },
                 stop: function(ev, ui){
-                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 50) {
+                    if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 3) {
                         var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first();
                         if (el.length) {
                             el.after($toInsert);
@@ -439,9 +436,6 @@
                         },0);
                     } else {
                         $toInsert.remove();
-                        if (self.$modal.find('input:not(:checked)').length) {
-                            self.$modal.modal('toggle');
-                        }
                     }
                 },
             });
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index cf3996bdba4..d73e0c3934a 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -15,43 +15,6 @@
             </div>
         </li>
     </t>
-    <t t-name="website.snippets_modal">
-        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
-                        <h4 class="modal-title">
-                            Building Block Not Inserted
-                        </h4>
-                    </div>
-                    <div class="modal-body">
-                        <p>
-                            Please drop building blocks in a valid zone, like
-                            this one:
-                        </p>
-                        <div class="row">
-                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                <span class="mt16">drop in this zone</span>
-                            </div>
-                        </div>
-                        <div class="text-muted">
-                            <b>Tip:</b> when your cursor is in a valid zone,
-                            OpenERP shows you a preview of the building block
-                            in the page.  You must release the block when the
-                            preview is visible.
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-                        <div class="pull-left">
-                            <input type="checkbox" value="1"/> Never show this tip again
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
 
     <t t-name="website.snippets">
         <div id='oe_snippets'></div>

From a7e5025f29951805bfb0d9609d311afa3cad985c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 12 Feb 2014 16:28:42 +0100
Subject: [PATCH 08/19] [FIX]website_sale: crappy fix for view product:
 branding error => can't edit guarantee part when the product_attributes
 inherit is apply

bzr revid: chm@openerp.com-20140212152842-6ymg8kund5l2v7yk
---
 addons/website_sale/views/website_sale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 1c616a3d1f7..9dd1ed75cdc 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -338,7 +338,7 @@
                     </div>
                     <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
                     <hr t-if="product.description_sale"/>
-                    <p t-field="product.description_sale" class="text-muted"/>
+                    <div><p t-field="product.description_sale" class="text-muted"/></div>
                     <hr/>
                     <p class="text-muted">
                         30-day money-back guarantee<br/>

From 652c574866b619bc31cd8fd09568e9fa9492c254 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 18:52:24 +0100
Subject: [PATCH 09/19] [FIX] product.pricelist: leftover undefined variable
 from pricelist refactoring at
 revid:fp@tinyerp.com-20131206221809-x1muf0wonl4ated0

bzr revid: odo@openerp.com-20140212175224-wd9etr8xyrg6l0oz
---
 addons/product/pricelist.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6f47d6d39d7..65c4311f34a 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -279,7 +279,6 @@ class product_pricelist(osv.osv):
 
             if price:
                 if 'uom' in context and not uom_price_already_computed:
-                    product = products_dict[product.id]
                     uom = product.uos_id or product.uom_id
                     price = product_uom_obj._compute_price(cr, uid, uom.id, price, context['uom'])
 

From 47312a5f375a2887da71db65c80844d63672d11f Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 12 Feb 2014 19:02:16 +0100
Subject: [PATCH 10/19] [MERGE] Forward-port of latest saas-2 bugfixes, up to
 rev. 5011 rev-id: odo@openerp.com-20140212175952-ehkgu7uyvbymj9od

bzr revid: odo@openerp.com-20140212180216-vhynt924xgsixzfq
---
 openerp/addons/base/res/res_users_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index 9c84d4326f4..ba603c7a0f0 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -231,7 +231,7 @@
             <field name="model">res.users</field>
             <field name="arch" type="xml">
                 <search string="Users">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email,'ilike',self)]" string="User"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email','ilike',self)]" string="User"/>
                     <field name="company_ids" string="Company" groups="base.group_multi_company"/>
                 </search>
             </field>

From 1c871da2269494e97a6ebcf96f83441ceabc4e1a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:08:45 +0100
Subject: [PATCH 11/19] [FIX] crm: enable needaction filters

bzr revid: chs@openerp.com-20140212180845-wme2uqa0iyl8wps9
---
 addons/crm/crm_lead_view.xml      | 2 ++
 addons/crm/crm_phonecall_view.xml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c728404d9ce..e76a7a9124d 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -343,6 +343,7 @@
                             help="Leads that are assigned to any sales teams I am member of"/>
                     <filter string="Dead" name="dead"
                             domain="[('probability', '=', '0'), ('stage_id.fold', '=', True)]"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator />
                     <filter string="Available for mass mailing"
                             name='not_opt_out' domain="[('opt_out', '=', False)]"
@@ -562,6 +563,7 @@
                     <filter string="My Team(s)"
                             domain="[('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
                             help="Opportunities that are assigned to any sales teams I am member of"/>
+                    <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <group expand="0" string="Group By..." colspan="16">
                         <filter string="Salesperson" domain="[]" context="{'group_by':'user_id'}"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a027a910520..9675913a0b5 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -171,6 +171,7 @@
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
                <filter string="Unassigned Phonecalls" icon="terp-personal-" domain="[('user_id','=',False)]" help="Unassigned Phonecalls"/>
+               <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                <separator/>
                <filter string="Phone Calls Assigned to Me or My Team(s)" icon="terp-personal+" domain="['|', ('section_id.user_id','=',uid), ('user_id', '=', uid)]"
                        help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>

From 9d670cd45fe2f1e2d06bb27df8d249fec1ef83b0 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:09:32 +0100
Subject: [PATCH 12/19] [FIX] web: navbar must have a z-index at 0 to be hidden
 when passing pad in fullscreen

bzr revid: chs@openerp.com-20140212180932-z1vtcfrif0rzsozu
---
 addons/web/static/src/css/base.css  | 4 ++--
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 35b6fcc582d..c5c9af94479 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "UTF-8";
+@charset "utf-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -3025,7 +3025,7 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 1;
+  z-index: 0;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 5021644a062..95c30e5dc93 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,7 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 1
+        z-index: 0
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default

From e90a59aef626d65e30eaa10f861c5bfe83b9201e Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 12 Feb 2014 19:10:14 +0100
Subject: [PATCH 13/19] [FIX] pad: font-awesomeize icon

bzr revid: chs@openerp.com-20140212181014-rk1qh1pcovtmjhqu
---
 addons/pad/static/src/css/etherpad.css | 5 ++---
 addons/pad/static/src/js/pad.js        | 1 +
 addons/pad/static/src/xml/pad.xml      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index facf15b28de..d8281ef4d48 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -13,13 +13,12 @@
     border: solid 1px #ccc;
     border-radius:3px;
     text-align: center;
-    line-height: 22px;
+    line-height: 28px;
     overflow: hidden;
     -webkit-box-sizing: border-box;
     color: #666666;
-    padding-top:-3px;
-    padding-left:-1px;
     cursor: pointer;
+    font-size: 14px;
 }
 
 .oe_pad_switch:hover{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index ba5ee3a3037..b685eb1e8fb 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -13,6 +13,7 @@ openerp.pad = function(instance) {
             this.switch_configured();
             this.$('.oe_pad_switch').click(function() {
                 self.$el.toggleClass('oe_pad_fullscreen');
+                self.$el.find('.oe_pad_switch').toggleClass('fa-expand fa-compress');
             });
             this.render_value();
         },
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index f915e867b35..5d2ab779ead 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -15,7 +15,7 @@
             </t>
             <t t-if="! widget.get('effective_readonly')">
                 <div class="oe_pad_switch_positioner oe_configured">
-                    <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                    <span class="fa fa-expand oe_pad_switch"></span>
                 </div>
                 <div class="oe_pad_content oe_editing oe_configured">
                 </div>

From b8950c14c8cd52fe64f11d97fe981303e6980a0d Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 12:09:37 +0100
Subject: [PATCH 14/19] [FIX] ir.values: be tolerant to actions pointing to non
 existing actions (aka old wizards)

bzr revid: chs@openerp.com-20140213110937-hc3u6fwfclhf5mmn
---
 openerp/addons/base/ir/ir_values.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py
index a21b034d1b0..6af09b7ecbb 100644
--- a/openerp/addons/base/ir/ir_values.py
+++ b/openerp/addons/base/ir/ir_values.py
@@ -394,17 +394,16 @@ class ir_values(osv.osv):
         for action in cr.dictfetchall():
             if not action['value']:
                 continue    # skip if undefined
-            action_model,id = action['value'].split(',')
-            fields = [
-                    field
-                    for field in self.pool[action_model]._all_columns
-                    if field not in EXCLUDED_FIELDS]
+            action_model_name, action_id = action['value'].split(',')
+            action_model = self.pool.get(action_model_name)
+            if not action_model:
+                continue    # unknow model? skip it
+            fields = [field for field in action_model._all_columns if field not in EXCLUDED_FIELDS]
             # FIXME: needs cleanup
             try:
-                action_def = self.pool[action_model].read(cr, uid, int(id), fields, context)
+                action_def = action_model.read(cr, uid, int(action_id), fields, context)
                 if action_def:
-                    if action_model in ('ir.actions.report.xml','ir.actions.act_window',
-                                        'ir.actions.wizard'):
+                    if action_model_name in ('ir.actions.report.xml', 'ir.actions.act_window'):
                         groups = action_def.get('groups_id')
                         if groups:
                             cr.execute('SELECT 1 FROM res_groups_users_rel WHERE gid IN %s AND uid=%s',

From a193f3fef89cf2ab3568b02cacabcfa1fece21bb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 14:21:56 +0100
Subject: [PATCH 15/19] [FIX] website: login for test js

bzr revid: chm@openerp.com-20140213132156-plxe5hqohmkxf40g
---
 addons/website/tests/ui_suite/ui_test_runner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js
index 745adc15f0c..a8a9671c92f 100644
--- a/addons/website/tests/ui_suite/ui_test_runner.js
+++ b/addons/website/tests/ui_suite/ui_test_runner.js
@@ -27,7 +27,7 @@ function run (test, onload, inject) {
     var scheme = options.scheme ? options.scheme+'://' : 'http://';
     var host = options.host ? options.host : 'localhost';
     var port = options.port ? ':'+options.port : '';
-    var path = options.path ? options.path : '/web/login';
+    var path = options.path ? options.path : '/login';
 
     var queryParams = [];
     if (options.db) queryParams.push('db='+options.db);

From c86156bbecca2303e00fe90fdd844d3510b60edb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 13 Feb 2014 14:25:50 +0100
Subject: [PATCH 16/19] [FIX] website: comment test login_test.js. Error QWeb2
 (test dependence) is not injected in the login page to insert login and
 password

bzr revid: chm@openerp.com-20140213132550-9i28l7v8vcibz36t
---
 addons/website/tests/test_ui.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index eafe791c204..19ba393cb4d 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -150,7 +150,7 @@ def full_path(pyfile, filename):
 
 def load_tests(loader, base, _):
     base.addTest(WebsiteUiSuite(full_path(__file__, 'dummy_test.js'), {}, 5.0))
-    base.addTest(WebsiteUiSuite(full_path(__file__, 'login_test.js'), {'path': '/', 'user': None}, 60.0))
+    #base.addTest(WebsiteUiSuite(full_path(__file__, 'login_test.js'), {'path': '/', 'user': None}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'simple_dom_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     base.addTest(WebsiteUiSuite(full_path(__file__, 'homepage_test.js'), {'redirect': '/page/website.homepage'}, 60.0))
     return base

From 9e6c1114090c6bcb4efe48cc2e86c6588315af33 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:26:43 +0100
Subject: [PATCH 17/19] [FIX] web: correct navbar position

bzr revid: chs@openerp.com-20140213142643-y0wtmbv3fzh8f0wt
---
 addons/web/static/src/css/base.css  | 3 ++-
 addons/web/static/src/css/base.sass | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c5c9af94479..899ea2df34b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3025,7 +3025,8 @@
   min-height: 32px;
   margin-bottom: 0px;
   border: none;
-  z-index: 0;
+  z-index: 1;
+  position: static;
   background-color: #414141;
   background-color: #454343;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626));
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 95c30e5dc93..e0e1df0c1fc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2425,7 +2425,8 @@ $sheet-padding: 16px
         min-height: 32px
         margin-bottom: 0px
         border: none
-        z-index: 0
+        z-index: 1
+        position: static
         background-color: #414141
         @include vertical-gradient(#646060, #262626)
     .navbar-default

From 487dee485132b9d1b6bc010815d7244719b5d2e4 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 13 Feb 2014 15:28:42 +0100
Subject: [PATCH 18/19] [IMP] web: generic sass/css Makefile

bzr revid: chs@openerp.com-20140213142842-u7r5axxewqjfsd1c
---
 addons/web/static/src/css/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile
index f4f1f6d1bb5..ba88946baac 100644
--- a/addons/web/static/src/css/Makefile
+++ b/addons/web/static/src/css/Makefile
@@ -1,2 +1,5 @@
-sass:
-	sass -t expanded --compass --unix-newlines --watch base.sass:base.css&
\ No newline at end of file
+all: *.css
+%.css: %.sass
+	sass -t expanded --compass --unix-newlines $< $@
+watch:
+	sass -t expanded --compass --unix-newlines --watch .:.

From 68128c971bb898604480ffc6b7706053010d8780 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 13 Feb 2014 16:06:13 +0100
Subject: [PATCH 19/19] [ADD] gamification: i18n translation files

bzr revid: mat@openerp.com-20140213150613-hgblsyl893bc6ov7
---
 addons/gamification/i18n/gamification.pot | 1733 +++++++++++++++++++++
 1 file changed, 1733 insertions(+)
 create mode 100644 addons/gamification/i18n/gamification.pot

diff --git a/addons/gamification/i18n/gamification.pot b/addons/gamification/i18n/gamification.pot
new file mode 100644
index 00000000000..03fcc645bec
--- /dev/null
+++ b/addons/gamification/i18n/gamification.pot
@@ -0,0 +1,1733 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* gamification
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.saas~3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 15:03+0000\n"
+"PO-Revision-Date: 2014-02-13 15:03+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: gamification
+#: view:gamification.goal:0
+msgid "Search Goals"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_data
+msgid "Set your Company Data"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Never"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,computation_mode:0
+msgid "Defined how will be computed the goals. The result of the operation will be stored in the field 'Current'."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,goal_id:0
+msgid "Goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+msgid "Non recurring"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,next_report_date:0
+msgid "Next Report Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,monetary:0
+msgid "Monetary Value"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "My Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The lower the better"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Grant Badge To"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count_distinct:0
+msgid "The number of time this badge has been received by unique users."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,unique_owner_ids:0
+msgid "The list of unique users having received this badge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+#: view:gamification.goal.definition:0
+msgid "Group By..."
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_configure
+msgid "Setup your Company"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "/∞"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "You can not grant a badge to yourself"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,completeness:0
+msgid "Completeness"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_date_id:0
+msgid "Date Field"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_this_month:0
+msgid "The number of time the current user has received this badge this month."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid ">="
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.challenge_wizard
+msgid "Challenge Description"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user_wizard
+msgid "gamification.badge.user.wizard"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reward"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_ids:0
+#: help:gamification.challenge,message_ids:0
+#: help:gamification.goal,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,category:0
+msgid "Define the visibility of the challenge through menus"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Refresh Challenge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge_line
+msgid "Gamification generic goal for challenge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. result = pool.get('mail.followers').search(cr, uid, [('res_model', '=', 'mail.group'), ('partner_id', '=', object.user_id.partner_id.id)], count=True, context=context)"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_monetary:0
+msgid "Monetary"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress (to update)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_definition
+msgid "Gamification goal definition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,remaining_sending:0
+msgid "If a maxium is set"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,invited_user_ids:0
+msgid "Suggest to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goal_list_action
+#: model:ir.ui.menu,name:gamification.gamification_goal_menu
+msgid "Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "than the target."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Badges are granted when a challenge is finished. This is either at the end of a running period (eg: end of the month for a monthly challenge), at the end date of a challenge (if no periodicity is set) or when the challenge is manually closed."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,manager_id:0
+msgid "The user responsible for the challenge."
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:385
+#, python-format
+msgid "Update %s"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,description:0
+msgid "Goal Description"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "this month"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,owner_ids:0
+msgid "Owners"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,sender_id:0
+msgid "Sender"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_this_month:0
+msgid "My Monthly Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,remind_update_delay:0
+msgid "Never reminded if no value or zero is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge.line,challenge_id:0
+#: field:gamification.goal,challenge_id:0
+msgid "Challenge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,condition:0
+msgid "Goal Performance"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_ids:0
+#: field:gamification.challenge,message_ids:0
+#: field:gamification.goal,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "badges this month"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "Granted by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count_distinct:0
+msgid "Number of users"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_unread:0
+#: help:gamification.challenge,message_unread:0
+#: help:gamification.goal,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.action_new_simplified_res_users
+msgid "Create User"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "People having some badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "granted,"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_full_suffix:0
+#: field:gamification.goal,definition_suffix:0
+#: field:gamification.goal.definition,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reference"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,autojoin_group_id:0
+msgid "Auto-subscription Group"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "refresh"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Even if the challenge is failed, best challengers will be rewarded"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_id:0
+msgid "For Every Succeding User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,target_goal:0
+msgid "Target Value to Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,start_date:0
+msgid "The day a new challenge will be automatically started. If no periodicity is set, will use this date as the goal start date."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Notification Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,manager_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:108
+#, python-format
+msgid "more details..."
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,name:gamification.badge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_badge_menu
+msgid "Badges"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_badge_ids:0
+msgid "Only the people having these badges can give this badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Recorded manually"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Statistics"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "From"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Granting"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "e.g. days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,definition_id:0
+#: field:gamification.goal.definition,name:0
+msgid "Goal Definition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Failed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: field:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: field:gamification.goal,state:0
+msgid "State"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_follower_ids:0
+#: field:gamification.challenge,message_follower_ids:0
+#: field:gamification.goal,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_first_id:0
+msgid "For 1st user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Can not grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_unread:0
+#: field:gamification.challenge,message_unread:0
+#: field:gamification.goal,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,display_mode:0
+msgid "Displayed as"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+#: field:gamification.badge,name:0
+#: field:gamification.badge.user,badge_id:0
+#: field:gamification.badge.user.wizard,badge_id:0
+msgid "Badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,suffix:0
+msgid "The unit of the target and current values"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.goals_from_challenge_act
+msgid "Related Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Subscriptions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: model:ir.actions.act_window,name:gamification.action_grant_wizard
+msgid "Grant Badge"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:683
+#, python-format
+msgid "<br/>Reward (badge %s) for every succeeding user was sent to %s."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,message_summary:0
+#: help:gamification.challenge,message_summary:0
+#: help:gamification.goal,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_group_id:0
+msgid "Send a copy to"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.challenge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a challenge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    Assign a list of goals to chosen users to evaluate them.\n"
+"                    The challenge can use a period (weekly, monthly...) for automatic creation of goals.\n"
+"                    The goals are created for the specified users or member of the group.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:695
+#, python-format
+msgid "Nobody reached the required conditions to receive special badges."
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:35
+#: code:addons/gamification/static/src/xml/gamification.xml:57
+#, python-format
+msgid "Target: <="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reminders for Manual Goals"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:265
+#, python-format
+msgid "Invalid return content from the evaluation of %s"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,computation_mode:0
+msgid "Computation Mode"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.simple_report_template
+msgid "<header><strong>${object.name}</strong>\n"
+"</header><p class=\"oe_grey\">The following message contains the current progress for the challenge ${object.name}</p>\n"
+"\n"
+"% if object.visibility_mode == 'personal':\n"
+"    <table width=\"100%\" border=\"1\"><tr><th>Goal</th>\n"
+"        <th>Target</th>\n"
+"        <th>Current</th>\n"
+"        <th>Completeness</th>\n"
+"    </tr>\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <tr if line>= 100:\n"
+"                style=\"font-weight:bold;\"\n"
+"            % endif\n"
+"            &gt;\n"
+"            <td>${line['name']}</td>\n"
+"            <td>${line['target']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['current']}\n"
+"            % if line['suffix']:\n"
+"                ${line['suffix']}\n"
+"            % endif\n"
+"            </td>\n"
+"            <td>${line['completeness']} %</td>\n"
+"        </tr>\n"
+"    % endfor\n"
+"    </table>\n"
+"% else:\n"
+"    % for line in ctx[\"challenge_lines\"]:\n"
+"        <table width=\"100%\" border=\"1\"><tr><th colspan=\"4\">${line['name']}</th>\n"
+"            </tr><tr><th>#</th>\n"
+"                <th>Person</th>\n"
+"                <th>Completeness</th>\n"
+"                <th>Current</th>\n"
+"            </tr>\n"
+"            % for goal in line['goals']:\n"
+"                <tr if goal.completeness>= 100:\n"
+"                        style=\"font-weight:bold;\"\n"
+"                    % endif\n"
+"                    &gt;\n"
+"                    <td>${goal['rank']}</td>\n"
+"                    <td>${goal['name']}</td>\n"
+"                    <td>${goal['completeness']}%</td>\n"
+"                    <td>${goal['current']}/${line['target']}\n"
+"                    % if line['suffix']:\n"
+"                        ${line['suffix']}\n"
+"                    % endif\n"
+"                    </td>\n"
+"                </tr>\n"
+"            % endfor\n"
+"        </table><br><br>\n"
+"\n"
+"    % endfor\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,condition:0
+msgid "A goal is considered as completed when the current value is compared to the value to reach"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,remind_update_delay:0
+msgid "Non-updated manual goals will be reminded after"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,full_suffix:0
+msgid "The currency and suffix field"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Exclusive (done or not-done)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#: code:addons/gamification/models/badge.py:225
+#: code:addons/gamification/models/badge.py:227
+#: code:addons/gamification/models/badge.py:229
+#: code:addons/gamification/wizard/grant_badge.py:44
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,last_update:0
+msgid "Last Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_message_frequency:0
+msgid "Report Frequency"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_id:0
+msgid "The field containing the value to evaluate"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,end_date:0
+msgid "The day a new challenge will be automatically closed. If no periodicity is set, will use this date as the goal end date."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_idea
+msgid "Brilliant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Individual Goals"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Invited"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "On change"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal.definition:0
+msgid "Goal definitions"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Participating"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth:0
+msgid "Who can grant this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,last_report_date:0
+msgid "Last Report Date"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: execute a specific Python code"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal_wizard
+msgid "gamification.goal.wizard"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge_user
+msgid "Gamification user badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Describe the challenge: what is does, who it targets, why it matters..."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,comment:0
+#: field:gamification.badge.user.wizard,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "In progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Search Challenges"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "No one, assigned through challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my:0
+msgid "My Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "reply later"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,image:0
+msgid "Image"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Running Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,category:0
+msgid "Appears in"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Passed"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Clickable Goals"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Canceled"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,badge_name:0
+msgid "Badge Name"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,definition_suffix:0
+msgid "Unit"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:229
+#, python-format
+msgid "You have already sent this badge too many time this month."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_my_monthly_sending:0
+msgid "My Monthly Sending Total"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Check Badge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Assign Challenge To"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.challenge:0
+#: view:gamification.goal.wizard:0
+msgid "or"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge.line,sequence:0
+msgid "Sequence number for ordering"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Category"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,current:0
+msgid "Current Value"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,field_date_id:0
+msgid "The date to use for the time period evaluated"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goals_from_challenge_act
+msgid "<p>\n"
+"                There is no goals associated to this challenge matching your search.\n"
+"                Make sure that your challenge is active and assigned to at least one user.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.badge_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a badge. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A badge is a symbolic token granted to a user as a sign of reward.\n"
+"                    It can be deserved automatically when some conditions are met or manually by users.\n"
+"                    Some badges are harder than others to get with specific conditions.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_badge_ids:0
+msgid "Required Badges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Line List"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max:0
+msgid "Monthly Limited Sending"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:517
+#, python-format
+msgid "Retrieving progress for personal challenge without user information"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_timezone
+msgid "Set your Timezone"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,goal_definition_ids:0
+msgid "The users that have succeeded theses goals will receive automatically the badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,image:0
+msgid "This field holds the image used for the badge, limited to 256x256"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Update"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,line_id:0
+msgid "Goal Line"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_max_number:0
+msgid "Limitation Number"
+msgstr ""
+
+#. module: gamification
+#: model:ir.module.category,name:gamification.module_goal_category
+msgid "Gamification"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+#: view:gamification.goal:0
+#: selection:gamification.goal,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Reject"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,model_id:0
+msgid "The model object for the field to evaluate"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_definition_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal definition. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal definition is a technical model of goal defining a condition to reach.\n"
+"                    The dates, values to reach or users are defined in goal instance.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge.user,sender_id:0
+msgid "The user who has send the badge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_count:0
+msgid "The number of time this badge has been received."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: field:gamification.goal.definition,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_challenge
+msgid "Gamification challenge"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max:0
+msgid "Check to set a monthly limit per person of sending this badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_badge
+msgid "Gamification badge"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.action_new_simplified_res_users
+msgid "Create and manage users that will connect to the system. Users can be deactivated should there be a period of time during which they will/should not connect to the system. You can assign them groups in order to give them specific access to the applications they need to use in the system."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Security rules to define who is allowed to manually grant badges. Not enforced for administrator."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,display_mode:0
+msgid "Progressive (using numerical values)"
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_gamification_goal
+msgid "Gamification goal instance"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:685
+#, python-format
+msgid "<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_is_follower:0
+#: field:gamification.challenge,message_is_follower:0
+#: field:gamification.goal,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,full_suffix:0
+msgid "Full Suffix"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,start_date:0
+#: field:gamification.goal,start_date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_second_id:0
+msgid "For 2nd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Data"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,user_id:0
+#: field:gamification.badge.user.wizard,user_id:0
+#: view:gamification.goal:0
+#: field:gamification.goal,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,domain:0
+msgid "Filter Domain"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Schedule"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: number of records"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_max_number:0
+msgid "The maximum number of time this badge can be sent per month per person."
+msgstr ""
+
+#. module: gamification
+#: model:ir.model,name:gamification.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Formating Options"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,compute_code:0
+msgid "Python code to be executed for each user. 'result' should contains the new current value. Evaluated user can be access through object.user_id."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,user_ids:0
+#: model:ir.model,name:gamification.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "A selected list of users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.challenge.line:0
+msgid "Challenge Lines"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,rule_auth_user_ids:0
+msgid "Only these people can give this badge"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,active:0
+msgid "Active"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,action_id:0
+msgid "The action that will be called to update the goal value."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "You can still grant"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,computation_mode:0
+msgid "Computation mode"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_invite
+msgid "Invite new Users"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_description:0
+msgid "Definition Description"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_problem_solver
+msgid "Problem Solver"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Target: less than"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_this_month:0
+msgid "The number of time this badge has been received this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,last_update:0
+msgid "In case of manual goal, reminders are sent if the goal as not been updated for a while (defined in challenge). Ignored in case of non-manual goal or goal not linked to a challenge."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Depending on the Display mode, reports will be individual or shared."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Start goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,period:0
+msgid "Periodicity"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge.user,create_uid:0
+msgid "Creator"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:692
+#, python-format
+msgid "<br/>Special rewards were sent to the top competing users. The ranking for this challenge is :"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,compute_code:0
+msgid "Python Code"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Rewards for challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Send Report"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Period"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,name:0
+msgid "Challenge Name"
+msgstr ""
+
+#. module: gamification
+#: model:ir.ui.menu,name:gamification.gamification_menu
+msgid "Gamification Tools"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,goal_definition_ids:0
+msgid "Rewarded by"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,remaining_sending:0
+msgid "Remaining Sending Allowed"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "Done"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,visibility_mode:0
+#: field:gamification.goal,definition_display:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+#: view:gamification.goal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "There is no reward upon completion of this challenge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,monetary:0
+msgid "The target and current value are defined in the company currency."
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,condition:0
+msgid "The higher the better"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_base_company_logo
+msgid "Set your Company Logo"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Reached"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my:0
+msgid "The number of time the current user has received this badge."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,report_message_group_id:0
+msgid "Group that will receive a copy of the report in addition to the user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,target_goal:0
+msgid "To Reach"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,res_id_field:0
+msgid "The field name on the user profile (res.users) containing the value for res_id for action."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,remind_update_delay:0
+msgid "The number of days after which the user assigned to a manual goal will be reminded. Never reminded if no value is specified."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Who would you like to reward?"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge.line,condition:0
+msgid "<="
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Configure Challenge"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,period:0
+#: selection:gamification.challenge,report_message_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,user_ids:0
+msgid "List of users participating to the challenge"
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_goal_reminder
+msgid "<header><strong>Reminder ${object.name}</strong>\n"
+"    </header><p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>\n"
+"\n"
+"    <p>If you have not changed your score yet, you can use the button \"The current value is up to date\" to indicate so.</p>"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+#: field:gamification.goal.wizard,current:0
+msgid "Current"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "To"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:225
+#, python-format
+msgid "You are not in the user allowed list."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "í"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,challenge_ids:0
+msgid "Reward of Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,definition_condition:0
+msgid "Definition Condition"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,autojoin_group_id:0
+msgid "Group of users whose members will be automatically added to user_ids once the challenge is started"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+#: model:ir.actions.act_window,name:gamification.goal_definition_list_action
+#: model:ir.ui.menu,name:gamification.gamification_definition_menu
+msgid "Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_hidden
+msgid "Hidden"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: view:gamification.goal:0
+msgid "days"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,report_template_id:0
+msgid "Report Template"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth:0
+msgid "Allowance to Grant"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal.definition,computation_mode:0
+msgid "Automatic: sum on a field"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.challenge,name:gamification.challenge_base_discover
+msgid "Complete your Profile"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,description:0
+#: field:gamification.challenge,description:0
+msgid "Description"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:223
+#, python-format
+msgid "This badge can not be sent by users."
+msgstr ""
+
+#. module: gamification
+#: model:email.template,body_html:gamification.email_template_badge_received
+msgid "<p>Congratulation, you have received the badge <strong>${object.badge_id.name}</strong> !\n"
+"            % if object.sender_id\n"
+"                This badge was granted by <strong>${object.sender_id.name}</strong>.\n"
+"            % endif\n"
+"        </p>\n"
+"\n"
+"        % if object.comment\n"
+"            <p><em>${object.comment}</em></p>\n"
+"        % endif\n"
+"        "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_this_month:0
+msgid "Monthly total"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_third_id:0
+msgid "For 3rd user"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user.wizard:0
+msgid "Describe what they did and why it matters (will be public)"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/badge.py:227
+#, python-format
+msgid "You do not have the required badges."
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "e.g. Monthly Sales Objectives"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,line_ids:0
+msgid "List of goals that will be set"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Badge List"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.challenge,visibility_mode:0
+msgid "Leader Board (Group Ranking)"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reached when current value is"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/goal.py:351
+#, python-format
+msgid "Can not modify the configuration of a started goal"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,unique_owner_ids:0
+msgid "Unique Owners"
+msgstr ""
+
+#. module: gamification
+#: code:addons/gamification/models/challenge.py:665
+#, python-format
+msgid "The challenge %s is finished."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,end_date:0
+#: view:gamification.goal:0
+#: field:gamification.goal,end_date:0
+msgid "End Date"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,owner_ids:0
+msgid "The list of instances of this badge granted to users"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Goal Failed"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,res_id_field:0
+msgid "ID Field of user"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge.line,name:0
+msgid "Name"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:105
+#, python-format
+msgid "Invited Challenges"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal:0
+msgid "Reset Completion"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal.definition,domain:0
+msgid "Domain for filtering records. The rule can contain reference to 'user' that is a browse record of the current user, e.g. [('user_id', '=', user.id)]."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.badge,stat_my_monthly_sending:0
+msgid "The number of time the current user has sent this badge this month."
+msgstr ""
+
+#. module: gamification
+#: help:gamification.goal,challenge_id:0
+msgid "Challenge that generated the goal, assign challenge to users to generate goals with a value in this field."
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,rule_auth_user_ids:0
+msgid "Authorized Users"
+msgstr ""
+
+#. module: gamification
+#: model:ir.actions.act_window,help:gamification.goal_list_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a goal. \n"
+"                </p>\n"
+"                <p>\n"
+"                    A goal is defined by a user and a goal definition.\n"
+"                    Goals can be created automatically by using challenges.\n"
+"                </p>\n"
+"            "
+msgstr ""
+
+#. module: gamification
+#: field:gamification.challenge,reward_failure:0
+msgid "Reward Bests if not Succeeded?"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal.definition,field_id:0
+msgid "Field to Sum"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,message_summary:0
+#: field:gamification.challenge,message_summary:0
+#: field:gamification.goal,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.badge,name:gamification.badge_good_job
+msgid "Good Job"
+msgstr ""
+
+#. module: gamification
+#. openerp-web
+#: code:addons/gamification/static/src/xml/gamification.xml:32
+#: code:addons/gamification/static/src/xml/gamification.xml:54
+#, python-format
+msgid "Target:"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.wizard:0
+msgid "Set the current value you have reached for this goal"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.badge,rule_auth:0
+msgid "Everyone"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "How to compute the goal?"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.goal.definition:0
+msgid "Search Goal Definitions"
+msgstr ""
+
+#. module: gamification
+#: model:gamification.goal.definition,name:gamification.definition_nbr_following
+msgid "Mail Group Following"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "Accept"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "Grant this Badge"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+#: model:ir.actions.act_window,name:gamification.challenge_list_action
+#: model:ir.ui.menu,name:gamification.gamification_challenge_menu
+msgid "Challenges"
+msgstr ""
+
+#. module: gamification
+#: model:res.groups,name:gamification.group_goal_manager
+msgid "Manager"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.challenge:0
+msgid "HR Challenges"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.goal,remind_update_delay:0
+msgid "Remind delay"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge:0
+msgid "No monthly sending limit"
+msgstr ""
+
+#. module: gamification
+#: selection:gamification.goal,state:0
+msgid "Reached"
+msgstr ""
+
+#. module: gamification
+#: view:gamification.badge.user:0
+msgid "the"
+msgstr ""
+
+#. module: gamification
+#: field:gamification.badge,stat_count:0
+msgid "Total"
+msgstr ""
+
+#. module: gamification
+#: help:gamification.challenge,period:0
+msgid "Period of automatic goal assigment. If none is selected, should be launched manually."
+msgstr ""
+