From ff37d0ebcaed01b628be188c4b0a29810765d18c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 31 Jan 2014 00:39:51 +0100
Subject: [PATCH 001/106] website sale refactor

bzr revid: al@openerp.com-20140130233951-55ttup4ohmp4i0nf
---
 addons/website/__openerp__.py                 |   4 +-
 .../data/{website_data.xml => data.xml}       |   0
 .../data/{website_demo.xml => demo.xml}       |   0
 addons/website/models/ir_http.py              |   7 +
 addons/website/models/website.py              |  14 +-
 addons/website_event_sale/models/website.py   |   4 +-
 .../views/website_event_sale.xml              |   2 +-
 addons/website_mail/doc/changelog.rst         |   9 -
 addons/website_mail/doc/index.rst             |  10 -
 addons/website_partner/__openerp__.py         |   2 +-
 .../demo.xml}                                 |   0
 addons/website_sale/__openerp__.py            |   8 +-
 addons/website_sale/controllers/main.py       | 574 +++++++-----------
 .../data/{website_sale_data.xml => data.xml}  |   2 +-
 .../data/{website_sale_demo.xml => demo.xml}  |   8 +-
 addons/website_sale/models/__init__.py        |   4 -
 .../models/payment_transaction.py             |  11 -
 addons/website_sale/models/product.py         | 143 ++---
 .../models/product_characteristics.py         |  87 ---
 addons/website_sale/models/sale_order.py      | 171 +++++-
 addons/website_sale/models/website.py         | 222 -------
 addons/website_sale/models/website_styles.py  |  30 -
 .../static/src/js/website_sale.js             |  37 +-
 .../website_sale/tests/test_sale_process.py   |   9 +
 ..._process-test.js => test_sale_process1.js} |   0
 ...rocess-test-2.js => test_sale_process2.js} |   0
 addons/website_sale/tests/test_ui.py          |   8 -
 .../views/{website_sale.xml => templates.xml} | 333 +++++-----
 .../{website_sale_backend.xml => views.xml}   |   9 +-
 addons/website_sale_delivery/__openerp__.py   |   2 +-
 .../website_sale_delivery/controllers/main.py |   7 +-
 .../views/website_sale_delivery.xml           |   2 +-
 32 files changed, 644 insertions(+), 1075 deletions(-)
 rename addons/website/data/{website_data.xml => data.xml} (100%)
 rename addons/website/data/{website_demo.xml => demo.xml} (100%)
 delete mode 100644 addons/website_mail/doc/changelog.rst
 delete mode 100644 addons/website_mail/doc/index.rst
 rename addons/website_partner/{website_partner_demo.xml => data/demo.xml} (100%)
 rename addons/website_sale/data/{website_sale_data.xml => data.xml} (94%)
 rename addons/website_sale/data/{website_sale_demo.xml => demo.xml} (99%)
 delete mode 100644 addons/website_sale/models/payment_transaction.py
 delete mode 100644 addons/website_sale/models/product_characteristics.py
 delete mode 100644 addons/website_sale/models/website.py
 delete mode 100644 addons/website_sale/models/website_styles.py
 create mode 100644 addons/website_sale/tests/test_sale_process.py
 rename addons/website_sale/tests/{ui_suite/website_sale-sale_process-test.js => test_sale_process1.js} (100%)
 rename addons/website_sale/tests/{ui_suite/website_sale-sale_process-test-2.js => test_sale_process2.js} (100%)
 delete mode 100644 addons/website_sale/tests/test_ui.py
 rename addons/website_sale/views/{website_sale.xml => templates.xml} (86%)
 rename addons/website_sale/views/{website_sale_backend.xml => views.xml} (92%)

diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index 9161255c835..3969c745d1e 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -12,7 +12,7 @@ OpenERP Website CMS
     'depends': ['web', 'share', 'mail'],
     'installable': True,
     'data': [
-        'data/website_data.xml',
+        'data/data.xml',
         'security/ir.model.access.csv',
         'security/ir_ui_view.xml',
         'views/website_templates.xml',
@@ -22,7 +22,7 @@ OpenERP Website CMS
         'views/res_config.xml',
     ],
     'demo': [
-        'data/website_demo.xml',
+        'data/demo.xml',
     ],
     'js': ['static/src/js/website.backend.js'],
     'qweb' : ['static/src/xml/website.backend.xml'],
diff --git a/addons/website/data/website_data.xml b/addons/website/data/data.xml
similarity index 100%
rename from addons/website/data/website_data.xml
rename to addons/website/data/data.xml
diff --git a/addons/website/data/website_demo.xml b/addons/website/data/demo.xml
similarity index 100%
rename from addons/website/data/website_demo.xml
rename to addons/website/data/demo.xml
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index d8773e6ebfc..044b5a7f26a 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -31,6 +31,13 @@ class ir_http(orm.AbstractModel):
             page=PageConverter,
         )
 
+    def _auth_method_public(self):
+        # TODO: select user_id from matching website
+        if not request.session.uid:
+            request.uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base.public_user')
+        else:
+            request.uid = request.session.uid
+
     def _dispatch(self):
         first_pass = not hasattr(request, 'website')
         request.website = None
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index e3c683861f9..ce91e731136 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -106,10 +106,6 @@ class website(osv.osv):
         menu = menus and menus[0] or False
         return dict( map(lambda x: (x, menu), ids) )
 
-    def _get_public_user(self, cr, uid, ids, name='public_user', arg=(), context=None):
-        ref = self.get_public_user(cr, uid, context=context)
-        return dict( map(lambda x: (x, ref), ids) )
-
     _name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco
     _description = "Website"
     _columns = {
@@ -126,7 +122,7 @@ class website(osv.osv):
         'social_googleplus': fields.char('Google+ Account'),
         'google_analytics_key': fields.char('Google Analytics Key'),
         'user_id': fields.many2one('res.users', string='Public User'),
-        'public_user': fields.function(_get_public_user, relation='res.users', type='many2one', string='Public User'),
+        'partner_id': fields.related('user_id','partner_id', type='many2one', relation='res.partner', string='Public Partner'),
         'menu_id': fields.function(_get_menu, relation='website.menu', type='many2one', string='Main Menu',
             store= {
                 'website.menu': (_get_menu_website, ['sequence','parent_id','website_id'], 10)
@@ -185,11 +181,6 @@ class website(osv.osv):
         except:
             return False
 
-    def get_public_user(self, cr, uid, context=None):
-        uid = openerp.SUPERUSER_ID
-        res = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'public_user')
-        return res and res[1] or False
-
     @openerp.tools.ormcache(skiparg=3)
     def _get_languages(self, cr, uid, id, context=None):
         website = self.browse(cr, uid, id)
@@ -380,7 +371,8 @@ class website(osv.osv):
         """
         router = request.httprequest.app.get_db_router(request.db)
         # Force enumeration to be performed as public user
-        uid = self.get_public_user(cr, uid, context=context)
+        # TODO: use website.user_id instead
+        uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base.public_user')
         for rule in router.iter_rules():
             if not self.rule_is_enumerable(rule):
                 continue
diff --git a/addons/website_event_sale/models/website.py b/addons/website_event_sale/models/website.py
index e41a7092404..84315b52a77 100644
--- a/addons/website_event_sale/models/website.py
+++ b/addons/website_event_sale/models/website.py
@@ -5,6 +5,6 @@ from openerp.osv import orm
 class Website(orm.Model):
     _inherit = 'website'
 
-    def ecommerce_get_product_domain(self):
+    def sale_product_domain(self):
         # remove product event from the website content grid and list view (not removed in detail view)
-        return ['&'] + super(Website, self).ecommerce_get_product_domain() + [('event_ok', '=', False)]
+        return ['&'] + super(Website, self).sale_product_domain() + [('event_ok', '=', False)]
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index aa56a5542ac..3fe467c0aaa 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -13,7 +13,7 @@
     </xpath>
 </template>
 
-<template id="mycart" inherit_id="website_sale.mycart" name="My Cart Event's Price">
+<template id="cart" inherit_id="website_sale.cart" name="My Cart Event's Price">
     <xpath expr="//td[@name='price']/t" position="attributes">
         <attribute name="t-if">abs(line.product_id.lst_price - line.price_unit) &gt; 0.2 and not line.product_id.event_ok</attribute>
     </xpath>
diff --git a/addons/website_mail/doc/changelog.rst b/addons/website_mail/doc/changelog.rst
deleted file mode 100644
index fe2b38bad01..00000000000
--- a/addons/website_mail/doc/changelog.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-.. _changelog:
-
-Changelog
-=========
-
-`trunk (saas-3)`
-----------------
-
- - created ``website_mail`` menu, holding website-related stuff about mail module
diff --git a/addons/website_mail/doc/index.rst b/addons/website_mail/doc/index.rst
deleted file mode 100644
index 5b0999d8a6c..00000000000
--- a/addons/website_mail/doc/index.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-Website Mail Module documentation topics
-''''''''''''''''''''''''''''''''''''''''
-
-Changelog
-'''''''''
-
-.. toctree::
-   :maxdepth: 1
-
-   changelog.rst
diff --git a/addons/website_partner/__openerp__.py b/addons/website_partner/__openerp__.py
index 73e5278fc99..c221c817f7d 100644
--- a/addons/website_partner/__openerp__.py
+++ b/addons/website_partner/__openerp__.py
@@ -32,7 +32,7 @@
         'views/website_partner_view.xml',
         'data/website_data.xml',
     ],
-    'demo': ['website_partner_demo.xml'],
+    'demo': ['data/demo.xml'],
     'css': [
     ],
     'js': [
diff --git a/addons/website_partner/website_partner_demo.xml b/addons/website_partner/data/demo.xml
similarity index 100%
rename from addons/website_partner/website_partner_demo.xml
rename to addons/website_partner/data/demo.xml
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index a30da144b1f..85f182672d9 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -11,14 +11,14 @@ OpenERP E-Commerce
     'author': 'OpenERP SA',
     'depends': ['website', 'sale', 'payment'],
     'data': [
-        'data/website_sale_data.xml',
-        'views/website_sale.xml',
-        'views/website_sale_backend.xml',
+        'data/data.xml',
+        'views/views.xml',
+        'views/templates.xml',
         'security/ir.model.access.csv',
         'security/website_sale.xml',
     ],
     'demo': [
-        'data/website_sale_demo.xml',
+        'data/demo.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index b9119b486ff..403c9b82846 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -7,50 +7,9 @@ from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 
-PPG = 20                        # Products Per Page
-PPR = 4                         # Products Per Row
+PPG = 20 # Products Per Page
+PPR = 4  # Products Per Row
 
-
-class CheckoutInfo(object):
-    mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["company", "state_id"]
-    string_billing_fields = ["name", "phone", "email", "street", "city", "zip"]
-
-    mandatory_shipping_fields = ["shipping_name", "shipping_phone", "shipping_street", "shipping_city", "shipping_country_id", "shipping_zip"]
-    optional_shipping_field = ["shipping_state_id"]
-    string_shipping_fields = ["shipping_name", "shipping_phone", "shipping_street", "shipping_city", "shipping_zip"]
-
-    def mandatory_fields(self):
-        return self.mandatory_billing_fields + self.mandatory_shipping_fields
-
-    def optional_fields(self):
-        return self.optional_billing_fields + self.optional_shipping_field
-
-    def all_fields(self):
-        return self.mandatory_fields() + self.optional_fields()
-
-    def empty(self):
-        return dict.fromkeys(self.all_fields(), '')
-
-    def from_partner(self, partner, address_type='billing'):
-        assert address_type in ('billing', 'shipping')
-        if address_type == 'billing':
-            prefix = ''
-        else:
-            prefix = 'shipping_'
-        result = dict((prefix + field_name, getattr(partner, field_name)) for field_name in self.string_billing_fields if getattr(partner, field_name))
-        result[prefix + 'state_id'] = partner.state_id and partner.state_id.id or ''
-        result[prefix + 'country_id'] = partner.country_id and partner.country_id.id or ''
-        result[prefix + 'company'] = partner.parent_id and partner.parent_id.name or ''
-        return result
-
-    def from_post(self, post):
-        return dict((field_name, post[field_name]) for field_name in self.all_fields() if post[field_name])
-
-
-#
-# Compute grid of products according to their sizes
-#
 class table_compute(object):
     def __init__(self):
         self.table = {}
@@ -107,91 +66,42 @@ class table_compute(object):
             rows[col] = map(lambda x: x[1], cols)
         return filter(bool, rows)
 
+        # TODO keep with input type hidden
 
-class Ecommerce(http.Controller):
 
-    _order = 'website_published desc, website_sequence desc'
+class QueryURL(object):
+    def __init__(self, path='', **args):
+        self.path = path
+        self.args = args
 
-    def get_attribute_ids(self):
-        attributes_obj = request.registry['product.attribute']
-        attributes_ids = attributes_obj.search(request.cr, request.uid, [], context=request.context)
-        return attributes_obj.browse(request.cr, request.uid, attributes_ids, context=request.context)
+    def __call__(self, path=None, **kw):
+        if not path:
+            path = self.path
+        for k,v in self.args.items():
+            kw.setdefault(k,v)
+        l = []
+        for k,v in kw.items():
+            if v:
+                if isinstance(v, list) or isinstance(v, set):
+                    l.append(werkzeug.url_encode([(k,i) for i in v]))
+                else:
+                    l.append(werkzeug.url_encode([(k,v)]))
+        if l:
+            path += '?' + '&'.join(l)
+        return path
+
+
+class website_sale(http.Controller):
 
     def get_pricelist(self):
-        """ Shortcut to get the pricelist from the website model """
-        return request.registry['website'].ecommerce_get_pricelist_id(request.cr, request.uid, None, context=request.context)
-
-    def get_order(self):
-        """ Shortcut to get the current ecommerce quotation from the website model """
-        return request.registry['website'].ecommerce_get_current_order(request.cr, request.uid, context=request.context)
-
-    def get_products(self, product_ids):
-        product_obj = request.registry.get('product.template')
-        request.context['pricelist'] = self.get_pricelist()
-        # search for checking of access rules and keep order
-        product_ids = [id for id in product_ids if id in product_obj.search(request.cr, request.uid, [("id", 'in', product_ids)], context=request.context)]
-        return product_obj.browse(request.cr, request.uid, product_ids, context=request.context)
-
-    def has_search_filter(self, attribute_id, value_id=None):
-        if request.httprequest.args.get('filters'):
-            filters = simplejson.loads(request.httprequest.args['filters'])
+        cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
+        sale_order = context.get('sale_order')
+        if sale_order:
+            pricelist = sale_order.pricelist_id
         else:
-            filters = []
-        for key_val in filters:
-            if key_val[0] == attribute_id and (not value_id or value_id in key_val[1:]):
-                return key_val
-        return False
-
-    @http.route(['/shop/filters/'], type='http', auth="public", website=True, multilang=True)
-    def filters(self, **post):
-        index = []
-        filters = []
-        for key, val in post.items():
-            cat = key.split("-")
-            if len(cat) < 3 or cat[2] in ('max','minmem','maxmem'):
-                continue
-            cat_id = int(cat[1])
-            if cat[2] == 'min':
-                minmem = float(post.pop("att-%s-minmem" % cat[1]))
-                maxmem = float(post.pop("att-%s-maxmem" % cat[1]))
-                _max = int(post.pop("att-%s-max" % cat[1]))
-                _min = int(val)
-                if (minmem != _min or maxmem != _max) and cat_id not in index:
-                    filters.append([cat_id , [_min, _max] ])
-                    index.append(cat_id)
-            elif cat_id not in index:
-                filters.append([ cat_id, int(cat[2]) ])
-                index.append(cat_id)
-            else:
-                cat[2] = int(cat[2])
-                if cat[2] not in filters[index.index(cat_id)][1:]:
-                    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 ""
-            ))
-
-    def attributes_to_ids(self, attributes):
-        obj = request.registry.get('product.attribute.line')
-        domain = []
-        for key_val in attributes:
-            domain.append(("attribute_id", "=", key_val[0]))
-            if isinstance(key_val[1], list):
-                domain.append(("value", ">=", key_val[1][0]))
-                domain.append(("value", "<=", key_val[1][1]))
-            else:
-                domain.append(("value_id", "in", key_val[1:]))
-        att_ids = obj.search(request.cr, request.uid, domain, context=request.context)
-        att = obj.read(request.cr, request.uid, att_ids, ["product_tmpl_id"], context=request.context)
-        return [r["product_tmpl_id"][0] for r in att]
-
-    @http.route(['/shop/pricelist'], type='http', auth="public", website=True, multilang=True)
-    def shop_promo(self, promo=None, **post):
-        request.registry['website']._ecommerce_change_pricelist(request.cr, request.uid, code=promo, context=request.context)
-        return request.redirect("/shop/mycart/")
+            partner = pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+            pricelist = partner.property_product_pricelist
+        return pricelist
 
     @http.route([
         '/shop/',
@@ -199,89 +109,89 @@ class Ecommerce(http.Controller):
         '/shop/category/<model("product.public.category"):category>/',
         '/shop/category/<model("product.public.category"):category>/page/<int:page>/'
     ], type='http', auth="public", website=True, multilang=True)
-    def shop(self, category=None, page=0, filters='', search='', **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        product_obj = request.registry.get('product.template')
-        domain = request.registry.get('website').ecommerce_get_product_domain()
-        if search:
-            domain += ['|',
-                ('name', 'ilike', search),
-                ('description', 'ilike', search)]
-        if category:
-            domain.append(('product_variant_ids.public_categ_id', 'child_of', category.id))
-        if filters:
-            filters = simplejson.loads(filters)
-            if filters:
-                ids = self.attributes_to_ids(filters)
-                domain.append(('id', 'in', ids or [0]))
+    def shop(self, page=0, category=None, search='', **post):
+        cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
 
+        domain = request.website.sale_product_domain()
+        if search:
+            domain += ['|', ('name', 'ilike', search), ('description', 'ilike', search)]
+        if category:
+            domain += [('product_variant_ids.public_categ_id', 'child_of', category.id)]
+
+        attrib_values = map(int,request.httprequest.args.getlist('attrib'))
+        if attrib_values:
+            domain += [('attribute_lines.value_id', 'in', attrib_values)]
+        attrib_set = set(attrib_values) 
+        keep = QueryURL('/shop', category=category and category.id, search=search, attrib=attrib_set)
+
+        product_obj = pool.get('product.template')
         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)
+        product_ids = product_obj.search(cr, uid, domain, limit=PPG+10, offset=pager['offset'], order='website_published desc, website_sequence desc', context=context)
+        products = product_obj.browse(cr, uid, product_ids, context=context)
 
-        request.context['pricelist'] = self.get_pricelist()
+        style_obj = pool['product.style']
+        style_ids = style_obj.search(cr, uid, [], context=context)
+        styles = style_obj.browse(cr, uid, style_ids, context=context)
 
-        pids = product_obj.search(cr, uid, domain, limit=PPG+10, offset=pager['offset'], order=self._order, context=context)
-        products = product_obj.browse(cr, uid, pids, context=context)
-
-        styles = []
-        try:
-            style_obj = request.registry.get('product.style')
-            style_ids = style_obj.search(request.cr, request.uid, [], context=request.context)
-            styles = style_obj.browse(request.cr, request.uid, style_ids, context=request.context)
-        except:
-            pass
-
-        category_obj = request.registry.get('product.public.category')
+        category_obj = pool['product.public.category']
         category_ids = category_obj.search(cr, uid, [], context=context)
         categories = category_obj.browse(cr, uid, category_ids, context=context)
         categs = filter(lambda x: not x.parent_id, categories)
 
+        attributes_obj = request.registry['product.attribute']
+        attributes_ids = attributes_obj.search(cr, uid, [], context=request.context)
+        attributes = attributes_obj.browse(cr, uid, attributes_ids, context=request.context)
+
         values = {
+            'search': search,
+            'category': category and category.id,
+            'attrib_set': attrib_set,
+            'pager': pager,
+            'pricelist': self.get_pricelist(),
             'products': products,
             'bins': table_compute().process(products),
             'rows': PPR,
-            'range': range,
-            'search': {
-                'search': search,
-                'category': category and category.id,
-                'filters': filters,
-            },
-            'pager': pager,
             'styles': styles,
             'categories': categs,
-            'Ecommerce': self,   # TODO fp: Should be removed
+            'attributes': attributes,
+            'keep': keep,
             'style_in_product': lambda style, product: style.id in [s.id for s in product.website_style_ids],
+            'attrib_encode': lambda attribs: werkzeug.url_encode([('attrib',i) for i in attribs]),
         }
+
         return request.website.render("website_sale.products", values)
 
     @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])
+    def product(self, product, category='', search='', **kwargs):
+        cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
 
         if category:
             category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
 
-        request.context['pricelist'] = self.get_pricelist()
+        attrib_values = map(int,request.httprequest.args.getlist('attrib'))
+        attrib_set = set(attrib_values) 
+
+        keep = QueryURL('/shop', category=category and category.id, search=search, attrib=attrib_set)
+
+        category_obj = pool['product.public.category']
+        category_ids = category_obj.search(cr, uid, [], context=context)
+        category_list = category_obj.name_get(cr, uid, category_ids, context=context)
+        category_list = sorted(category_list, key=lambda category: category[1])
 
         values = {
-            'Ecommerce': self,
+            'search': search,
             'category': category,
+            'pricelist': self.get_pricelist(),
+            'attrib_set': attrib_set,
+            'keep': keep,
             'category_list': category_list,
             'main_object': product,
             'product': product,
-            'search': {
-                'search': search,
-                'category': category and str(category.id),
-                'filters': filters,
-            }
         }
         return request.website.render("website_sale.product", values)
 
-    @http.route(['/shop/product/comment'], type='http', auth="public", methods=['POST'], website=True)
+    @http.route(['/shop/product/comment/<int:product_template_id>'], type='http', auth="public", methods=['POST'], website=True)
     def product_comment(self, product_template_id, **post):
         cr, uid, context = request.cr, request.uid, request.context
         if post.get('comment'):
@@ -293,111 +203,59 @@ class Ecommerce(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
-    def add_product(self, name="New Product", category=0, **post):
-        Product = request.registry.get('product.product')
-        product_id = Product.create(request.cr, request.uid, {
-            'name': name, 'public_categ_id': category
-        }, context=request.context)
-        product = Product.browse(request.cr, request.uid, product_id, context=request.context)
-
-        return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
-
-    @http.route(['/shop/mycart/'], type='http', auth="public", website=True, multilang=True)
-    def mycart(self, **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        prod_obj = request.registry.get('product.product')
-
-        # must have a draft sale order with lines at this point, otherwise reset
-        order = self.get_order()
-        if order and order.state != 'draft':
-            request.registry['website'].sale_reset_order(cr, uid, context=context)
-            return request.redirect('/shop/')
-
-        self.get_pricelist()
-
-        suggested_ids = []
-        product_ids = []
-        if order:
-            for line in order.order_line:
-                suggested_ids += [p.id for p in line.product_id and line.product_id.accessory_product_ids or []]
-                product_ids.append(line.product_id.id)
-        suggested_ids = list(set(suggested_ids) - set(product_ids))
-        if suggested_ids:
-            suggested_ids = prod_obj.search(cr, uid, [('id', 'in', suggested_ids)], context=context)
-
-        # select 3 random products
-        suggested_products = []
-        while len(suggested_products) < 3 and suggested_ids:
-            index = random.randrange(0, len(suggested_ids))
-            suggested_products.append(suggested_ids.pop(index))
-
-        context = dict(context or {}, pricelist=request.registry['website'].ecommerce_get_pricelist_id(cr, uid, None, context=context))
-
+    @http.route(['/shop/cart'], type='http', auth="public", website=True, multilang=True)
+    def cart(self, **post):
+        order = request.website.sale_get_order()
         values = {
-            'int': int,
-            'suggested_products': prod_obj.browse(cr, uid, suggested_products, context),
+            'order': order,
+            'suggested_products': [],
         }
-        return request.website.render("website_sale.mycart", values)
+        if order:
+            values['suggested_products'] = order._cart_accessories()
+        return request.website.render("website_sale.cart", values)
 
-    @http.route(['/shop/add_cart/'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
-    def add_cart(self, product_id, remove=None, **kw):
-        request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
-            product_id=int(product_id),
-            context=request.context)
-        return request.redirect("/shop/mycart/")
+    @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    def cart_update(self, product_id, add_qty=None, set_qty=None, **kw):
+        cr, uid, context = request.cr, request.uid, request.context
+        request.website.sale_get_order(force_create=1)._cart_update(product_id=product_id, add_qty=add_qty, set_qty=set_qty)
+        return request.redirect("/shop/cart")
 
-    @http.route(['/shop/change_cart/<int:order_line_id>/'], type='http', auth="public", website=True, multilang=True)
-    def add_cart_order_line(self, order_line_id=None, remove=None, **kw):
-        request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
-            order_line_id=order_line_id, number=(remove and -1 or 1),
-            context=request.context)
-        return request.redirect("/shop/mycart/")
+    @http.route(['/shop/cart/update_json'], type='json', auth="public", website=True, multilang=True)
+    def cart_update_json(self, product_id, add_qty=None, set_qty=None):
+        order = request.website.sale_get_order(force_create=1)
+        quantity = order._cart_update(product_id=product_id, add_qty=add_qty, set_qty=set_qty)
+        return request.website._render("website_sale.total", {'website_sale_order': order}) # FIXME good template
 
-    @http.route(['/shop/add_cart_json/'], type='json', auth="public", website=True, multilang=True)
-    def add_cart_json(self, product_id=None, order_line_id=None, remove=None):
-        quantity = request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
-            product_id=product_id, order_line_id=order_line_id, number=(remove and -1 or 1),
-            context=request.context)
-        order = self.get_order()
-        return [quantity,
-                order.get_number_of_products(),
-                order.amount_total,
-                request.website._render("website_sale.total", {'website_sale_order': order})]
-
-    @http.route(['/shop/set_cart_json/'], type='json', auth="public")
-    def set_cart_json(self, path=None, product_id=None, order_line_id=None, set_number=0, json=None):
-        quantity = request.registry['website']._ecommerce_add_product_to_cart(request.cr, request.uid,
-            product_id=product_id, order_line_id=order_line_id, set_number=set_number,
-            context=request.context)
-        return quantity
-
-    @http.route(['/shop/checkout/'], type='http', auth="public", website=True, multilang=True)
-    def checkout(self, **post):
+    #------------------------------------------------------
+    # Checkout
+    #------------------------------------------------------
+    def checkout_redirection(self, order):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
         # must have a draft sale order with lines at this point, otherwise reset
-        order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
-            request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect('/shop/')
+        if order.state != 'draft':
+            request.website_sale_reset(cr, uid, context=context)
+            return request.redirect('/shop')
+
         # if transaction pending / done: redirect to confirmation
         tx = context.get('website_sale_transaction')
         if tx and tx.state != 'draft':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
-        self.get_pricelist()
-
+    def checkout_values(self):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')
         orm_country = registry.get('res.country')
+        state_orm = registry.get('res.country.state')
+
         country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
         countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
-        state_orm = registry.get('res.country.state')
         states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
         states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
 
         info = CheckoutInfo()
+
         values = {
             'countries': countries,
             'states': states,
@@ -405,65 +263,60 @@ class Ecommerce(http.Controller):
             'shipping': post.get("shipping_different"),
             'error': {},
         }
-        checkout = values['checkout']
+        return values
 
-        partner = None
-        public_id = request.registry['website'].get_public_user(cr, uid, context)
-        if not request.uid == public_id:
-            partner = orm_user.browse(cr, uid, uid, context).partner_id
-        elif order.partner_id:
-            domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
-            user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
-            if not user_ids or public_id not in user_ids:
-                partner = orm_partner.browse(cr, SUPERUSER_ID, order.partner_id.id, context)
-
-        if partner:
-            partner_info = info.from_partner(partner)
-            checkout.update(partner_info)
-            shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
-            if shipping_ids:
-                values['shipping'] = "true"
-                shipping_partner = orm_partner.browse(cr, SUPERUSER_ID, shipping_ids[0], context)
-                checkout.update(info.from_partner(shipping_partner, address_type='shipping'))
-
-        return request.website.render("website_sale.checkout", values)
-
-    @http.route(['/shop/confirm_order/'], type='http', auth="public", website=True, multilang=True)
-    def confirm_order(self, **post):
+    def checkout_form_parse(self):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
-        order_line_obj = request.registry.get('sale.order')
 
-        # must have a draft sale order with lines at this point, otherwise redirect to shop
-        order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
-            request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect('/shop/')
-        # if transaction pending / done: redirect to confirmation
-        tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'draft':
-            return request.redirect('/shop/payment/confirmation/%s' % order.id)
+        #public_id = request.registry['website'].get_public_user(cr, uid, context)
+        #if not request.uid == public_id:
+        #    partner = orm_user.browse(cr, uid, uid, context).partner_id
 
-        orm_partner = registry.get('res.partner')
-        orm_user = registry.get('res.users')
-        orm_country = registry.get('res.country')
-        country_ids = orm_country.search(cr, SUPERUSER_ID, [], context=context)
-        countries = orm_country.browse(cr, SUPERUSER_ID, country_ids, context)
-        orm_state = registry.get('res.country.state')
-        states_ids = orm_state.search(cr, SUPERUSER_ID, [], context=context)
-        states = orm_state.browse(cr, SUPERUSER_ID, states_ids, context)
+        #elif order.partner_id:
+        #    domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
 
-        info = CheckoutInfo()
-        values = {
-            'countries': countries,
-            'states': states,
-            'checkout': info.empty(),
-            'shipping': post.get("shipping_different"),
-            'error': {},
-        }
-        checkout = values['checkout']
-        checkout.update(post)
-        error = values['error']
+        #    user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
+        #    if not user_ids or public_id not in user_ids:
+        #        partner = orm_partner.browse(cr, SUPERUSER_ID, order.partner_id.id, context)
 
+        #if partner:
+        #    partner_info = info.from_partner(partner)
+        #    checkout.update(partner_info)
+        #    shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
+        #    if shipping_ids:
+        #        values['shipping'] = "true"
+        #        shipping_partner = orm_partner.browse(cr, SUPERUSER_ID, shipping_ids[0], context)
+        #        checkout.update(info.from_partner(shipping_partner, address_type='shipping'))
+
+        # from query
+        query = dict((field_name, post[field_name]) for field_name in self.all_fields() if post[field_name])
+
+        # fill with partner
+        assert address_type in ('billing', 'shipping')
+        if address_type == 'billing':
+            prefix = ''
+        else:
+            prefix = 'shipping_'
+        result = dict((prefix + field_name, getattr(partner, field_name)) for field_name in self.string_billing_fields if getattr(partner, field_name))
+        result[prefix + 'state_id'] = partner.state_id and partner.state_id.id or ''
+        result[prefix + 'country_id'] = partner.country_id and partner.country_id.id or ''
+        result[prefix + 'company'] = partner.parent_id and partner.parent_id.name or ''
+        return result
+
+        mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
+        optional_billing_fields = ["company", "state_id"]
+        #string_billing_fields = ["name", "phone", "email", "street", "city", "zip"]
+
+        mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
+        optional_shipping_field = ["state_id"]
+        #string_shipping_fields = ["name", "phone", "street", "city", "zip"]
+
+        return values
+
+    def checkout_form_validate(self):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+
+        # Validation
         for field_name in info.mandatory_billing_fields:
             if not checkout[field_name]:
                 error[field_name] = 'missing'
@@ -471,9 +324,12 @@ class Ecommerce(http.Controller):
             for field_name in info.mandatory_shipping_fields:
                 if not checkout[field_name]:
                     error[field_name] = 'missing'
-        if error:
-            return request.website.render("website_sale.checkout", values)
 
+        return values
+
+    def checkout_form_save(self):
+
+        # save partner for order
         company_name = checkout['company']
         company_id = None
         if post['company']:
@@ -533,9 +389,50 @@ class Ecommerce(http.Controller):
 
         order_line_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
 
-        return request.redirect("/shop/payment/")
+    @http.route(['/shop/checkout'], type='http', auth="public", website=True, multilang=True)
+    def checkout(self, **post):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
-    @http.route(['/shop/payment/'], type='http', auth="public", website=True, multilang=True)
+        order = request.website.sale_get_order(cr, uid, force_create=1, context=context)
+
+        redirection = checkout_redirection(order)
+        if redirection:
+            return redirection
+
+        values = self.checkout_values()
+        checkout = values['checkout']
+
+        partner = None
+        return request.website.render("website_sale.checkout", values)
+
+    @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, multilang=True)
+    def confirm_order(self, **post):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+        order_line_obj = request.registry.get('sale.order')
+
+        order = request.website.sale_get_order(cr, uid, context=context)
+
+        redirection = checkout_redirection(order)
+        if redirection:
+            return redirection
+
+        values = self.checkout_values()
+        checkout = values['checkout']
+        checkout.update(post)
+        error = values['error']
+
+        if error:
+            return request.website.render("website_sale.checkout", values)
+
+        checkout_form_save()
+
+        return request.redirect("/shop/payment")
+
+    #------------------------------------------------------
+    # Payment
+    #------------------------------------------------------
+
+    @http.route(['/shop/payment'], type='http', auth="public", website=True, multilang=True)
     def payment(self, **post):
         """ Payment step. This page proposes several payment means based on available
         payment.acquirer. State at this point :
@@ -549,15 +446,9 @@ class Ecommerce(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         payment_obj = request.registry.get('payment.acquirer')
 
-        # if no sale order at this stage: back to checkout beginning
-        order = self.get_order()
-        if not order or order.state != 'draft' or not order.order_line:
-            request.registry['website'].ecommerce_reset(cr, uid, context=context)
-            return request.redirect("/shop/")
-        # alread a transaction: forward to confirmation
-        tx = context.get('website_sale_transaction')
-        if tx and tx.state != 'draft':
-            return request.redirect('/shop/confirmation/%s' % order.id)
+        redirection = checkout_redirection(order)
+        if redirection:
+            return redirection
 
         shipping_partner_id = False
         if order:
@@ -593,8 +484,7 @@ class Ecommerce(http.Controller):
 
         return request.website.render("website_sale.payment", values)
 
-    @http.route(['/shop/payment/transaction/<int:acquirer_id>'],
-                   type='http', methods=['POST'], auth="public", website=True)
+    @http.route(['/shop/payment/transaction/<int:acquirer_id>'], type='http', methods=['POST'], auth="public", website=True)
     def payment_transaction(self, acquirer_id, **post):
         """ Hook method that creates a payment.transaction and redirect to the
         acquirer, using post values to re-create the post action.
@@ -609,7 +499,7 @@ class Ecommerce(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         payment_obj = request.registry.get('payment.acquirer')
         transaction_obj = request.registry.get('payment.transaction')
-        order = self.get_order()
+        order = request.website.sale_get_order(cr, uid, context=context)
 
         if not order or not order.order_line or acquirer_id is None:
             return request.redirect("/shop/checkout/")
@@ -684,7 +574,7 @@ class Ecommerce(http.Controller):
             'validation': validation
         }
 
-    @http.route('/shop/payment/validate/', type='http', auth="public", website=True, multilang=True)
+    @http.route('/shop/payment/validate', type='http', auth="public", website=True, multilang=True)
     def payment_validate(self, transaction_id=None, sale_order_id=None, **post):
         """ Method that should be called by the server when receiving an update
         for a transaction. State at this point :
@@ -701,7 +591,7 @@ class Ecommerce(http.Controller):
             tx = request.registry['payment.transaction'].browse(cr, uid, transaction_id, context=context)
 
         if sale_order_id is None:
-            order = self.get_order()
+            order = request.website.sale_get_order(cr, uid, context=context)
         else:
             order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
             assert order.website_session_id == request.httprequest.session['website_session_id']
@@ -744,19 +634,24 @@ class Ecommerce(http.Controller):
 
         return request.website.render("website_sale.confirmation", {'order': order})
 
-    @http.route(['/shop/change_sequence/'], type='json', auth="public")
-    def change_sequence(self, id, sequence):
-        product_obj = request.registry.get('product.template')
-        if sequence == "top":
-            product_obj.set_sequence_top(request.cr, request.uid, [id], context=request.context)
-        elif sequence == "bottom":
-            product_obj.set_sequence_bottom(request.cr, request.uid, [id], context=request.context)
-        elif sequence == "up":
-            product_obj.set_sequence_up(request.cr, request.uid, [id], context=request.context)
-        elif sequence == "down":
-            product_obj.set_sequence_down(request.cr, request.uid, [id], context=request.context)
+    #------------------------------------------------------
+    # Edit
+    #------------------------------------------------------
 
-    @http.route(['/shop/change_styles/'], type='json', auth="public")
+    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    def add_product(self, name="New Product", category=0, **post):
+        cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
+        product_obj = pool['product.product']
+        product_id = product_obj.create(cr, uid, { 'name': name, 'public_categ_id': category }, context=context)
+        product = product_obj.browse(cr, uid, product_id, context=request.context)
+
+        return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
+
+    @http.route(['/shop/reorder'], type='json', auth="public")
+    def reorder(self, product_id, operation):
+        request.registry['product.template'].website_reorder(request.cr, request.uid, [id], operation, context=request.context)
+
+    @http.route(['/shop/change_styles'], type='json', auth="public")
     def change_styles(self, id, style_id):
         product_obj = request.registry.get('product.template')
         product = product_obj.browse(request.cr, request.uid, id, context=request.context)
@@ -778,10 +673,11 @@ class Ecommerce(http.Controller):
 
         return not active
 
-    @http.route(['/shop/change_size/'], type='json', auth="public")
+    @http.route(['/shop/change_size'], type='json', auth="public")
     def change_size(self, id, x, y):
         product_obj = request.registry.get('product.template')
         product = product_obj.browse(request.cr, request.uid, id, context=request.context)
         return product.write({'website_size_x': x, 'website_size_y': y})
 
+
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/data.xml
similarity index 94%
rename from addons/website_sale/data/website_sale_data.xml
rename to addons/website_sale/data/data.xml
index 3658ea7bdc6..de00bd4fffa 100644
--- a/addons/website_sale/data/website_sale_data.xml
+++ b/addons/website_sale/data/data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 
         <record id="product.group_product_attributes" model="res.groups">
-            <field name="name">Product attribute (not supported)</field>
+            <field name="name">Product Attributes</field>
             <field name="category_id" ref="base.module_category_hidden"/>
         </record>
 
diff --git a/addons/website_sale/data/website_sale_demo.xml b/addons/website_sale/data/demo.xml
similarity index 99%
rename from addons/website_sale/data/website_sale_demo.xml
rename to addons/website_sale/data/demo.xml
index ad3b472c49d..5d564f915b6 100644
--- a/addons/website_sale/data/website_sale_demo.xml
+++ b/addons/website_sale/data/demo.xml
@@ -11,7 +11,7 @@
             <field name="website_size_x">2</field>
             <field name="website_size_y">2</field>
             <field name="website_sequence">5</field>
-            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
+            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.style_image_full')])]"/>
             <field name="website_description" type="html">
                 <section data-snippet-id="text-image" class="mt16 mb16 oe_dark">
                     <div class="container">
@@ -59,7 +59,7 @@
         <record id="product.product_product_5" model="product.product">
             <field name="website_published" eval="True"/>
             <field name="website_size_x">2</field>
-            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_promo')])]"/>
+            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.style_image_promo')])]"/>
             <field name="website_description" type="html">
                 <section data-snippet-id="text-image" class="mt16 mb16">
                     <div class="container">
@@ -165,7 +165,7 @@
         <record id="product.product_product_6" model="product.product">
             <field name="website_published" eval="True"/>
             <field name="website_sequence">4</field>
-            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
+            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.style_image_full')])]"/>
             <field name="description_sale">Color: White
 Capacity: 16GB
 Connectivity: Wifi
@@ -273,7 +273,7 @@ iOS7
                 </section>
             </field>
             <field name="website_sequence">4</field>
-            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.image_full')])]"/>
+            <field name="website_style_ids" eval="[(6,0,[ref('website_sale.style_image_full')])]"/>
         </record>
 
         <record id="product.product_product_7" model="product.product">
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index 2dbf56cee88..b2de3c5753e 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -1,7 +1,3 @@
-import website_styles
-import payment_transaction
 import product
-import product_characteristics
 import res_config
 import sale_order
-import website
diff --git a/addons/website_sale/models/payment_transaction.py b/addons/website_sale/models/payment_transaction.py
deleted file mode 100644
index ffe78ab8762..00000000000
--- a/addons/website_sale/models/payment_transaction.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import orm, fields
-
-
-class PaymentTransaction(orm.Model):
-    _inherit = 'payment.transaction'
-
-    _columns = {
-        # link with the sale order
-        'sale_order_id': fields.many2one('sale.order', 'Sale Order'),
-    }
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 1cdc206c4af..e533f18531d 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -21,6 +21,39 @@
 
 from openerp.osv import osv, fields
 
+class product_attribue(osv.Model):
+    # TODO merge product.attribute, mrp.properties product_manufacturer_attributes
+    _name = "product.attribute"
+    _columns = {
+        'name': fields.char('Name', translate=True, required=True),
+        'value_ids': fields.one2many('product.attribute.value', 'attribute_id', 'Values'),
+    }
+
+class product_attribute_value(osv.Model):
+    _name = "product.attribute.value"
+    _columns = {
+        'attribute_id': fields.many2one('product.attribute', 'attribute', required=True),
+        'name': fields.char('Value', translate=True, required=True),
+    }
+
+class product_attribute_line(osv.Model):
+    _name = "product.attribute.line"
+    _order = 'attribute_id, value_id'
+    _columns = {
+        'product_tmpl_id': fields.many2one('product.template', 'Product', required=True),
+        'attribute_id': fields.many2one('product.attribute', 'attribute', required=True),
+        'value_id': fields.many2one('product.attribute.value', 'Textual Value'),
+    }
+
+    def onchange_attribute_id(self, cr, uid, ids, attribute_id, context=None):
+        return {'value': {'value_id': False}}
+
+class product_style(osv.Model):
+    _name = "product.style"
+    _columns = {
+        'name' : fields.char('Style Name', required=True),
+        'html_class': fields.char('HTML Classes'),
+    }
 
 class product_pricelist(osv.Model):
     _inherit = "product.pricelist"
@@ -28,7 +61,6 @@ class product_pricelist(osv.Model):
         'code': fields.char('Promotional Code'),
     }
 
-
 class product_template(osv.Model):
     _inherit = ["product.template", "website.seo.metadata"]
     _order = 'website_published desc, website_sequence desc, name'
@@ -42,104 +74,77 @@ class product_template(osv.Model):
         return res
 
     _columns = {
-        'website_published': fields.boolean('Available in the website'),
-        'website_description': fields.html('Description for the website'),
-        # TDE TODO FIXME: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
+        'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
+        # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
         'website_message_ids': fields.one2many(
             'mail.message', 'res_id',
             domain=lambda self: [
                 '&', ('model', '=', self._name), ('type', '=', 'comment')
             ],
-            string='Website Messages',
-            help="Website communication history",
+            string='Website Comments',
         ),
+        'website_published': fields.boolean('Available in the website'),
+        'website_description': fields.html('Description for the website'),
         'alternative_product_ids': fields.many2many('product.template','product_alternative_rel','src_id','dest_id', string='Alternative Products', help='Appear on the product page'),
         'accessory_product_ids': fields.many2many('product.template','product_accessory_rel','src_id','dest_id', string='Accessory Products', help='Appear on the shopping cart'),
         'website_size_x': fields.integer('Size X'),
         'website_size_y': fields.integer('Size Y'),
-        'website_style_ids': fields.many2many('product.style', 'product_website_style_rel', 'product_id', 'style_id', 'Styles'),
+        'website_style_ids': fields.many2many('product.style', string='Styles'),
         'website_sequence': fields.integer('Sequence', help="Determine the display order in the Website E-commerce"),
         'website_url': fields.function(_website_url, string="Website url", type="char"),
     }
 
-    def __defaults_website_sequence(self, cr, uid, *kwargs):
-        cr.execute('SELECT MAX(website_sequence) FROM product_template')
-        max_sequence = cr.fetchone()[0] or 0
-        return max_sequence + 1
+    def _defaults_website_sequence(self, cr, uid, *l, **kwargs):
+        cr.execute('SELECT MAX(website_sequence)+1 FROM product_template')
+        next_sequence = cr.fetchone()[0] or 0
+        return next_sequence
 
     _defaults = {
         'website_size_x': 1,
         'website_size_y': 1,
-        'website_sequence': __defaults_website_sequence,
+        'website_sequence': _defaults_website_sequence,
         'website_published': False,
     }
 
-    def set_sequence_top(self, cr, uid, ids, context=None):
-        cr.execute('SELECT MAX(website_sequence) FROM product_template')
-        max_sequence = cr.fetchone()[0] or 0
-        return self.write(cr, uid, ids, {'website_sequence': max_sequence + 1}, context=context)
-
-    def set_sequence_bottom(self, cr, uid, ids, context=None):
-        cr.execute('SELECT MIN(website_sequence) FROM product_template')
-        min_sequence = cr.fetchone()[0] or 0
-        return self.write(cr, uid, ids, {'website_sequence': min_sequence -1}, context=context)
-
-    def set_sequence_up(self, cr, uid, ids, context=None):
-        product = self.browse(cr, uid, ids[0], context=context)
-        cr.execute("""  SELECT id, website_sequence FROM product_template
-                        WHERE website_sequence > %s AND website_published = %s ORDER BY website_sequence ASC LIMIT 1""" % (product.website_sequence, product.website_published))
-        prev = cr.fetchone()
-        if prev:
-            self.write(cr, uid, [prev[0]], {'website_sequence': product.website_sequence}, context=context)
-            return self.write(cr, uid, [ids[0]], {'website_sequence': prev[1]}, context=context)
-        else:
-            return self.set_sequence_top(cr, uid, ids, context=context)
-
-    def set_sequence_down(self, cr, uid, ids, context=None):
-        product = self.browse(cr, uid, ids[0], context=context)
-        cr.execute("""  SELECT id, website_sequence FROM product_template
-                        WHERE website_sequence < %s AND website_published = %s ORDER BY website_sequence DESC LIMIT 1""" % (product.website_sequence, product.website_published))
-        next = cr.fetchone()
-        if next:
-            self.write(cr, uid, [next[0]], {'website_sequence': product.website_sequence}, context=context)
-            return self.write(cr, uid, [ids[0]], {'website_sequence': next[1]}, context=context)
-        else:
-            return self.set_sequence_bottom(cr, uid, ids, context=context)
-
-    def recommended_products(self, cr, uid, ids, context=None):
-        id = ids[0]
-        product_ids = []
-        query = """
-            SELECT      sol.product_id
-            FROM        sale_order_line as my
-            LEFT JOIN   sale_order_line as sol
-            ON          sol.order_id = my.order_id
-            WHERE       my.product_id in (%s)
-            AND         sol.product_id not in (%s)
-            GROUP BY    sol.product_id
-            ORDER BY    COUNT(sol.order_id) DESC
-            LIMIT 10
-        """
-        cr.execute(query, (id, id))
-        for p in cr.fetchall():
-            product_ids.append(p[0])
-
-        # search to apply access rules
-        product_ids = self.search(cr, uid, [("id", "in", product_ids)], limit=3)
-        return self.browse(cr, uid, product_ids)
+    def website_reorder(self, cr, uid, ids, operation=None, context=None):
+        if operation == "top":
+            cr.execute('SELECT MAX(website_sequence) FROM product_template')
+            seq = (cr.fetchone()[0] or 0) + 1
+        if operation == "bottom":
+            cr.execute('SELECT MIN(website_sequence) FROM product_template')
+            seq = (cr.fetchone()[0] or 0) -1
+        if operation == "up":
+            product = self.browse(cr, uid, ids[0], context=context)
+            cr.execute("""  SELECT id, website_sequence FROM product_template
+                            WHERE website_sequence > %s AND website_published = %s ORDER BY website_sequence ASC LIMIT 1""" % (product.website_sequence, product.website_published))
+            prev = cr.fetchone()
+            if prev:
+                self.write(cr, uid, [prev[0]], {'website_sequence': product.website_sequence}, context=context)
+                return self.write(cr, uid, [ids[0]], {'website_sequence': prev[1]}, context=context)
+            else:
+                return self.website_reorder(cr, uid, ids, operation='top', context=context)
+        if operation == "down":
+            product = self.browse(cr, uid, ids[0], context=context)
+            cr.execute("""  SELECT id, website_sequence FROM product_template
+                            WHERE website_sequence < %s AND website_published = %s ORDER BY website_sequence DESC LIMIT 1""" % (product.website_sequence, product.website_published))
+            next = cr.fetchone()
+            if next:
+                self.write(cr, uid, [next[0]], {'website_sequence': product.website_sequence}, context=context)
+                return self.write(cr, uid, [ids[0]], {'website_sequence': next[1]}, context=context)
+            else:
+                return self.website_reorder(cr, uid, ids, operation='bottom', context=context)
+        return self.write(cr, uid, ids, {'website_sequence': seq}, context=context)
 
     def img(self, cr, uid, ids, field='image_small', context=None):
         return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])
 
-
 class product_product(osv.Model):
     _inherit = "product.product"
 
     def _website_url(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
         for product in self.browse(cr, uid, ids, context=context):
-            res[product.id] = "%s/shop/product/%s/" % (base_url, product.product_tmpl_id.id)
+            res[product.id] = "/shop/product/%s" % (product.product_tmpl_id.id)
         return res
 
     _columns = {
@@ -149,3 +154,5 @@ class product_product(osv.Model):
     def img(self, cr, uid, ids, field='image_small', context=None):
         temp_id = self.browse(cr, uid, ids[0], context=context).product_tmpl_id.id
         return "/website/image?model=product.template&field=%s&id=%s" % (field, temp_id)
+
+# vim:et:
diff --git a/addons/website_sale/models/product_characteristics.py b/addons/website_sale/models/product_characteristics.py
deleted file mode 100644
index ae641184db3..00000000000
--- a/addons/website_sale/models/product_characteristics.py
+++ /dev/null
@@ -1,87 +0,0 @@
-
-from openerp.osv import osv, fields
-
-
-class attributes(osv.Model):
-    _name = "product.attribute"
-
-    def _get_float_max(self, cr, uid, ids, field_name, arg, context=None):
-        result = dict.fromkeys(ids, 0)
-        if ids:
-            cr.execute("""
-                SELECT attribute_id, MAX(value)
-                FROM product_attribute_line
-                WHERE attribute_id in (%s)
-                GROUP BY attribute_id
-            """ % ",".join(map(str, ids)))
-            result.update(dict(cr.fetchall()))
-        return result
-
-    def _get_float_min(self, cr, uid, ids, field_name, arg, context=None):
-        result = dict.fromkeys(ids, 0)
-        if ids:
-            cr.execute("""
-                SELECT attribute_id, MIN(value)
-                FROM product_attribute_line
-                WHERE attribute_id in (%s)
-                GROUP BY attribute_id
-            """ % ",".join(map(str, ids)))
-            result.update(dict(cr.fetchall()))
-        return result
-
-    def _get_min_max(self, cr, uid, ids, context=None):
-        result = {}
-        for value in self.pool.get('product.attribute.line').browse(cr, uid, ids, context=context):
-            if value.type == 'float':
-                result[value.attribute_id.id] = True
-        return result.keys()
-
-    _columns = {
-        'name': fields.char('Name', translate=True, required=True),
-        'type': fields.selection([('distinct', 'Textual Value'), ('float', 'Numeric Value')], "Type", required=True),
-        'value_ids': fields.one2many('product.attribute.value', 'attribute_id', 'Values'),
-        'attr_product_ids': fields.one2many('product.attribute.line', 'attribute_id', 'Products'),
-
-        'float_max': fields.function(_get_float_max, type='float', string="Max", store={
-                'product.attribute.line': (_get_min_max, ['value','attribute_id'], 20),
-            }),
-        'float_min': fields.function(_get_float_min, type='float', string="Min", store={
-                'product.attribute.line': (_get_min_max, ['value','attribute_id'], 20),
-            }),
-        'visible': fields.boolean('Display Filter on Website'),
-    }
-    _defaults = {
-        'type': 'distinct',
-        'visible': True,
-    }
-
-class attributes_value(osv.Model):
-    _name = "product.attribute.value"
-    _columns = {
-        'name': fields.char('Value', translate=True, required=True),
-        'attribute_id': fields.many2one('product.attribute', 'attribute', required=True),
-        'atr_product_ids': fields.one2many('product.attribute.line', 'value_id', 'Products'),
-    }
-
-class attributes_product(osv.Model):
-    _name = "product.attribute.line"
-    _order = 'attribute_id, value_id, value'
-    _columns = {
-        'value': fields.float('Numeric Value'),
-        'value_id': fields.many2one('product.attribute.value', 'Textual Value'),
-        'attribute_id': fields.many2one('product.attribute', 'attribute', required=True),
-        'product_tmpl_id': fields.many2one('product.template', 'Product', required=True),
-
-        'type': fields.related('attribute_id', 'type', type='selection',
-            selection=[('distinct', 'Distinct'), ('float', 'Float')], string='Type'),
-    }
-
-    def onchange_attribute_id(self, cr, uid, ids, attribute_id, context=None):
-        attribute = self.pool.get('product.attribute').browse(cr, uid, attribute_id, context=context)
-        return {'value': {'type': attribute.type, 'value_id': False, 'value': ''}}
-
-class product_template(osv.Model):
-    _inherit = "product.template"
-    _columns = {
-        'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
-    }
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 577005212c3..68425fb9dfe 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -1,14 +1,22 @@
 # -*- coding: utf-8 -*-
+import random
+
 from openerp import SUPERUSER_ID
-from openerp.osv import osv, fields
+from openerp.osv import osv, orm, fields
 from openerp.addons.web.http import request
 
+class payment_transaction(orm.Model):
+    _inherit = 'payment.transaction'
 
-class SaleOrder(osv.Model):
+    _columns = {
+        # link with the sale order
+        'sale_order_id': fields.many2one('sale.order', 'Sale Order'),
+    }
+
+class sale_order(osv.Model):
     _inherit = "sale.order"
 
     _columns = {
-        'website_session_id': fields.char('Session UUID4'),
         'website_order_line': fields.one2many(
             'sale.order.line', 'order_id',
             string='Order Lines displayed on Website', readonly=True,
@@ -22,29 +30,144 @@ class SaleOrder(osv.Model):
             'order': order
         }
 
-    def get_number_of_products(self, cr, uid, ids, context=None):
-        order = self.browse(cr, uid, ids[0], context=context)
-        return int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
+    # TODO make a function field instead
+    def _cart_qty(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            return int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
 
+    def _cart_find_product_line(self, cr, uid, ids, product_id=None, context=None):
+        for so in self.browse(cr, uid, ids, context=context):
+            line_id = None
+            line_ids = self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, [('order_id', '=', so.id), ('product_id', '=', product_id)], context=context)
+            if line_ids:
+                line_id = line_ids[0]
+            return line_id
 
-class SaleOrderLine(osv.Model):
-    _inherit = "sale.order.line"
+    def _cart_update(self, cr, uid, ids, product_id=None, add_qty=None, set_qty=None, context=None):
+        """ Add or set product quantity, add_qty can be negative """
+        for so in self.browse(cr, uid, ids, context=context):
+            sol = self.pool.get('sale.order.line')
 
-    def _recalculate_product_values(self, cr, uid, ids, product_id=0, context=None):
-        # TDE FIXME: seems to be defined several times -> fix me ?
-        if context is None:
-            context = {}
-        user_obj = self.pool.get('res.users')
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            line_id = so._cart_find_product_line(product_id)
 
-        if ids and not product_id:
-            order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
-            assert order_line.order_id.website_session_id == request.httprequest.session['website_session_id']
-            product_id = product_id or order_line.product_id.id
+            # Create line if no line with product_id can be located
+            if not line_id:
+                values = self.pool['sale.order.line'].product_id_change(cr, SUPERUSER_ID, [],
+                    pricelist=so.pricelist_id.id,
+                    product=product_id,
+                    partner_id=so.partner_id.id,
+                    context=context
+                )['value']
+                values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
+                # Maybe it's better to do this ? create and then link ?
+                #order_line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
+                #self.write(cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=context)
+                so.write({'order_line': (0, 0, values)})
+                line_id = so._cart_find_product_line(product_id)
 
-        return self.product_id_change(
-            cr, SUPERUSER_ID, ids,
-            pricelist=context.pop('pricelist'),
-            product=product_id,
-            partner_id=user_obj.browse(cr, SUPERUSER_ID, uid).partner_id.id,
-            context=context
-        )['value']
+            # compute new quantity
+            if set_qty:
+                quantity = set_qty
+            else:
+                quantity = line_id.product_uom_qty + add_qty
+
+            # Remove zero of negative lines
+            if quantity <= 0:
+                sol.unlink(cr, SUPERUSER_ID, line_id, context=context)
+            else:
+                # update line
+                values = self.pool['sale.order.line'].product_id_change(cr, SUPERUSER_ID, [],
+                    pricelist=so.pricelist_id.id,
+                    product=product_id,
+                    partner_id=so.partner_id.id,
+                    context=context
+                )['value']
+                values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
+                values['product_uom_qty'] = quantity
+                sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)
+
+            return quantity
+
+    def _cart_accessories(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            s = set(j for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
+            product_ids = random.sample(s, min(len(s),3))
+            return self.pool['product.product'].browse(cr, uid, product_ids, context=context)
+
+class website(orm.Model):
+    _inherit = 'website'
+
+    _columns = {
+        'pricelist_id': fields.related('user_id','partner_id','property_product_pricelist',
+            type='many2one', relation='product.pricelist', string='Default pricelist')
+    }
+
+    def sale_product_domain(self, cr, uid, ids, context=None):
+        return [("sale_ok", "=", True)]
+
+    def sale_get_order(self, cr, uid, ids, force_create=False, code=None, context=None):
+        sale_order_id = request.httprequest.session.get('sale_order_id')
+        sale_order = None
+        # create so if needed
+        if not sale_order_id and (force_create or code):  
+            for w in self.browse(cr, uid, ids):
+                # TODO cache partner_id session
+                partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+                values = {
+                    'user_id': w.user_id.id,
+                    'partner_id': partner.id,
+                    'pricelist_id': partner.property_product_pricelist.id,
+                }
+                sale_order_id = self.pool['sale.order'].create(cr, SUPERUSER_ID, values, context=context)
+                values = self.pool['sale.order'].onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
+                self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
+                request.httprequest.session['sale_order_id'] = sale_order_id
+        if sale_order_id:
+            # TODO cache partner_id session
+            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+            sale_order = self.pool['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
+
+            # check for change of pricelist with a coupon
+            # TODO cache sale_order.pricelist_id.code in session
+            if code and code != sale_order.pricelist_id.code:
+                pricelist_ids = self.pool['product.pricelist'].search(cr, SUPERUSER_ID, [('code', '=', code)], context=context)
+                if pricelist_ids:
+                    pricelist_id = pricelist_ids[0]
+                    values = {'pricelist_id': pricelist_id}
+                    values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
+                    order.write(values)
+                    for line in order.order_line:
+                        sale_order._cart_update(cr, uid, order.product_id, add_qty=0)
+
+            # check for change of partner_id ie after signup
+            if sale_order.partner_id.id !=  partner.id:
+                values = self.pool['sale.order'].onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
+                self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
+        return sale_order
+
+    def sale_get_transaction(self, cr, uid, context=None):
+        transaction_obj = self.pool.get('payment.transaction')
+        tx_id = request.httprequest.session.get('payment_transaction_id')
+        if tx_id:
+            tx_ids = transaction_obj.search(cr, uid, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)
+            if tx_ids:
+                return transaction_obj.browse(cr, uid, tx_ids[0], context=context)
+            else:
+                request.httprequest.session['payment_transaction_id'] = False
+        return False
+
+    def sale_reset(self, cr, uid, context=None):
+        request.httprequest.session.update({
+            'sale_order_id': False,
+            'sale_transaction_id': False,
+        })
+
+    def preprocess_request(self, cr, uid, ids, request, context=None):
+        request.context.update({
+            'sale_order': self.sale_get_order(cr, uid, ids, context=context),
+            #'website_sale_transaction': self.ecommerce_get_current_transaction(cr, uid, context=context)
+        })
+        return super(website, self).preprocess_request(cr, uid, ids, request, context=None)
+
+# vim:et:
diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py
deleted file mode 100644
index 14a9a5decff..00000000000
--- a/addons/website_sale/models/website.py
+++ /dev/null
@@ -1,222 +0,0 @@
-# -*- coding: utf-8 -*-
-import uuid
-from openerp.osv import orm, fields
-from openerp.addons.web.http import request
-from openerp import SUPERUSER_ID
-
-
-class Website(orm.Model):
-    _inherit = 'website'
-
-    def _get_pricelist_id(self, cr, uid, ids, field_name, arg, context=None):
-        pricelist_id = self.ecommerce_get_pricelist_id(cr, uid, None, context=context)
-        return dict.fromkeys(ids, pricelist_id)
-
-    _columns = {
-        'pricelist_id': fields.function(
-            _get_pricelist_id, type='many2one', obj='product.pricelist')
-    }
-
-    # ************************************************************
-    # Ecommerce pricelist management
-    # ***********************************************************
-
-    def ecommerce_get_pricelist_id(self, cr, uid, ids, context=None):
-        if not request.httprequest.session.get('ecommerce_pricelist'):
-            self._ecommerce_change_pricelist(cr, uid, None, context=context)
-        return request.httprequest.session.get('ecommerce_pricelist')
-
-    def _ecommerce_change_pricelist(self, cr, uid, code=None, context=None):
-        request.httprequest.session.setdefault('ecommerce_pricelist', False)
-
-        pricelist_id = False
-        if code:
-            pricelist_obj = self.pool.get('product.pricelist')
-            pricelist_ids = pricelist_obj.search(cr, SUPERUSER_ID, [('code', '=', code)], context=context)
-            if pricelist_ids:
-                pricelist_id = pricelist_ids[0]
-
-        if not pricelist_id:
-            partner_id = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context).partner_id.id
-            pricelist_id = self.pool.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value']['pricelist_id']
-
-        request.httprequest.session['ecommerce_pricelist'] = pricelist_id
-
-        order = self.ecommerce_get_current_order(cr, uid, context=context)
-        if order:
-            values = {'pricelist_id': pricelist_id}
-            values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
-            order.write(values)
-            for line in order.order_line:
-                self._ecommerce_add_product_to_cart(cr, uid, order_line_id=line.id, number=0)
-
-    # ************************************************************
-    # Ecommerce quotation management
-    # ************************************************************
-
-    def _ecommerce_add_product_to_cart(self, cr, uid, product_id=0, order_line_id=0, number=1, set_number=-1, context=None):
-        order = self.ecommerce_get_current_order(cr, uid, context=context)
-        if not order:
-            order = self.ecommerce_get_new_order(cr, uid, context=context)
-
-        order_line_obj = self.pool.get('sale.order.line')
-        order_obj = self.pool.get('sale.order')
-
-        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
-
-        # set order_line_id and product_id
-        if order_line_id:
-            order_line = None
-            for line in order.order_line:
-                if line.id == order_line_id:
-                    order_line = line
-                    break
-            if order_line:
-                product_id = order_line.product_id.id
-            else:
-                order_line_id = None
-        else:
-            order_line_ids = order_line_obj.search(cr, SUPERUSER_ID,
-                [('order_id', '=', order.id), ('product_id', '=', product_id)], context=context)
-            if order_line_ids:
-                order_line_id = order_line_ids[0]
-
-        if not order_line_id and not product_id:
-            return 0
-
-        # values initialisation
-        quantity = 0
-        values = {}
-        order_line_ids = []
-        if order_line_id:
-            order_line_val = order_line_obj.read(cr, SUPERUSER_ID, [order_line_id], [], context=context)[0]
-            if not product_id:
-                product_id = order_line_val['product_id'][0]
-            if set_number >= 0:
-                quantity = set_number
-            else:
-                quantity = order_line_val['product_uom_qty'] + number
-            if quantity < 0:
-                quantity = 0
-            order_line_ids = [order_line_id]
-        else:
-            fields = [k for k, v in order_line_obj._columns.items()]
-            values = order_line_obj.default_get(cr, SUPERUSER_ID, fields, context=context)
-            quantity = 1
-
-        # change and record value
-        if quantity:
-            vals = order_line_obj._recalculate_product_values(cr, uid, order_line_ids, product_id, context=context)
-            values.update(vals)
-            values['product_uom_qty'] = quantity
-            values['product_id'] = product_id
-            values['order_id'] = order.id
-
-            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
-            values['tax_id'] = [(6, 0, [tax.id for tax in product.taxes_id])]
-            if order_line_id:
-                order_line_obj.write(cr, SUPERUSER_ID, order_line_ids, values, context=context)
-            else:
-                order_line_id = order_line_obj.create(cr, SUPERUSER_ID, values, context=context)
-                order_obj.write(cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=context)
-        elif order_line_ids:
-            order_line_obj.unlink(cr, SUPERUSER_ID, order_line_ids, context=context)
-
-        order = self.ecommerce_get_current_order(cr, uid, context=context)
-        if not order or not order.order_line:
-            self._ecommerce_change_pricelist(cr, uid, None, context=context)
-
-        return quantity
-
-    def _ecommerce_get_quotation_values(self, cr, uid, context=None):
-        """ Generate the values for a new ecommerce quotation. """
-        SaleOrder = self.pool.get('sale.order')
-        fields = [k for k, v in SaleOrder._columns.items()]
-        values = SaleOrder.default_get(cr, SUPERUSER_ID, fields, context=context)
-        if request.httprequest.session.get('ecommerce_pricelist'):
-            values['pricelist_id'] = request.httprequest.session['ecommerce_pricelist']
-        values['partner_id'] = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
-        values.update(SaleOrder.onchange_partner_id(cr, SUPERUSER_ID, [], values['partner_id'], context=context)['value'])
-        values['website_session_id'] = request.httprequest.session['website_session_id']
-        return values
-
-    def _ecommerce_create_quotation(self, cr, uid, context=None):
-        """ Create a new quotation used in the ecommerce (event, sale) """
-        SaleOrder = self.pool.get('sale.order')
-        quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context)
-        quotation_values['user_id'] = False
-        return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context)
-
-    def ecommerce_get_new_order(self, cr, uid, context=None):
-        """ Create a new quotation for the ecommerce and update the session
-        accordingly: website_session_id if not set, ecommerce_order_id """
-        SaleOrder = self.pool.get('sale.order')
-
-        # add website_session_id key for access rules
-        if not request.httprequest.session.get('website_session_id'):
-            request.httprequest.session['website_session_id'] = str(uuid.uuid4())
-
-        order_id = self._ecommerce_create_quotation(cr, uid, context=context)
-        request.httprequest.session['ecommerce_order_id'] = order_id
-        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
-        return SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context)
-
-    def ecommerce_get_current_order(self, cr, uid, context=None):
-        SaleOrder = self.pool.get('sale.order')
-        context = dict(context or {}, pricelist=self.ecommerce_get_pricelist_id(cr, uid, None, context=context))
-        order_id = request.httprequest.session.get('ecommerce_order_id')
-        if not order_id:
-            request.httprequest.session['ecommerce_order_id'] = False
-            return False
-        if not order_id in SaleOrder.exists(cr, uid, [order_id], context=context):
-            request.httprequest.session['ecommerce_order_id'] = False
-            return False
-        try:
-            order = SaleOrder.browse(cr, SUPERUSER_ID, order_id, context=context)
-            assert order.website_session_id == request.httprequest.session['website_session_id']
-            return order
-        except:
-            request.httprequest.session['ecommerce_order_id'] = False
-            return False
-
-    # ************************************************************
-    # Ecommerce transaction management
-    # ************************************************************
-
-    def _get_transaction(self, cr, uid, tx_id=None, context=None):
-        transaction_obj = self.pool.get('payment.transaction')
-        if tx_id:
-            tx_ids = transaction_obj.search(cr, uid, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)
-            if tx_ids:
-                return transaction_obj.browse(cr, uid, tx_ids[0], context=context)
-        return False
-
-    def ecommerce_get_current_transaction(self, cr, uid, context=None):
-        if request.httprequest.session.get('website_sale_transaction_id'):
-            tx = self._get_transaction(cr, uid, tx_id=request.httprequest.session['website_sale_transaction_id'], context=context)
-            if not tx:
-                request.httprequest.session['website_sale_transaction_id'] = False
-            return tx
-        return False
-
-    def ecommerce_reset(self, cr, uid, context=None):
-        request.httprequest.session.update({
-            'ecommerce_order_id': False,
-            'ecommerce_pricelist': False,
-            'website_sale_transaction_id': False,
-        })
-        request.context.update({
-            'website_sale_order': False,
-            'website_sale_transaction': False,
-        })
-
-    def preprocess_request(self, cr, uid, ids, request, context=None):
-        request.context.update({
-            'website_sale_order': self.ecommerce_get_current_order(cr, uid, context=context),
-            'website_sale_transaction': self.ecommerce_get_current_transaction(cr, uid, context=context)
-        })
-        return super(Website, self).preprocess_request(cr, uid, ids, request, context=None)
-
-    def ecommerce_get_product_domain(self):
-        return [("sale_ok", "=", True),("product_variant_ids","!=",False)]
diff --git a/addons/website_sale/models/website_styles.py b/addons/website_sale/models/website_styles.py
deleted file mode 100644
index 5b4a5dc0825..00000000000
--- a/addons/website_sale/models/website_styles.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv, fields
-
-
-class product_style(osv.Model):
-    _name = "product.style"
-    _columns = {
-        'name' : fields.char('Style Name', required=True, translate=True),
-        'html_class': fields.char('HTML Classes'),
-    }
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 7f6d24373f7..2fb7741e993 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -20,7 +20,7 @@ $(document).ready(function () {
             .fadeIn(600);
     }
 
-    $(".oe_website_sale .oe_mycart input.js_quantity").change(function () {
+    $(".oe_website_sale .oe_cart input.js_quantity").change(function () {
         var $input = $(this);
         var value = parseInt($input.val(), 10);
         if (isNaN(value)) value = 0;
@@ -55,7 +55,7 @@ $(document).ready(function () {
                 }
                 set_my_cart_quantity(data[1]);
                 $link.parents(".input-group:first").find(".js_quantity").val(data[0]);
-                $('#mycart_total').replaceWith(data[3]);
+                $('#cart_total').replaceWith(data[3]);
             });
         return false;
     });
@@ -76,39 +76,6 @@ $(document).ready(function () {
     var js_slider_time = null;
     var $form = $("form.attributes");
     $form.on("change", "label input", function () {
-        clearTimeout(js_slider_time);
         $form.submit();
     });
-    $(".js_slider", $form).each(function() {
-        var $slide = $(this);
-        var $slider = $('<div>'+
-                '<input type="hidden" name="att-'+$slide.data("id")+'-minmem" value="'+$slide.data("min")+'"/>'+
-                '<input type="hidden" name="att-'+$slide.data("id")+'-maxmem" value="'+$slide.data("max")+'"/>'+
-            '</div>');
-        var $min = $("<input readonly name='att-"+$slide.data("id")+"-min'/>")
-            .css("border", "0").css("width", "50%")
-            .val($slide.data("min"));
-        var $max = $("<input readonly name='att-"+$slide.data("id")+"-max'/>")
-            .css("border", "0").css("width", "50%").css("text-align", "right")
-            .val($slide.data("max"));
-        $slide.append($min);
-        $slide.append($max);
-        $slide.append($slider);
-        $slider.slider({
-            range: true,
-            min: +$slide.data("min"),
-            max: +$slide.data("max"),
-            values: [
-                $slide.data("value-min") ? +$slide.data("value-min") : +$slide.data("min"),
-                $slide.data("value-max") ? +$slide.data("value-max") : +$slide.data("max")
-            ],
-            change: function( event, ui ) {
-                $min.val( ui.values[ 0 ] );
-                $max.val( ui.values[ 1 ] );
-                $form.submit();
-            }
-        });
-        $min.val( $slider.slider( "values", 0 ) );
-        $max.val( $slider.slider( "values", 1 ) );
-    });
 });
diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py
new file mode 100644
index 00000000000..438ef8be4c4
--- /dev/null
+++ b/addons/website_sale/tests/test_sale_process.py
@@ -0,0 +1,9 @@
+import openerp
+import openerp.addons.website.tests.test_ui as test_ui
+
+def load_tests(loader, base, _):
+    jsfile = openerp.modules.module.get_module_resource('website_sale','tests','test_sale_process1.js')
+    base.addTest(test_ui.WebsiteUiSuite(jsfile,{ 'action': 'website.action_website_homepage' }, 120.0))
+    jsfile = openerp.modules.module.get_module_resource('website_sale','tests','test_sale_process2.js')
+    base.addTest(test_ui.WebsiteUiSuite(jsfile,{ 'action': 'website.action_website_homepage' }, 120.0))
+    return base
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js b/addons/website_sale/tests/test_sale_process1.js
similarity index 100%
rename from addons/website_sale/tests/ui_suite/website_sale-sale_process-test.js
rename to addons/website_sale/tests/test_sale_process1.js
diff --git a/addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js b/addons/website_sale/tests/test_sale_process2.js
similarity index 100%
rename from addons/website_sale/tests/ui_suite/website_sale-sale_process-test-2.js
rename to addons/website_sale/tests/test_sale_process2.js
diff --git a/addons/website_sale/tests/test_ui.py b/addons/website_sale/tests/test_ui.py
deleted file mode 100644
index 72b948830b1..00000000000
--- a/addons/website_sale/tests/test_ui.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import openerp.addons.website.tests.test_ui as test_ui
-
-def load_tests(loader, base, _):
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test.js'),
-        { 'action': 'website.action_website_homepage' }))
-    base.addTest(test_ui.WebsiteUiSuite(test_ui.full_path(__file__,'website_sale-sale_process-test-2.js'),
-        { 'action': 'website.action_website_homepage' }))
-    return base
\ No newline at end of file
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/templates.xml
similarity index 86%
rename from addons/website_sale/views/website_sale.xml
rename to addons/website_sale/views/templates.xml
index ed2007e27c7..059c03946c7 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/templates.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-<!-- Layout add nav and footer -->
+<!-- Layout and common templates -->
 
 <template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_sale_manager">
   <xpath expr="//script[@id='website_tour_js']" position="after">
@@ -13,43 +13,41 @@
 
 <template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
   <xpath expr="//header//ul[@id='top_menu']/li" position="before">
-      <li t-att-class="(not website_sale_order or not website_sale_order.get_number_of_products()) and 'hidden' or ''">
-          <a href="/shop/mycart/">
+      <li t-att-class="'' if sale_order and sale_order._cart_qty() else 'hidden'">
+          <a href="/shop/cart/">
               <i class="fa fa-shopping-cart"></i>
-              My cart <sup t-attf-class="my_cart_quantity label label-primary"
-                            t-esc="website_sale_order and website_sale_order.get_number_of_products() or ''"/>
+              My cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="sale_order and sale_order._cart_qty() or ''"/>
           </a>
       </li>
   </xpath>
 </template>
 
-<!-- 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">
-              <t t-call="website_sale.categories_recursive"/>
-          </t>
-      </ul>
-  </li>
-</template>
-
-<!-- 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 ''"/>
+    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search"/>
     <span class="input-group-btn">
       <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
     </span>
   </div>
 </template>
 
-<template id="products_cart" name="Shopping cart">
+<template id="404">
+  <t t-call="website.layout">
+      <div id="wrap">
+          <div class="oe_structure oe_empty">
+              <div class="container">
+                  <h1 class="mt32">Product not found!</h1>
+                  <p>Sorry, this product is not available anymore.</p>
+                  <p><a t-attf-href="/shop/">Return to the product list.</a></p>
+              </div>
+          </div>
+      </div>
+  </t>
+</template>
+
+<!-- Product item used by /shop and /shop/cart -->
+
+<template id="products_item" name="Product item">
   <div class="ribbon-wrapper">
     <div class="ribbon btn btn-danger">Sale</div>
   </div>
@@ -63,21 +61,32 @@
       <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">
-                <del class="text-danger"
-                  t-field="product.product_variant_ids[0].lst_price" t-field-options='{
-                       "widget": "monetary",
-                       "display_currency": "website.pricelist_id.currency_id"
-                  }'/>&amp;nbsp;
+                <del class="text-danger" t-field="product.product_variant_ids[0].lst_price" t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/>&amp;nbsp;
               </t>
-              <span t-field="product.product_variant_ids[0].price"  t-field-options='{
-                   "widget": "monetary",
-                   "display_currency": "website.pricelist_id.currency_id"
-               }'/>
+              <span t-field="product.product_variant_ids[0].price"  t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/>
           </b>
       </div>
   </section>
 </template>
 
+<template id="products_description" inherit_option_id="website_sale.products_item" name="Product Description">
+  <xpath expr="//div[@class='product_price']" position="before">
+      <div class="text-info oe_subdescription oe_shadow" t-field="product.description_sale"/>
+      <div class="text-info oe_subdescription" t-field="product.description_sale"/>
+  </xpath>
+</template>
+
+<template id="products_add_to_cart" inherit_option_id="website_sale.products_item" name="Add to Cart">
+  <xpath expr="//div[@class='product_price']" position="inside">
+      <form action="/shop/cart/update" method="post" style="display: inline-block;">
+          <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
+          <button type="submit" class="fa fa-shopping-cart"/>
+      </form>
+  </xpath>
+</template>
+
+<!-- /shop product listing -->
+
 <template id="products" name="Products">
   <t t-call="website.layout">
       <t t-set="head">
@@ -93,7 +102,7 @@
         <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">
+              <form t-att-action="keep('/shop',search=0)" method="get" class="pagination form-inline col-md-3">
                   <t t-call="website_sale.search" />
               </form>
               <t t-call="website.pager"/>
@@ -176,7 +185,7 @@
                               </div>
                             </div>
 
-                            <t t-call="website_sale.products_cart"/>
+                            <t t-call="website_sale.products_item"/>
                           </div>
 
                       </td>
@@ -210,53 +219,75 @@
   </t>
 </template>
 
-<!-- Product Description-->
+<template id="categories_recursive" name="Category list">
+  <li t-att-class="'active' if c.id == category else ''">
+      <a t-att-href="keep('/shop/category/' + slug(c), category=0)" t-field="c.name"></a>
+      <ul t-if="c.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="c.child_id" t-as="c">
+              <t t-call="website_sale.categories_recursive"/>
+          </t>
+      </ul>
+  </li>
+</template>
 
-<template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
-  <xpath expr="//div[@class='product_price']" position="before">
-      <div class="text-info oe_subdescription oe_shadow" t-field="product.description_sale"/>
-      <div class="text-info oe_subdescription" t-field="product.description_sale"/>
+<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 category else 'active' "><a t-att-href="keep('/shop',category=0)">All Products</a></li>
+          <t t-foreach="categories" t-as="c">
+              <t t-call="website_sale.categories_recursive"/>
+          </t>
+      </ul>
+  </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3 hidden-xs</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
   </xpath>
 </template>
 
-<!-- Add to cart button-->
-
-<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
-  <xpath expr="//div[@class='product_price']" position="inside">
-      <form action="/shop/add_cart/" method="post" style="display: inline-block;">
-          <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
-          <button type="submit" class="fa fa-shopping-cart"/>
+<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-att-action="keep('shop',attrib=0)" class="attributes" method="get">
+          <ul class="nav nav-pills nav-stacked mt16">
+              <t t-foreach="attributes" t-as="a">
+                  <li t-if="a.value_ids">
+                      <div t-field="a.name"/>
+                      <ul class="nav nav-pills nav-stacked">
+                          <t t-foreach="a.value_ids" t-as="v">
+                              <li t-att-class="'active' if v.id in attrib_set else ''">
+                                  <label style="margin: 0 20px;">
+                                      <input type="checkbox" name="attrib" t-att-value="v.id" t-att-checked="'checked' if v.id in attrib_set else ''"/>
+                                      <span style="font-weight: normal" t-field="v.name"/>
+                                  </label>
+                              </li>
+                          </t>
+                      </ul>
+                  </li>
+              </t>
+          </ul>
       </form>
   </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3 hidden-xs</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
+  </xpath>
 </template>
 
-<!-- List view of products -->
-
-<template id="list_view" inherit_option_id="website_sale.products" name="List View">
+<template id="products_list_view" inherit_option_id="website_sale.products" name="List View">
   <xpath expr="//div[@id='products_grid']//table" position="replace">
     <t t-foreach="products" t-as="product">
       <div class="oe_product oe_list oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
-        <t t-call="website_sale.products_cart"/>
+        <t t-call="website_sale.products_item"/>
       </div>
     </t>
   </xpath>
 </template>
 
-
-<!-- product -->
-<template id="404">
-  <t t-call="website.layout">
-      <div id="wrap">
-          <div class="oe_structure oe_empty">
-              <div class="container">
-                  <h1 class="mt32">Product not found!</h1>
-                  <p>Sorry, this product is not available anymore.</p>
-                  <p><a t-attf-href="/shop/">Return to the product list.</a></p>
-              </div>
-          </div>
-      </div>
-  </t>
-</template>
+<!-- /shop/product product page -->
 
 <template id="product" name="Product">
   <t t-call="website.layout">
@@ -272,14 +303,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-att-href="keep(category=0)" onclick="history.go(-1); return false;">Products</a></li>
+                    <li t-if="category"><a t-att-href="keep()" 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-att-action="keep(search=0)" method="get" class="pull-right">
+                  <t t-call="website_sale.search"/>
               </form>
             </div>
             <div class="col-sm-4" groups="base.group_sale_manager">
@@ -298,17 +329,14 @@
             </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
                 <h1 t-field="product.name">Product Name</h1>
 
-                <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
+                <form action="/shop/cart/update" class="js_add_cart_json" method="POST">
                     <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
                     <t t-if="len(product.product_variant_ids) &gt; 1">
                         <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
                             <input type="radio" name="product_id" t-att-value="variant_id.id" t-att-checked="variant_id == product.product_variant_ids[0] or None"/>
                             <t t-esc="variant_id.variants or ''">Standard</t>
                             <span class="badge" t-if="variant_id.price_extra">
-                                <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{
-                                             "widget": "monetary",
-                                             "display_currency": "website.pricelist_id.currency_id"
-                                         }'/>
+                                <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/>
                             </span>
                         </label>
                     </t>
@@ -318,17 +346,11 @@
                             <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
                             <span class="text-danger" style="text-decoration: line-through;"
                               t-field="product.product_variant_ids[0].lst_price"
-                              t-field-options='{
-                                 "widget": "monetary",
-                                 "display_currency": "website.pricelist_id.currency_id"
-                             }'/><br/>
+                              t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/><br/>
                             </t>
                             <b class="oe_price"
                               t-field="product.product_variant_ids[0].price"
-                              t-field-options='{
-                                 "widget": "monetary",
-                                 "display_currency": "website.pricelist_id.currency_id"
-                             }'/>
+                              t-field-options='{ "widget": "monetary", "display_currency": "pricelist.currency_id" }'/>
                         </h4>
                     </div>
                     <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
@@ -349,21 +371,18 @@
   </t>
 </template>
 
-<!-- Product option: related / recommended products -->
-<template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
+<template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Alternative Products">
   <xpath expr="//div[@id='product_full_description']" position="after">
-      <div class="container mt32" t-if="product.recommended_products()">
-          <h3>Customers who have bought this product also bought:</h3>
+      <div class="container mt32" t-if="product.alternative_product_ids">
+          <h3>Suggested alternatives:</h3>
           <div class='row mt16' style="margin-left: 15px !important;">
-          <t t-foreach="product.recommended_products()" t-as="product">
+          <t t-foreach="product.alternative_product_ids" t-as="product">
               <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>
                   <div class='mt16 text-center'>
                       <span t-field="product.image_small" t-field-options='{"widget": "image", "class": "img-rounded shadow" }'/>
                       <h5>
-                          <a t-attf-href="/shop/product/#{ slug(product) }/"
-                             style="display: block">
-                              <span t-field='product.name'
-                                    style="display: block"/>
+                          <a t-attf-href="/shop/product/#{ slug(product) }/" style="display: block">
+                              <span t-field='product.name' style="display: block"/>
                           </a>
                       </h5>
                   </div>
@@ -374,19 +393,18 @@
   </xpath>
 </template>
 
-<!-- Product option: attributes -->
 <template id="product_attributes" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Product attributes" groups="product.group_product_attributes">
 <xpath expr="//p[@t-field='product.description_sale']" position="after">
   <hr t-if="product.attribute_lines"/>
   <p class="text-muted">
-    <t t-set="attr" t-value="None"/>
-    <t t-foreach="product.attribute_lines" t-as="attribute"><br t-if="attr and attribute.attribute_id.id != attr"/><t t-if="attribute.attribute_id.id != attr"><span t-field="attribute.attribute_id"/>: </t><t t-if="attribute.attribute_id.id == attr">, </t><t t-if="attribute.attribute_id.type == 'distinct'"><span t-field="attribute.value_id"/></t><t t-if="attribute.attribute_id.type == 'float'"><span t-field="attribute.value"/></t><t t-set="attr" t-value="attribute.attribute_id.id"/></t>
+    <t t-foreach="product.attribute_lines" t-as="l">
+        <span t-field="l.attribute_id.name"/>: <span t-field="l.value_id.name"/> <br/>
+    </t>
   </p>
 </xpath>
 </template>
 
-<!-- Product options: OpenChatter -->
-<template id="product_option_openchatter" inherit_option_id="website_sale.product" name="Discussion">
+<template id="product_comment" inherit_option_id="website_sale.product" name="Discussion">
     <xpath expr="//div[@t-field='product.website_description']" position="after">
         <hr class="mb32"/>
         <section class="container">
@@ -431,8 +449,7 @@
                     </li>
                 </ul>
                 <div class="css_editable_mode_hidden">
-                    <form id="comment" t-attf-action="/shop/product/#{product.id}/comment"
-                            method="POST">
+                    <form id="comment" t-attf-action="/shop/product/comment/#{product.id}" method="POST">
                         <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
                         <div class="pull-left mb32" style="width: 75%%">
                             <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
@@ -445,9 +462,9 @@
     </xpath>
 </template>
 
-<!-- Page Shop my cart -->
+<!-- /shop/cart -->
 
-<template id="mycart" name="Your Cart">
+<template id="cart" name="Shopping Cart">
   <t t-call="website.layout">
       <t t-set="head">
           <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
@@ -465,11 +482,11 @@
           </ul>
           <h1 class="mb32">Shopping Cart</h1>
           <div class="row">
-              <div class="col-md-8 col-sm-9 oe_mycart">
+              <div class="col-md-8 col-sm-9 oe_cart">
                   <div t-if="not website_sale_order or not website_sale_order.website_order_line" class="well well-lg">
                       Your cart is empty!
                   </div>
-                  <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.website_order_line">
+                  <table class='table table-striped table-condensed' id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
                       <thead>
                           <tr>
                               <th colspan="2" width="100">Product</th>
@@ -508,14 +525,14 @@
                               <td>
                                   <div class="input-group">
                                       <span class="input-group-addon">
-                                          <a t-attf-href="../change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
+                                          <a t-attf-href="/shop/cart/update?product_id={{ line.product_id.id }&amp;add_qty=-1" class="mb8 js_add_cart_json">
                                               <i class="fa fa-minus"></i>
                                           </a>
                                       </span>
                                       <input type="text" class="js_quantity form-control"
                                           t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
                                       <span class="input-group-addon">
-                                          <a t-attf-href="../change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
+                                          <a t-attf-href="/shop/cart/update?product_id={{ line.product_id.id }&amp;add_qty=1" class="mb8 float_left js_add_cart_json">
                                               <i class="fa fa-plus"></i>
                                           </a>
                                       </span>
@@ -550,79 +567,8 @@
   </t>
 </template>
 
-
-<template id="continue_shopping" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Continue Shopping Button">
-  <xpath expr="//a[@href='/shop/checkout/']" position="before">
-    <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
-  </xpath>
-</template>
-
-
-<!-- Page Shop -->
-
-<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">
-              <t t-call="website_sale.categories_recursive"/>
-          </t>
-      </ul>
-  </xpath>
-  <xpath expr="//div[@id='products_grid_before']" position="attributes">
-      <attribute name="class">col-md-3 hidden-xs</attribute>
-  </xpath>
-  <xpath expr="//div[@id='products_grid']" position="attributes">
-      <attribute name="class">col-md-9</attribute>
-  </xpath>
-</template>
-
-<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">
-          <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">
-                <t t-if="attribute_id.visible">
-                  <li t-if="attribute_id.value_ids and attribute_id.type == 'distinct'">
-                      <div t-field="attribute_id.name"/>
-                      <ul class="nav nav-pills nav-stacked">
-                          <t t-foreach="attribute_id.value_ids" t-as="value_id">
-                              <li t-att-class="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'active' or ''">
-                                  <label style="margin: 0 20px;">
-                                      <input type="checkbox" t-att-name="'att-%s-%s' % (attribute_id.id, value_id.id)"
-                                          t-att-checked="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'checked' or ''"/>
-                                      <span style="font-weight: normal" t-field="value_id.name"/>
-                                  </label>
-                              </li>
-                          </t>
-                      </ul>
-                  </li>
-                  <li t-if="attribute_id.type == 'float' and attribute_id.float_min != attribute_id.float_max">
-                      <div t-field="attribute_id.name"/>
-                      <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
-                      <div style="margin: 0 20px;" class="js_slider"
-                        t-att-data-id="attribute_id.id"
-                        t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
-                        t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
-                        t-att-data-min="attribute_id.float_min"
-                        t-att-data-max="attribute_id.float_max"></div>
-                  </li>
-                </t>
-              </t>
-          </ul>
-      </form>
-  </xpath>
-  <xpath expr="//div[@id='products_grid_before']" position="attributes">
-      <attribute name="class">col-md-3 hidden-xs</attribute>
-  </xpath>
-  <xpath expr="//div[@id='products_grid']" position="attributes">
-      <attribute name="class">col-md-9</attribute>
-  </xpath>
-</template>
-
-<template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
-  <xpath expr="//table[@id='mycart_products']" position="after">
+<template id="suggested_products_list" inherit_id="website_sale.cart" inherit_option_id="website_sale.cart" name="Suggested Products in my cart">
+  <xpath expr="//table[@id='cart_products']" position="after">
       <table t-if="suggested_products" class='table table-striped table-condensed'>
           <colgroup>
               <col width="80"/>
@@ -666,7 +612,7 @@
                        }'/>
                   </td>
                   <td class="text-center">
-                      <form action="/shop/add_cart/" method="post">
+                      <form action="/shop/cart/update" method="post">
                           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
                           <button type="submit" class="btn btn-link"><strong>Add to Cart</strong></button>
                       </form>
@@ -677,7 +623,13 @@
   </xpath>
 </template>
 
-<template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
+<template id="continue_shopping" inherit_id="website_sale.cart" inherit_option_id="website_sale.cart" name="Continue Shopping Button">
+  <xpath expr="//a[@href='/shop/checkout/']" position="before">
+    <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
+  </xpath>
+</template>
+
+<template id="reduction_code" inherit_option_id="website_sale.cart" name="Reduction Code">
   <xpath expr="//div[@id='right_column']" position="inside">
       <h4>Coupon Code</h4>
       <p>
@@ -694,8 +646,7 @@
   </xpath>
 </template>
 
-
-<!-- Page confirm my cart -->
+<!-- /shop/checkout -->
 
 <template id="checkout">
   <t t-call="website.layout">
@@ -708,7 +659,7 @@
     <div id="wrap">
       <div class="container oe_website_sale">
           <ul class="wizard pull-right">
-              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li><a href="/shop/cart" class="text-success">Review Order<span class="chevron"></span></a></li>
               <li class="text-primary">Shipping &amp; Billing<span class="chevron"></span></li>
               <li class="text-muted">Payment<span class="chevron"></span></li>
               <li class="text-muted">Confirmation<span class="chevron"></span></li>
@@ -717,7 +668,7 @@
           <form action="/shop/confirm_order/" method="post">
 
           <div class="row">
-          <div class="col-md-8 oe_mycart">
+          <div class="col-md-8 oe_cart">
               <h3 class="page-header mt16">Billing Information
                   <small groups="base.group_public"> or
                       <a class='btn btn-primary' t-if="not partner" t-attf-href="/web?redirect=#{ request.httprequest.url }">Sign in</a>
@@ -829,7 +780,7 @@
               <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
           </div>
           <div class="col-lg-offset-1 col-lg-3 text-muted">
-              <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
+              <h3 class="page-header mt16">Your Order <small><a href="/shop/cart"><span class="fa fa-arrow-right"/> change</a></small></h3>
               <div class="row">
                   <div class="col-sm-6 text-right">Subtotal:</div>
                   <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
@@ -855,6 +806,8 @@
   </t>
 </template>
 
+<!-- /shop/payment -->
+
 <template id="payment">
   <t t-call="website.layout">
       <t t-set="head">
@@ -868,15 +821,15 @@
         <div class="container oe_website_sale">
 
           <ul class="wizard pull-right">
-              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li><a href="/shop/cart" class="text-success">Review Order<span class="chevron"></span></a></li>
               <li><a href="/shop/checkout" class="text-success">Shipping &amp; Billing<span class="chevron"></span></a></li>
               <li class="text-primary">Payment<span class="chevron"></span></li>
               <li class="text-muted">Confirmation<span class="chevron"></span></li>
           </ul>
           <h1 class="mb32">Validate Order</h1>
           <div class="row">
-          <div class="col-lg-8 col-sm-9 oe_mycart">
-              <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.website_order_line">
+          <div class="col-lg-8 col-sm-9 oe_cart">
+              <table class='table table-striped table-condensed' id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
                   <thead>
                       <tr>
                           <th colspan="2" width="80">Product</th>
@@ -997,7 +950,7 @@
           </ul>
           <h1 class="mb32">Order <em t-field="order.name"/> Confirmed</h1>
           <div class="row">
-              <div class="col-md-8 oe_mycart">
+              <div class="col-md-8 oe_cart">
                   <h2>Thank you for your order.</h2>
                   <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
                   </div>
@@ -1033,7 +986,7 @@
 <!-- Page Shop my cart and payment total -->
 
 <template id="total">
-    <table class='pull-right mb16' id="mycart_total" t-if="website_sale_order">
+    <table class='pull-right mb16' id="cart_total" t-if="website_sale_order">
         <thead>
             <tr width="100" style="border-top: 1px solid #000" id="order_total">
                 <th><h3>Total:</h3></th>
diff --git a/addons/website_sale/views/website_sale_backend.xml b/addons/website_sale/views/views.xml
similarity index 92%
rename from addons/website_sale/views/website_sale_backend.xml
rename to addons/website_sale/views/views.xml
index 863c47ac565..f85be0e4651 100644
--- a/addons/website_sale/views/website_sale_backend.xml
+++ b/addons/website_sale/views/views.xml
@@ -29,6 +29,7 @@
 
             <group name="sale" position="inside">
                 <group name="website" string="Website">
+                    <field name="alternative_product_ids" widget="many2many_tags"/>
                     <field name="accessory_product_ids" widget="many2many_tags"/>
                     <field name="website_style_ids" widget="many2many_tags"/>
                     <field name="website_sequence"/>
@@ -61,15 +62,13 @@
             </xpath>
             <xpath expr="//field[@name='description']" position="before">
                 <group colspan="4" string="Website Options">
+                    <field name="alternative_product_ids" widget="many2many_tags"/>
                     <field name="accessory_product_ids" widget="many2many_tags"/>
                     <field name="website_style_ids" widget="many2many_tags"/>
                     <field colspan="4" name="attribute_lines" nolabel="1" groups="product.group_product_attributes">
                         <tree string="Product attributes" editable="bottom">
                             <field name="attribute_id" on_change="onchange_attribute_id(attribute_id)"/>
-                            <field name="type" invisible="1"/>
-                            <field name="value" attrs="{'required': [('type','=','float')]}"/>
                             <field name="value_id"
-                                attrs="{'required': [('type','=','distinct')]}"
                                 context="{'default_attribute_id': attribute_id}"
                                 domain="[('attribute_id', '=', attribute_id)]"/>
                         </tree>
@@ -87,12 +86,10 @@
         <form string="Product attributes" version="7.0">
           <group>
             <field name="name"/>
-            <field name="type"/>
-            <field name="visible"/>
           </group>
         </form>
       </field>
     </record>
 
- </data>
+</data>
 </openerp>
diff --git a/addons/website_sale_delivery/__openerp__.py b/addons/website_sale_delivery/__openerp__.py
index 2864727e42e..99899ea59a4 100644
--- a/addons/website_sale_delivery/__openerp__.py
+++ b/addons/website_sale_delivery/__openerp__.py
@@ -16,5 +16,5 @@ Delivery Costs
     ],
     'demo': [],
     'qweb': [],
-    'installable': True,
+    'installable': False,
 }
diff --git a/addons/website_sale_delivery/controllers/main.py b/addons/website_sale_delivery/controllers/main.py
index 73da87b549d..e59413a215b 100644
--- a/addons/website_sale_delivery/controllers/main.py
+++ b/addons/website_sale_delivery/controllers/main.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-from openerp.addons.website_sale.controllers.main import Ecommerce
+import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp import SUPERUSER_ID
 
-
-class Ecommerce(Ecommerce):
+class website_sale(openerp.addons.website_sale.controllers.main.website_sale):
 
     @http.route(['/shop/payment/'], type='http', auth="public", website=True, multilang=True)
     def payment(self, **post):
@@ -18,5 +17,5 @@ class Ecommerce(Ecommerce):
             request.registry['website']._check_carrier_quotation(cr,uid,order,carrier_id,context=context)
             return request.redirect("/shop/payment/")
 
-        res = super(Ecommerce, self).payment(**post)
+        res = super(website_sale, self).payment(**post)
         return res
diff --git a/addons/website_sale_delivery/views/website_sale_delivery.xml b/addons/website_sale_delivery/views/website_sale_delivery.xml
index 7f37a0647e3..50200a7344c 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 
-    <template id="mycart_delivery" name="Delivery Costs" inherit_id="website_sale.total">
+    <template id="cart_delivery" name="Delivery Costs" inherit_id="website_sale.total">
         <xpath expr="//tr[@id='order_total_taxes']" position="after">
             <tr class="text-muted" id="order_delivery">
                 <td><abbr title="Delivery will be updated after choosing a new delivery method">Delivery:</abbr></td>

From 1d4f8783b50543efbe44486652dd699284a2a2e9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 21 Feb 2014 18:28:16 +0100
Subject: [PATCH 002/106] [IMP] website_sale: some fix and imp

bzr revid: chm@openerp.com-20140221172816-5bb5l9z2xsvswz8u
---
 addons/website/models/website.py              |  7 ++-
 addons/website/views/website_templates.xml    |  2 +-
 addons/website_event_sale/models/website.py   |  4 +-
 addons/website_sale/controllers/main.py       | 63 +++++++------------
 addons/website_sale/models/sale_order.py      | 43 ++++++-------
 .../static/src/js/website_sale.js             | 32 +++-------
 addons/website_sale/views/templates.xml       | 24 +++----
 7 files changed, 69 insertions(+), 106 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index dbb09d504d3..fb47298463b 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -129,6 +129,10 @@ class website(osv.osv):
             })
     }
 
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool['ir.model.data'].xmlid_to_res_id(cr, openerp.SUPERUSER_ID, 'base.public_user'),
+    }
+    
     # cf. Wizard hack in website_views.xml
     def noop(self, *args, **kwargs):
         pass
@@ -339,8 +343,7 @@ class website(osv.osv):
         """
         router = request.httprequest.app.get_db_router(request.db)
         # Force enumeration to be performed as public user
-        # TODO: use website.user_id instead
-        uid = self.pool['ir.model.data'].xmlid_to_res_id(request.cr, openerp.SUPERUSER_ID, 'base.public_user')
+        uid = request.website.user_id.id
         url_list = []
         for rule in router.iter_rules():
             if not self.rule_is_enumerable(rule):
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 6025e09ee5b..42c0ad46dbb 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -257,7 +257,7 @@
 
 
         <link rel="stylesheet" href="/web/static/lib/select2/select2.css"/>
-        <link rel="stylesheet" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+        <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
         <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
 
         <script type="text/javascript" src="/web/static/lib/select2/select2.js"></script>
diff --git a/addons/website_event_sale/models/website.py b/addons/website_event_sale/models/website.py
index 84315b52a77..83c653a3999 100644
--- a/addons/website_event_sale/models/website.py
+++ b/addons/website_event_sale/models/website.py
@@ -5,6 +5,6 @@ from openerp.osv import orm
 class Website(orm.Model):
     _inherit = 'website'
 
-    def sale_product_domain(self):
+    def sale_product_domain(self, cr, uid, ids, context=None):
         # remove product event from the website content grid and list view (not removed in detail view)
-        return ['&'] + super(Website, self).sale_product_domain() + [('event_ok', '=', False)]
+        return ['&'] + super(Website, self).sale_product_domain(cr, uid, ids, context=context) + [('event_ok', '=', False)]
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 504789ead1b..6e5520f08a4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -104,8 +104,7 @@ class website_sale(http.Controller):
             pricelist = partner.property_product_pricelist
         return pricelist
 
-    @http.route([
-        '/shop/',
+    @http.route(['/shop/',
         '/shop/page/<int:page>/',
         '/shop/category/<model("product.public.category"):category>/',
         '/shop/category/<model("product.public.category"):category>/page/<int:page>/'
@@ -125,6 +124,8 @@ class website_sale(http.Controller):
         attrib_set = set(attrib_values) 
         keep = QueryURL('/shop', category=category and category.id, search=search, attrib=attrib_set)
 
+        if not context.get('pricelist'):
+            context['pricelist'] = int(self.get_pricelist())
         product_obj = pool.get('product.template')
         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)
@@ -166,6 +167,7 @@ class website_sale(http.Controller):
     @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, category='', search='', **kwargs):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
+        category_obj = pool['product.public.category']
 
         if category:
             category = category_obj.browse(request.cr, request.uid, int(category), context=request.context)
@@ -175,11 +177,14 @@ class website_sale(http.Controller):
 
         keep = QueryURL('/shop', category=category and category.id, search=search, attrib=attrib_set)
 
-        category_obj = pool['product.public.category']
         category_ids = category_obj.search(cr, uid, [], context=context)
         category_list = category_obj.name_get(cr, uid, category_ids, context=context)
         category_list = sorted(category_list, key=lambda category: category[1])
 
+        if not context.get('pricelist'):
+            context['pricelist'] = int(self.get_pricelist())
+            product = request.registry.get('product.template').browse(request.cr, request.uid, int(product), context=context)
+
         values = {
             'search': search,
             'category': category,
@@ -216,37 +221,6 @@ class website_sale(http.Controller):
 
         return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
 
-    @http.route(['/shop/mycart/'], type='http', auth="public", website=True, multilang=True)
-    def mycart(self, **post):
-        cr, uid, context = request.cr, request.uid, request.context
-        prod_obj = request.registry.get('product.product')
-
-        # must have a draft sale order with lines at this point, otherwise reset
-        order = self.get_order()
-        if order and order.state != 'draft':
-            request.registry['website'].sale_reset_order(cr, uid, context=context)
-            return request.redirect('/shop/')
-
-        self.get_pricelist()
-
-        suggested_ids = []
-        product_ids = []
-        if order:
-            for line in order.order_line:
-                suggested_ids += [p.id for p in line.product_id and line.product_id.accessory_product_ids or []]
-                product_ids.append(line.product_id.id)
-        suggested_ids = list(set(suggested_ids) - set(product_ids))
-        if suggested_ids:
-            suggested_ids = prod_obj.search(cr, uid, [('id', 'in', suggested_ids)], context=context)
-
-        # select 3 random products
-        suggested_products = []
-        while len(suggested_products) < 3 and suggested_ids:
-            index = random.randrange(0, len(suggested_ids))
-            suggested_products.append(suggested_ids.pop(index))
-
-        context = dict(context or {}, pricelist=request.registry['website'].ecommerce_get_pricelist_id(cr, uid, None, context=context))
-
     @http.route(['/shop/cart'], type='http', auth="public", website=True, multilang=True)
     def cart(self, **post):
         order = request.website.sale_get_order()
@@ -255,20 +229,26 @@ class website_sale(http.Controller):
             'suggested_products': [],
         }
         if order:
-            values['suggested_products'] = order._cart_accessories()
+            if not request.context.get('pricelist'):
+                request.context['pricelist'] = order.pricelist_id.id
+            values['suggested_products'] = order._cart_accessories(context=request.context)
         return request.website.render("website_sale.cart", values)
 
     @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
-    def cart_update(self, product_id, add_qty=None, set_qty=None, **kw):
+    def cart_update(self, product_id, add_qty=0, set_qty=0, **kw):
         cr, uid, context = request.cr, request.uid, request.context
-        request.website.sale_get_order(force_create=1)._cart_update(product_id=product_id, add_qty=add_qty, set_qty=set_qty)
+        request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=add_qty, set_qty=set_qty)
         return request.redirect("/shop/cart")
 
-    @http.route(['/shop/cart/update_json'], type='json', auth="public", website=True, multilang=True)
+    @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, multilang=True)
     def cart_update_json(self, product_id, add_qty=None, set_qty=None):
         order = request.website.sale_get_order(force_create=1)
         quantity = order._cart_update(product_id=product_id, add_qty=add_qty, set_qty=set_qty)
-        return request.website._render("website_sale.total", {'website_sale_order': order}) # FIXME good template
+        return {
+            'quantity': quantity,
+            'cart_quantity': order.cart_quantity,
+            'website_sale.total': request.website._render("website_sale.total", {'website_sale_order': order}) # FIXME good template
+        }
 
     #------------------------------------------------------
     # Checkout
@@ -384,13 +364,12 @@ class website_sale(http.Controller):
         billing_info['parent_id'] = company_id
 
         partner_id = None
-        public_id = request.registry['website'].get_public_user(cr, uid, context)
-        if request.uid != public_id:
+        if request.uid != request.website.user_id.id:
             partner_id = orm_user.browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         elif order.partner_id:
             domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
             user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
-            if not user_ids or public_id not in user_ids:
+            if not user_ids or request.website.user_id.id not in user_ids:
                 partner_id = order.partner_id.id
 
         if partner_id:
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 68425fb9dfe..5e2df03e5cf 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -16,12 +16,19 @@ class payment_transaction(orm.Model):
 class sale_order(osv.Model):
     _inherit = "sale.order"
 
+    def _cart_qty(self, cr, uid, ids, field_name, arg, context=None):
+        res = dict();
+        for order in self.browse(cr, uid, ids, context=context):
+            res[order.id] = int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
+        return res
+
     _columns = {
         'website_order_line': fields.one2many(
             'sale.order.line', 'order_id',
             string='Order Lines displayed on Website', readonly=True,
             help='Order Lines to be displayed on the website. They should not be used for computation purpose.',
         ),
+        'cart_quantity': fields.function(_cart_qty, type='integer', string='Main Menu'),
     }
 
     def _get_website_data(self, cr, uid, order, context):
@@ -30,11 +37,6 @@ class sale_order(osv.Model):
             'order': order
         }
 
-    # TODO make a function field instead
-    def _cart_qty(self, cr, uid, ids, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            return int(sum(l.product_uom_qty for l in (order.website_order_line or [])))
-
     def _cart_find_product_line(self, cr, uid, ids, product_id=None, context=None):
         for so in self.browse(cr, uid, ids, context=context):
             line_id = None
@@ -43,7 +45,7 @@ class sale_order(osv.Model):
                 line_id = line_ids[0]
             return line_id
 
-    def _cart_update(self, cr, uid, ids, product_id=None, add_qty=None, set_qty=None, context=None):
+    def _cart_update(self, cr, uid, ids, product_id=None, add_qty=0, set_qty=0, context=None):
         """ Add or set product quantity, add_qty can be negative """
         for so in self.browse(cr, uid, ids, context=context):
             sol = self.pool.get('sale.order.line')
@@ -60,17 +62,15 @@ class sale_order(osv.Model):
                     context=context
                 )['value']
                 values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
-                # Maybe it's better to do this ? create and then link ?
-                #order_line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
-                #self.write(cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=context)
-                so.write({'order_line': (0, 0, values)})
-                line_id = so._cart_find_product_line(product_id)
+                values['product_id'] = product_id
+                values['order_id'] = so.id
+                line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
 
             # compute new quantity
             if set_qty:
                 quantity = set_qty
             else:
-                quantity = line_id.product_uom_qty + add_qty
+                quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + add_qty
 
             # Remove zero of negative lines
             if quantity <= 0:
@@ -91,9 +91,9 @@ class sale_order(osv.Model):
 
     def _cart_accessories(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
-            s = set(j for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
+            s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
             product_ids = random.sample(s, min(len(s),3))
-            return self.pool['product.product'].browse(cr, uid, product_ids, context=context)
+            return self.pool['product.template'].browse(cr, uid, product_ids, context=context)
 
 class website(orm.Model):
     _inherit = 'website'
@@ -135,10 +135,10 @@ class website(orm.Model):
                 if pricelist_ids:
                     pricelist_id = pricelist_ids[0]
                     values = {'pricelist_id': pricelist_id}
-                    values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
-                    order.write(values)
-                    for line in order.order_line:
-                        sale_order._cart_update(cr, uid, order.product_id, add_qty=0)
+                    values.update(sale_order.onchange_pricelist_id(pricelist_id, None)['value'])
+                    sale_order.write(values)
+                    for line in sale_order.order_line:
+                        sale_order._cart_update(cr, uid, sale_order.product_id, add_qty=0)
 
             # check for change of partner_id ie after signup
             if sale_order.partner_id.id !=  partner.id:
@@ -163,11 +163,4 @@ class website(orm.Model):
             'sale_transaction_id': False,
         })
 
-    def preprocess_request(self, cr, uid, ids, request, context=None):
-        request.context.update({
-            'sale_order': self.sale_get_order(cr, uid, ids, context=context),
-            #'website_sale_transaction': self.ecommerce_get_current_transaction(cr, uid, context=context)
-        })
-        return super(website, self).preprocess_request(cr, uid, ids, request, context=None)
-
 # vim:et:
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 8de601c1b35..67b38bce1f9 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -24,14 +24,16 @@ $(document).ready(function () {
         var $input = $(this);
         var value = parseInt($input.val(), 10);
         if (isNaN(value)) value = 0;
-        openerp.jsonRpc("/shop/set_cart_json/", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
+        openerp.jsonRpc("/shop/cart/update_json", 'call', {
+            'product_id': parseInt($input.data('id'),10),
+            'set_qty': value})
             .then(function (data) {
-                if (!data) {
+                if (!data.quantity) {
                     location.reload();
                     return;
                 }
-                set_my_cart_quantity(data[1]);
-                $input.val(data[0]);
+                set_my_cart_quantity(data.cart_quantity);
+                $input.val(data.quantity);
             });
     });
 
@@ -39,25 +41,9 @@ $(document).ready(function () {
     $('.oe_website_sale a.js_add_cart_json').on('click', function (ev) {
         ev.preventDefault();
         var $link = $(ev.currentTarget);
-        var href = $link.attr("href");
-
-        var add_cart = href.match(/add_cart\/([0-9]+)/);
-        var product_id = add_cart && +add_cart[1] || false;
-
-        var change_cart = href.match(/change_cart\/([0-9]+)/);
-        var order_line_id = change_cart && +change_cart[1] || false;
-        openerp.jsonRpc("/shop/add_cart_json/", 'call', {
-                'product_id': product_id,
-                'order_line_id': order_line_id,
-                'remove': $link.is('[href*="remove"]')})
-            .then(function (data) {
-                if (!data[0]) {
-                    location.reload();
-                }
-                set_my_cart_quantity(data[1]);
-                $link.parents(".input-group:first").find(".js_quantity").val(data[0]);
-                $('#cart_total').replaceWith(data[3]);
-            });
+        var $input = $link.parent().parent().find("input");
+        $input.val(($link.has(".fa-minus").length ? -1 : 1) + parseFloat($input.val(),10));
+        $input.change();
         return false;
     });
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 1b0e5c84654..979b29c9e93 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -19,17 +19,18 @@
 
 <template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
   <xpath expr="//header//ul[@id='top_menu']/li" position="before">
-      <li t-att-class="'' if sale_order and sale_order._cart_qty() else 'hidden'">
+      <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
+      <li t-att-class="'' if website_sale_order and website_sale_order.cart_quantity else 'hidden'">
           <a href="/shop/cart/">
               <i class="fa fa-shopping-cart"></i>
-              My cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="sale_order and sale_order._cart_qty() or ''"/>
+              My cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="website_sale_order and website_sale_order.cart_quantity or ''"/>
           </a>
       </li>
   </xpath>
 </template>
 
 <template id="search" name="Search hidden fields">
-  <input t-if="search.get('filters')" type="hidden" name="filters" t-att-value="search.get('filters')"/>
+  <input t-if="attrib" type="hidden" name="filters" t-att-value="attrib"/>
   <div class="input-group">
     <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search"/>
     <span class="input-group-btn">
@@ -495,6 +496,7 @@
           <h1 class="mb32">Shopping Cart</h1>
           <div class="row">
               <div class="col-md-8 col-sm-9 oe_cart">
+                  <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
                   <div t-if="not website_sale_order or not website_sale_order.website_order_line" class="well well-lg">
                       Your cart is empty!
                   </div>
@@ -537,14 +539,14 @@
                               <td>
                                   <div class="input-group">
                                       <span class="input-group-addon">
-                                          <a t-attf-href="/shop/cart/update?product_id={{ line.product_id.id }&amp;add_qty=-1" class="mb8 js_add_cart_json">
+                                          <a t-attf-href="#" class="mb8 js_add_cart_json">
                                               <i class="fa fa-minus"></i>
                                           </a>
                                       </span>
                                       <input type="text" class="js_quantity form-control"
-                                          t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
+                                          t-att-data-id="line.product_id.id" t-att-value="int(line.product_uom_qty)"/>
                                       <span class="input-group-addon">
-                                          <a t-attf-href="/shop/cart/update?product_id={{ line.product_id.id }&amp;add_qty=1" class="mb8 float_left js_add_cart_json">
+                                          <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
                                               <i class="fa fa-plus"></i>
                                           </a>
                                       </span>
@@ -597,28 +599,28 @@
               <tr t-foreach="suggested_products" t-as="product">
 
                   <td>
-                      <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                      <a t-attf-href="/shop/product/#{ slug(product) }/">
                           <span t-field="product.image_small"
                                 t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                       </a>
                   </td>
                   <td>
                       <div>
-                          <a t-attf-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                          <a t-attf-href="/shop/product/#{ slug(product) }/">
                               <strong t-field="product.name"/>
                           </a>
                       </div>
                       <div class="text-muted" t-field="product.description_sale"/>
                   </td>
                   <td>
-                      <t t-if="abs(product.lst_price - product.price) &gt; 0.2">
+                      <t t-if="abs(product.product_variant_ids[0].lst_price - product.product_variant_ids[0].price) &gt; 0.2">
                         <del class="text-danger"
-                          t-field="product.lst_price" t-field-options='{
+                          t-field="product.product_variant_ids[0].lst_price" t-field-options='{
                                "widget": "monetary",
                                "display_currency": "website.pricelist_id.currency_id"
                           }'/>&amp;nbsp;
                       </t>
-                      <span t-field="product.price"  t-field-options='{
+                      <span t-field="product.product_variant_ids[0].price"  t-field-options='{
                            "widget": "monetary",
                            "display_currency": "website.pricelist_id.currency_id"
                        }'/>

From 91f64613aebd8fb79be3d3a99798f219e4fc95cb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 24 Feb 2014 11:00:50 +0100
Subject: [PATCH 003/106] [FIX] website_sale: int(category)

bzr revid: chm@openerp.com-20140224100050-eyye9p5oug3cnq87
---
 addons/website_sale/controllers/main.py | 8 +++-----
 addons/website_sale/views/templates.xml | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 6e5520f08a4..1956c0383fc 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-import random
-import simplejson
 import werkzeug
 
 from openerp import SUPERUSER_ID
@@ -116,13 +114,13 @@ class website_sale(http.Controller):
         if search:
             domain += ['|', ('name', 'ilike', search), ('description', 'ilike', search)]
         if category:
-            domain += [('product_variant_ids.public_categ_id', 'child_of', category.id)]
+            domain += [('product_variant_ids.public_categ_id', 'child_of', int(category))]
 
         attrib_values = map(int,request.httprequest.args.getlist('attrib'))
         if attrib_values:
             domain += [('attribute_lines.value_id', 'in', attrib_values)]
         attrib_set = set(attrib_values) 
-        keep = QueryURL('/shop', category=category and category.id, search=search, attrib=attrib_set)
+        keep = QueryURL('/shop', category=category and int(category), search=search, attrib=attrib_set)
 
         if not context.get('pricelist'):
             context['pricelist'] = int(self.get_pricelist())
@@ -147,7 +145,7 @@ class website_sale(http.Controller):
 
         values = {
             'search': search,
-            'category': category and category.id,
+            'category': category and int(category),
             'attrib_set': attrib_set,
             'pager': pager,
             'pricelist': self.get_pricelist(),
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 979b29c9e93..0546eb41b93 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -28,9 +28,9 @@
       </li>
   </xpath>
 </template>
-
 <template id="search" name="Search hidden fields">
   <input t-if="attrib" type="hidden" name="filters" t-att-value="attrib"/>
+  <input t-if="category" type="hidden" name="category" t-att-value="int(category or 0)"/>
   <div class="input-group">
     <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search"/>
     <span class="input-group-btn">

From 73853f07444727ffa57160c4693f34e9ba6af196 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 24 Feb 2014 17:20:41 +0100
Subject: [PATCH 004/106] [IMP] website_sale: checkout_values, checkout_parse
 and checkout_form_validate

bzr revid: chm@openerp.com-20140224162041-rii00m5hs1e4jadz
---
 addons/website_sale/controllers/main.py | 91 ++++++++++++-------------
 1 file changed, 43 insertions(+), 48 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 1956c0383fc..372f0203882 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -276,78 +276,73 @@ class website_sale(http.Controller):
         states_ids = state_orm.search(cr, SUPERUSER_ID, [], context=context)
         states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
 
-        info = CheckoutInfo()
+        checkout = {}
+        shipping = False
+        if request.uid != request.website.user_id.id:
+            partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
+            checkout.update( self.checkout_parse("billing", partner) )
+
+            shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
+            if shipping_ids:
+                shipping = orm_user.browse(cr, SUPERUSER_ID, request.uid, context)
+                checkout.update( self.checkout_parse("shipping", shipping) )
 
         values = {
             'countries': countries,
             'states': states,
-            'checkout': info.empty(),
-            'shipping': post.get("shipping_different"),
+            'checkout': checkout.empty(),
+            'shipping': bool(shipping),
             'error': {},
         }
         return values
 
-    def checkout_form_parse(self):
-        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+    mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
+    optional_billing_fields = ["company", "state_id"]
+    mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
+    optional_shipping_fields = ["state_id"]
 
-        #public_id = request.registry['website'].get_public_user(cr, uid, context)
-        #if not request.uid == public_id:
-        #    partner = orm_user.browse(cr, uid, uid, context).partner_id
-
-        #elif order.partner_id:
-        #    domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
-
-        #    user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
-        #    if not user_ids or public_id not in user_ids:
-        #        partner = orm_partner.browse(cr, SUPERUSER_ID, order.partner_id.id, context)
-
-        #if partner:
-        #    partner_info = info.from_partner(partner)
-        #    checkout.update(partner_info)
-        #    shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
-        #    if shipping_ids:
-        #        values['shipping'] = "true"
-        #        shipping_partner = orm_partner.browse(cr, SUPERUSER_ID, shipping_ids[0], context)
-        #        checkout.update(info.from_partner(shipping_partner, address_type='shipping'))
-
-        # from query
-        query = dict((field_name, post[field_name]) for field_name in self.all_fields() if post[field_name])
-
-        # fill with partner
+    def checkout_parse(self, address_type, data):
+        """ data is a dict OR a partner browse record
+        """
+        # set mandatory and optional fields
         assert address_type in ('billing', 'shipping')
         if address_type == 'billing':
+            all_fields = self.mandatory_billing_fields + self.optional_billing_fields
             prefix = ''
         else:
+            all_fields = self.mandatory_shipping_fields + self.optional_shipping_fields
             prefix = 'shipping_'
-        result = dict((prefix + field_name, getattr(partner, field_name)) for field_name in self.string_billing_fields if getattr(partner, field_name))
-        result[prefix + 'state_id'] = partner.state_id and partner.state_id.id or ''
-        result[prefix + 'country_id'] = partner.country_id and partner.country_id.id or ''
-        result[prefix + 'company'] = partner.parent_id and partner.parent_id.name or ''
-        return result
 
-        mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-        optional_billing_fields = ["company", "state_id"]
-        #string_billing_fields = ["name", "phone", "email", "street", "city", "zip"]
+        # set data
+        if isinstance(data, dict):
+            query = dict((field_name, data[field_name]) for field_name in all_fields if data[field_name])
+        else:
+            query = dict((prefix + field_name, getattr(data, field_name)) for field_name in all_fields if getattr(data, field_name))
+            if data.parent_id:
+                query[prefix + 'company'] = data.parent_id.name
 
-        mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
-        optional_shipping_field = ["state_id"]
-        #string_shipping_fields = ["name", "phone", "street", "city", "zip"]
+        if query.get(prefix + 'state_id'):
+            query[prefix + 'state_id'] = int(query[prefix + 'state_id'])
+        if query.get(prefix + 'country_id'):
+            query[prefix + 'country_id'] = int(query[prefix + 'country_id'])
 
-        return values
+        return query
 
-    def checkout_form_validate(self):
+    def checkout_form_validate(self, data):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
         # Validation
-        for field_name in info.mandatory_billing_fields:
-            if not checkout[field_name]:
+        error = dict()
+        for field_name in self.mandatory_billing_fields:
+            if not data.get(field_name):
                 error[field_name] = 'missing'
-        if post.get("shipping_different"):
-            for field_name in info.mandatory_shipping_fields:
-                if not checkout[field_name]:
+
+        if data.get("shipping_different"):
+            for field_name in self.mandatory_shipping_fields:
+                if not data.get(field_name):
                     error[field_name] = 'missing'
 
-        return values
+        return error
 
     def checkout_form_save(self):
 

From a5ca54fd5b068a0d7997aa17c5e454fe529f2694 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 25 Feb 2014 11:09:34 +0100
Subject: [PATCH 005/106] [IMP] website_sale: fixed and refactored until
 shop/payment

bzr revid: chm@openerp.com-20140225100934-74v930kb4suxb9x4
---
 addons/website_sale/controllers/main.py | 111 ++++++++++++++----------
 addons/website_sale/views/templates.xml |   5 +-
 2 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 372f0203882..2ff14ddee82 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -264,7 +264,7 @@ class website_sale(http.Controller):
         if tx and tx.state != 'draft':
             return request.redirect('/shop/payment/confirmation/%s' % order.id)
 
-    def checkout_values(self):
+    def checkout_values(self, data=None):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')
@@ -277,21 +277,34 @@ class website_sale(http.Controller):
         states = state_orm.browse(cr, SUPERUSER_ID, states_ids, context)
 
         checkout = {}
-        shipping = False
-        if request.uid != request.website.user_id.id:
-            partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
-            checkout.update( self.checkout_parse("billing", partner) )
+        if not data:
+            if request.uid != request.website.user_id.id:
+                partner = orm_user.browse(cr, SUPERUSER_ID, request.uid, context).partner_id
+                checkout.update( self.checkout_parse("billing", partner) )
 
-            shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
-            if shipping_ids:
-                shipping = orm_user.browse(cr, SUPERUSER_ID, request.uid, context)
-                checkout.update( self.checkout_parse("shipping", shipping) )
+                shipping_ids = orm_partner.search(cr, SUPERUSER_ID, [("parent_id", "=", partner.id), ('type', "=", 'delivery')], limit=1, context=context)
+                if shipping_ids:
+                    shipping = orm_user.browse(cr, SUPERUSER_ID, request.uid, context)
+                    checkout.update( self.checkout_parse("shipping", shipping) )
+                    checkout['shipping_different'] = True
+            else:
+                order = request.website.sale_get_order(force_create=1, context=context)
+                if order.partner_id:
+                    domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
+                    user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
+                    if not user_ids or request.website.user_id.id not in user_ids:
+                        checkout.update( self.checkout_parse("billing", order.partner_id) )
+        else:
+            checkout = self.checkout_parse('billing', data)
+            if data.get("shipping_different"):
+                checkout.update(self.checkout_parse('shipping', data))
+                checkout["shipping_different"] = True
 
         values = {
             'countries': countries,
             'states': states,
-            'checkout': checkout.empty(),
-            'shipping': bool(shipping),
+            'checkout': checkout,
+            'shipping_different': checkout.get('shipping_different'),
             'error': {},
         }
         return values
@@ -315,9 +328,10 @@ class website_sale(http.Controller):
 
         # set data
         if isinstance(data, dict):
-            query = dict((field_name, data[field_name]) for field_name in all_fields if data[field_name])
+            query = dict((field_name, data[field_name]) for field_name in all_fields if data.get(field_name))
         else:
-            query = dict((prefix + field_name, getattr(data, field_name)) for field_name in all_fields if getattr(data, field_name))
+            query = dict((prefix + field_name, getattr(data, field_name))
+                for field_name in all_fields if field_name != "company" and getattr(data, field_name))
             if data.parent_id:
                 query[prefix + 'company'] = data.parent_id.name
 
@@ -344,18 +358,27 @@ class website_sale(http.Controller):
 
         return error
 
-    def checkout_form_save(self):
+    def checkout_form_save(self, post):
+        cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
+
+        order = request.website.sale_get_order(force_create=1, context=context)
+
+        orm_partner = registry.get('res.partner')
+        orm_user = registry.get('res.users')
+        order_line_obj = request.registry.get('sale.order')
+
+        billing_info = self.checkout_parse('billing', post)
 
         # save partner for order
-        company_name = checkout['company']
         company_id = None
-        if post['company']:
+        if billing_info.get('company'):
+            company_name = billing_info['company']
             company_ids = orm_partner.search(cr, SUPERUSER_ID, [("name", "ilike", company_name), ('is_company', '=', True)], context=context)
             company_id = (company_ids and company_ids[0]) or orm_partner.create(cr, SUPERUSER_ID, {'name': company_name, 'is_company': True}, context)
 
-        billing_info = dict((k, v) for k,v in checkout.items() if "shipping_" not in k and k != "company")
         billing_info['parent_id'] = company_id
 
+        # set partner_id
         partner_id = None
         if request.uid != request.website.user_id.id:
             partner_id = orm_user.browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
@@ -365,29 +388,25 @@ class website_sale(http.Controller):
             if not user_ids or request.website.user_id.id not in user_ids:
                 partner_id = order.partner_id.id
 
+        # save partner informations
         if partner_id:
             orm_partner.write(cr, SUPERUSER_ID, [partner_id], billing_info, context=context)
         else:
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
+        # set shipping_id
         shipping_id = None
         if post.get('shipping_different'):
-            shipping_info = {
-                'phone': post['shipping_phone'],
-                'zip': post['shipping_zip'],
-                'street': post['shipping_street'],
-                'city': post['shipping_city'],
-                'name': post['shipping_name'],
-                'email': post['email'],
-                'type': 'delivery',
-                'parent_id': partner_id,
-                'country_id': post['shipping_country_id'],
-                'state_id': post['shipping_state_id'],
-            }
-            domain = [(key, '_id' in key and '=' or 'ilike', '_id' in key and value and int(value) or value)
-                      for key, value in shipping_info.items() if key in info.mandatory_billing_fields + ["type", "parent_id"]]
+            shipping_info = self.checkout_parse('shipping', post)
+            shipping_info = dict ((field_name, shipping_info[field_name]) for field_name in shipping_info.items())
+            shipping_info['type'] = 'delivery'
+            shipping_info['parent_id'] = partner_id
 
+            domain = [(key, '_id' in key and '=' or 'ilike', value)
+                      for key, value in shipping_info.items() if key in self.mandatory_shipping_fields + ["type", "parent_id"]]
             shipping_ids = orm_partner.search(cr, SUPERUSER_ID, domain, context=context)
+            
+            # save shipping informations
             if shipping_ids:
                 shipping_id = shipping_ids[0]
                 orm_partner.write(cr, SUPERUSER_ID, [shipping_id], shipping_info, context)
@@ -409,38 +428,32 @@ class website_sale(http.Controller):
     def checkout(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
-        order = request.website.sale_get_order(cr, uid, force_create=1, context=context)
+        order = request.website.sale_get_order(force_create=1, context=context)
 
-        redirection = checkout_redirection(order)
+        redirection = self.checkout_redirection(order)
         if redirection:
             return redirection
 
         values = self.checkout_values()
-        checkout = values['checkout']
 
-        partner = None
         return request.website.render("website_sale.checkout", values)
 
     @http.route(['/shop/confirm_order'], type='http', auth="public", website=True, multilang=True)
     def confirm_order(self, **post):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
-        order_line_obj = request.registry.get('sale.order')
 
-        order = request.website.sale_get_order(cr, uid, context=context)
+        order = request.website.sale_get_order(context=context)
 
-        redirection = checkout_redirection(order)
+        redirection = self.checkout_redirection(order)
         if redirection:
             return redirection
 
-        values = self.checkout_values()
-        checkout = values['checkout']
-        checkout.update(post)
-        error = values['error']
-
-        if error:
+        values = self.checkout_values(post)
+        values["error"] = self.checkout_form_validate(values["checkout"])
+        if values["error"]:
             return request.website.render("website_sale.checkout", values)
 
-        checkout_form_save()
+        self.checkout_form_save(values["checkout"])
 
         return request.redirect("/shop/payment")
 
@@ -462,7 +475,9 @@ class website_sale(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         payment_obj = request.registry.get('payment.acquirer')
 
-        redirection = checkout_redirection(order)
+        order = request.website.sale_get_order(context=context)
+
+        redirection = self.checkout_redirection(order)
         if redirection:
             return redirection
 
@@ -515,7 +530,7 @@ class website_sale(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
         payment_obj = request.registry.get('payment.acquirer')
         transaction_obj = request.registry.get('payment.transaction')
-        order = request.website.sale_get_order(cr, uid, context=context)
+        order = request.website.sale_get_order(context=context)
 
         if not order or not order.order_line or acquirer_id is None:
             return request.redirect("/shop/checkout/")
@@ -607,7 +622,7 @@ class website_sale(http.Controller):
             tx = request.registry['payment.transaction'].browse(cr, uid, transaction_id, context=context)
 
         if sale_order_id is None:
-            order = request.website.sale_get_order(cr, uid, context=context)
+            order = request.website.sale_get_order(context=context)
         else:
             order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
             assert order.website_session_id == request.httprequest.session['website_session_id']
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 0546eb41b93..bf8cc68b766 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -743,12 +743,12 @@
 
                   <div class="form-group col-lg-6" groups="sale.group_delivery_invoice_address">
                       <label>
-                          <input type="checkbox" name="shipping_different" t-att-checked="shipping"/>
+                          <input type="checkbox" name="shipping_different" t-att-checked="checkout.get('shipping_different')"/>
                           Ship to a different address
                       </label>
                   </div>
               </div>
-              <div class="js_shipping row mb16" t-att-style="not shipping and 'display:none' or ''" groups="sale.group_delivery_invoice_address">
+              <div class="js_shipping row mb16" t-att-style="not checkout.get('shipping_different') and 'display:none' or ''" groups="sale.group_delivery_invoice_address">
                   <h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
 
                   <div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
@@ -795,6 +795,7 @@
           </div>
           <div class="col-lg-offset-1 col-lg-3 col-md-3 text-muted">
               <h3 class="page-header mt16">Your Order <small><a href="/shop/cart"><span class="fa fa-arrow-right"/> change</a></small></h3>
+              <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
               <div class="row">
                   <div class="col-sm-6 text-right">Subtotal:</div>
                   <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{

From 07b5cb38a0d79a0a0bb0317ed91d50842b6f1562 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 25 Feb 2014 13:57:36 +0100
Subject: [PATCH 006/106] [IMP] website_sale: refactoring: website_event_sale:
 fix for refactoring

bzr revid: chm@openerp.com-20140225125736-dni507i8xpz1b61j
---
 addons/website_event_sale/controllers/main.py |  6 +-
 .../website_event_sale/models/sale_order.py   |  2 +-
 addons/website_sale/controllers/main.py       | 65 +++++++++----------
 addons/website_sale/models/sale_order.py      | 14 ++--
 .../static/src/js/website_sale.js             | 13 ++--
 addons/website_sale/views/templates.xml       |  1 +
 6 files changed, 45 insertions(+), 56 deletions(-)

diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index cc9ddc0ad56..7f65c2aa615 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -27,17 +27,15 @@ from openerp.tools.translate import _
 
 
 class website_event(website_event):
+
     @http.route(['/event/add_cart'], type='http', auth="public", website=True, multilang=True)
     def add_cart(self, event_id, **post):
         user_obj = request.registry['res.users']
         order_line_obj = request.registry.get('sale.order.line')
         ticket_obj = request.registry.get('event.event.ticket')
         order_obj = request.registry.get('sale.order')
-        website = request.registry['website']
 
-        order = website.ecommerce_get_current_order(request.cr, request.uid, context=request.context)
-        if not order:
-            order = website.ecommerce_get_new_order(request.cr, request.uid, context=request.context)
+        order = request.website.sale_get_order(force_create=1)
 
         partner_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid,
                                      context=request.context).partner_id.id
diff --git a/addons/website_event_sale/models/sale_order.py b/addons/website_event_sale/models/sale_order.py
index b94111ac868..50854c5f798 100644
--- a/addons/website_event_sale/models/sale_order.py
+++ b/addons/website_event_sale/models/sale_order.py
@@ -12,7 +12,7 @@ class sale_order_line(osv.osv):
             return super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product_id, context=context)
 
         order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
-        assert order_line.order_id.website_session_id == request.httprequest.session['website_session_id']
+        assert order_line.order_id.id == request.session.get('sale_last_order_id')
 
         product = product_id and self.pool.get('product.product').browse(cr, uid, product_id, context=context) or order_line.product_id
         res = super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product.id, context=context)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 2ff14ddee82..09bb12ef210 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -207,18 +207,6 @@ class website_sale(http.Controller):
                 context=dict(context, mail_create_nosubcribe=True))
         return werkzeug.utils.redirect(request.httprequest.referrer + "#comments")
 
-    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
-    def add_product(self, name=None, category=0, **post):
-        if not name:
-            name = _("New Product")
-        Product = request.registry.get('product.product')
-        product_id = Product.create(request.cr, request.uid, {
-            'name': name, 'public_categ_id': category
-        }, context=request.context)
-        product = Product.browse(request.cr, request.uid, product_id, context=request.context)
-
-        return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
-
     @http.route(['/shop/cart'], type='http', auth="public", website=True, multilang=True)
     def cart(self, **post):
         order = request.website.sale_get_order()
@@ -245,12 +233,15 @@ class website_sale(http.Controller):
         return {
             'quantity': quantity,
             'cart_quantity': order.cart_quantity,
-            'website_sale.total': request.website._render("website_sale.total", {'website_sale_order': order}) # FIXME good template
+            'website_sale.total': request.website._render("website_sale.total", {
+                    'website_sale_order': request.website.sale_get_order()
+                })
         }
 
     #------------------------------------------------------
     # Checkout
     #------------------------------------------------------
+
     def checkout_redirection(self, order):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
@@ -454,6 +445,7 @@ class website_sale(http.Controller):
             return request.website.render("website_sale.checkout", values)
 
         self.checkout_form_save(values["checkout"])
+        request.session['sale_last_order_id'] = order.id
 
         return request.redirect("/shop/payment")
 
@@ -494,10 +486,10 @@ class website_sale(http.Controller):
         values.update(request.registry.get('sale.order')._get_website_data(cr, uid, order, context))
 
         # fetch all registered payment means
-        if tx:
-            acquirer_ids = [tx.acquirer_id.id]
-        else:
-            acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True)], context=context)
+        # if tx:
+        #     acquirer_ids = [tx.acquirer_id.id]
+        # else:
+        acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True)], context=context)
         values['acquirers'] = payment_obj.browse(cr, uid, acquirer_ids, context=context)
         render_ctx = dict(context, submit_class='btn btn-primary', submit_txt='Pay Now')
         for acquirer in values['acquirers']:
@@ -536,7 +528,7 @@ class website_sale(http.Controller):
             return request.redirect("/shop/checkout/")
 
         # find an already existing transaction
-        tx = context.get('website_sale_transaction')
+        tx = request.website.sale_get_transaction()
         if not tx:
             tx_id = transaction_obj.create(cr, SUPERUSER_ID, {
                 'acquirer_id': acquirer_id,
@@ -547,8 +539,8 @@ class website_sale(http.Controller):
                 'reference': order.name,
                 'sale_order_id': order.id,
             }, context=context)
-            request.httprequest.session['website_sale_transaction_id'] = tx_id
-        elif tx and tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
+            request.session['sale_transaction_id'] = tx_id
+        elif tx.state == 'draft':  # button cliked but no more info -> rewrite on tx or create a new one ?
             tx.write({
                 'acquirer_id': acquirer_id,
             })
@@ -562,7 +554,7 @@ class website_sale(http.Controller):
         cr, uid, context = request.cr, request.uid, request.context
 
         order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
-        assert order.website_session_id == request.httprequest.session['website_session_id']
+        assert order.id == request.session.get('sale_last_order_id')
 
         if not order:
             return {
@@ -617,7 +609,7 @@ class website_sale(http.Controller):
         sale_order_obj = request.registry['sale.order']
 
         if transaction_id is None:
-            tx = context.get('website_sale_transaction')
+            tx = request.website.sale_get_transaction()
         else:
             tx = request.registry['payment.transaction'].browse(cr, uid, transaction_id, context=context)
 
@@ -625,7 +617,7 @@ class website_sale(http.Controller):
             order = request.website.sale_get_order(context=context)
         else:
             order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
-            assert order.website_session_id == request.httprequest.session['website_session_id']
+            assert order.id == request.session.get('sale_last_order_id')
 
         if not tx or not order:
             return request.redirect('/shop/')
@@ -643,12 +635,12 @@ class website_sale(http.Controller):
             sale_order_obj.action_cancel(cr, SUPERUSER_ID, [order.id], context=request.context)
 
         # clean context and session, then redirect to the confirmation page
-        request.registry['website'].ecommerce_reset(cr, uid, context=context)
+        request.website.sale_reset(context=context)
 
-        return request.redirect('/shop/confirmation/%s' % order.id)
+        return request.redirect('/shop/confirmation/')
 
-    @http.route(['/shop/confirmation/<int:sale_order_id>'], type='http', auth="public", website=True, multilang=True)
-    def payment_confirmation(self, sale_order_id, **post):
+    @http.route(['/shop/confirmation/'], type='http', auth="public", website=True, multilang=True)
+    def payment_confirmation(self, **post):
         """ End of checkout process controller. Confirmation is basically seing
         the status of a sale.order. State at this point :
 
@@ -658,10 +650,11 @@ class website_sale(http.Controller):
         """
         cr, uid, context = request.cr, request.uid, request.context
 
-        order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
-        assert order.website_session_id == request.httprequest.session['website_session_id']
-
-        request.registry['website']._ecommerce_change_pricelist(cr, uid, None, context=context or {})
+        sale_order_id = request.session.get('sale_last_order_id')
+        if sale_order_id:
+            order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
+        else:
+            return request.redirect('/shop/')
 
         return request.website.render("website_sale.confirmation", {'order': order})
 
@@ -669,12 +662,14 @@ class website_sale(http.Controller):
     # Edit
     #------------------------------------------------------
 
-    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
-    def add_product(self, name="New Product", category=0, **post):
+    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    def add_product(self, name=None, category=0, **post):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
-        product_obj = pool['product.product']
+        if not name:
+            name = _("New Product")
+        product_obj = request.registry.get('product.product')
         product_id = product_obj.create(cr, uid, { 'name': name, 'public_categ_id': category }, context=context)
-        product = product_obj.browse(cr, uid, product_id, context=request.context)
+        product = product_obj.browse(cr, uid, product_id, context=context)
 
         return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
 
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 5e2df03e5cf..3f1de739218 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -107,7 +107,7 @@ class website(orm.Model):
         return [("sale_ok", "=", True)]
 
     def sale_get_order(self, cr, uid, ids, force_create=False, code=None, context=None):
-        sale_order_id = request.httprequest.session.get('sale_order_id')
+        sale_order_id = request.session.get('sale_order_id')
         sale_order = None
         # create so if needed
         if not sale_order_id and (force_create or code):  
@@ -122,7 +122,7 @@ class website(orm.Model):
                 sale_order_id = self.pool['sale.order'].create(cr, SUPERUSER_ID, values, context=context)
                 values = self.pool['sale.order'].onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
                 self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
-                request.httprequest.session['sale_order_id'] = sale_order_id
+                request.session['sale_order_id'] = sale_order_id
         if sale_order_id:
             # TODO cache partner_id session
             partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
@@ -146,19 +146,19 @@ class website(orm.Model):
                 self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
         return sale_order
 
-    def sale_get_transaction(self, cr, uid, context=None):
+    def sale_get_transaction(self, cr, uid, ids, context=None):
         transaction_obj = self.pool.get('payment.transaction')
-        tx_id = request.httprequest.session.get('payment_transaction_id')
+        tx_id = request.session.get('sale_transaction_id')
         if tx_id:
             tx_ids = transaction_obj.search(cr, uid, [('id', '=', tx_id), ('state', 'not in', ['cancel'])], context=context)
             if tx_ids:
                 return transaction_obj.browse(cr, uid, tx_ids[0], context=context)
             else:
-                request.httprequest.session['payment_transaction_id'] = False
+                request.session['sale_transaction_id'] = False
         return False
 
-    def sale_reset(self, cr, uid, context=None):
-        request.httprequest.session.update({
+    def sale_reset(self, cr, uid, ids, context=None):
+        request.session.update({
             'sale_order_id': False,
             'sale_transaction_id': False,
         })
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 67b38bce1f9..8b3c83d3a73 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -12,14 +12,6 @@ $(document).ready(function () {
         $(ev.currentTarget).parents(".thumbnail").toggleClass("disabled");
     });
 
-    function set_my_cart_quantity(qty) {
-        var $q = $(".my_cart_quantity");
-        $q.parent().parent().removeClass("hidden", !qty);
-        $q.html(qty)
-            .hide()
-            .fadeIn(600);
-    }
-
     $(".oe_website_sale .oe_cart input.js_quantity").change(function () {
         var $input = $(this);
         var value = parseInt($input.val(), 10);
@@ -32,8 +24,11 @@ $(document).ready(function () {
                     location.reload();
                     return;
                 }
-                set_my_cart_quantity(data.cart_quantity);
+                var $q = $(".my_cart_quantity");
+                $q.parent().parent().removeClass("hidden", !data.quantity);
+                $q.html(data.cart_quantity).hide().fadeIn(600);
                 $input.val(data.quantity);
+                $("#cart_total").replaceWith(data['website_sale.total']);
             });
     });
 
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index bf8cc68b766..48b778c29e9 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -844,6 +844,7 @@
           <h1 class="mb32">Validate Order</h1>
           <div class="row">
           <div class="col-lg-8 col-sm-9 oe_cart">
+              <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
               <table class='table table-striped table-condensed' id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
                   <thead>
                       <tr>

From 8f7c96d5be133a845541ae4c5b6b036ffdc80200 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 25 Feb 2014 14:02:01 +0100
Subject: [PATCH 007/106] [REM] website_event_sale: remove sale_order.py

bzr revid: chm@openerp.com-20140225130201-3fu69q8tsbb9fdbu
---
 addons/website_event_sale/models/__init__.py  |  1 -
 .../website_event_sale/models/sale_order.py   | 22 -------------------
 2 files changed, 23 deletions(-)
 delete mode 100644 addons/website_event_sale/models/sale_order.py

diff --git a/addons/website_event_sale/models/__init__.py b/addons/website_event_sale/models/__init__.py
index b0e3f323f8c..498013de541 100644
--- a/addons/website_event_sale/models/__init__.py
+++ b/addons/website_event_sale/models/__init__.py
@@ -1,3 +1,2 @@
 import product
-import sale_order
 import website
diff --git a/addons/website_event_sale/models/sale_order.py b/addons/website_event_sale/models/sale_order.py
deleted file mode 100644
index 50854c5f798..00000000000
--- a/addons/website_event_sale/models/sale_order.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-from openerp.osv import osv
-from openerp import SUPERUSER_ID
-from openerp.addons.web.http import request
-
-
-class sale_order_line(osv.osv):
-    _inherit = "sale.order.line"
-
-    def _recalculate_product_values(self, cr, uid, ids, product_id=0, context=None):
-        if not ids:
-            return super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product_id, context=context)
-
-        order_line = self.browse(cr, SUPERUSER_ID, ids[0], context=context)
-        assert order_line.order_id.id == request.session.get('sale_last_order_id')
-
-        product = product_id and self.pool.get('product.product').browse(cr, uid, product_id, context=context) or order_line.product_id
-        res = super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product.id, context=context)
-        if product.event_type_id and order_line.event_ticket_id and order_line.event_ticket_id.price != product.lst_price:
-            res.update({'price_unit': order_line.event_ticket_id.price})
-
-        return res

From 77c484351c14d9e88f17875b540bd6db8a80b2b7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 25 Feb 2014 14:51:00 +0100
Subject: [PATCH 008/106] [FIX] website_sale: import test_ui

bzr revid: chm@openerp.com-20140225135100-l526befjiyhnv5gp
---
 addons/website_sale/tests/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/tests/__init__.py b/addons/website_sale/tests/__init__.py
index bf8ba6321ad..f2f75d42d2c 100644
--- a/addons/website_sale/tests/__init__.py
+++ b/addons/website_sale/tests/__init__.py
@@ -1 +1 @@
-import test_ui
+import test_sale_process

From da4cf6d55c933ce8de12c03bd2c599e41e8521ba Mon Sep 17 00:00:00 2001
From: "Amit Vora (OpenERP)" <voraamitr@gmail.com>
Date: Wed, 26 Feb 2014 11:46:23 +0530
Subject: [PATCH 009/106] [FIX] override copy method to avoid duplicate child
 ids

lp bug: https://launchpad.net/bugs/1256437 fixed

bzr revid: voraamitr@gmail.com-20140226061623-255kguaytkex9a8m
---
 addons/hr/hr.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 2cdb964f45f..4f262fae7a1 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -211,7 +211,14 @@ class hr_employee(osv.osv):
     }
 
     _order='name_related'
-
+    
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'child_ids': False})
+        return super(hr_employee, self).copy(cr, uid, ids, default, context=context)
+        
     def create(self, cr, uid, data, context=None):
         employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
         try:
@@ -302,6 +309,13 @@ class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
 
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'employee_ids': False})
+        return super(res_users, self).copy(cr, uid, ids, default, context=context)
+    
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
 

From 5de677208c8db5589f20727d987b729dc9545976 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 18 Mar 2014 15:06:11 +0530
Subject: [PATCH 010/106] [FIX] [saas-3/trunk] IE9: Bad display of the address
 on a contact attached to a company

lp bug: https://launchpad.net/bugs/1293523 fixed

bzr revid: psa@tinyerp.com-20140318093611-iis8wfuzgqclngnm
---
 openerp/addons/base/res/res_partner_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index a0e32ab83bd..02bee3d719e 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -156,10 +156,12 @@
 
                             <label for="street" string="Address"/>
                             <div>
-                                <field name="use_parent_address" class="oe_edit_only oe_inline"
-                                       on_change="onchange_address(use_parent_address, parent_id)"
-                                       attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
-                                <label for="use_parent_address" class="oe_edit_only" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                <div class="oe_edit_only">
+                                    <field name="use_parent_address" class="oe_inline"
+                                           on_change="onchange_address(use_parent_address, parent_id)"
+                                           attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                    <label for="use_parent_address" attrs="{'invisible': [('parent_id','=', False),('use_parent_address','=',False)]}"/>
+                                </div>
                                 <button name="open_parent" type="object" string="(edit company address)" class="oe_link oe_edit_only"
                                         attrs="{'invisible': ['|',('parent_id','=', False),('use_parent_address','=',False)]}"/>
                                 <field name="street" placeholder="Street..."  attrs="{'readonly': [('use_parent_address','=',True)]}"/>

From 046f19fa9baaab2c97a1b474f53e47dd749e63b1 Mon Sep 17 00:00:00 2001
From: Maxime Chambreuil <maxime.chambreuil@savoirfairelinux.com>
Date: Sat, 22 Mar 2014 20:08:05 -0400
Subject: [PATCH 011/106] [IMP] Add fr_CA translation

bzr revid: maxime.chambreuil@savoirfairelinux.com-20140323000805-vead0t0gcgkqzthh
---
 openerp/tools/misc.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py
index bb61fe2e7a2..d251b47bb68 100644
--- a/openerp/tools/misc.py
+++ b/openerp/tools/misc.py
@@ -459,6 +459,7 @@ ALL_LANGUAGES = {
         'fa_IR': u'Persian / فارس',
         'fi_FI': u'Finnish / Suomi',
         'fr_BE': u'French (BE) / Français (BE)',
+        'fr_CA': u'French (CA) / Français (CA)',
         'fr_CH': u'French (CH) / Français (CH)',
         'fr_FR': u'French / Français',
         'gl_ES': u'Galician / Galego',

From 81cfa028e563e0ecddfb4fc61c37110f9743acfb Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 10 Apr 2014 16:35:24 +0200
Subject: [PATCH 012/106] [FIX] website_sale: checkout shipping address; remove
 url terminal slash

bzr revid: chm@openerp.com-20140410143524-zrrsh6zvvrg9ntgz
---
 addons/website_sale/controllers/main.py       | 30 +++++------
 addons/website_sale/models/sale_order.py      |  6 ++-
 .../static/src/js/website.tour.sale.js        | 12 ++---
 addons/website_sale/views/templates.xml       | 50 ++++++-------------
 4 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 784dd0e0ddd..febec4280f4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -109,10 +109,10 @@ class website_sale(http.Controller):
             pricelist = partner.property_product_pricelist
         return pricelist
 
-    @http.route(['/shop/',
-        '/shop/page/<int:page>/',
-        '/shop/category/<model("product.public.category"):category>/',
-        '/shop/category/<model("product.public.category"):category>/page/<int:page>/'
+    @http.route(['/shop',
+        '/shop/page/<int:page>',
+        '/shop/category/<model("product.public.category"):category>',
+        '/shop/category/<model("product.public.category"):category>/page/<int:page>'
     ], type='http', auth="public", website=True, multilang=True)
     def shop(self, page=0, category=None, search='', **post):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
@@ -133,7 +133,7 @@ class website_sale(http.Controller):
             context['pricelist'] = int(self.get_pricelist())
         product_obj = pool.get('product.template')
         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)
+        pager = request.website.pager(url="/shop", total=product_count, page=page, step=PPG, scope=7, url_args=post)
         product_ids = product_obj.search(cr, uid, domain, limit=PPG+10, offset=pager['offset'], order='website_published desc, website_sequence desc', context=context)
         products = product_obj.browse(cr, uid, product_ids, context=context)
 
@@ -169,7 +169,7 @@ class website_sale(http.Controller):
 
         return request.website.render("website_sale.products", values)
 
-    @http.route(['/shop/product/<model("product.template"):product>/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/product/<model("product.template"):product>'], type='http', auth="public", website=True, multilang=True)
     def product(self, product, category='', search='', **kwargs):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
         category_obj = pool['product.public.category']
@@ -253,7 +253,7 @@ class website_sale(http.Controller):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
         # must have a draft sale order with lines at this point, otherwise reset
-        if order.state != 'draft':
+        if not order or order.state != 'draft':
             request.website_sale_reset(cr, uid, context=context)
             return request.redirect('/shop')
 
@@ -326,7 +326,7 @@ class website_sale(http.Controller):
 
         # set data
         if isinstance(data, dict):
-            query = dict((field_name, data[field_name]) for field_name in all_fields if data.get(field_name))
+            query = dict((prefix + field_name, data[prefix + field_name]) for field_name in all_fields if data.get(prefix + field_name))
         else:
             query = dict((prefix + field_name, getattr(data, field_name))
                 for field_name in all_fields if field_name != "company" and getattr(data, field_name))
@@ -351,6 +351,7 @@ class website_sale(http.Controller):
 
         if data.get("shipping_different"):
             for field_name in self.mandatory_shipping_fields:
+                field_name = 'shipping_' + field_name
                 if not data.get(field_name):
                     error[field_name] = 'missing'
 
@@ -447,6 +448,7 @@ class website_sale(http.Controller):
             return redirection
 
         values = self.checkout_values(post)
+
         values["error"] = self.checkout_form_validate(values["checkout"])
         if values["error"]:
             return request.website.render("website_sale.checkout", values)
@@ -532,7 +534,7 @@ class website_sale(http.Controller):
         order = request.website.sale_get_order(context=context)
 
         if not order or not order.order_line or acquirer_id is None:
-            return request.redirect("/shop/checkout/")
+            return request.redirect("/shop/checkout")
 
         # find an already existing transaction
         tx = request.website.sale_get_transaction()
@@ -627,7 +629,7 @@ class website_sale(http.Controller):
             assert order.id == request.session.get('sale_last_order_id')
 
         if not tx or not order:
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
 
         if not order.amount_total or tx.state == 'done':
             # confirm the quotation
@@ -644,9 +646,9 @@ class website_sale(http.Controller):
         # clean context and session, then redirect to the confirmation page
         request.website.sale_reset(context=context)
 
-        return request.redirect('/shop/confirmation/')
+        return request.redirect('/shop/confirmation')
 
-    @http.route(['/shop/confirmation/'], type='http', auth="public", website=True, multilang=True)
+    @http.route(['/shop/confirmation'], type='http', auth="public", website=True, multilang=True)
     def payment_confirmation(self, **post):
         """ End of checkout process controller. Confirmation is basically seing
         the status of a sale.order. State at this point :
@@ -661,7 +663,7 @@ class website_sale(http.Controller):
         if sale_order_id:
             order = request.registry['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
         else:
-            return request.redirect('/shop/')
+            return request.redirect('/shop')
 
         return request.website.render("website_sale.confirmation", {'order': order})
 
@@ -669,7 +671,7 @@ class website_sale(http.Controller):
     # Edit
     #------------------------------------------------------
 
-    @http.route(['/shop/add_product/'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
+    @http.route(['/shop/add_product'], type='http', auth="user", methods=['POST'], website=True, multilang=True)
     def add_product(self, name=None, category=0, **post):
         cr, uid, context, pool = request.cr, request.uid, request.context, request.registry
         if not name:
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 3f1de739218..a2d8a464118 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -124,10 +124,12 @@ class website(orm.Model):
                 self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
                 request.session['sale_order_id'] = sale_order_id
         if sale_order_id:
+            sale_order = self.pool['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
+            if not sale_order.exists():
+                request.session['sale_order_id'] = None
+                return None
             # TODO cache partner_id session
             partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
-            sale_order = self.pool['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
-
             # check for change of pricelist with a coupon
             # TODO cache sale_order.pricelist_id.code in session
             if code and code != sale_order.pricelist_id.code:
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index f85a8b22ad7..0ffc6f6e966 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -22,11 +22,11 @@
                 {
                     title:     "click on add to cart",
                     waitFor:   'input[name="product_id"]:eq(1)[checked]',
-                    element:   'form[action="/shop/add_cart/"] .btn',
+                    element:   'form[action="/shop/add_cart"] .btn',
                 },
                 {
                     title:     "add suggested",
-                    element:   'form[action="/shop/add_cart/"] .btn-link:contains("Add to Cart")',
+                    element:   'form[action="/shop/add_cart"] .btn-link:contains("Add to Cart")',
                 },
                 {
                     title:     "add one more iPod",
@@ -47,19 +47,19 @@
                 {
                     title:     "go to checkout",
                     waitFor:   '#mycart_products input.js_quantity[value=1]',
-                    element:   'a[href="/shop/checkout/"]',
+                    element:   'a[href="/shop/checkout"]',
                 },
                 {
                     title:     "test with input error",
-                    element:   'form[action="/shop/confirm_order/"] .btn:contains("Confirm")',
+                    element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                     onload: function (tour) {
                         $("input[name='phone']").val("");
                     },
                 },
                 {
                     title:     "test without input error",
-                    waitFor:   'form[action="/shop/confirm_order/"] .has-error',
-                    element:   'form[action="/shop/confirm_order/"] .btn:contains("Confirm")',
+                    waitFor:   'form[action="/shop/confirm_order"] .has-error',
+                    element:   'form[action="/shop/confirm_order"] .btn:contains("Confirm")',
                     onload: function (tour) {
                         if ($("input[name='name']").val() === "")
                             $("input[name='name']").val("website_sale-test-shoptest");
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 8f18cc04747..0737fcb3bf4 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -21,7 +21,7 @@
   <xpath expr="//header//ul[@id='top_menu']/li" position="before">
       <t t-set="website_sale_order" t-value="website.sale_get_order()"/>
       <li t-att-class="'' if website_sale_order and website_sale_order.cart_quantity else 'hidden'">
-          <a href="/shop/cart/">
+          <a href="/shop/cart">
               <i class="fa fa-shopping-cart"></i>
               My cart <sup t-attf-class="my_cart_quantity label label-primary" t-esc="website_sale_order and website_sale_order.cart_quantity or ''"/>
           </a>
@@ -46,7 +46,7 @@
               <div class="container">
                   <h1 class="mt32">Product not found!</h1>
                   <p>Sorry, this product is not available anymore.</p>
-                  <p><a t-attf-href="/shop/">Return to the product list.</a></p>
+                  <p><a t-attf-href="/shop">Return to the product list.</a></p>
               </div>
           </div>
       </div>
@@ -87,8 +87,9 @@
 
 <template id="products_description" inherit_option_id="website_sale.products_item" name="Product Description">
   <xpath expr="//div[@class='product_price']" position="before">
-      <div class="text-info oe_subdescription oe_shadow" t-field="product.description_sale"/>
-      <div class="text-info oe_subdescription" t-field="product.description_sale"/>
+      <div class="text-info oe_subdescription" contenteditable="false">
+        <div itemprop="description" t-field="product.description_sale"></div>
+      </div>
   </xpath>
 </template>
 
@@ -96,7 +97,7 @@
   <xpath expr="//div[@class='product_price']" position="inside">
       <form action="/shop/cart/update" method="post" style="display: inline-block;">
           <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
-          <button type="submit" class="fa fa-shopping-cart"/>
+          <a class="btn btn-default btn-xs fa fa-shopping-cart a-submit"/>
       </form>
   </xpath>
 </template>
@@ -230,27 +231,8 @@
   </t>
 </template>
 
-<!-- Product Description-->
-
-<template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
-  <xpath expr="//div[@class='product_price']" position="before">
-      <div class="text-info oe_subdescription" contenteditable="false">
-        <div itemprop="description" t-field="product.description_sale"></div>
-      </div>
-  </xpath>
-</template>
-
 <!-- Add to cart button-->
 
-<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
-  <xpath expr="//div[@class='product_price']" position="inside">
-      <form action="/shop/add_cart/" method="post" style="display: inline-block;">
-          <input name="product_id" t-att-value="product.product_variant_ids[0].id" type="hidden"/>
-          <a class="btn btn-default btn-xs fa fa-shopping-cart a-submit"/>
-      </form>
-  </xpath>
-</template>
-
 <template id="categories_recursive" name="Category list">
   <li t-att-class="'active' if c.id == category else ''">
       <a t-att-href="keep('/shop/category/' + slug(c), category=0)" t-field="c.name"></a>
@@ -415,7 +397,7 @@
                   <div class='mt16 text-center'>
                       <span t-field="product.image_small" t-field-options='{"widget": "image", "class": "img-rounded shadow" }'/>
                       <h5>
-                          <a t-attf-href="/shop/product/#{ slug(product) }/" style="display: block">
+                          <a t-attf-href="/shop/product/#{ slug(product) }" style="display: block">
                               <span t-field='product.name' style="display: block"/>
                           </a>
                       </h5>
@@ -538,7 +520,7 @@
                               </td>
                               <td t-if="line.product_id.product_tmpl_id">
                                   <div>
-                                      <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                      <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
                                           <strong t-field="line.name"/>
                                       </a>
                                   </div>
@@ -579,7 +561,7 @@
                   </table>
                   <t t-call="website_sale.total"/>
                   <div class="clearfix"/>
-                  <a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
+                  <a t-if="website_sale_order and website_sale_order.website_order_line" href="/shop/checkout" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
                   <div class="oe_structure"/>
               </div>
               <div class="col-lg-3 col-lg-offset-1 col-sm-3 col-md-3 text-muted" id="right_column">
@@ -620,14 +602,14 @@
               <tr t-foreach="suggested_products" t-as="product">
 
                   <td>
-                      <a t-attf-href="/shop/product/#{ slug(product) }/">
+                      <a t-attf-href="/shop/product/#{ slug(product) }">
                           <span t-field="product.image_small"
                                 t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                       </a>
                   </td>
                   <td>
                       <div>
-                          <a t-attf-href="/shop/product/#{ slug(product) }/">
+                          <a t-attf-href="/shop/product/#{ slug(product) }">
                               <strong t-field="product.name"/>
                           </a>
                       </div>
@@ -659,7 +641,7 @@
 </template>
 
 <template id="continue_shopping" inherit_id="website_sale.cart" inherit_option_id="website_sale.cart" name="Continue Shopping Button">
-  <xpath expr="//a[@href='/shop/checkout/']" position="before">
+  <xpath expr="//a[@href='/shop/checkout']" position="before">
     <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
   </xpath>
 </template>
@@ -670,7 +652,7 @@
       <p>
           Have a coupon code? Fill in this field and apply.
       </p>
-      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/pricelist/" method="post" class="mb32">
+      <form t-if="website_sale_order and website_sale_order.website_order_line" action="/shop/pricelist" method="post" class="mb32">
           <div class="input-group">
               <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
               <div class="input-group-btn">
@@ -700,7 +682,7 @@
               <li class="text-muted">Confirmation<span class="chevron"></span></li>
           </ul>
           <h1>Your Address</h1>
-          <form action="/shop/confirm_order/" method="post">
+          <form action="/shop/confirm_order" method="post">
 
           <div class="row">
           <div class="col-md-8 oe_cart">
@@ -878,7 +860,7 @@
                       <tr t-foreach="website_sale_order.website_order_line" t-as="line">
                           <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
                           <td t-if="line.product_id.product_tmpl_id">
-                              <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                              <a t-attf-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }">
                                   <span t-field="line.product_id.image_small"
                                         t-field-options='{"widget": "image", "class": "img-rounded"}'/>
                               </a>
@@ -953,7 +935,7 @@
           </div>
           <div class="js_payment mb64 row" t-if="not website_sale_order.amount_total" id="payment_method">
             <div class="col-lg-8 col-sm-8">
-              <form target="_self" action="/shop/payment/validate/" method="post" class="pull-right">
+              <form target="_self" action="/shop/payment/validate" method="post" class="pull-right">
                   <a style="width:100px;" class="btn btn-primary a-submit">
                     <span>Pay Now <span class="fa fa-long-arrow-right"></span></span>
                   </a>

From db080813dffd1441af8bad92a2a554578d814ccf Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 10 Apr 2014 17:13:30 +0200
Subject: [PATCH 013/106] [FIX] website_sale: checkout prefix

bzr revid: chm@openerp.com-20140410151330-md9fq3zg8e6bliok
---
 addons/website_sale/controllers/main.py | 38 +++++++++----------------
 addons/website_sale/models/product.py   |  1 +
 addons/website_sale/views/templates.xml |  6 ++--
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index febec4280f4..cb7ffc0babc 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -308,11 +308,11 @@ class website_sale(http.Controller):
         return values
 
     mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["company", "state_id"]
+    optional_billing_fields = ["company_name", "state_id"]
     mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
     optional_shipping_fields = ["state_id"]
 
-    def checkout_parse(self, address_type, data):
+    def checkout_parse(self, address_type, data, remove_prefix=False):
         """ data is a dict OR a partner browse record
         """
         # set mandatory and optional fields
@@ -328,17 +328,19 @@ class website_sale(http.Controller):
         if isinstance(data, dict):
             query = dict((prefix + field_name, data[prefix + field_name]) for field_name in all_fields if data.get(prefix + field_name))
         else:
-            query = dict((prefix + field_name, getattr(data, field_name))
-                for field_name in all_fields if field_name != "company" and getattr(data, field_name))
+            query = dict((prefix + field_name, getattr(data, field_name)) for field_name in all_fields if getattr(data, field_name))
             if data.parent_id:
-                query[prefix + 'company'] = data.parent_id.name
+                query[prefix + 'company_name'] = data.company_name or data.parent_id.name
 
         if query.get(prefix + 'state_id'):
             query[prefix + 'state_id'] = int(query[prefix + 'state_id'])
         if query.get(prefix + 'country_id'):
             query[prefix + 'country_id'] = int(query[prefix + 'country_id'])
 
-        return query
+        if not remove_prefix:
+            return query
+
+        return dict((field_name, data[prefix + field_name]) for field_name in all_fields if data.get(prefix + field_name))
 
     def checkout_form_validate(self, data):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
@@ -357,7 +359,7 @@ class website_sale(http.Controller):
 
         return error
 
-    def checkout_form_save(self, post):
+    def checkout_form_save(self, checkout):
         cr, uid, context, registry = request.cr, request.uid, request.context, request.registry
 
         order = request.website.sale_get_order(force_create=1, context=context)
@@ -366,16 +368,7 @@ class website_sale(http.Controller):
         orm_user = registry.get('res.users')
         order_line_obj = request.registry.get('sale.order')
 
-        billing_info = self.checkout_parse('billing', post)
-
-        # save partner for order
-        company_id = None
-        if billing_info.get('company'):
-            company_name = billing_info['company']
-            company_ids = orm_partner.search(cr, SUPERUSER_ID, [("name", "ilike", company_name), ('is_company', '=', True)], context=context)
-            company_id = (company_ids and company_ids[0]) or orm_partner.create(cr, SUPERUSER_ID, {'name': company_name, 'is_company': True}, context)
-
-        billing_info['parent_id'] = company_id
+        billing_info = self.checkout_parse('billing', checkout, True)
 
         # set partner_id
         partner_id = None
@@ -388,27 +381,24 @@ class website_sale(http.Controller):
                 partner_id = order.partner_id.id
 
         # save partner informations
-        if partner_id:
+        if partner_id and request.website.user_id.partner_id.id != partner_id:
             orm_partner.write(cr, SUPERUSER_ID, [partner_id], billing_info, context=context)
         else:
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
         # set shipping_id
         shipping_id = None
-        if post.get('shipping_different'):
-            shipping_info = self.checkout_parse('shipping', post)
-            shipping_info = dict ((field_name, shipping_info[field_name]) for field_name in shipping_info.items())
+        if checkout.get('shipping_different'):
+            shipping_info = self.checkout_parse('shipping', checkout, True)
             shipping_info['type'] = 'delivery'
             shipping_info['parent_id'] = partner_id
 
-            domain = [(key, '_id' in key and '=' or 'ilike', value)
-                      for key, value in shipping_info.items() if key in self.mandatory_shipping_fields + ["type", "parent_id"]]
+            domain = [(key, '_id' in key and '=' or 'ilike', value) for key, value in shipping_info.items()]
             shipping_ids = orm_partner.search(cr, SUPERUSER_ID, domain, context=context)
             
             # save shipping informations
             if shipping_ids:
                 shipping_id = shipping_ids[0]
-                orm_partner.write(cr, SUPERUSER_ID, [shipping_id], shipping_info, context)
             else:
                 shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
 
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index e533f18531d..844639879e1 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -74,6 +74,7 @@ class product_template(osv.Model):
         return res
 
     _columns = {
+        'company_name': fields.char('Company Name'),
         'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
         # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
         'website_message_ids': fields.one2many(
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 0737fcb3bf4..747dea048a0 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -696,9 +696,9 @@
                       <label class="control-label" for="contact_name">Your Name</label>
                       <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
                   </div>
-                  <div t-attf-class="form-group #{error.get('company') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="company" style="font-weight: normal">Your Company</label>
-                      <input type="text" name="company" class="form-control" t-att-value="checkout.get('company')"/>
+                  <div t-attf-class="form-group #{error.get('company_name') and 'has-error' or ''} col-lg-6">
+                      <label class="control-label" for="company_name" style="font-weight: normal">Your Company</label>
+                      <input type="text" name="company_name" class="form-control" t-att-value="checkout.get('company_name')"/>
                   </div>
                   <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
                       <label class="control-label" for="contact_name">Email</label>

From 9932aa3b451d436685b65a613900c7cb644b4172 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 10 Apr 2014 17:37:46 +0200
Subject: [PATCH 014/106] [FIX] website_sale: checkout_parse

bzr revid: chm@openerp.com-20140410153746-kp8rw92j89x0c7vp
---
 addons/website_sale/controllers/main.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index cb7ffc0babc..eb011531ea2 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -326,11 +326,13 @@ class website_sale(http.Controller):
 
         # set data
         if isinstance(data, dict):
-            query = dict((prefix + field_name, data[prefix + field_name]) for field_name in all_fields if data.get(prefix + field_name))
+            query = dict((prefix + field_name, data[prefix + field_name])
+                for field_name in all_fields if data.get(prefix + field_name))
         else:
-            query = dict((prefix + field_name, getattr(data, field_name)) for field_name in all_fields if getattr(data, field_name))
+            query = dict((prefix + field_name, getattr(data, field_name))
+                for field_name in all_fields if field_name != "company_name" and getattr(data, field_name))
             if data.parent_id:
-                query[prefix + 'company_name'] = data.company_name or data.parent_id.name
+                query[prefix + 'company_name'] = data.parent_id.name
 
         if query.get(prefix + 'state_id'):
             query[prefix + 'state_id'] = int(query[prefix + 'state_id'])

From d77b000aff4f842b111eaea035b33350ac3e287d Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 23 Apr 2014 14:14:11 +0200
Subject: [PATCH 015/106] [FIX] Don't reset an existing but empty
 mail.catchall.domain

bzr revid: stefan@therp.nl-20140423121411-l3qyijr6fnsexrtn
---
 addons/mail/res_config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1c720..0e2e362d07b 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -33,14 +33,14 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
-        if not alias_domain:
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", default=None, context=context)
+        if alias_domain is None:
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
             try:
                 alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
             except Exception:
                 pass
-        return {'alias_domain': alias_domain}
+        return {'alias_domain': alias_domain or False}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")

From cee3cabaa866bd0a32eeae37fa38a3e7460aec53 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 25 Apr 2014 15:20:49 +0200
Subject: [PATCH 016/106] [IMP] website_sale: create new shipping address;
 company_name field; fix acquierer image

bzr revid: chm@openerp.com-20140425132049-kg4w68qn07eof47q
---
 addons/website_sale/controllers/main.py | 12 ++----------
 addons/website_sale/models/__init__.py  |  1 +
 addons/website_sale/models/product.py   |  1 -
 addons/website_sale/views/templates.xml |  2 +-
 addons/website_sale/views/views.xml     | 11 +++++++++++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index eb011531ea2..c8f0020bbe4 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -388,21 +388,13 @@ class website_sale(http.Controller):
         else:
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)
 
-        # set shipping_id
+        # create a new shipping partner
         shipping_id = None
         if checkout.get('shipping_different'):
             shipping_info = self.checkout_parse('shipping', checkout, True)
             shipping_info['type'] = 'delivery'
             shipping_info['parent_id'] = partner_id
-
-            domain = [(key, '_id' in key and '=' or 'ilike', value) for key, value in shipping_info.items()]
-            shipping_ids = orm_partner.search(cr, SUPERUSER_ID, domain, context=context)
-            
-            # save shipping informations
-            if shipping_ids:
-                shipping_id = shipping_ids[0]
-            else:
-                shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
+            shipping_id = orm_partner.create(cr, SUPERUSER_ID, shipping_info, context)
 
         order_info = {
             'partner_id': partner_id,
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index b2de3c5753e..ba031ee77da 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -1,3 +1,4 @@
 import product
 import res_config
 import sale_order
+import res_partner
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index e98954ea132..daa2a61c851 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -73,7 +73,6 @@ class product_template(osv.Model):
         return res
 
     _columns = {
-        'company_name': fields.char('Company Name'),
         'attribute_lines': fields.one2many('product.attribute.line', 'product_tmpl_id', 'Product attributes'),
         # TODO FIXME tde: when website_mail/mail_thread.py inheritance work -> this field won't be necessary
         'website_message_ids': fields.one2many(
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 747dea048a0..2831a225733 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -918,7 +918,7 @@
                           <input t-att-value="acquirer.id" type="radio" name="acquirer" t-att-checked="acquirers[0] == acquirer"/>
                           <img class="media-object" style="width: 60px; display: inline-block;"
                               t-att-title="acquirer.name"
-                              t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
+                              t-att-src="'/payment_%s/static/src/img/%s_icon.png' % (acquirer.provider, acquirer.provider)"/>
                               <span t-field="acquirer.name"/>
                       </label>
                     </li>
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index f85be0e4651..fd7f61754f1 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -38,6 +38,17 @@
         </field>
     </record>
 
+    <record id="res_partner_form_view" model="ir.ui.view">
+        <field name="name">res.partner.form.inherit</field>
+        <field name="model">res.partner</field>
+        <field name="inherit_id" ref="base.view_partner_form"/>
+        <field name="arch" type="xml">
+            <field name="parent_id" position="after">
+                <field name="company_name" placeholder="Company Name" attrs="{'invisible': [('company_name','=', '')]}"/>
+            </field>
+        </field>
+    </record>
+
     <record model="ir.ui.view" id="product_pricelist_view">
         <field name="name">product.pricelist.website.form</field>
         <field name="model">product.pricelist</field>

From edaed14f3ff12b825cab82768b23e9a97d8df0ea Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 25 Apr 2014 15:34:03 +0200
Subject: [PATCH 017/106] [FIX] website_sale: apply tax

bzr revid: chm@openerp.com-20140425133403-g94w1yaj56k9whr5
---
 addons/website_sale/models/sale_order.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index bab09ff6070..c9c18e7442b 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -50,15 +50,15 @@ class sale_order(osv.Model):
 
     def _cart_update(self, cr, uid, ids, product_id=None, add_qty=0, set_qty=0, context=None):
         """ Add or set product quantity, add_qty can be negative """
-        for so in self.browse(cr, uid, ids, context=context):
-            sol = self.pool.get('sale.order.line')
+        sol = self.pool.get('sale.order.line')
 
+        for so in self.browse(cr, uid, ids, context=context):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             line_id = so._cart_find_product_line(product_id)
 
             # Create line if no line with product_id can be located
             if not line_id:
-                values = self.pool['sale.order.line'].product_id_change(cr, SUPERUSER_ID, [],
+                values = sol.product_id_change(cr, SUPERUSER_ID, [],
                     pricelist=so.pricelist_id.id,
                     product=product_id,
                     partner_id=so.partner_id.id,
@@ -67,6 +67,8 @@ class sale_order(osv.Model):
                 values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
                 values['product_id'] = product_id
                 values['order_id'] = so.id
+                if values.get('tax_id'):
+                    values['tax_id'] = [(6, 0, values['tax_id'])]
                 line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
 
             # compute new quantity
@@ -80,7 +82,7 @@ class sale_order(osv.Model):
                 sol.unlink(cr, SUPERUSER_ID, line_id, context=context)
             else:
                 # update line
-                values = self.pool['sale.order.line'].product_id_change(cr, SUPERUSER_ID, [],
+                values = sol.product_id_change(cr, SUPERUSER_ID, [],
                     pricelist=so.pricelist_id.id,
                     product=product_id,
                     partner_id=so.partner_id.id,
@@ -88,6 +90,8 @@ class sale_order(osv.Model):
                 )['value']
                 values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
                 values['product_uom_qty'] = quantity
+                if values.get('tax_id'):
+                    values['tax_id'] = [(6, 0, values['tax_id'])]
                 sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)
 
             return quantity

From bb2ebf7cb92671e58b3cac68fc5964a034953b7a Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 28 Apr 2014 11:36:09 +0200
Subject: [PATCH 018/106] [FIX] website_sale: apply fiscal position on change
 product id and update cart. [IMP] sale: apply fiscal position of the partner
 if they are not fiscal position defined

bzr revid: chm@openerp.com-20140428093609-8z8my9vj322shcll
---
 addons/sale/sale.py                      | 13 ++++---
 addons/website_sale/controllers/main.py  |  4 +--
 addons/website_sale/models/sale_order.py | 43 +++++++++++-------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 782030a9494..b3c68bc4517 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -862,15 +862,15 @@ class sale_order_line(osv.osv):
             lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False, context=None):
         context = context or {}
         lang = lang or context.get('lang',False)
-        if not  partner_id:
+        if not partner_id:
             raise osv.except_osv(_('No Customer Defined!'), _('Before choosing a product,\n select a customer in the sales form.'))
         warning = {}
         product_uom_obj = self.pool.get('product.uom')
         partner_obj = self.pool.get('res.partner')
         product_obj = self.pool.get('product.product')
         context = {'lang': lang, 'partner_id': partner_id}
-        if partner_id:
-            lang = partner_obj.browse(cr, uid, partner_id).lang
+        partner = partner_obj.browse(cr, uid, partner_id)
+        lang = partner.lang
         context_partner = {'lang': lang, 'partner_id': partner_id}
 
         if not product:
@@ -896,7 +896,12 @@ class sale_order_line(osv.osv):
                     uos = False
             else:
                 uos = False
-        fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
+
+        fpos = False
+        if not fiscal_position:
+            fpos = partner.property_account_position or False
+        else:
+            fpos = self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position)
         if update_tax: #The quantity only have changed
             result['tax_id'] = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, product_obj.taxes_id)
 
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index c8f0020bbe4..21124f9f136 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -377,8 +377,8 @@ class website_sale(http.Controller):
         if request.uid != request.website.user_id.id:
             partner_id = orm_user.browse(cr, SUPERUSER_ID, uid, context=context).partner_id.id
         elif order.partner_id:
-            domain = [("active", "=", False), ("partner_id", "=", order.partner_id.id)]
-            user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID, domain, context=context)
+            user_ids = request.registry['res.users'].search(cr, SUPERUSER_ID,
+                [("partner_id", "=", order.partner_id.id)], context=dict(context or {}, active_test=False))
             if not user_ids or request.website.user_id.id not in user_ids:
                 partner_id = order.partner_id.id
 
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index c9c18e7442b..5fe8564a0bf 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -52,46 +52,43 @@ class sale_order(osv.Model):
         """ Add or set product quantity, add_qty can be negative """
         sol = self.pool.get('sale.order.line')
 
+        def product_id_change(so, product_id):
+            values = sol.product_id_change(cr, SUPERUSER_ID, [],
+                pricelist=so.pricelist_id.id,
+                product=product_id,
+                partner_id=so.partner_id.id,
+                context=context
+            )['value']
+            values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
+            values['product_id'] = product_id
+            values['order_id'] = so.id
+            if values.get('tax_id') != None:
+                values['tax_id'] = [(6, 0, values['tax_id'])]
+            return values
+
         for so in self.browse(cr, uid, ids, context=context):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             line_id = so._cart_find_product_line(product_id)
 
             # Create line if no line with product_id can be located
             if not line_id:
-                values = sol.product_id_change(cr, SUPERUSER_ID, [],
-                    pricelist=so.pricelist_id.id,
-                    product=product_id,
-                    partner_id=so.partner_id.id,
-                    context=context
-                )['value']
-                values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
-                values['product_id'] = product_id
-                values['order_id'] = so.id
-                if values.get('tax_id'):
-                    values['tax_id'] = [(6, 0, values['tax_id'])]
+                values = product_id_change(so, product_id)
                 line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
 
             # compute new quantity
+            quantity = 0
             if set_qty:
                 quantity = set_qty
-            else:
-                quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + add_qty
+            elif add_qty != None:
+                quantity = sol.browse(cr, SUPERUSER_ID, line_id, context=context).product_uom_qty + (add_qty or 0)
 
             # Remove zero of negative lines
             if quantity <= 0:
-                sol.unlink(cr, SUPERUSER_ID, line_id, context=context)
+                sol.unlink(cr, SUPERUSER_ID, [line_id], context=context)
             else:
                 # update line
-                values = sol.product_id_change(cr, SUPERUSER_ID, [],
-                    pricelist=so.pricelist_id.id,
-                    product=product_id,
-                    partner_id=so.partner_id.id,
-                    context=context
-                )['value']
-                values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
+                values = product_id_change(so, product_id)
                 values['product_uom_qty'] = quantity
-                if values.get('tax_id'):
-                    values['tax_id'] = [(6, 0, values['tax_id'])]
                 sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)
 
             return quantity

From 36fc910e4852a21f87595df5c70b99dc3c6a8056 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 28 Apr 2014 12:28:57 +0200
Subject: [PATCH 019/106] [FIX] website_sale: apply new pricelist and fiscal
 position after signup.

bzr revid: chm@openerp.com-20140428102857-41lfs08v1crudnco
---
 addons/website_sale/models/sale_order.py | 56 ++++++++++++++++--------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 5fe8564a0bf..ca107eda3e3 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -66,6 +66,7 @@ class sale_order(osv.Model):
                 values['tax_id'] = [(6, 0, values['tax_id'])]
             return values
 
+        quantity = 0
         for so in self.browse(cr, uid, ids, context=context):
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             line_id = so._cart_find_product_line(product_id)
@@ -76,7 +77,6 @@ class sale_order(osv.Model):
                 line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
 
             # compute new quantity
-            quantity = 0
             if set_qty:
                 quantity = set_qty
             elif add_qty != None:
@@ -91,7 +91,7 @@ class sale_order(osv.Model):
                 values['product_uom_qty'] = quantity
                 sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)
 
-            return quantity
+        return quantity
 
     def _cart_accessories(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -111,45 +111,64 @@ class website(orm.Model):
         return [("sale_ok", "=", True)]
 
     def sale_get_order(self, cr, uid, ids, force_create=False, code=None, context=None):
+        sale_order_obj = self.pool['sale.order']
         sale_order_id = request.session.get('sale_order_id')
         sale_order = None
         # create so if needed
         if not sale_order_id and (force_create or code):  
+            # TODO cache partner_id session
+            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+
             for w in self.browse(cr, uid, ids):
-                # TODO cache partner_id session
-                partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
                 values = {
                     'user_id': w.user_id.id,
                     'partner_id': partner.id,
                     'pricelist_id': partner.property_product_pricelist.id,
                 }
-                sale_order_id = self.pool['sale.order'].create(cr, SUPERUSER_ID, values, context=context)
-                values = self.pool['sale.order'].onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
-                self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
+                sale_order_id = sale_order_obj.create(cr, SUPERUSER_ID, values, context=context)
+                values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
+                sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
                 request.session['sale_order_id'] = sale_order_id
         if sale_order_id:
-            sale_order = self.pool['sale.order'].browse(cr, SUPERUSER_ID, sale_order_id, context=context)
+            # TODO cache partner_id session
+            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+
+            sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order_id, context=context)
             if not sale_order.exists():
                 request.session['sale_order_id'] = None
                 return None
-            # TODO cache partner_id session
-            partner = self.pool['res.users'].browse(cr, SUPERUSER_ID, uid, context=context).partner_id
+
+            def update_pricelist(pricelist_id):
+                values = {'pricelist_id': pricelist_id}
+                values.update(sale_order.onchange_pricelist_id(pricelist_id, None)['value'])
+                sale_order.write(values)
+                for line in sale_order.order_line:
+                    sale_order._cart_update(product_id=line.product_id.id, add_qty=0)
+
             # check for change of pricelist with a coupon
-            # TODO cache sale_order.pricelist_id.code in session
             if code and code != sale_order.pricelist_id.code:
                 pricelist_ids = self.pool['product.pricelist'].search(cr, SUPERUSER_ID, [('code', '=', code)], context=context)
                 if pricelist_ids:
                     pricelist_id = pricelist_ids[0]
-                    values = {'pricelist_id': pricelist_id}
-                    values.update(sale_order.onchange_pricelist_id(pricelist_id, None)['value'])
-                    sale_order.write(values)
-                    for line in sale_order.order_line:
-                        sale_order._cart_update(cr, uid, sale_order.product_id, add_qty=0)
+                    request.session['sale_order_code_pricelist_id'] = pricelist_id
+                    update_pricelist(pricelist_id)
+                request.session['sale_order_code_pricelist_id'] = False
 
             # check for change of partner_id ie after signup
             if sale_order.partner_id.id !=  partner.id:
-                values = self.pool['sale.order'].onchange_partner_id(cr, SUPERUSER_ID, [], partner.id, context=context)['value']
-                self.pool['sale.order'].write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
+                flag_pricelist = False
+                pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id
+                if pricelist_id != sale_order.pricelist_id.id:
+                    flag_pricelist = True
+                fiscal_position = sale_order.fiscal_position and sale_order.fiscal_position.id or False
+
+                values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [sale_order_id], partner.id, context=context)['value']
+                values['partner_id'] = partner.id
+                sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
+
+                if flag_pricelist or values.get('fiscal_position') != fiscal_position:
+                    update_pricelist(pricelist_id)
+
         return sale_order
 
     def sale_get_transaction(self, cr, uid, ids, context=None):
@@ -167,6 +186,7 @@ class website(orm.Model):
         request.session.update({
             'sale_order_id': False,
             'sale_transaction_id': False,
+            'sale_order_code_pricelist_id': False,
         })
 
 # vim:et:

From 1199b60d7000b56852a0bd8881fea90a95b01bc7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 28 Apr 2014 15:46:32 +0200
Subject: [PATCH 020/106] [IMP] website_sale: use street 2 to set company_name

bzr revid: chm@openerp.com-20140428134632-v3w7imtz7j3u3tp0
---
 addons/website_sale/controllers/main.py |  6 +++---
 addons/website_sale/models/__init__.py  |  1 -
 addons/website_sale/views/templates.xml |  8 ++++----
 addons/website_sale/views/views.xml     | 11 -----------
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 21124f9f136..718475db558 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -308,7 +308,7 @@ class website_sale(http.Controller):
         return values
 
     mandatory_billing_fields = ["name", "phone", "email", "street", "city", "country_id", "zip"]
-    optional_billing_fields = ["company_name", "state_id"]
+    optional_billing_fields = ["street2", "state_id"]
     mandatory_shipping_fields = ["name", "phone", "street", "city", "country_id", "zip"]
     optional_shipping_fields = ["state_id"]
 
@@ -330,9 +330,9 @@ class website_sale(http.Controller):
                 for field_name in all_fields if data.get(prefix + field_name))
         else:
             query = dict((prefix + field_name, getattr(data, field_name))
-                for field_name in all_fields if field_name != "company_name" and getattr(data, field_name))
+                for field_name in all_fields if field_name != "street2" and getattr(data, field_name))
             if data.parent_id:
-                query[prefix + 'company_name'] = data.parent_id.name
+                query[prefix + 'street2'] = data.parent_id.name
 
         if query.get(prefix + 'state_id'):
             query[prefix + 'state_id'] = int(query[prefix + 'state_id'])
diff --git a/addons/website_sale/models/__init__.py b/addons/website_sale/models/__init__.py
index ba031ee77da..b2de3c5753e 100644
--- a/addons/website_sale/models/__init__.py
+++ b/addons/website_sale/models/__init__.py
@@ -1,4 +1,3 @@
 import product
 import res_config
 import sale_order
-import res_partner
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 2831a225733..790e22793f8 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -696,9 +696,9 @@
                       <label class="control-label" for="contact_name">Your Name</label>
                       <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
                   </div>
-                  <div t-attf-class="form-group #{error.get('company_name') and 'has-error' or ''} col-lg-6">
-                      <label class="control-label" for="company_name" style="font-weight: normal">Your Company</label>
-                      <input type="text" name="company_name" class="form-control" t-att-value="checkout.get('company_name')"/>
+                  <div t-attf-class="form-group #{error.get('street2') and 'has-error' or ''} col-lg-6">
+                      <label class="control-label" for="street2" style="font-weight: normal">Company Name</label>
+                      <input type="text" name="street2" class="form-control" t-att-value="checkout.get('street2')"/>
                   </div>
                   <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
                       <label class="control-label" for="contact_name">Email</label>
@@ -1008,7 +1008,7 @@
     <table class='pull-right mb16' id="cart_total" t-if="website_sale_order">
         <thead>
             <tr width="100" style="border-top: 1px solid #000" id="order_total">
-                <th><h3>Total:</h3></th>
+                <th><h3>Total: </h3></th>
                 <th class="text-right">
                   <h3><span t-field="website_sale_order.amount_total" t-field-options='{
                       "widget": "monetary",
diff --git a/addons/website_sale/views/views.xml b/addons/website_sale/views/views.xml
index fd7f61754f1..f85be0e4651 100644
--- a/addons/website_sale/views/views.xml
+++ b/addons/website_sale/views/views.xml
@@ -38,17 +38,6 @@
         </field>
     </record>
 
-    <record id="res_partner_form_view" model="ir.ui.view">
-        <field name="name">res.partner.form.inherit</field>
-        <field name="model">res.partner</field>
-        <field name="inherit_id" ref="base.view_partner_form"/>
-        <field name="arch" type="xml">
-            <field name="parent_id" position="after">
-                <field name="company_name" placeholder="Company Name" attrs="{'invisible': [('company_name','=', '')]}"/>
-            </field>
-        </field>
-    </record>
-
     <record model="ir.ui.view" id="product_pricelist_view">
         <field name="name">product.pricelist.website.form</field>
         <field name="model">product.pricelist</field>

From 37c41f9c78ef7ef2eab0f1cd74f907cbe824c95c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 29 Apr 2014 16:53:32 +0200
Subject: [PATCH 021/106] [FIX] stock: when delivering a product in average
 cost, make sure the price_unit on the stock.move is up to date (opw 607272)

bzr revid: mat@openerp.com-20140429145332-s3c22w47aihdsfub
---
 addons/stock/stock.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9a1c93f436e..d2d5ba3fab1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2322,7 +2322,9 @@ class stock_move(osv.osv):
 
         # if product is set to average price and a specific value was entered in the picking wizard,
         # we use it
-        if move.product_id.cost_method == 'average' and move.price_unit:
+        if move.location_dest_id.usage != 'internal' and move.product_id.cost_method == 'average':
+            reference_amount = qty * move.product_id.standard_price
+        elif move.product_id.cost_method == 'average' and move.price_unit:
             reference_amount = qty * move.price_unit
             reference_currency_id = move.price_currency_id.id or reference_currency_id
 

From c1601e75d37cea87cb41fd7fe501d2eb8fc5ff74 Mon Sep 17 00:00:00 2001
From: Yannick Vaucher <yannick.vaucher@camptocamp.com>
Date: Wed, 30 Apr 2014 13:37:30 +0200
Subject: [PATCH 022/106] [FIX] sign in and sign out were broken in rev 10019
 as it doesn't provide a date to conversion of attendance time to employee
 timezone

lp bug: https://launchpad.net/bugs/1314589 fixed

bzr revid: yannick.vaucher@camptocamp.com-20140430113730-cn3xw66fbik8p32n
---
 addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 47fb0a0810d..1d7e701ed14 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -407,6 +407,9 @@ class hr_attendance(osv.osv):
             employee = employee_obj.browse(cr, uid, employee_id, context=context)
             tz = employee.user_id.partner_id.tz
 
+        if not date:
+            date = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
         att_tz = timezone(tz or 'utc')
 
         attendance_dt = datetime.strptime(date, DEFAULT_SERVER_DATETIME_FORMAT)

From 434c3c455e90a34cb20215532b5da16205227e5c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 1 May 2014 23:45:01 +0200
Subject: [PATCH 023/106] [FIX] free chs who was stuck in a 2010 spacetime
 continuum

bzr revid: al@openerp.com-20140501214501-dnt6qjxvqa8tm58o
---
 openerp/addons/base/security/base_security.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml
index c0f4242198c..755e20c3832 100644
--- a/openerp/addons/base/security/base_security.xml
+++ b/openerp/addons/base/security/base_security.xml
@@ -43,7 +43,7 @@
 
         <!-- Set accesses to menu -->
         <record model="ir.ui.menu" id="base.menu_administration">
-            <field name="name">Administration</field>
+            <field name="name">Settings</field>
             <field name="groups_id" eval="[(6,0, [ref('group_system'), ref('group_erp_manager')])]"/>
         </record>
 

From f299180399a2a994f9011161dc54b9973b194d2a Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 11:26:59 +0200
Subject: [PATCH 024/106] [FIX] website_mail: request.website.user_id.id

bzr revid: chm@openerp.com-20140502092659-1gwsx6lmgmtcf80q
---
 addons/website_mail/controllers/main.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index a6b400ec4a1..0932794ee28 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -32,14 +32,13 @@ class WebsiteMail(http.Controller):
 
         partner_obj = request.registry['res.partner']
         user_obj = request.registry['res.users']
-        website = request.registry['website']
 
         _id = int(id)
         _message_is_follower = message_is_follower == 'on'
         _object = request.registry[object]
 
         # search partner_id
-        public_id = website.get_public_user(cr, uid, context)
+        public_id = request.website.user_id.id
         if uid != public_id:
             partner_ids = [user_obj.browse(cr, uid, uid, context).partner_id.id]
         else:
@@ -68,10 +67,9 @@ class WebsiteMail(http.Controller):
         partner_obj = request.registry.get('res.partner')
         users_obj = request.registry.get('res.users')
         obj = request.registry.get(model)
-        website = request.registry['website']
 
         partner_id = None
-        public_id = website.get_public_user(cr, uid, context)
+        public_id = request.website.user_id.id
         if uid != public_id:
             partner_id = users_obj.browse(cr, SUPERUSER_ID, uid, context).partner_id
         elif request.session.get('partner_id'):

From 03b03d04767b99d1a29b0b2131879036c947a332 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 12:15:25 +0200
Subject: [PATCH 025/106] [FIX] crm: in order the mark as lost action to work,
 the dead stage has to be folded

bzr revid: dle@openerp.com-20140502101525-bzyjpz7jbr1njobl
---
 addons/crm/crm_lead_data.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 6bb8e2700d4..4defb8d5021 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -14,6 +14,7 @@
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Dead</field>
             <field name="case_default">1</field>
+            <field name="fold">1</field>
             <field name="probability">0</field>
             <field name="on_change">1</field>
             <field name="sequence">30</field>

From df80f783932cae253912f639d9ea03c0aa928041 Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Fri, 2 May 2014 14:34:07 +0200
Subject: [PATCH 026/106] [FIX] Webiste google Map - don't force http

bzr revid: jke@openerp.com-20140502123407-ojyzpf2dynewo7u0
---
 addons/website_google_map/views/google_map.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_google_map/views/google_map.xml b/addons/website_google_map/views/google_map.xml
index 1c4254786f2..d9a9d2740e8 100644
--- a/addons/website_google_map/views/google_map.xml
+++ b/addons/website_google_map/views/google_map.xml
@@ -26,10 +26,10 @@
       }
     </style>
     <script>var partner_url = '<t t-raw="partner_url or ''"/>';</script>
-    <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+    <script src="//maps.google.com/maps/api/js?sensor=false"></script>
     <script type="text/javascript" t-attf-src="/google_map/partners.json?partner_ids=#{ partner_ids }"></script>
     <script type="text/javascript" src="/website_google_map/static/src/js/markerclusterer_compiled.js"></script>
-    <script src="http://code.jquery.com/jquery-1.6.1.min.js"></script>
+    <script src="//code.jquery.com/jquery-1.6.1.min.js"></script>
     <script type="text/javascript" src="/website_google_map/static/src/js/google_map.js"></script>
   </head>
   <body>

From 7ad6d7a1500f6618eb6c9030c7d1eb444a150144 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:03:10 +0200
Subject: [PATCH 027/106] [FIX] Report: usage of ids in get_action more
 consistent: only pass them when they are useful, else pass an empty list

bzr revid: sle@openerp.com-20140502130310-106au0jsza0b3nwe
---
 addons/account/account_invoice.py             |  2 +-
 .../wizard/account_analytic_balance_report.py |  2 +-
 ...analytic_cost_ledger_for_journal_report.py |  2 +-
 .../account_analytic_cost_ledger_report.py    |  2 +-
 ...ccount_analytic_inverted_balance_report.py |  2 +-
 .../wizard/account_analytic_journal_report.py |  2 +-
 .../wizard/account_financial_report.py        |  2 +-
 .../wizard/account_report_account_balance.py  |  3 ++-
 .../account_report_aged_partner_balance.py    |  2 +-
 .../wizard/account_report_central_journal.py  |  3 ++-
 .../wizard/account_report_general_journal.py  |  3 ++-
 .../wizard/account_report_general_ledger.py   |  2 +-
 .../wizard/account_report_partner_balance.py  |  2 +-
 .../wizard/account_report_partner_ledger.py   |  4 +--
 .../wizard/account_report_print_journal.py    |  4 +--
 addons/account/wizard/account_vat.py          |  2 +-
 .../wizard/account_crossovered_analytic.py    |  3 ++-
 .../wizard/account_budget_analytic.py         |  2 +-
 .../account_budget_crossovered_report.py      |  2 +-
 ...count_budget_crossovered_summary_report.py |  2 +-
 .../wizard/account_budget_report.py           |  2 +-
 .../account_check_writing/account_voucher.py  | 25 ++++++------------
 .../wizard/account_check_batch_printing.py    | 26 +++++--------------
 addons/account_followup/account_followup.py   |  2 +-
 addons/report/models/report.py                |  9 +++++--
 25 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c23f0c37115..35979cd808e 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -409,7 +409,7 @@ class account_invoice(osv.osv):
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time.'
         self.write(cr, uid, ids, {'sent': True}, context=context)
-        return self.pool['report'].get_action(cr, uid, [], 'account.report_invoice', context=context)
+        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invoice', context=context)
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
         '''
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index 3a3c301cffc..062945fa53e 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -50,6 +50,6 @@ class account_analytic_balance(osv.osv_memory):
 
         datas['form']['active_ids'] = context.get('active_ids', False)
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticbalance', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticbalance', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 125dfda46fb..ab84af4880a 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -49,6 +49,6 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
         }
 
         datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledgerquantity', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledgerquantity', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 5f00c3c9ac5..978863f5900 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -49,6 +49,6 @@ class account_analytic_cost_ledger(osv.osv_memory):
 
         datas['form']['active_ids'] = context.get('active_ids', False)
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticcostledger', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticcostledger', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index ad79c0b33f6..93946960297 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -47,6 +47,6 @@ class account_analytic_inverted_balance(osv.osv_memory):
             'form': data
         }
         datas['form']['active_ids'] = context.get('active_ids', False)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_invertedanalyticbalance', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_invertedanalyticbalance', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index f2e406bc3a5..d8790e805d8 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -57,7 +57,7 @@ class account_analytic_journal_report(osv.osv_memory):
         context2 = context.copy()
         context2['active_model'] = 'account.analytic.journal'
         context2['active_ids'] = ids_list
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_analyticjournal', data=datas, context=context2)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_analyticjournal', data=datas, context=context2)
 
     def default_get(self, cr, uid, fields, context=None):
         if context is None:
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 6c1b57fa428..721e47193a2 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -89,6 +89,6 @@ class accounting_report(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data['form'].update(self.read(cr, uid, ids, ['date_from_cmp',  'debit_credit', 'date_to_cmp',  'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp',  'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0])
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_financial', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_financial', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 3b9d3c21777..9eba5f24b99 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_balance_report(osv.osv_memory):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
@@ -36,6 +37,6 @@ class account_balance_report(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_trialbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_trialbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index c918a1119fd..d7b57eaba02 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -81,6 +81,6 @@ class account_aged_trial_balance(osv.osv_memory):
         data['form'].update(res)
         if data.get('form',False):
             data['ids']=[data['form'].get('chart_account_id',False)]
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_agedpartnerbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_agedpartnerbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index 9f22d49afac..a31fef91ae4 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_central_journal(osv.osv_memory):
     _name = 'account.central.journal'
     _description = 'Account Central Journal'
@@ -32,6 +33,6 @@ class account_central_journal(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_centraljournal', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_centraljournal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index 3d9d55b19c1..c35a5920428 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import fields, osv
 
+
 class account_general_journal(osv.osv_memory):
     _inherit = "account.common.journal.report"
     _name = 'account.general.journal'
@@ -32,6 +33,6 @@ class account_general_journal(osv.osv_memory):
 
     def _print_report(self, cr, uid, ids, data, context=None):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_generaljournal', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_generaljournal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index c75477da40a..5f0a302d720 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -59,6 +59,6 @@ class account_report_general_ledger(osv.osv_memory):
         if data['form']['landscape'] is False:
             data['form'].pop('landscape')
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_generalledger', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_generalledger', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index d4b5fb27d14..7485bec67fe 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -44,6 +44,6 @@ class account_partner_balance(osv.osv_memory):
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['display_partner'])[0])
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerbalance', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerbalance', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index eb743e32e4f..38ff6988fd7 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -58,7 +58,7 @@ class account_partner_ledger(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['initial_balance', 'filter', 'page_split', 'amount_currency'])[0])
         if data['form'].get('page_split') is True: 
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerledgerother', data=data, context=context)
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_partnerledger', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledgerother', data=data, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_partnerledger', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index 3aafc63acf4..1f6b6e0cf4d 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -67,8 +67,8 @@ class account_print_journal(osv.osv_memory):
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         data['form'].update(self.read(cr, uid, ids, ['sort_selection'], context=context)[0])
         if context.get('sale_purchase_only'):
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_salepurchasejournal', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_salepurchasejournal', data=data, context=context)
         else:
-            return self.pool['report'].get_action(cr, uid, ids, 'account.report_journal', data=data, context=context)
+            return self.pool['report'].get_action(cr, uid, [], 'account.report_journal', data=data, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 5cc5c678df1..e7c806be2f9 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -61,6 +61,6 @@ class account_vat_declaration(osv.osv_memory):
         taxcode = taxcode_obj.browse(cr, uid, [taxcode_id], context=context)[0]
         datas['form']['company_id'] = taxcode.company_id.id
 
-        return self.pool['report'].get_action(cr, uid, ids, 'account.report_vat', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_vat', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index ccac123c681..1bdc91f2995 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -24,6 +24,7 @@ import time
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
+
 class account_crossovered_analytic(osv.osv_memory):
     _name = "account.crossovered.analytic"
     _description = "Print Crossovered Analytic"
@@ -65,6 +66,6 @@ class account_crossovered_analytic(osv.osv_memory):
              'model': 'account.analytic.account',
              'form': data
         }
-        return self.pool['report'].get_action(cr, uid, ids, 'account_analytic_plans.report_crossoveredanalyticplans', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_analytic_plans.report_crossoveredanalyticplans', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index a58b804ebbf..bd3bbdc8d99 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -46,6 +46,6 @@ class account_budget_analytic(osv.osv_memory):
             'form': data
         }
         datas['form']['ids'] = datas['ids']
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_analyticaccountbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_analyticaccountbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 96561df5af0..e47ff5cb421 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -47,6 +47,6 @@ class account_budget_crossvered_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-full'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_crossoveredbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_crossoveredbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index 6b676ecc684..d79e6097787 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -49,6 +49,6 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-one'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_crossoveredbudget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_crossoveredbudget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 2308b5ff9ac..fb1814a9171 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -47,6 +47,6 @@ class account_budget_report(osv.osv_memory):
         }
         datas['form']['ids'] = datas['ids']
         datas['form']['report'] = 'analytic-full'
-        return self.pool['report'].get_action(cr, uid, ids, 'account_budget.report_budget', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_budget.report_budget', data=datas, context=context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index c3abe28eef0..779ff61be44 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -74,26 +74,17 @@ class account_voucher(osv.osv):
 
     def print_check(self, cr, uid, ids, context=None):
         if not ids:
-            return  {}
+            raise osv.except_osv(_('Printing error'), _('No check selected '))
 
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
+        data = {
+            'id': ids and ids[0],
+            'ids': ids,
         }
 
-        check_layout = self.browse(cr, uid, ids[0], context=context).company_id.check_layout
-        return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
-            'datas': {
-                    'model':'account.voucher',
-                    'id': ids and ids[0] or False,
-                    'ids': ids and ids or [],
-                    'report_type': 'pdf'
-                },
-            'nodestroy': True
-            }
+        return self.pool['report'].get_action(
+            cr, uid, [], 'account_check_writing.report_check', data=data, context=context
+        )
+
     def create(self, cr, uid, vals, context=None):
         if vals.get('amount') and vals.get('journal_id') and 'amount_in_word' not in vals:
             vals['amount_in_word'] = self._amount_to_text(cr, uid, vals['amount'], vals.get('currency_id') or \
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
index c3a13e2c687..bf59557d904 100644
--- a/addons/account_check_writing/wizard/account_check_batch_printing.py
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -20,9 +20,9 @@
 ##############################################################################
 
 from openerp.tools.translate import _
-
 from openerp.osv import fields, osv
 
+
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
     _description = 'Prin Check in Batch'
@@ -64,23 +64,11 @@ class account_check_write(osv.osv_memory):
         ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
 
         #print the checks
-        check_layout_report = {
-            'top' : 'account.print.check.top',
-            'middle' : 'account.print.check.middle',
-            'bottom' : 'account.print.check.bottom',
+        data = {
+            'id': voucher_ids and voucher_ids[0],
+            'ids': voucher_ids,
         }
-        check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
-        if not check_layout:
-            check_layout = 'top'
-        return {
-            'type': 'ir.actions.report.xml', 
-            'report_name':check_layout_report[check_layout],
-            'datas': {
-                'model':'account.voucher',
-                'ids': voucher_ids,
-                'report_type': 'pdf'
-                },
-            'nodestroy': True
-            }
-
 
+        return self.pool['report'].get_action(
+            cr, uid, [], 'account_check_writing.report_check', data=data, context=context
+        )
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index eae361913ad..82ae10a0937 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -188,7 +188,7 @@ class res_partner(osv.osv):
              'model': 'account_followup.followup',
              'form': data
         }
-        return self.pool['report'].get_action(cr, uid, wizard_partner_ids, 'account_followup.report_followup', data=datas, context=context)
+        return self.pool['report'].get_action(cr, uid, [], 'account_followup.report_followup', data=datas, context=context)
 
     def do_partner_mail(self, cr, uid, partner_ids, context=None):
         if context is None:
diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 8dd8a4dce6f..fed6a2335ee 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -260,11 +260,17 @@ class Report(osv.Model):
     def get_action(self, cr, uid, ids, report_name, data=None, context=None):
         """Return an action of type ir.actions.report.xml.
 
+        :param ids: Ids of the records to print (if not used, pass an empty list)
         :param report_name: Name of the template to generate an action for
         """
         if context is None:
             context = {}
 
+        if ids:
+            if not isinstance(ids, list):
+                ids = [ids]
+            context['active_ids'] = ids
+
         report_obj = self.pool['ir.actions.report.xml']
         idreport = report_obj.search(cr, uid, [('report_name', '=', report_name)], context=context)
         try:
@@ -272,7 +278,7 @@ class Report(osv.Model):
         except IndexError:
             raise osv.except_osv(_('Bad Report'), _('This report is not loaded into the database.'))
 
-        action = {
+        return {
             'context': context,
             'data': data,
             'type': 'ir.actions.report.xml',
@@ -280,7 +286,6 @@ class Report(osv.Model):
             'report_type': report.report_type,
             'report_file': report.report_file,
         }
-        return action
 
     #--------------------------------------------------------------------------
     # Report generation helpers

From 66f5bbcf671a7544426960b67509b795c5ecf978 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:03:40 +0200
Subject: [PATCH 028/106] [FIX] account report_invoice: more space to display
 the taxes, right field to display the fiscal position

bzr revid: sle@openerp.com-20140502130340-22dyefrmj4kqrzdb
---
 addons/account/views/report_invoice.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 6757095a7d4..2620e230ec1 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -100,7 +100,7 @@
             </div>
 
             <div class="row" t-if="o.tax_line">
-                <div class="col-xs-3">
+                <div class="col-xs-6">
                     <table class="table table-condensed">
                         <thead>
                             <tr>
@@ -136,7 +136,7 @@
             </p>
             <p t-if="o.fiscal_position">
                 <strong>Fiscal Position:</strong>
-                <span t-field="o.fiscal_position.note"/>
+                <span t-field="o.fiscal_position"/>
             </p>
         </div>
     </t>

From 139c35800f92b1c788bf54481db1adc3f277a26a Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 2 May 2014 15:17:06 +0200
Subject: [PATCH 029/106] [FIX] account report_invoice: display the unit of
 measure in the same cell as the quantity

bzr revid: sle@openerp.com-20140502131706-cepyft5y0essj0zr
---
 addons/account/views/report_invoice.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml
index 2620e230ec1..6c4b701c6cf 100644
--- a/addons/account/views/report_invoice.xml
+++ b/addons/account/views/report_invoice.xml
@@ -47,7 +47,6 @@
                     <tr>
                         <th>Description</th>
                         <th>Quantity</th>
-                        <th groups="product.group_uom">Unit of measure</th>
                         <th class="text-right">Unit Price</th>
                         <th class="text-right" groups="sale.group_discount_per_so_line">Discount (%)</th>
                         <th class="text-right">Taxes</th>
@@ -57,8 +56,10 @@
                 <tbody class="invoice_tbody">
                     <tr t-foreach="o.invoice_line" t-as="l">
                         <td><span t-field="l.name"/></td>
-                        <td><span t-field="l.quantity"/></td>
-                        <td groups="product.group_uom"><span t-field="l.uos_id"/></td>
+                        <td>
+                            <span t-field="l.quantity"/>
+                            <span t-field="l.uos_id"  groups="product.group_uom"/>
+                        </td>
                         <td class="text-right">
                             <span t-field="l.price_unit"/>
                         </td>

From deb091ea64f7f38a09938295e1cb80ee1689b778 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 15:41:35 +0200
Subject: [PATCH 030/106] [FIX] website: missing acl for manage website menu

bzr revid: dle@openerp.com-20140502134135-zp05ecbpcj8inftc
---
 addons/website/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv
index 1a9ccccba5c..8682a349f70 100644
--- a/addons/website/security/ir.model.access.csv
+++ b/addons/website/security/ir.model.access.csv
@@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_website_public,website,website.model_website,,1,0,0,0
 access_website,website,website.model_website,base.group_website_designer,1,1,1,1
 access_website_menu,access_website_menu,model_website_menu,,1,0,0,0
+access_website_menu_designer,Web Menu Manager,model_website_menu,base.group_website_designer,1,1,1,1
 access_website,web menu manager,website.model_website,base.group_website_designer,1,1,1,1
 access_website_converter_test,access_website_converter_test,model_website_converter_test,,1,1,1,1
 access_website_converter_test_sub,access_website_converter_test_sub,model_website_converter_test_sub,,1,1,1,1

From c10800f2f1c083150251f69fb0f79487bd0c08f8 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 16:01:52 +0200
Subject: [PATCH 031/106] [FIX] website_event_sale: multi tickets

bzr revid: chm@openerp.com-20140502140152-hx7ktaf0cg2m7ija
---
 addons/event_sale/event_sale.py               |  3 +
 addons/website_event_sale/controllers/main.py | 55 ++++-------------
 addons/website_event_sale/models/__init__.py  |  1 +
 .../website_event_sale/models/sale_order.py   | 49 +++++++++++++++
 .../views/website_event_sale.xml              |  2 +-
 addons/website_sale/controllers/main.py       |  4 +-
 addons/website_sale/models/sale_order.py      | 61 +++++++++++--------
 .../static/src/js/website_sale.js             |  3 +-
 addons/website_sale/views/templates.xml       |  4 +-
 9 files changed, 109 insertions(+), 73 deletions(-)
 create mode 100644 addons/website_event_sale/models/sale_order.py

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index b4f42673aba..c96b5d73932 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -37,6 +37,9 @@ class product_template(osv.osv):
 
 class product(osv.osv):
     _inherit = 'product.product'
+    _columns = {
+        'event_ticket_ids': fields.one2many('event.event.ticket', 'product_id', 'Event Tickets'),
+    }
 
     def onchange_event_ok(self, cr, uid, ids, type, event_ok, context=None):
         # cannot directly forward to product.template as the ids are theoretically different
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 9f340c86f9d..1c39484f8c8 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -28,54 +28,23 @@ from openerp.tools.translate import _
 
 class website_event(website_event):
 
-    @http.route(['/event/add_cart'], type='http', auth="public", website=True, multilang=True)
-    def add_cart(self, event_id, **post):
-        user_obj = request.registry['res.users']
-        order_line_obj = request.registry.get('sale.order.line')
+    @http.route(['/event/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
+    def cart_update(self, event_id, **post):
+        cr, uid, context = request.cr, request.uid, request.context
         ticket_obj = request.registry.get('event.event.ticket')
-        order_obj = request.registry.get('sale.order')
 
-        order = request.website.sale_get_order(force_create=1)
-
-        partner_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid,
-                                     context=request.context).partner_id.id
-
-        fields = [k for k, v in order_line_obj._columns.items()]
-        values = order_line_obj.default_get(request.cr, SUPERUSER_ID, fields,
-                                            context=request.context)
-
-        _values = None
+        sale = False
         for key, value in post.items():
-            try:
-                quantity = int(value)
-                assert quantity > 0
-            except:
-                quantity = None
-            ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
-            if not ticket_id or not quantity:
+            quantity = int(value or "0")
+            if not quantity:
                 continue
-            ticket = ticket_obj.browse(request.cr, request.uid, ticket_id,
-                                       context=request.context)
+            sale = True
+            ticket_id = key.split("-")[0] == 'ticket' and int(key.split("-")[1]) or None
+            ticket = ticket_obj.browse(cr, SUPERUSER_ID, ticket_id, context=context)
+            request.website.sale_get_order(force_create=1)._cart_update(
+                product_id=ticket.product_id.id, add_qty=quantity, context=dict(context, event_ticket_id=ticket.id))
 
-            values['product_id'] = ticket.product_id.id
-            values['event_id'] = ticket.event_id.id
-            values['event_ticket_id'] = ticket.id
-            values['product_uom_qty'] = quantity
-            values['price_unit'] = ticket.price
-            values['order_id'] = order.id
-            values['name'] = "%s: %s" % (ticket.event_id.name, ticket.name)
-
-            # change and record value
-            pricelist_id = order.pricelist_id and order.pricelist_id.id or False
-            _values = order_line_obj.product_id_change(
-                request.cr, SUPERUSER_ID, [], pricelist_id, ticket.product_id.id,
-                partner_id=partner_id, context=request.context)['value']
-            _values.update(values)
-
-            order_line_id = order_line_obj.create(request.cr, SUPERUSER_ID, _values, context=request.context)
-            order_obj.write(request.cr, SUPERUSER_ID, [order.id], {'order_line': [(4, order_line_id)]}, context=request.context)
-
-        if not _values:
+        if not sale:
             return request.redirect("/event/%s" % event_id)
         return request.redirect("/shop/checkout")
 
diff --git a/addons/website_event_sale/models/__init__.py b/addons/website_event_sale/models/__init__.py
index 498013de541..ed23b1cd133 100644
--- a/addons/website_event_sale/models/__init__.py
+++ b/addons/website_event_sale/models/__init__.py
@@ -1,2 +1,3 @@
 import product
 import website
+import sale_order
diff --git a/addons/website_event_sale/models/sale_order.py b/addons/website_event_sale/models/sale_order.py
new file mode 100644
index 00000000000..91f282a1c00
--- /dev/null
+++ b/addons/website_event_sale/models/sale_order.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+from openerp import SUPERUSER_ID
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+
+# defined for access rules
+class sale_order(osv.Model):
+    _inherit = "sale.order"
+
+    def _cart_find_product_line(self, cr, uid, ids, product_id=None, line_id=None, context=None):
+        for so in self.browse(cr, uid, ids, context=context):
+            order_line_id = None
+            domain = [('order_id', '=', so.id), ('product_id', '=', product_id)]
+            if line_id:
+                domain += [('id', '=', line_id)]
+            elif context.get("event_ticket_id"):
+                domain += [('event_ticket_id', '=', context.get("event_ticket_id"))]
+            order_line_ids = self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, domain, context=context)
+            if order_line_ids:
+                order_line_id = order_line_ids[0]
+            return order_line_id
+
+    def _website_product_id_change(self, cr, uid, ids, order_id, product_id, line_id=None, context=None):
+        values = super(sale_order,self)._website_product_id_change(cr, uid, ids, order_id, product_id, line_id=None, context=None)
+
+        event_ticket_id = None
+        if context.get("event_ticket_id"):
+            event_ticket_id = context.get("event_ticket_id")
+        elif line_id:
+            line = self.pool.get('sale.order.line').browse(cr, SUPERUSER_ID, line_id, context=context)
+            if line.event_ticket_id:
+                event_ticket_id = line.event_ticket_id.id
+        else:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            if product.event_ticket_ids:
+                event_ticket_id = product.event_ticket_ids[0]
+
+        if event_ticket_id:
+            ticket = self.pool.get('event.event.ticket').browse(cr, uid, event_ticket_id, context=context)
+            if product_id != ticket.product_id.id:
+                raise osv.except_osv(_('Error!'),_("The ticket doesn't match with this product."))
+
+            values['product_id'] = ticket.product_id.id
+            values['event_id'] = ticket.event_id.id
+            values['event_ticket_id'] = ticket.id
+            values['price_unit'] = ticket.price
+            values['name'] = "%s: %s" % (ticket.event_id.name, ticket.name)
+
+        return values
diff --git a/addons/website_event_sale/views/website_event_sale.xml b/addons/website_event_sale/views/website_event_sale.xml
index 84da4278555..b2f5d2a78f5 100644
--- a/addons/website_event_sale/views/website_event_sale.xml
+++ b/addons/website_event_sale/views/website_event_sale.xml
@@ -28,7 +28,7 @@
 
 <template id="event_description_full" inherit_id="website_event.event_description_full" inherit_option_id="website_event.event_description_full" name="Event's Ticket form">
     <xpath expr="//div[@t-field='event.description']" position="before">
-        <form t-attf-action="/event/add_cart?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
+        <form t-attf-action="/event/cart/update?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
             <table itemprop="offers" class="table table-striped">
                 <thead>
                     <tr>
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 718475db558..ab9bf58848f 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -234,9 +234,9 @@ class website_sale(http.Controller):
         return request.redirect("/shop/cart")
 
     @http.route(['/shop/cart/update_json'], type='json', auth="public", methods=['POST'], website=True, multilang=True)
-    def cart_update_json(self, product_id, add_qty=None, set_qty=None):
+    def cart_update_json(self, product_id, line_id, add_qty=None, set_qty=None):
         order = request.website.sale_get_order(force_create=1)
-        quantity = order._cart_update(product_id=product_id, add_qty=add_qty, set_qty=set_qty)
+        quantity = order._cart_update(product_id=product_id, line_id=line_id, add_qty=add_qty, set_qty=set_qty)
         return {
             'quantity': quantity,
             'cart_quantity': order.cart_quantity,
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index ca107eda3e3..3bdeef3f918 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -40,40 +40,51 @@ class sale_order(osv.Model):
             'order': order
         }
 
-    def _cart_find_product_line(self, cr, uid, ids, product_id=None, context=None):
+    def _cart_find_product_line(self, cr, uid, ids, product_id=None, line_id=None, context=None):
         for so in self.browse(cr, uid, ids, context=context):
-            line_id = None
-            line_ids = self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, [('order_id', '=', so.id), ('product_id', '=', product_id)], context=context)
-            if line_ids:
-                line_id = line_ids[0]
-            return line_id
+            order_line_id = None
+            domain = [('order_id', '=', so.id), ('product_id', '=', product_id)]
+            if line_id:
+                domain += [('id', '=', line_id)]
+            order_line_ids = self.pool.get('sale.order.line').search(cr, SUPERUSER_ID, domain, context=context)
+            if order_line_ids:
+                order_line_id = order_line_ids[0]
+            return order_line_id
 
-    def _cart_update(self, cr, uid, ids, product_id=None, add_qty=0, set_qty=0, context=None):
+    def _website_product_id_change(self, cr, uid, ids, order_id, product_id, line_id=None, context=None):
+        so = self.pool.get('sale.order').browse(cr, uid, order_id, context=context)
+
+        values = self.pool.get('sale.order.line').product_id_change(cr, SUPERUSER_ID, [],
+            pricelist=so.pricelist_id.id,
+            product=product_id,
+            partner_id=so.partner_id.id,
+            context=context
+        )['value']
+
+        if line_id:
+            line = self.pool.get('sale.order.line').browse(cr, SUPERUSER_ID, line_id, context=context)
+            values['name'] = line.name
+        else:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            values['name'] = product.name_get()[0][1]
+
+        values['product_id'] = product_id
+        values['order_id'] = order_id
+        if values.get('tax_id') != None:
+            values['tax_id'] = [(6, 0, values['tax_id'])]
+        return values
+
+    def _cart_update(self, cr, uid, ids, product_id=None, line_id=None, add_qty=0, set_qty=0, context=None):
         """ Add or set product quantity, add_qty can be negative """
         sol = self.pool.get('sale.order.line')
 
-        def product_id_change(so, product_id):
-            values = sol.product_id_change(cr, SUPERUSER_ID, [],
-                pricelist=so.pricelist_id.id,
-                product=product_id,
-                partner_id=so.partner_id.id,
-                context=context
-            )['value']
-            values['name'] = "%s: %s" % (product.name, product.variants) if product.variants else product.name
-            values['product_id'] = product_id
-            values['order_id'] = so.id
-            if values.get('tax_id') != None:
-                values['tax_id'] = [(6, 0, values['tax_id'])]
-            return values
-
         quantity = 0
         for so in self.browse(cr, uid, ids, context=context):
-            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            line_id = so._cart_find_product_line(product_id)
+            line_id = so._cart_find_product_line(product_id, line_id, context=context)
 
             # Create line if no line with product_id can be located
             if not line_id:
-                values = product_id_change(so, product_id)
+                values = self._website_product_id_change(cr, uid, ids, so.id, product_id, context=context)
                 line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
 
             # compute new quantity
@@ -87,7 +98,7 @@ class sale_order(osv.Model):
                 sol.unlink(cr, SUPERUSER_ID, [line_id], context=context)
             else:
                 # update line
-                values = product_id_change(so, product_id)
+                values = self._website_product_id_change(cr, uid, ids, so.id, product_id, line_id, context=context)
                 values['product_uom_qty'] = quantity
                 sol.write(cr, SUPERUSER_ID, [line_id], values, context=context)
 
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 27cdcf36211..6e3102e4a19 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -17,7 +17,8 @@ $(document).ready(function () {
         var value = parseInt($input.val(), 10);
         if (isNaN(value)) value = 0;
         openerp.jsonRpc("/shop/cart/update_json", 'call', {
-            'product_id': parseInt($input.data('id'),10),
+            'line_id': parseInt($input.data('line-id'),10),
+            'product_id': parseInt($input.data('product-id'),10),
             'set_qty': value})
             .then(function (data) {
                 if (!data.quantity) {
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 97c6046a3ae..0329784d3d8 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -547,7 +547,9 @@
                                           </a>
                                       </span>
                                       <input type="text" class="js_quantity form-control"
-                                          t-att-data-id="line.product_id.id" t-att-value="int(line.product_uom_qty)"/>
+                                          t-att-data-line-id="line.id" 
+                                          t-att-data-product-id="line.product_id.id"
+                                          t-att-value="int(line.product_uom_qty)"/>
                                       <span class="input-group-addon">
                                           <a t-attf-href="#" class="mb8 float_left js_add_cart_json">
                                               <i class="fa fa-plus"></i>

From 61d212298773d0c49048fde9f0a1af9f1a2d1df1 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 2 May 2014 16:44:31 +0200
Subject: [PATCH 032/106] [FIX] mail.mail: avoid prefetching attachment data in
 memory while processing mail queue, could fail due to memory limit

Specifically when there are many emails in the queue, prefetching
all their attachments at once when processing the first one
could fail, so not even one mail would be sent.

Added explicit logging when an email triggers a MemoryError,
as well as logging when each email is successfully sent.

bzr revid: odo@openerp.com-20140502144431-r3brgagl4gel4wmt
---
 addons/mail/mail_mail.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index f984f8f3482..0bd15374ee2 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -240,13 +240,17 @@ class mail_mail(osv.Model):
             :return: True
         """
         ir_mail_server = self.pool.get('ir.mail_server')
+        ir_attachment = self.pool['ir.attachment']
                 
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
-                # handle attachments
-                attachments = []
-                for attach in mail.attachment_ids:
-                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+                # load attachment binary data with a separate read(), as prefetching all
+                # `datas` (binary field) could bloat the browse cache, triggerring
+                # soft/hard mem limits with temporary data.
+                attachment_ids = [a.id for a in mail.attachment_ids]
+                attachments = ((a['datas_fname'], base64.b64decode(a['datas']))
+                                 for a in ir_attachment.read(cr, uid, attachment_ids,
+                                                             ['datas_fname', 'datas']))
                 # specific behavior to customize the send email for notified partners
                 email_list = []
                 if mail.email_to:
@@ -295,10 +299,14 @@ class mail_mail(osv.Model):
                 # /!\ can't use mail.state here, as mail.refresh() will cause an error
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 if mail_sent:
+                    _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
                     self._postprocess_sent_message(cr, uid, mail, context=context)
             except MemoryError:
                 # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job
                 # instead of marking the mail as failed
+                _logger.exception('MemoryError while processing mail with ID %r and Msg-Id %r. '\
+                                      'Consider raising the --limit-memory-hard startup option',
+                                  mail.id, mail.message_id)
                 raise
             except Exception as e:
                 _logger.exception('failed sending mail.mail %s', mail.id)

From ce88158381e6a78af7f343aa58eac49065edc5e3 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 2 May 2014 16:58:23 +0200
Subject: [PATCH 033/106] [FIX] crm: typo, interrests to interest

bzr revid: dle@openerp.com-20140502145823-vtkqkd7njqf31682
---
 addons/crm/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/static/description/index.html b/addons/crm/static/description/index.html
index 70f52d0ca87..d1fe80f0275 100644
--- a/addons/crm/static/description/index.html
+++ b/addons/crm/static/description/index.html
@@ -88,7 +88,7 @@ Find duplicates, merge leads and assign them to the right salesperson in one ope
             <p class="oe_mt32">
 Get your opportunities organized to stay focused on the best deals. Manage all your customer interactions from the opportunity like emails, phone calls, internal notes, meetings and quotations.
             </p><p>
-Follow opportunities that interrests you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
+Follow opportunities that interest you to get notified upon specific events: deal won or lost, stage changed, new customer demand, etc.
             </p>
         </div>
     </div>

From bbfdc57ad94998bfccd0cb57328d2ee069da86f7 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 17:08:42 +0200
Subject: [PATCH 034/106] [FIX] website_sale: add to cart product => quantity +
 1

bzr revid: chm@openerp.com-20140502150842-nitu8tsxd02e6dnh
---
 addons/website_sale/controllers/main.py  | 2 +-
 addons/website_sale/models/sale_order.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ab9bf58848f..e6eb43d79e6 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -228,7 +228,7 @@ class website_sale(http.Controller):
         return request.website.render("website_sale.cart", values)
 
     @http.route(['/shop/cart/update'], type='http', auth="public", methods=['POST'], website=True, multilang=True)
-    def cart_update(self, product_id, add_qty=0, set_qty=0, **kw):
+    def cart_update(self, product_id, add_qty=1, set_qty=0, **kw):
         cr, uid, context = request.cr, request.uid, request.context
         request.website.sale_get_order(force_create=1)._cart_update(product_id=int(product_id), add_qty=add_qty, set_qty=set_qty)
         return request.redirect("/shop/cart")
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 3bdeef3f918..8b1185f30e5 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -86,6 +86,8 @@ class sale_order(osv.Model):
             if not line_id:
                 values = self._website_product_id_change(cr, uid, ids, so.id, product_id, context=context)
                 line_id = sol.create(cr, SUPERUSER_ID, values, context=context)
+                if add_qty:
+                    add_qty -= 1
 
             # compute new quantity
             if set_qty:

From 939b2f2d44c855885b24d28846683846045e9bbc Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 17:51:24 +0200
Subject: [PATCH 035/106] [FIX] website_sale & tour

bzr revid: chm@openerp.com-20140502155124-98xz2b4gd2zzzrkx
---
 addons/website/static/src/js/website.tour.js  | 20 ++++++++++++-------
 addons/website_sale/models/sale_order.py      |  1 +
 .../static/src/js/website.tour.sale.js        | 17 ++++++++--------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 2a661b4cc9b..0544d29df08 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -104,11 +104,11 @@ var T = website.Tour = {
         if (tour.path && !window.location.href.match(new RegExp("("+T.getLang()+")?"+tour.path+"#?$", "i"))) {
             var href = "/"+T.getLang()+tour.path;
             console.log("Tour Begin from run method (redirection to "+href+")");
-            T.saveState(tour.id, mode || tour.mode, -1);
+            T.saveState(tour.id, mode || tour.mode, -1, 0);
             window.location.href = href;
         } else {
             console.log("Tour Begin from run method");
-            T.saveState(tour.id, mode || tour.mode, 0);
+            T.saveState(tour.id, mode || tour.mode, 0, 0);
             T.running();
         }
     },
@@ -311,7 +311,7 @@ var T = website.Tour = {
             };
             window.location.hash = "";
             console.log("Tour Begin from url hash");
-            T.saveState(state.id, state.mode, state.step_id);
+            T.saveState(state.id, state.mode, state.step_id, 0);
         }
         if (!state.id) {
             return;
@@ -341,8 +341,8 @@ var T = website.Tour = {
         }
         return tour_ids;
     },
-    saveState: function (tour_id, mode, step_id) {
-        localStorage.setItem("tour", JSON.stringify({"id":tour_id, "mode":mode, "step_id":step_id || 0, "time": this.time}));
+    saveState: function (tour_id, mode, step_id, number) {
+        localStorage.setItem("tour", JSON.stringify({"id":tour_id, "mode":mode, "step_id":step_id || 0, "time": this.time, "number": number+1}));
     },
     reset: function () {
         var state = T.getState();
@@ -402,6 +402,7 @@ var T = website.Tour = {
             if (T.check(next)) {
                 clearTimeout(T.currentTimer);
                 // use an other timeout for cke dom loading
+                T.saveState(state.id, state.mode, state.step.id, 0);
                 setTimeout(function () {
                     T.nextStep(next);
                 }, T.defaultDelay);
@@ -421,7 +422,13 @@ var T = website.Tour = {
         }
 
         step = step || state.step;
-        T.saveState(state.id, state.mode, step.id);
+        var next = state.tour.steps[step.id+1];
+
+        if (state.number > 3) {
+            T.error(next, "Cycling. Can't reach the next step");
+        }
+        
+        T.saveState(state.id, state.mode, step.id, state.number);
 
         if (step.id !== state.step_id) {
             console.log("Tour Step: '" + (step._title || step.title) + "' (" + (new Date().getTime() - this.time) + "ms)");
@@ -433,7 +440,6 @@ var T = website.Tour = {
             step.onload();
         }
 
-        var next = state.tour.steps[step.id+1];
         if (next) {
             setTimeout(function () {
                     T.waitNextStep();
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 8b1185f30e5..1102016bacd 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -109,6 +109,7 @@ class sale_order(osv.Model):
     def _cart_accessories(self, cr, uid, ids, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             s = set(j.id for l in (order.website_order_line or []) for j in (l.product_id.accessory_product_ids or []))
+            s -= set(l.product_id.id for l in order.order_line)
             product_ids = random.sample(s, min(len(s),3))
             return self.pool['product.template'].browse(cr, uid, product_ids, context=context)
 
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index a957747c91b..7bdcc0fbe75 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -20,31 +20,32 @@
             {
                 title:     "click on add to cart",
                 waitFor:   'input[name="product_id"]:eq(1)[checked]',
-                element:   'form[action="/shop/add_cart"] .btn',
+                element:   'form[action="/shop/cart/update"] .btn',
             },
             {
                 title:     "add suggested",
-                element:   'form[action="/shop/add_cart"] .btn-link:contains("Add to Cart")',
+                waitNot:   '#cart_products:contains("[A8767] Apple In-Ear Headphones")',
+                element:   'form[action="/shop/cart/update"] .btn-link:contains("Add to Cart")',
             },
             {
                 title:     "add one more iPod",
                 waitFor:   '.my_cart_quantity:contains(2)',
-                element:   '#mycart_products tr:contains("iPod: 32 Gb") a.js_add_cart_json:eq(1)',
+                element:   '#cart_products tr:contains("iPod - 32 Gb") a.js_add_cart_json:eq(1)',
             },
             {
                 title:     "remove Headphones",
-                waitFor:   '#mycart_products tr:contains("iPod: 32 Gb") input.js_quantity[value=2]',
-                element:   '#mycart_products tr:contains("Apple In-Ear Headphones") a.js_add_cart_json:first',
+                waitFor:   '#cart_products tr:contains("iPod - 32 Gb") input.js_quantity[value=2]',
+                element:   '#cart_products tr:contains("Apple In-Ear Headphones") a.js_add_cart_json:first',
             },
             {
                 title:     "set one iPod",
-                waitNot:   '#mycart_products tr:contains("Apple In-Ear Headphones")',
-                element:   '#mycart_products input.js_quantity',
+                waitNot:   '#cart_products tr:contains("Apple In-Ear Headphones")',
+                element:   '#cart_products input.js_quantity',
                 sampleText: '1',
             },
             {
                 title:     "go to checkout",
-                waitFor:   '#mycart_products input.js_quantity[value=1]',
+                waitFor:   '#cart_products input.js_quantity[value=1]',
                 element:   'a[href="/shop/checkout"]',
             },
             {

From 1fd1114c690f8d725aba634f139eebd966527325 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 18:06:28 +0200
Subject: [PATCH 036/106] [FIX] website_sale: access to the webite partner_id

bzr revid: chm@openerp.com-20140502160628-nbwzx28j4daj1ua8
---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index e6eb43d79e6..9a9dc6bbd53 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -383,7 +383,7 @@ class website_sale(http.Controller):
                 partner_id = order.partner_id.id
 
         # save partner informations
-        if partner_id and request.website.user_id.partner_id.id != partner_id:
+        if partner_id and request.website.partner_id.id != partner_id:
             orm_partner.write(cr, SUPERUSER_ID, [partner_id], billing_info, context=context)
         else:
             partner_id = orm_partner.create(cr, SUPERUSER_ID, billing_info, context=context)

From e09a8934b4e5ed09f6158b8752d898fb22eb63f3 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 2 May 2014 18:21:38 +0200
Subject: [PATCH 037/106] [FIX] website_event: access right for portal user

bzr revid: chm@openerp.com-20140502162138-qp2kci9i1bncsj1i
---
 addons/website_event/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 2d98213669f..aeb66c3e088 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
+access_event_event_portal,event.event.portal,event.model_event_event,base.group_portal,1,0,0,0
 access_event_type_public,event.type.public,event.model_event_type,base.group_public,1,0,0,0
+access_event_type_portal,event.type.portal,event.model_event_type,base.group_portal,1,0,0,0

From f426972e37a6fc2f8bd603fc81f65c94b706c8a7 Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Sun, 4 May 2014 06:27:21 +0000
Subject: [PATCH 038/106] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070138-uuemdpfseyysxlvs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064550-9r0c2t3tr8dp1hwu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140501063929-ta3t6lhed5dpdz9a
bzr revid: launchpad_translations_on_behalf_of_openerp-20140502064608-1zwt52snc5pg5kfi
bzr revid: launchpad_translations_on_behalf_of_openerp-20140504062721-dgb7m6o6ge2btumg
---
 addons/account_analytic_analysis/i18n/de.po |  38 +++----
 addons/account_followup/i18n/nl.po          |   8 +-
 addons/base_setup/i18n/fa.po                |  52 ++++-----
 addons/mail/i18n/lt.po                      |  16 +--
 addons/mail/i18n/nl.po                      |  10 +-
 addons/mrp/i18n/de.po                       |  93 ++++++++--------
 addons/mrp_byproduct/i18n/de.po             |  10 +-
 addons/mrp_operations/i18n/de.po            |  75 +++++++------
 addons/project/i18n/lt.po                   |  30 +++---
 openerp/addons/base/i18n/ab.po              |   4 +-
 openerp/addons/base/i18n/af.po              |   4 +-
 openerp/addons/base/i18n/am.po              |   4 +-
 openerp/addons/base/i18n/ar.po              |   4 +-
 openerp/addons/base/i18n/bg.po              |   2 +-
 openerp/addons/base/i18n/bn.po              |   4 +-
 openerp/addons/base/i18n/bs.po              |   4 +-
 openerp/addons/base/i18n/ca.po              |   4 +-
 openerp/addons/base/i18n/cs.po              |   4 +-
 openerp/addons/base/i18n/da.po              |   4 +-
 openerp/addons/base/i18n/de.po              | 114 ++++++++++++++++++--
 openerp/addons/base/i18n/el.po              |   4 +-
 openerp/addons/base/i18n/en_GB.po           |   4 +-
 openerp/addons/base/i18n/es.po              |   4 +-
 openerp/addons/base/i18n/es_AR.po           |   4 +-
 openerp/addons/base/i18n/es_BO.po           |   4 +-
 openerp/addons/base/i18n/es_CL.po           |   4 +-
 openerp/addons/base/i18n/es_CR.po           |   4 +-
 openerp/addons/base/i18n/es_DO.po           |   4 +-
 openerp/addons/base/i18n/es_EC.po           |   4 +-
 openerp/addons/base/i18n/es_MX.po           |   4 +-
 openerp/addons/base/i18n/es_PE.po           |   4 +-
 openerp/addons/base/i18n/es_VE.po           |   4 +-
 openerp/addons/base/i18n/et.po              |   4 +-
 openerp/addons/base/i18n/eu.po              |   4 +-
 openerp/addons/base/i18n/fa.po              |   4 +-
 openerp/addons/base/i18n/fa_AF.po           |   4 +-
 openerp/addons/base/i18n/fi.po              |   4 +-
 openerp/addons/base/i18n/fr.po              |   4 +-
 openerp/addons/base/i18n/fr_CA.po           |   4 +-
 openerp/addons/base/i18n/gl.po              |   4 +-
 openerp/addons/base/i18n/gu.po              |   4 +-
 openerp/addons/base/i18n/he.po              |   4 +-
 openerp/addons/base/i18n/hi.po              |   2 +-
 openerp/addons/base/i18n/hr.po              |   4 +-
 openerp/addons/base/i18n/hu.po              |   6 +-
 openerp/addons/base/i18n/hy.po              |   4 +-
 openerp/addons/base/i18n/id.po              |   4 +-
 openerp/addons/base/i18n/is.po              |   4 +-
 openerp/addons/base/i18n/it.po              |   4 +-
 openerp/addons/base/i18n/ja.po              |   4 +-
 openerp/addons/base/i18n/ka.po              |   4 +-
 openerp/addons/base/i18n/kk.po              |   4 +-
 openerp/addons/base/i18n/ko.po              |   4 +-
 openerp/addons/base/i18n/lt.po              |   4 +-
 openerp/addons/base/i18n/lv.po              |   4 +-
 openerp/addons/base/i18n/mk.po              |   4 +-
 openerp/addons/base/i18n/mn.po              |   4 +-
 openerp/addons/base/i18n/nb.po              |   4 +-
 openerp/addons/base/i18n/nl.po              |   4 +-
 openerp/addons/base/i18n/nl_BE.po           |   4 +-
 openerp/addons/base/i18n/pl.po              |   4 +-
 openerp/addons/base/i18n/pt.po              |   4 +-
 openerp/addons/base/i18n/pt_BR.po           |   4 +-
 openerp/addons/base/i18n/ro.po              |   4 +-
 openerp/addons/base/i18n/ru.po              |   4 +-
 openerp/addons/base/i18n/sk.po              |   4 +-
 openerp/addons/base/i18n/sl.po              |   4 +-
 openerp/addons/base/i18n/sq.po              |   4 +-
 openerp/addons/base/i18n/sr.po              |   4 +-
 openerp/addons/base/i18n/sr@latin.po        |   4 +-
 openerp/addons/base/i18n/sv.po              |   4 +-
 openerp/addons/base/i18n/th.po              |   4 +-
 openerp/addons/base/i18n/tlh.po             |   4 +-
 openerp/addons/base/i18n/tr.po              |   4 +-
 openerp/addons/base/i18n/uk.po              |   4 +-
 openerp/addons/base/i18n/ur.po              |   4 +-
 openerp/addons/base/i18n/vi.po              |   4 +-
 openerp/addons/base/i18n/zh_CN.po           |   4 +-
 openerp/addons/base/i18n/zh_HK.po           |   4 +-
 openerp/addons/base/i18n/zh_TW.po           |   4 +-
 80 files changed, 410 insertions(+), 314 deletions(-)

diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index bebe5db7593..56fa2cb71f0 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-25 11:47+0000\n"
-"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
+"PO-Revision-Date: 2014-05-01 10:17+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-26 05:15+0000\n"
-"X-Generator: Launchpad (build 16914)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -26,12 +26,12 @@ msgstr "Kein Auftrag abzurechnen, erstellen"
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:547
 #, python-format
 msgid "Timesheets to Invoice of %s"
-msgstr "Stundenzettel in Rechnung von %s"
+msgstr "Abzurechnende Stundenzettel von %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "Gruppierung ..."
+msgstr "Gruppieren nach …"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -41,7 +41,7 @@ msgstr "Vorlage"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr "Abrechnen"
+msgstr "Abzurechnen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -76,7 +76,7 @@ msgstr "=> Rechnung"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Abgerechnet"
+msgstr "Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
@@ -86,7 +86,7 @@ msgstr "Datum der letzten Abrechnung"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr "Summe abzurechnende Beträge"
+msgstr "Angebotssummen zu diesem Vertrag"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_sales_order
@@ -207,7 +207,7 @@ msgstr "Enddatum"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Account Manager"
-msgstr "Buchhalter"
+msgstr "Kostenstellenverantwortlicher"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -536,7 +536,7 @@ msgstr "Status"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "Theoretische Einnahmen"
+msgstr "Planumsatz"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -637,7 +637,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr "Umsatz pro Stunde"
+msgstr "Erzielter Umsatz pro Zeiteinheit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -787,12 +787,12 @@ msgstr "Theoretische Marge"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr "Summe verbleibende Abrechnung"
+msgstr "Verbleibende Summe"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Berechnungsformel: Rechnungsbetrag - Gesamtkosten."
+msgstr "Berechnungsformel: Abgerechnete Summe - Gesamtkosten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
@@ -833,7 +833,7 @@ msgstr "sale.config.settings"
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr "Zwingende Nutzung von Vorlagen"
+msgstr "Verbindliche Nutzung von Vorlagen"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
@@ -854,12 +854,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr "Erwartete Gesamtabrechnung"
+msgstr "Erwartete Gesamtsumme"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr "Verbleibender Gewinn"
+msgstr "Verbleibender Umsatz"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -882,8 +882,8 @@ msgstr "Gesamtzeit"
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
 msgstr ""
-"ein Auswahl für die Projektvorlage und Vertragseinstellungen sind "
-"erforderlich"
+"Das Feld Vorlage aus der Kostenstellenrechnung und dem Vertragswesen wird "
+"erforderlich sein."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 7677027a68b..6b43c32a919 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-10-14 09:53+0000\n"
+"PO-Revision-Date: 2014-05-03 08:41+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 05:58+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: account_followup
 #: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -520,7 +520,7 @@ msgid ""
 "action."
 msgstr ""
 "Het betalingsherinneringschema wat is gedefinieerd voor het huidige bedrijf, "
-"heeft gen opvolgende actie."
+"heeft geen opvolgende actie."
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 34221e4c9fd..45faaaa9d02 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-03 21:19+0000\n"
+"Last-Translator: fshahy <fshahy@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -25,17 +25,17 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "مهمان"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "تماس ها"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
@@ -59,22 +59,22 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_sale:0
 msgid "SALE"
-msgstr ""
+msgstr "فروش"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "عضو"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "دسترسی پورتال"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "احراز هویت"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -86,7 +86,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "تنظیمات عمومی"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -96,12 +96,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "ایمیل"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -111,12 +111,12 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "امکان بارگذاری فایل CSV توسط کاربران"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "مدیریت چند شرکت"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -141,7 +141,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -183,7 +183,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "مشتری"
 
 #. module: base_setup
 #: help:sale.config.settings,module_web_linkedin:0
@@ -218,7 +218,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -241,7 +241,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -268,7 +268,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "همکار"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -279,7 +279,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "تنظیمات فروش"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -351,7 +351,7 @@ msgstr "لغو"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "اعمال"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -362,9 +362,9 @@ msgstr ""
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "یا"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "تنظیم اطلاعات شرکت"
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 8206fdcfcb5..129e5b017e0 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-08-21 12:36+0000\n"
-"Last-Translator: Eimis <eimislap@gmail.com>\n"
+"PO-Revision-Date: 2014-04-30 16:38+0000\n"
+"Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:18+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-01 06:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -139,7 +139,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:268
 #, python-format
 msgid "updated document"
-msgstr ""
+msgstr "atnaujino dukomentą"
 
 #. module: mail
 #. openerp-web
@@ -409,7 +409,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:294
 #, python-format
 msgid "notified"
-msgstr ""
+msgstr "informuotas"
 
 #. module: mail
 #. openerp-web
@@ -1508,7 +1508,7 @@ msgstr "Atsakyti"
 #: field:mail.compose.message,notified_partner_ids:0
 #: field:mail.message,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Informuoti partneriai"
 
 #. module: mail
 #. openerp-web
@@ -1644,7 +1644,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:154
 #, python-format
 msgid "Attach a note that will not be sent to the followers"
-msgstr ""
+msgstr "Pridėkite pastabą kuri nebus nusiųsta prenumeratoriams"
 
 #. module: mail
 #. openerp-web
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 3ca7d4f9bb8..4c7732829e4 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-07-06 11:09+0000\n"
+"PO-Revision-Date: 2014-05-03 09:56+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:18+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-04 06:27+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mail
 #: view:mail.followers:0
@@ -1535,9 +1535,7 @@ msgstr "Aanmaak maand"
 #: help:mail.message,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
-"Relaties die een notificatie hebben, die dit bericht doorgestuurd hebben "
-"naar hun e-mailbox"
+msgstr "Relaties welke berichten ontvangen via de e-mail."
 
 #. module: mail
 #: view:mail.message:0
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 2a5b2baf1f0..ea408377e92 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2014-01-20 09:00+0000\n"
-"Last-Translator: Matthias Fax <matthias.fax@greensolid.de>\n"
+"PO-Revision-Date: 2014-05-01 17:39+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-01-21 06:20+0000\n"
-"X-Generator: Launchpad (build 16901)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -47,7 +47,7 @@ msgstr "Anzahl Zyklen"
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "Maßgeblicher Lagerort für Verfügbarkeit von Waren."
+msgstr "Lagerort für Komponenten der Produktion."
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -112,7 +112,7 @@ msgstr "Für Lager- und Verbrauchsprodukte"
 #: help:mrp.production,message_unread:0
 #: help:mrp.production.workcenter.line,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr "Als zu erledigen markieren"
+msgstr "Wenn markiert, erfordern neue Nachrichten Ihr Handeln."
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -196,7 +196,7 @@ msgstr ""
 #. module: mrp
 #: field:change.production.qty,product_qty:0
 msgid "Product Qty"
-msgstr "Anzahl"
+msgstr "Produktmenge"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -357,12 +357,12 @@ msgstr "Verwalte Arbeitspläne"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Produkt zu fertigen"
+msgstr "Produkt fertigen"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Fehler! Sie können keine rekursiven Stücklisten erstellen"
+msgstr "Fehler! Sie dürfen keine rekursiven Stücklisten erstellen"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -419,7 +419,7 @@ msgstr "Referenz muss je Unternehmen eindeutig sein"
 #: report:mrp.production.order:0
 #, python-format
 msgid "Quantity"
-msgstr "Anzahl"
+msgstr "Menge"
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -427,8 +427,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
-"Tragen Sie hier ein Produkt ein, zur Verfolgung der Arbeitskosten auf einer "
-"Kostenstelle."
+"Tragen Sie hier ein Produkt ein, zur Verfolgung der Fertigungskosten in der "
+"Kostenstellenrechnung."
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
@@ -595,7 +595,7 @@ msgstr "Produkttyp ist Service (Dienstleistung)"
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr "Kosten des Arbeitsplatzes je Zyklus"
+msgstr "Arbeitsplatzkosten je Zyklus"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -611,7 +611,7 @@ msgstr "Für Dienstleistungsprodukte."
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr "Anfrage für Angebot"
+msgstr "Angebotsanfrage"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -661,7 +661,7 @@ msgstr "Bestandswert"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Struktur Stückliste"
+msgstr "Produkt-Stücklistenstruktur"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -677,12 +677,12 @@ msgstr "Bestimmt die Reihenfolge der angezeigten Arbeitsplätze"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Stückliste Hierachie"
+msgstr "Stücklistenhierachie"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr "Zu produzieren"
+msgstr "Zu fertigen"
 
 #. module: mrp
 #: help:mrp.config.settings,module_stock_no_autopicking:0
@@ -721,7 +721,7 @@ msgstr "Komponenten"
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr "Vorbereitung"
+msgstr "Vorbereitungszeit"
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -747,7 +747,7 @@ msgstr "Verbrauchte Produkte"
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr "Arbeitsplatz Auslastung"
+msgstr "Arbeitsplatzauslastung"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:55
@@ -931,13 +931,13 @@ msgstr "Warnung!"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Printing date"
-msgstr "Datum Druck"
+msgstr "Druckdatum"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "Anfrage Angebot"
+msgstr "Angebotsanfrage"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
@@ -1119,7 +1119,8 @@ msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
 msgstr ""
-"BItte zuerst den internen Lieferschein dieses Fertigungsauftrags stornieren!"
+"BItte zuerst die interne Kommissionierung dieses Fertigungsauftrags "
+"stornieren!"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -1155,12 +1156,12 @@ msgstr "Kurzbez."
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "No. Of Hours"
-msgstr "Anzahl Stunden"
+msgstr "Stundenanzahl"
 
 #. module: mrp
 #: view:mrp.property:0
 msgid "Property Group"
-msgstr "Fertigungsmerkmale Gruppe"
+msgstr "Merkmalsgruppe"
 
 #. module: mrp
 #: field:mrp.config.settings,group_mrp_routings:0
@@ -1170,7 +1171,7 @@ msgstr "Verwalte Arbeitspläne und Arbeitsaufträge "
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr "Fertigungsplanung"
+msgstr "Produktionsplanung"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1194,8 +1195,8 @@ msgid ""
 "subcontracting demand for instance."
 msgstr ""
 "Wenn einem Dienstleistungsprodukt 'Einkauf' als Beschaffungsmethode "
-"zugewiesen wird, wird eine Anfrage für eine Fremdvergabe an Lieferanten "
-"erstellt."
+"zugewiesen wird, wird eine Anfrage für die Fremdvergabe an externe "
+"Dienstleister erstellt."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1210,7 +1211,7 @@ msgstr "Beschaffe an Lager"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "Stückliste Bezeichnung"
+msgstr "Stücklistenbezeichnung"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1249,7 +1250,7 @@ msgstr "Bezeichnung"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "Fertigung Auftragsnummer:"
+msgstr "Fertigungsauftragsnummer:"
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
@@ -1362,7 +1363,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "Kostenstellen Journal"
+msgstr "Kostenstellenjournal"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1389,8 +1390,8 @@ msgid ""
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
 "Das System wartet bis das Produkt als Bestand im Lager verfügbar ist. Diese "
-"Produkte werden typischerweise manuell bestellt oder es werden über die "
-"Meldebestandsregeln Bestellvorschläge erstellt."
+"Produkte werden typischerweise manuell oder über Meldebestandsregeln "
+"beschafft."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1487,7 +1488,7 @@ msgstr "Priorität"
 #: model:ir.model,name:mrp.model_stock_picking
 #: field:mrp.production,picking_id:0
 msgid "Picking List"
-msgstr "Pickliste"
+msgstr "Kommissionierschein"
 
 #. module: mrp
 #: help:mrp.production,bom_id:0
@@ -1555,7 +1556,7 @@ msgstr "Definieren von Hersteller "
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr "Produkte Kostenübersicht"
+msgstr "Produktkostenstruktur"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1576,12 +1577,12 @@ msgstr "Suche nach Arbeitsplatz"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "BoM Structure"
-msgstr "Stückliste Struktur"
+msgstr "Stücklistenstruktur"
 
 #. module: mrp
 #: field:mrp.production,date_start:0
 msgid "Start Date"
-msgstr "Start Datum"
+msgstr "Anfangsdatum"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour_account_id:0
@@ -1633,7 +1634,7 @@ msgstr ""
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center Loads"
-msgstr "Arbeitsplatz Auslastungen"
+msgstr "Arbeitsplätzeauslastung"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1659,7 +1660,7 @@ msgstr "Meldebestandregel Material"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Extra Information"
-msgstr "Extra Information"
+msgstr "Zusatzinformation"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
@@ -1669,12 +1670,12 @@ msgstr "Ändere die Mengen für die Produkte"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr "Löst Beschaffungsaufträge für Komponenten aus ."
+msgstr "Löst Beschaffungsaufträge für Komponenten aus."
 
 #. module: mrp
 #: field:mrp.production.product.line,product_uos_qty:0
 msgid "Product UOS Quantity"
-msgstr "Produkt VE Menge"
+msgstr "Produktmenge in VE"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1684,7 +1685,7 @@ msgstr "Sachkonto"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "SO Number"
-msgstr "Auftrag Nummer"
+msgstr "Auftragsnummer"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:505
@@ -1721,7 +1722,7 @@ msgstr "Verantwortlicher"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Startbereit für Fertigung"
+msgstr "Auszuführende Fertigungsaufträge"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
@@ -1846,7 +1847,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,date_finished:0
 msgid "End Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: mrp
 #: field:mrp.workcenter,resource_id:0
@@ -1956,7 +1957,7 @@ msgstr "Dienstleistung"
 #. module: mrp
 #: selection:mrp.production,state:0
 msgid "Cancelled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1970,8 +1971,8 @@ msgid ""
 "lines (in the \"Work Centers\" tab).\n"
 "                This installs the module mrp_operations."
 msgstr ""
-"Hierdurch können Sie Status, das geplante Datum, das voraussichtliche Ende "
-"Datum für die einzelnen Arbeitsaufträge (im Aktenreiter Arbeitsaufträge) "
+"Hierdurch können Sie Status, das Anfangsdatum, das voraussichtliche Enddatum "
+"für die einzelnen Arbeitsaufträge (im Aktenreiter Arbeitsaufträge) "
 "definieren. \n"
 "Es wird das Modul mrp_operations installiert."
 
diff --git a/addons/mrp_byproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
index 0bd55833b36..518375c6a51 100644
--- a/addons/mrp_byproduct/i18n/de.po
+++ b/addons/mrp_byproduct/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2014-05-01 07:30+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -54,7 +54,7 @@ msgstr "Fertigungsauftrag"
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr "Ändere Menge bei Produkten"
+msgstr "Ändere Menge der Produkte"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index b32e2efd29a..f40ce20147c 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-01-06 21:44+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
+"PO-Revision-Date: 2014-05-01 12:17+0000\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:21+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -30,7 +29,7 @@ msgstr "Arbeitsaufträge"
 #: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Operation is already finished!"
-msgstr "Vorgang ist bereits beendet"
+msgstr "Vorgang ist bereits abgeschlossen!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -56,7 +55,7 @@ msgstr "Information von der Arbeitsplan Definition"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "Unit of Measure"
-msgstr "ME"
+msgstr "Mengeneinheit"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -103,7 +102,7 @@ msgstr "Fertigungsauftrag"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr "Arbeitsaufträge"
+msgstr "MRP-Vorgänge"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -114,7 +113,7 @@ msgstr "Tag"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr "Storno Bestellung"
+msgstr "Auftrag abbrechen"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -129,7 +128,7 @@ msgstr "Ausnahme Lieferauftrag"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr "Erstellung von Arbeitsaufträgen"
+msgstr "Erstellung des Arbeitsauftrags"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -145,14 +144,14 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:484
 #, python-format
 msgid "Error!"
-msgstr "Fehler !"
+msgstr "Fehler!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:477
@@ -164,18 +163,18 @@ msgstr "Vorgang ist bereits storniert"
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
 #: view:mrp.production.workcenter.line:0
 msgid "Operations"
-msgstr "Arbeitsaufträge"
+msgstr "Vorgänge"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr "Lieferung"
+msgstr "Lagerbuchung"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:481
 #, python-format
 msgid "No operation to cancel."
-msgstr "Es gibt keinen Auftrag, der storniert werden könnte."
+msgstr "Kein Vorgang zum Abbrechen."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:474
@@ -183,7 +182,7 @@ msgstr "Es gibt keinen Auftrag, der storniert werden könnte."
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
 msgstr ""
-"Um einen Vorgang abzuschließen muss dieser Im Status Start oder "
+"Um einen Vorgang abschließen zu können, muss dieser Im Status Start oder "
 "Wiederaufnahme sein!"
 
 #. module: mrp_operations
@@ -214,7 +213,7 @@ msgstr "Arbeitsplatz"
 #: field:mrp.production.workcenter.line,date_planned_end:0
 #: field:mrp_operations.operation,date_finished:0
 msgid "End Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -233,8 +232,8 @@ msgid ""
 "There is 1 work order per work center. The information about the number of "
 "cycles or the cycle time."
 msgstr ""
-"Hier finden Sie je einen Arbeitsauftrag je Arbeitsplatz. Diese Information "
-"wird generiert von der Anzahl der Arbeitszyklen oder der Zyklendauer."
+"Es gibt einen Arbeitsauftrag je Arbeitsplatz. Information zu Anzahl der "
+"Arbeitszyklen oder der Zyklendauer."
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
@@ -244,18 +243,18 @@ msgstr "Statistik Arbeitsaufträge"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
 msgid "Work Orders By Resource"
-msgstr "Arbeitsaufträge"
+msgstr "Arbeitsaufträge nach Ressource"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Planned Date"
-msgstr "Geplantes Datum"
+msgstr "Plandatum"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr "Produkt Anz."
+msgstr "Produktmenge"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:134
@@ -347,7 +346,7 @@ msgstr "Arbeitsauftrag wurde storniert"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Pause Work Order"
-msgstr "Unterbreche Arbeitsauftrag"
+msgstr "Arbeitsauftrag aussetzen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -368,7 +367,7 @@ msgstr "Monat"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Canceled"
-msgstr "Storniert"
+msgstr "Abgebrochen"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
@@ -378,13 +377,13 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr "Bericht Arbeitsauftrag"
+msgstr "Arbeitsaufträge-Bericht"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
 #: field:mrp_operations.operation,date_start:0
 msgid "Start Date"
-msgstr "Start Datum"
+msgstr "Startdatum"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -415,7 +414,7 @@ msgstr "In Bearbeitung"
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
-"Um einen Vorgang zu unterbrechen, muss dieser den Status Start oder "
+"Um einen Vorgang auszusetzen, muss dieser den Status Start oder "
 "Wiederaufnahme haben"
 
 #. module: mrp_operations
@@ -481,7 +480,7 @@ msgstr "August"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr "Start Datum"
+msgstr "Begonnen"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -517,7 +516,7 @@ msgstr "Abhängige Lieferungen"
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_planning
 msgid "Work Orders Planning"
-msgstr "Planung Arbeitsaufträge"
+msgstr "Arbeitsaufträgeplanung"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -564,7 +563,7 @@ msgstr "Arbeitsauftrag wurde noch nicht gestartet !"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr "Information zum Fertigungsauftrag."
+msgstr "Information aus dem Fertigungsauftrag."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:454
@@ -599,12 +598,12 @@ msgstr "Auftragskürzel"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
 msgid "Qty"
-msgstr "Anzahl"
+msgstr "Menge"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr "Arbeitsauftrag erledigt"
+msgstr "Arbeitsauftrag abgeschlossen"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -725,7 +724,7 @@ msgstr "Arbeitsplatz"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_planned:0
 msgid "Scheduled Date"
-msgstr "Geplantes Datum"
+msgstr "Plantermin"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,product:0
@@ -746,8 +745,8 @@ msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
 msgstr ""
-"Aktivieren Sie diese Option, wenn Sie möchten, dass unabhängig voneinander "
-"alle Fertigungsaufträge verschoben werden können."
+"Aktivieren Sie diese Option, wenn Sie Fertigungsaufträge ohne "
+"Berücksichtigung von Abhängikeiten verschieben möchten."
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -785,12 +784,12 @@ msgstr "Februar"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr "Arbeitsauftrag storniert"
+msgstr "Vorgang abgebrochen"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr "Starte Arbeitsauftrag"
+msgstr "Vorgang beginnen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -800,7 +799,7 @@ msgstr "April"
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr "Arbeitsauftrag erledigt"
+msgstr "Vorgang abgeschlossen"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index c4c6e039bd7..63a78d05939 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:36+0000\n"
-"PO-Revision-Date: 2013-05-09 06:10+0000\n"
+"PO-Revision-Date: 2014-04-30 16:34+0000\n"
 "Last-Translator: Andrius Preimantas @ hbee <andrius.preimantas@gmail.com>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"X-Launchpad-Export-Date: 2014-05-01 06:39+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: project
 #: view:project.project:0
@@ -235,7 +235,7 @@ msgstr "Priskirtas"
 #: model:mail.message.subtype,name:project.mt_project_task_closed
 #: model:mail.message.subtype,name:project.mt_task_closed
 msgid "Task Done"
-msgstr ""
+msgstr "Užduotis atlikta"
 
 #. module: project
 #: view:project.project:0
@@ -276,7 +276,7 @@ msgstr "Projekto užduoties delegavimas"
 #: model:mail.message.subtype,name:project.mt_project_task_started
 #: model:mail.message.subtype,name:project.mt_task_started
 msgid "Task Started"
-msgstr ""
+msgstr "Užduotis pradėta"
 
 #. module: project
 #: view:project.task:0
@@ -458,7 +458,7 @@ msgstr ""
 #: model:mail.message.subtype,name:project.mt_project_task_blocked
 #: model:mail.message.subtype,name:project.mt_task_blocked
 msgid "Task Blocked"
-msgstr ""
+msgstr "Užduotis užblokuota"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -478,7 +478,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_blocked
 msgid "Task blocked"
-msgstr ""
+msgstr "Užduotis užblokuota"
 
 #. module: project
 #: view:project.task:0
@@ -997,7 +997,7 @@ msgstr "Vartotojai"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Etapas pakeistas"
 
 #. module: project
 #: view:project.project:0
@@ -1252,7 +1252,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Užduotis etapas pakeistas"
 
 #. module: project
 #: view:project.task:0
@@ -1324,7 +1324,7 @@ msgstr "Pradžios data"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blokuota"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1492,7 +1492,7 @@ msgstr "Likusios valandos"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Etapas pakeistas"
 
 #. module: project
 #: constraint:project.task:0
@@ -1599,7 +1599,7 @@ msgstr "Deleguoti savo užduotį kitam naudotojui"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Užduotis pradėta"
 
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@@ -1760,7 +1760,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Užduotis sukurta"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1947,7 +1947,7 @@ msgstr "Juodraštis"
 #: field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Kanban statusas"
 
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
@@ -2026,7 +2026,7 @@ msgstr ""
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "Užduotis sukurta"
 
 #. module: project
 #: view:report.project.task.user:0
diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po
index cd513ef7507..588e4d0192c 100644
--- a/openerp/addons/base/i18n/ab.po
+++ b/openerp/addons/base/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:24+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:43+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po
index 6db28359325..3d966597d98 100644
--- a/openerp/addons/base/i18n/af.po
+++ b/openerp/addons/base/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:43+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po
index 3f9d48ce249..3ddda383fff 100644
--- a/openerp/addons/base/i18n/am.po
+++ b/openerp/addons/base/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po
index b192aac5287..97ede03c0f2 100644
--- a/openerp/addons/base/i18n/ar.po
+++ b/openerp/addons/base/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po
index fcb2fa1fcea..a0537f0c0c0 100644
--- a/openerp/addons/base/i18n/bg.po
+++ b/openerp/addons/base/i18n/bg.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-18 07:21+0000\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/bn.po b/openerp/addons/base/i18n/bn.po
index f2cbedbe806..d73672df028 100644
--- a/openerp/addons/base/i18n/bn.po
+++ b/openerp/addons/base/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po
index d652ea6bbba..fe7660038e7 100644
--- a/openerp/addons/base/i18n/bs.po
+++ b/openerp/addons/base/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:45+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po
index ca2d622ee3c..db92eef8ea4 100644
--- a/openerp/addons/base/i18n/ca.po
+++ b/openerp/addons/base/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po
index bcb98493fc9..7e8eb75a11d 100644
--- a/openerp/addons/base/i18n/cs.po
+++ b/openerp/addons/base/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "X-Language: cs_CZ\n"
 "X-Source-Language: en\n"
 
diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po
index 74bc935bb85..3a98a511565 100644
--- a/openerp/addons/base/i18n/da.po
+++ b/openerp/addons/base/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:46+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po
index 91cc6e9175f..9d49252d0d7 100644
--- a/openerp/addons/base/i18n/de.po
+++ b/openerp/addons/base/i18n/de.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
-"PO-Revision-Date: 2014-04-19 16:21+0000\n"
+"PO-Revision-Date: 2014-05-01 14:38+0000\n"
 "Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-20 05:58+0000\n"
+"X-Launchpad-Export-Date: 2014-05-02 06:45+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
@@ -1256,7 +1256,7 @@ msgstr "Oman"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp
 msgid "MRP"
-msgstr "Bedarfsplanung"
+msgstr "Material- und Ressourcenplanung"
 
 #. module: base
 #: model:ir.module.module,description:base.module_hr_attendance
@@ -3308,6 +3308,38 @@ msgid ""
 "and\n"
 "directly integrated in the core accounting. \n"
 msgstr ""
+"\n"
+"Fügen Sie in Rechnungen eine zusätzliche Auswertungsebene für "
+"Konsolidierungen hinzu \n"
+"============================================================================="
+"==\n"
+"\n"
+"Standardmäßig können Kunden- und Lieferantenrechnungen an einen Kontakt\n"
+"innerhalb des Unternehmens gebunden werden, in der Datenstruktur ist \n"
+"das Unternehmen jedoch nicht fest mit einer Rechnung verknüpft. Journale "
+"sind\n"
+"hingegen immer fest auf ein Unternehmen bezogen und nicht auf Kontakte,\n"
+"so dass kreditorische und debitorische Konten immer korrekt behandelt "
+"werden\n"
+"und auf Unternehmensebene korrekt konsolidiert werden. \n"
+"\n"
+"Wenn viele verschiedene Kontakte/Abteilungen unter einer Unternehmensmutter\n"
+"konsolidiert werden, kann dies das Berichtswesen erschweren; Berichte "
+"basieren \n"
+"unmittelbar auf der Datenbankstruktur und liefern daher nicht die "
+"notwendige\n"
+"konsolidierte/aggregierte Dimension.\n"
+"\n"
+"Dieses Modul löst das Problem, indem eine explizite Referenz auf das "
+"Unternehmen\n"
+"in die Rechnungen eingebracht wird, welche automatisch aus dem Kontakt der \n"
+"Rechnung ermittelt wird. Dieser neue Bezug wird nun zum Gruppieren in Listen "
+"\n"
+"und in der Rechnungsübersicht nach Partnern verwendet.\n"
+"\n"
+"Hinweis: Mit großer Wahrscheinlichkeit wird dieses Modul in der nächsten\n"
+"Hauptversion von OpenERP in den Kern der Finanzmodule verankert und somit \n"
+"entfallen. \n"
 
 #. module: base
 #: model:res.country,name:base.ai
@@ -10229,6 +10261,53 @@ msgid ""
 "of creation of distribution models.\n"
 "        "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Verwendung mehrerer Umlagepläne gemäß der "
+"Kostenstelle.\n"
+"============================================================================="
+"============\n"
+"\n"
+"Hier werden mehrere Buchungen angelegt, wenn die Rechnung oder\n"
+"die Buchungen genehmigt werden.\n"
+"\n"
+"Zum Beispiel können Sie die folgene Kostenstellenstruktur definieren:\n"
+"--------------------------------------------------------------------------\n"
+"* **Projekte**\n"
+"* Projekt 1\n"
+"+ TeilProj 1.1\n"
+"\n"
+"+ TeilProj 1.2\n"
+"\n"
+"* Projekt 2\n"
+"\n"
+"* **Verkäufer**\n"
+"* Erik\n"
+"\n"
+"* Fabien\n"
+"\n"
+"Wir haben hier zwei Pläne: Projekte und Verkäufer. Eine Rechnungsposition "
+"muss Kosten auf beide Pläne umlegen können: TeilProj 1.1 und Fabien. Die "
+"Beträge können auch aufgeteilt werden.\n"
+"\n"
+"Das folgende Beispiel zeigt den Fall einer Rechnung, die beide Teilprojekte "
+"betrifft und einem Verkäufer zugeordent ist:\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
+"**Plan1:**\n"
+"\n"
+"* TeilProjekt 1.1 : 50%\n"
+"\n"
+"* TeilProjekt 1.2 : 50%\n"
+"\n"
+"**Plan2:**\n"
+"Erik: 100%\n"
+"\n"
+"Wenn diese Rechnungsposition bestätigt wird, wird sie drei "
+"Kostenstellenbuchungen für eine Finanzbuchung erzeugen.\n"
+"\n"
+"Der Umlageplan prüft die minimale bzw. maximale Umlage zum Zeitpunkt der "
+"Anlage des Umlageschlüssels.\n"
+"        "
 
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_sequence
@@ -11198,6 +11277,9 @@ msgid ""
 "related to a model that uses the need_action mechanism, this field is set to "
 "true. Otherwise, it is false."
 msgstr ""
+"Wenn der Menüeintrag eine act_window -Aktion ist und diese Aktion mit dem "
+"need_action -Mechanismus agiert, ist dieses Feld auf Wahr gesetzt. "
+"Anderenfalls ist es Falsch."
 
 #. module: base
 #: code:addons/orm.py:3961
@@ -11740,7 +11822,7 @@ msgstr "Benutzer-Interface"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_mrp_byproduct
 msgid "MRP Byproducts"
-msgstr "MRP nach Produkten"
+msgstr "MRP Kuppelprodukte"
 
 #. module: base
 #: field:res.request,ref_partner_id:0
@@ -12181,7 +12263,7 @@ msgstr "Neue Sprache (leere Übersetzungsvorlage)"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_account_report_company
 msgid "Invoice Analysis per Company"
-msgstr ""
+msgstr "Rechnungsprüfung je Unternehmen"
 
 #. module: base
 #: help:ir.actions.server,email:0
@@ -14124,6 +14206,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"    Klicken Sie, um eine neue Partner-Kategorie anzulegen.\n"
+"</p><p>\n"
+"    Verwalten Sie Partnerkategorien, um diese besser zu klassifizieren und "
+"für Analysezwecke.\n"
+"    Ein Partner kann mehreren Kategorien angehören und Kategorien können "
+"hierarchisch strukturiert sein; \n"
+"    ein Partner einer Kategorie gehört auch seiner Übergeordbeten Kategorie "
+"an.\n"
+"</p>\n"
+"            "
 
 #. module: base
 #: field:ir.actions.act_window,filter:0
@@ -14144,6 +14237,11 @@ msgid ""
 "a new contact should be created under that new company. You can use the "
 "\"Discard\" button to abandon this change."
 msgstr ""
+"Das Unternehmen eines Kontaktes sollte nur geändert werden, wenn dieses nie "
+"korrekt gepflegt wurde. Wenn ein bestehender Kontakt für ein Unternehmen zu "
+"arbeiten beginnt, sollte dieser in diesem (möglicherweise neuen) Unternehmen "
+"neu angelegt werden. Sie können \"abbrechen\" wählen, um diese Änderung zu "
+"verwerfen."
 
 #. module: base
 #: help:res.partner,customer:0
@@ -14865,7 +14963,7 @@ msgstr "Falklandinseln"
 #: code:addons/base/ir/ir_actions.py:606
 #, python-format
 msgid "Please specify an action to launch!"
-msgstr ""
+msgstr "Geben Sie bitte eine zu startende Aktion an."
 
 #. module: base
 #: model:res.country,name:base.lb
@@ -15552,7 +15650,7 @@ msgstr ""
 #: code:addons/base/ir/ir_model.py:295
 #, python-format
 msgid "Size of the field can never be less than 0 !"
-msgstr ""
+msgstr "Die Größe des Feldes darf niemals kleiner als 0 sein!"
 
 #. module: base
 #: help:ir.actions.server,sequence:0
@@ -19228,7 +19326,7 @@ msgstr "Kontext"
 #. module: base
 #: model:ir.module.module,shortdesc:base.module_sale_mrp
 msgid "Sales and MRP Management"
-msgstr "Verkaufs- und Fertigungsplanung"
+msgstr "Verkauf und Fertigungsplanung"
 
 #. module: base
 #: model:ir.actions.act_window,help:base.action_partner_form
diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po
index 2f4e6a3ccbc..6e0e6cf95bc 100644
--- a/openerp/addons/base/i18n/el.po
+++ b/openerp/addons/base/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po
index 0c48f809e1b..60c09f8fbdf 100644
--- a/openerp/addons/base/i18n/en_GB.po
+++ b/openerp/addons/base/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po
index 791861f93dd..3e2e43cf878 100644
--- a/openerp/addons/base/i18n/es.po
+++ b/openerp/addons/base/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: help:ir.actions.act_window,res_id:0
diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po
index ab4822147c2..6a2b174a1e5 100644
--- a/openerp/addons/base/i18n/es_AR.po
+++ b/openerp/addons/base/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_BO.po b/openerp/addons/base/i18n/es_BO.po
index 521160bb0e1..8589e50544a 100644
--- a/openerp/addons/base/i18n/es_BO.po
+++ b/openerp/addons/base/i18n/es_BO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po
index 0c6bf121a42..0c3dbd87a7f 100644
--- a/openerp/addons/base/i18n/es_CL.po
+++ b/openerp/addons/base/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po
index 1cedd08cd1c..e49d73a7661 100644
--- a/openerp/addons/base/i18n/es_CR.po
+++ b/openerp/addons/base/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_DO.po b/openerp/addons/base/i18n/es_DO.po
index b4b07072f4e..8a80555cd29 100644
--- a/openerp/addons/base/i18n/es_DO.po
+++ b/openerp/addons/base/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po
index 23795d2098e..a3e0dea0da3 100644
--- a/openerp/addons/base/i18n/es_EC.po
+++ b/openerp/addons/base/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po
index cf8a48e13cc..48f3474e178 100644
--- a/openerp/addons/base/i18n/es_MX.po
+++ b/openerp/addons/base/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_PE.po b/openerp/addons/base/i18n/es_PE.po
index 09411a50ed9..14ea6ec46dd 100644
--- a/openerp/addons/base/i18n/es_PE.po
+++ b/openerp/addons/base/i18n/es_PE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:00+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/es_VE.po b/openerp/addons/base/i18n/es_VE.po
index 436202e55b4..5dc77512e23 100644
--- a/openerp/addons/base/i18n/es_VE.po
+++ b/openerp/addons/base/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po
index b13e98ddec2..5d1002b41d7 100644
--- a/openerp/addons/base/i18n/et.po
+++ b/openerp/addons/base/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po
index 3e68d2841c1..34ef1492aca 100644
--- a/openerp/addons/base/i18n/eu.po
+++ b/openerp/addons/base/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po
index 11704cbc627..1f6989fd736 100644
--- a/openerp/addons/base/i18n/fa.po
+++ b/openerp/addons/base/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po
index 43591aa2e1f..c62abb31716 100644
--- a/openerp/addons/base/i18n/fa_AF.po
+++ b/openerp/addons/base/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po
index b98dc96cd4c..03a5f427814 100644
--- a/openerp/addons/base/i18n/fi.po
+++ b/openerp/addons/base/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po
index e7bac5bf2bb..e99c36b47c1 100644
--- a/openerp/addons/base/i18n/fr.po
+++ b/openerp/addons/base/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/fr_CA.po b/openerp/addons/base/i18n/fr_CA.po
index c8d28eaf3b6..4cda6729392 100644
--- a/openerp/addons/base/i18n/fr_CA.po
+++ b/openerp/addons/base/i18n/fr_CA.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:58+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po
index d1570a296ea..38f2650ed7d 100644
--- a/openerp/addons/base/i18n/gl.po
+++ b/openerp/addons/base/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po
index 3f9a60600f5..dd5485f122b 100644
--- a/openerp/addons/base/i18n/gu.po
+++ b/openerp/addons/base/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po
index a7d926f466f..11a530bc154 100644
--- a/openerp/addons/base/i18n/he.po
+++ b/openerp/addons/base/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:29+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: he\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hi.po b/openerp/addons/base/i18n/hi.po
index cb0c9f9b047..d93da0df53a 100644
--- a/openerp/addons/base/i18n/hi.po
+++ b/openerp/addons/base/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-19 06:34+0000\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:49+0000\n"
 "X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po
index ab565579309..4a444862822 100644
--- a/openerp/addons/base/i18n/hr.po
+++ b/openerp/addons/base/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po
index 3213fa81d20..239fa88c66a 100644
--- a/openerp/addons/base/i18n/hu.po
+++ b/openerp/addons/base/i18n/hu.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-07 19:35+0000\n"
 "PO-Revision-Date: 2013-06-14 11:19+0000\n"
-"Last-Translator: Csaba TOTH <csaba.toth@i3rendszerhaz.hu>\n"
+"Last-Translator: Csaba TOTH <tsabi@tsabi.hu>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po
index 099f41ebba1..4ab99460442 100644
--- a/openerp/addons/base/i18n/hy.po
+++ b/openerp/addons/base/i18n/hy.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:26+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po
index 1e4622ed19e..5120095c551 100644
--- a/openerp/addons/base/i18n/id.po
+++ b/openerp/addons/base/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po
index 628210885ba..89eed343710 100644
--- a/openerp/addons/base/i18n/is.po
+++ b/openerp/addons/base/i18n/is.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:30+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po
index 461555cde22..3be431ba87c 100644
--- a/openerp/addons/base/i18n/it.po
+++ b/openerp/addons/base/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:50+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po
index c58bb767caa..92e947b78bb 100644
--- a/openerp/addons/base/i18n/ja.po
+++ b/openerp/addons/base/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:31+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po
index a011dff3bd3..bdc54179ad9 100644
--- a/openerp/addons/base/i18n/ka.po
+++ b/openerp/addons/base/i18n/ka.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:28+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:48+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po
index d186b75e868..ec1cfe38c7f 100644
--- a/openerp/addons/base/i18n/kk.po
+++ b/openerp/addons/base/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po
index 9fc2f56d292..911b28b5972 100644
--- a/openerp/addons/base/i18n/ko.po
+++ b/openerp/addons/base/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po
index d57f0319380..46acc01f9cf 100644
--- a/openerp/addons/base/i18n/lt.po
+++ b/openerp/addons/base/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po
index 5f6e6d0f9b1..374edddbd75 100644
--- a/openerp/addons/base/i18n/lv.po
+++ b/openerp/addons/base/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:32+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:51+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po
index 4d92ff8d978..5656e9dc19a 100644
--- a/openerp/addons/base/i18n/mk.po
+++ b/openerp/addons/base/i18n/mk.po
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "Language: mk\n"
 
 #. module: base
diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po
index 364c347a944..281b3477992 100644
--- a/openerp/addons/base/i18n/mn.po
+++ b/openerp/addons/base/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po
index 17d20e7d623..bf0c8fcdca8 100644
--- a/openerp/addons/base/i18n/nb.po
+++ b/openerp/addons/base/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:33+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:52+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po
index 663c3e813e4..bc66d2afb9d 100644
--- a/openerp/addons/base/i18n/nl.po
+++ b/openerp/addons/base/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:27+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:47+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po
index fad9155c823..5deb09257da 100644
--- a/openerp/addons/base/i18n/nl_BE.po
+++ b/openerp/addons/base/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:39+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po
index c23cbd9dddc..fee6e78151d 100644
--- a/openerp/addons/base/i18n/pl.po
+++ b/openerp/addons/base/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po
index 437493a7e2d..ae1cdd4c60a 100644
--- a/openerp/addons/base/i18n/pt.po
+++ b/openerp/addons/base/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po
index ae64496adf1..b79ca897c09 100644
--- a/openerp/addons/base/i18n/pt_BR.po
+++ b/openerp/addons/base/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po
index 3841f3d4a24..cfbe450f235 100644
--- a/openerp/addons/base/i18n/ro.po
+++ b/openerp/addons/base/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:34+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:53+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po
index b3498fead28..c853ceac1c1 100644
--- a/openerp/addons/base/i18n/ru.po
+++ b/openerp/addons/base/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po
index 11d380b69b5..317a345df87 100644
--- a/openerp/addons/base/i18n/sk.po
+++ b/openerp/addons/base/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po
index 6ca483ec4cf..ef46ef7f18e 100644
--- a/openerp/addons/base/i18n/sl.po
+++ b/openerp/addons/base/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po
index d539cb25d57..0a27e13f5d4 100644
--- a/openerp/addons/base/i18n/sq.po
+++ b/openerp/addons/base/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:25+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:44+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po
index 55e7a48d2a8..34f65fc970f 100644
--- a/openerp/addons/base/i18n/sr.po
+++ b/openerp/addons/base/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:35+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:54+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po
index 324a680a5fc..8e3667cc9e8 100644
--- a/openerp/addons/base/i18n/sr@latin.po
+++ b/openerp/addons/base/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po
index 7373e77674f..c6608433dfc 100644
--- a/openerp/addons/base/i18n/sv.po
+++ b/openerp/addons/base/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po
index 7b9aae4552f..43b78261235 100644
--- a/openerp/addons/base/i18n/th.po
+++ b/openerp/addons/base/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:36+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po
index b0172cf3453..5f534d66862 100644
--- a/openerp/addons/base/i18n/tlh.po
+++ b/openerp/addons/base/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:55+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po
index 2a9ce6708fa..7528f74182c 100644
--- a/openerp/addons/base/i18n/tr.po
+++ b/openerp/addons/base/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po
index a47d17affc3..6b5501eaf80 100644
--- a/openerp/addons/base/i18n/uk.po
+++ b/openerp/addons/base/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po
index 29e92a5e5d0..7f193e562a7 100644
--- a/openerp/addons/base/i18n/ur.po
+++ b/openerp/addons/base/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po
index 0c8ca127f98..97cf0dad81d 100644
--- a/openerp/addons/base/i18n/vi.po
+++ b/openerp/addons/base/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:37+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:56+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po
index 4a8d5cedcc2..065c1df91df 100644
--- a/openerp/addons/base/i18n/zh_CN.po
+++ b/openerp/addons/base/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po
index 5be82b0a219..7fc4326ee57 100644
--- a/openerp/addons/base/i18n/zh_HK.po
+++ b/openerp/addons/base/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:38+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:57+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing
diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po
index 2aedacbdad3..f8bf4a7e578 100644
--- a/openerp/addons/base/i18n/zh_TW.po
+++ b/openerp/addons/base/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 09:40+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-30 06:59+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: base
 #: model:ir.module.module,description:base.module_account_check_writing

From 188930bb01e93d7d142d19c2ac171814257347dc Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 5 May 2014 09:46:36 +0200
Subject: [PATCH 039/106] [FIX] convert: gracefully ignore missing XML IDs when
 processing <delete> tags + warn in log

bzr revid: odo@openerp.com-20140505074636-bl2y5pst4pfmpz3u
---
 openerp/tools/convert.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 870f9d19dd2..bd7c214fd24 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -266,12 +266,17 @@ form: module.record_id""" % (xml_id,)
 
         if d_search:
             idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={})
-            ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
+            try:
+                ids = self.pool.get(d_model).search(cr, self.uid, unsafe_eval(d_search, idref))
+            except ValueError:
+                _logger.warning('Skipping deletion for failed search `%r`', d_search, exc_info=True)
+                pass
         if d_id:
             try:
                 ids.append(self.id_get(cr, d_id))
-            except:
+            except ValueError:
                 # d_id cannot be found. doesn't matter in this case
+                _logger.warning('Skipping deletion for missing XML ID `%r`', d_id, exc_info=True)
                 pass
         if ids:
             self.pool.get(d_model).unlink(cr, self.uid, ids)

From 1a9f3165ce08776d81b477f9cef6c0d2f13df9a1 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 10:57:55 +0200
Subject: [PATCH 040/106] [FIX] sale: change fiscal_position don't change order
 line taxes; Add onchange_fiscal_position method on sale.order

bzr revid: chm@openerp.com-20140505085755-wewn9xm8bp08ywnd
---
 addons/sale/sale.py       | 34 ++++++++++++++++++++++++++++++++++
 addons/sale/sale_view.xml |  3 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index b3c68bc4517..5eec3bc8b40 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -626,6 +626,40 @@ class sale_order(osv.osv):
     def action_done(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
+    def onchange_fiscal_position(self, cr, uid, ids, fiscal_position, order_lines, context=None):
+        order_line = []
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        product_obj = self.pool.get('product.product')
+        line_obj = self.pool.get('sale.order.line')
+
+        fpos = False
+        if fiscal_position:
+            fpos = fiscal_obj.browse(cr, uid, fiscal_position, context=context)
+        
+        for line in order_lines:
+            # create    (0, 0,  { fields })
+            # update    (1, ID, { fields })
+            if line[0] in [0, 1]:
+                taxes_id = None
+                if line[2].get('product_id'):
+                    taxes_id = product_obj.browse(cr, uid, line[2]['product_id'], context=context).taxes_id
+                elif line[1]:
+                    taxes_id = line_obj.browse(cr, uid, line[1], context=context).product_id.taxes_id
+                if taxes_id:
+                    line[2]['tax_id'] = [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, taxes_id)]]
+                order_line.append(line)
+
+            # link      (4, ID)
+            # link all  (6, 0, IDS)
+            elif line[0] in [4, 6]:
+                line_ids = line[0] == 4 and [line[1]] or line[2]
+                for line_id in line_ids:
+                    taxes_id = line_obj.browse(cr, uid, line_id, context=context).product_id.taxes_id
+                    order_line.append([1, line_id, {'tax_id': [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, taxes_id)]]}])
+
+            else:
+                order_line.append(line)
+        return {'value': {'order_line': order_line}}
 
 
 # TODO add a field price_unit_uos
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d352765cab7..2482b73b064 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,7 +206,8 @@
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" options="{'no_create': True}"/>
-                                    <field name="fiscal_position" options="{'no_create': True}"/>
+                                    <field name="fiscal_position" options="{'no_create': True}"
+                                        on_change="onchange_fiscal_position(fiscal_position, order_line, context)"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                                 </group>
                                 <group>

From 9e176a977e19a0ac0a70ec76bebd6906ae20a46e Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 11:23:00 +0200
Subject: [PATCH 041/106] [FIX] website_sale: apply tax position on checkout
 signup

bzr revid: chm@openerp.com-20140505092300-l29tc4pum31nqd1h
---
 addons/sale/sale.py                      | 1 +
 addons/website_sale/models/sale_order.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 5eec3bc8b40..71366c5a3ab 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -644,6 +644,7 @@ class sale_order(osv.osv):
                 if line[2].get('product_id'):
                     taxes_id = product_obj.browse(cr, uid, line[2]['product_id'], context=context).taxes_id
                 elif line[1]:
+                    # don't change taxes if they are no product defined
                     taxes_id = line_obj.browse(cr, uid, line[1], context=context).product_id.taxes_id
                 if taxes_id:
                     line[2]['tax_id'] = [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, taxes_id)]]
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index 1102016bacd..cd334a2c451 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -177,6 +177,10 @@ class website(orm.Model):
                 fiscal_position = sale_order.fiscal_position and sale_order.fiscal_position.id or False
 
                 values = sale_order_obj.onchange_partner_id(cr, SUPERUSER_ID, [sale_order_id], partner.id, context=context)['value']
+                order_lines = map(int,sale_order.order_line)
+                values.update(sale_order_obj.onchange_fiscal_position(cr, SUPERUSER_ID, [],
+                    values['fiscal_position'], [[6, 0, order_lines]], context=context)['value'])
+
                 values['partner_id'] = partner.id
                 sale_order_obj.write(cr, SUPERUSER_ID, [sale_order_id], values, context=context)
 

From 5b839bea890cff8ff87d40ed486350e8d9782436 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 11:27:30 +0200
Subject: [PATCH 042/106] [IMP] website_sale: attribute's filters template
 unactive by default

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

diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 0329784d3d8..20438a5f380 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -261,7 +261,7 @@
   </xpath>
 </template>
 
-<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">
+<template id="products_attributes" 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-att-action="keep('shop',attrib=0)" class="attributes" method="get">
           <ul class="nav nav-pills nav-stacked mt16">

From 06c63594bec9d64042c157c084e60ee43ce18bbb Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 11:34:23 +0200
Subject: [PATCH 043/106] [FIX] website_sale: message confirmation

bzr revid: chm@openerp.com-20140505093423-nrmou02ov1txod3k
---
 addons/website_sale/controllers/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 9a9dc6bbd53..3cb3ff0acaf 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -579,7 +579,8 @@ class website_sale(http.Controller):
                 message = '<p>The payment seems to have been canceled.</p>'
             elif state == 'pending' and tx.acquirer_id.validation == 'manual':
                 message = '<p>Your transaction is waiting confirmation.</p>'
-                message += tx.acquirer_id.post_msg
+                if tx.acquirer_id.post_msg:
+                    message += tx.acquirer_id.post_msg
             else:
                 message = '<p>Your transaction is waiting confirmation.</p>'
             validation = tx.acquirer_id.validation

From a918e8999502d7e70c94de772b53035b74a87f38 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <>
Date: Mon, 5 May 2014 11:43:29 +0200
Subject: [PATCH 044/106] [FIX] mail: change copy call to copy_data to avoid
 resending email during duplication (opw 607295)

bzr revid: mat@openerp.com-20140505094329-vr7h4c92i43ezob4
---
 addons/mail/mail_thread.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 83f3693e3be..90ae3cf0aa3 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -316,14 +316,14 @@ class mail_thread(osv.AbstractModel):
         fol_obj.unlink(cr, SUPERUSER_ID, fol_ids, context=context)
         return res
 
-    def copy(self, cr, uid, id, default=None, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         # avoid tracking multiple temporary changes during copy
         context = dict(context or {}, mail_notrack=True)
 
         default = default or {}
         default['message_ids'] = []
         default['message_follower_ids'] = []
-        return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
+        return super(mail_thread, self).copy_data(cr, uid, id, default=default, context=context)
 
     #------------------------------------------------------
     # Automatically log tracked fields

From 41ade23b090ec8087ee1cda151dbd72c4e6f80fd Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 11:57:24 +0200
Subject: [PATCH 045/106] [FIX] website_sale & website_event: create product
 (redirect with slug)

bzr revid: chm@openerp.com-20140505095724-mc9k6d2yf68ln9nq
---
 addons/website_event/controllers/main.py | 4 +++-
 addons/website_sale/controllers/main.py  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index aae57e32a93..b00e7038d5c 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -34,6 +34,7 @@ import time
 from dateutil.relativedelta import relativedelta
 from openerp import tools
 import werkzeug.urls
+from openerp.addons.website.models.website import slug
 
 try:
     import GeoIP
@@ -211,7 +212,8 @@ class website_event(http.Controller):
             'date_end': (date_begin + timedelta(days=(1))).strftime('%Y-%m-%d'),
         }
         event_id = Event.create(request.cr, request.uid, vals, context=context)
-        return request.redirect("/event/%s?enable_editor=1" % event_id)
+        event = Event.browse(request.cr, request.uid, event_id, context=context)
+        return request.redirect("/event/%s/register?enable_editor=1" % slug(event))
 
     def get_visitors_country(self):
         GI = GeoIP.open('/usr/share/GeoIP/GeoIP.dat', 0)
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 3cb3ff0acaf..866fd194316 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -5,6 +5,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
@@ -665,7 +666,7 @@ class website_sale(http.Controller):
         product_id = product_obj.create(cr, uid, { 'name': name, 'public_categ_id': category }, context=context)
         product = product_obj.browse(cr, uid, product_id, context=context)
 
-        return request.redirect("/shop/product/%s/?enable_editor=1" % product.product_tmpl_id.id)
+        return request.redirect("/shop/product/%s?enable_editor=1" % slug(product.product_tmpl_id))
 
     @http.route(['/shop/reorder'], type='json', auth="public")
     def reorder(self, product_id, operation):

From 5e406734abd0336503548803fd53ea44bc859869 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Mon, 5 May 2014 14:18:40 +0200
Subject: [PATCH 046/106] [FIX] module: do not crash in case of not found
 module

bzr revid: mat@openerp.com-20140505121840-f84u36mng3p1gstn
---
 openerp/modules/module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 82e86e83ce2..0ccb2865796 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -177,7 +177,7 @@ def load_information_from_description_file(module, mod_path=None):
 
     if not mod_path:
         mod_path = get_module_path(module)
-    terp_file = opj(mod_path, '__openerp__.py')
+    terp_file = mod_path and opj(mod_path, '__openerp__.py') or False
     if terp_file:
         info = {}
         if os.path.isfile(terp_file):

From 4f1dbde8d595fc3c977401e364adac3e50c94296 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 5 May 2014 14:38:52 +0200
Subject: [PATCH 047/106] [FIX] mail: attachments present for first recipient,
 but not for the others

attachments should be an array and not a generator [x for x in y] instead of (x for x in y)

bzr revid: dle@openerp.com-20140505123852-kjc6z0npiot9c54l
---
 addons/mail/mail_mail.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 0bd15374ee2..1cc033e8926 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -241,16 +241,16 @@ class mail_mail(osv.Model):
         """
         ir_mail_server = self.pool.get('ir.mail_server')
         ir_attachment = self.pool['ir.attachment']
-                
+
         for mail in self.browse(cr, SUPERUSER_ID, ids, context=context):
             try:
                 # load attachment binary data with a separate read(), as prefetching all
                 # `datas` (binary field) could bloat the browse cache, triggerring
                 # soft/hard mem limits with temporary data.
                 attachment_ids = [a.id for a in mail.attachment_ids]
-                attachments = ((a['datas_fname'], base64.b64decode(a['datas']))
-                                 for a in ir_attachment.read(cr, uid, attachment_ids,
-                                                             ['datas_fname', 'datas']))
+                attachments = [(a['datas_fname'], base64.b64decode(a['datas']))
+                                 for a in ir_attachment.read(cr, SUPERUSER_ID, attachment_ids,
+                                                             ['datas_fname', 'datas'])]
                 # specific behavior to customize the send email for notified partners
                 email_list = []
                 if mail.email_to:

From d3678bf5216f7b015ac75f9c929b225bd7e143c4 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 14:47:02 +0200
Subject: [PATCH 048/106] [FIX] website_sale: don't rewrite sale order
 partner_id with the public user

bzr revid: chm@openerp.com-20140505124702-cq6tvb6h3lgyst99
---
 addons/website_sale/controllers/main.py  | 7 +++++--
 addons/website_sale/models/sale_order.py | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 866fd194316..dd094794696 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -369,7 +369,7 @@ class website_sale(http.Controller):
 
         orm_partner = registry.get('res.partner')
         orm_user = registry.get('res.users')
-        order_line_obj = request.registry.get('sale.order')
+        order_obj = request.registry.get('sale.order')
 
         billing_info = self.checkout_parse('billing', checkout, True)
 
@@ -406,7 +406,7 @@ class website_sale(http.Controller):
         order_info.update(registry.get('sale.order').onchange_partner_id(cr, SUPERUSER_ID, [], partner_id, context=context)['value'])
         order_info.pop('user_id')
 
-        order_line_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
+        order_obj.write(cr, SUPERUSER_ID, [order.id], order_info, context=context)
 
     @http.route(['/shop/checkout'], type='http', auth="public", website=True, multilang=True)
     def checkout(self, **post):
@@ -521,6 +521,8 @@ class website_sale(http.Controller):
         if not order or not order.order_line or acquirer_id is None:
             return request.redirect("/shop/checkout")
 
+        assert order.partner_id.id != request.website.partner_id.id
+
         # find an already existing transaction
         tx = request.website.sale_get_transaction()
         if not tx:
@@ -530,6 +532,7 @@ class website_sale(http.Controller):
                 'amount': order.amount_total,
                 'currency_id': order.pricelist_id.currency_id.id,
                 'partner_id': order.partner_id.id,
+                'partner_country_id': order.partner_id.country_id.id,
                 'reference': order.name,
                 'sale_order_id': order.id,
             }, context=context)
diff --git a/addons/website_sale/models/sale_order.py b/addons/website_sale/models/sale_order.py
index cd334a2c451..a83bb26b6c8 100644
--- a/addons/website_sale/models/sale_order.py
+++ b/addons/website_sale/models/sale_order.py
@@ -169,7 +169,7 @@ class website(orm.Model):
                 request.session['sale_order_code_pricelist_id'] = False
 
             # check for change of partner_id ie after signup
-            if sale_order.partner_id.id !=  partner.id:
+            if sale_order.partner_id.id != partner.id and request.website.partner_id.id != partner.id:
                 flag_pricelist = False
                 pricelist_id = request.session.get('sale_order_code_pricelist_id') or partner.property_product_pricelist.id
                 if pricelist_id != sale_order.pricelist_id.id:
@@ -187,6 +187,10 @@ class website(orm.Model):
                 if flag_pricelist or values.get('fiscal_position') != fiscal_position:
                     update_pricelist(pricelist_id)
 
+            # update browse record
+            if (code and code != sale_order.pricelist_id.code) or sale_order.partner_id.id !=  partner.id:
+                sale_order = sale_order_obj.browse(cr, SUPERUSER_ID, sale_order.id, context=context)
+
         return sale_order
 
     def sale_get_transaction(self, cr, uid, ids, context=None):

From 41e6840169ab79b424990b91031ec1f5d9a6cb32 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Mon, 5 May 2014 15:02:26 +0200
Subject: [PATCH 049/106] [FIX] account_analytic_analysis: recurring invoices,
 prepare_invoice method actually prepare the invoice, without creating it.
 _recurring_create_invoice return value is the list of created invoices ids

bzr revid: dle@openerp.com-20140505130226-ylcycmzmj0hm35w6
---
 .../account_analytic_analysis.py              | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 5aa4b5a49db..a25950783ad 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -655,7 +655,6 @@ class account_analytic_account(osv.osv):
     def _prepare_invoice(self, cr, uid, contract, context=None):
         context = context or {}
 
-        inv_obj = self.pool.get('account.invoice')
         journal_obj = self.pool.get('account.journal')
         fpos_obj = self.pool.get('account.fiscal.position')
 
@@ -679,20 +678,19 @@ class account_analytic_account(osv.osv):
             currency_id = contract.company_id.currency_id.id
 
         inv_data = {
-           'reference': contract.code or False,
            'account_id': contract.partner_id.property_account_receivable.id,
            'type': 'out_invoice',
            'partner_id': contract.partner_id.id,
            'currency_id': currency_id,
            'journal_id': len(journal_ids) and journal_ids[0] or False,
            'date_invoice': contract.recurring_next_date,
-           'origin': contract.name,
+           'origin': contract.code,
            'fiscal_position': fpos and fpos.id,
            'payment_term': partner_payment_term,
            'company_id': contract.company_id.id or False,
         }
-        invoice_id = inv_obj.create(cr, uid, inv_data, context=context)
 
+        invoice_line_vals = []
         for line in contract.recurring_invoice_line_ids:
 
             res = line.product_id
@@ -704,7 +702,7 @@ class account_analytic_account(osv.osv):
             taxes = res.taxes_id or False
             tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
 
-            invoice_line_vals = {
+            invoice_line_vals.append({
                 'name': line.name,
                 'account_id': account_id,
                 'account_analytic_id': contract.id,
@@ -712,13 +710,13 @@ class account_analytic_account(osv.osv):
                 'quantity': line.quantity,
                 'uos_id': line.uom_id.id or False,
                 'product_id': line.product_id.id or False,
-                'invoice_id' : invoice_id,
+                # 'invoice_id' : invoice_id,
                 'invoice_line_tax_id': [(6, 0, tax_id)],
-            }
-            self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
+            })
 
-        inv_obj.button_compute(cr, uid, [invoice_id], context=context)
-        return invoice_id
+        inv_data['invoice_line'] = [(0, 0, line_vals) for line_vals in invoice_line_vals]
+
+        return inv_data
 
     def recurring_create_invoice(self, cr, uid, ids, context=None):
         return self._recurring_create_invoice(cr, uid, ids, context=context)
@@ -728,6 +726,7 @@ class account_analytic_account(osv.osv):
 
     def _recurring_create_invoice(self, cr, uid, ids, automatic=False, context=None):
         context = context or {}
+        invoice_ids = []
         current_date =  time.strftime('%Y-%m-%d')
         if ids:
             contract_ids = ids
@@ -735,8 +734,8 @@ class account_analytic_account(osv.osv):
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
         for contract in self.browse(cr, uid, contract_ids, context=context):
             try:
-                invoice_id = self._prepare_invoice(cr, uid, contract, context=context)
-
+                invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
                 next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
                 interval = contract.recurring_interval
                 if contract.recurring_rule_type == 'daily':
@@ -754,7 +753,7 @@ class account_analytic_account(osv.osv):
                     _logger.error(traceback.format_exc())
                 else:
                     raise
-        return True
+        return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):
     _name = "account_analytic_analysis.summary.user"

From 80c77d0355b60f578beabd2c3f87285e24d22222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 5 May 2014 16:51:38 +0200
Subject: [PATCH 050/106] [FIX] web: view_form: fixed effective_readonly
 behavior of the binary multi files widget. The option to add an attachment
 should be available only in edit mode.

lp bug: https://launchpad.net/bugs/1314974 fixed

bzr revid: tde@openerp.com-20140505145138-x9iwzp74ha2q0bp2
---
 addons/web/static/src/js/view_form.js | 6 +++++-
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6014e83dba1..d93b59bc520 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5408,7 +5408,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
  * Options on attribute ; "blockui" {Boolean} block the UI or not
  * during the file is uploading
  */
-instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: "FieldBinaryFileUploader",
     init: function(field_manager, node) {
         this._super(field_manager, node);
@@ -5426,6 +5426,9 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
     start: function() {
         this._super(this);
         this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change );
+        this.on("change:effective_readonly", this, function () {
+            this.render_value();
+        });
     },
     set_value: function(value_) {
         value_ = value_ || [];
@@ -5462,6 +5465,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
     },
     render_value: function () {
         var self = this;
+        this.$('.oe_add').css('visibility', this.get('effective_readonly') ? 'hidden': '');
         this.read_name_values().then(function (ids) {
             var render = $(instance.web.qweb.render('FieldBinaryFileUploader.files', {'widget': self, 'values': ids}));
             render.on('click', '.oe_delete', _.bind(self.on_file_delete, self));
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 82a3822a9c8..bda1a2b8fc3 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1336,7 +1336,7 @@
 <t t-name="FieldBinaryFileUploader">
     <div t-att-style="widget.node.attrs.style" t-attf-class="oe_fileupload #{widget.node.attrs.class ? widget.node.attrs.class :''}">
         <div class="oe_placeholder_files"/>
-        <div class="oe_add" t-if="!widget.get('effective_readonly')">
+        <div class="oe_add">
             <!-- uploader of file -->
             <button class="oe_attach"><span class="oe_e">'</span></button> 
             <span class='oe_attach_label'><t t-esc="widget.string"/></span>

From 3f032f3f9737c50a113331c12edc9b39a6e30d14 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 5 May 2014 17:07:22 +0200
Subject: [PATCH 051/106] [FIX] website editor: background image

bzr revid: chm@openerp.com-20140505150722-gwewelvu3uv6joen
---
 .../website/static/src/js/website.editor.js   |  1 +
 .../static/src/js/website.snippets.editor.js  | 23 +++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 2119d05f650..d7b7843de00 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1056,6 +1056,7 @@
             this.trigger("saved");
         },
         cancel: function () {
+            this.trigger("cancel");
         },
         close: function () {
             this.$el.modal('hide');
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index bae014029e1..51e8bc3b991 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -362,7 +362,7 @@
         },
         clean_for_save: function () {
             var self = this;
-            $(website.snippet.globalSelector).each(function () {
+            this.dom_filter(website.snippet.globalSelector).each(function () {
                 var $snippet = $(this);
                 self.make_active($snippet);
                 self.make_active(false);
@@ -875,20 +875,29 @@
             this._super(np);
             if (np.$next) {
                 if (np.$next.hasClass("oe_custom_bg")) {
-                    var editor = new website.editor.ImageDialog();
-                    editor.on('start', self, function (o) {o.url = np.$prev && np.$prev.data("src") || np.$next && np.$next.data("src") || "";});
-                    editor.on('save', self, function (o) {
-                        self._set_bg(o.url);
-                        np.$next.data("src", o.url);
+                    var $image = $('<img class="hidden"/>');
+                    $image.attr("src", np.$prev ? np.$prev.data("src") : '');
+                    $image.appendTo(self.$target);
+
+                    self.element = new CKEDITOR.dom.element($image[0]);
+                    var editor = new website.editor.MediaDialog(self, self.element);
+                    editor.appendTo(document.body);
+                    editor.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
+
+                    $image.on('saved', self, function (o) {
+                        var src = $image.attr("src");
+                        self._set_bg(src);
+                        np.$next.data("src", src);
                         self.$target.trigger("snippet-style-change", [self, np]);
+                        $image.remove();
                     });
                     editor.on('cancel', self, function () {
                         if (!np.$prev || np.$prev.data("src") === "") {
                             self.$target.removeClass(np.$next.data("value"));
                             self.$target.trigger("snippet-style-change", [self, np]);
                         }
+                        $image.remove();
                     });
-                    editor.appendTo($('body'));
                 } else {
                     this._set_bg(np.$next.data("src"));
                 }

From 55479a4cc2fc15c30aad23aa8db2574d9d008312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 5 May 2014 17:45:23 +0200
Subject: [PATCH 052/106] [FIX] website_forum: new batch of fixes : - fixed
 reopen link that was broken (python code appearing) - fixed close link that
 was leading to a 500 error due to post -> question - fixed link to question
 author, was redirecting to the current user - fixed displayed number of
 questions in the forum, now displaying actual question number, not number of
 displayed questions in the page - improved guidelines: added link back to the
 forum - fixed tags display: now by posts_count desc, unused tags are not
 shown - users are now displayed by desc karma - converting a comment as an
 answer does not allow to create a new answer if another one by uid is already
 present, it just moves the comment

bzr revid: tde@openerp.com-20140505154523-6dld9sfm0nc0oulu
---
 addons/website_forum/controllers/main.py     | 16 +++++++++-------
 addons/website_forum/views/website_forum.xml | 15 ++++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index 365221f9574..cd36a802422 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -124,6 +124,7 @@ class WebsiteForum(http.Controller):
         values.update({
             'main_object': tag or forum,
             'question_ids': question_ids,
+            'question_count': question_count,
             'pager': pager,
             'tag': tag,
             'filters': filters,
@@ -134,7 +135,7 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/<model("forum.forum"):forum>/faq'], type='http', auth="public", website=True, multilang=True)
     def forum_faq(self, forum, **post):
-        values = self._prepare_forum_values(forum=forum, searches=dict(), **post)
+        values = self._prepare_forum_values(forum=forum, searches=dict(), header={'is_guidelines': True}, **post)
         return request.website.render("website_forum.faq", values)
 
     @http.route('/forum/get_tags', type='http', auth="public", multilang=True, methods=['GET'], website=True)
@@ -147,7 +148,7 @@ class WebsiteForum(http.Controller):
     def tags(self, forum, page=1, **post):
         cr, uid, context = request.cr, request.uid, request.context
         Tag = request.registry['forum.tag']
-        obj_ids = Tag.search(cr, uid, [('forum_id', '=', forum.id)], limit=None, context=context)
+        obj_ids = Tag.search(cr, uid, [('forum_id', '=', forum.id), ('posts_count', '>', 0)], limit=None, order='posts_count DESC', context=context)
         tags = Tag.browse(cr, uid, obj_ids, context=context)
         values = self._prepare_forum_values(forum=forum, searches={'tags': True}, **post)
         values.update({
@@ -426,7 +427,7 @@ class WebsiteForum(http.Controller):
         tag_count = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], count=True, context=context)
         pager = request.website.pager(url="/forum/users", total=tag_count, page=page, step=step, scope=30)
 
-        obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], context=context)
+        obj_ids = User.search(cr, SUPERUSER_ID, [('karma', '>', 1)], limit=step, offset=pager['offset'], order='karma DESC', context=context)
         users = User.browse(cr, SUPERUSER_ID, obj_ids, context=context)
         searches['users'] = 'True'
 
@@ -590,12 +591,13 @@ class WebsiteForum(http.Controller):
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/comment/<model("mail.message"):comment>/convert_to_answer', type='http', auth="public", multilang=True, website=True)
     def convert_comment_to_answer(self, forum, post, comment, **kwarg):
-        values = {
-            'content': comment.body,
-        }
+        body = comment.body
         request.registry['mail.message'].unlink(request.cr, request.uid, [comment.id], context=request.context)
         question = post.parent_id if post.parent_id else post
-        return self.post_new(forum, question, **values)
+        for answer in question.child_ids:
+            if answer.create_uid.id == request.uid:
+                return self.post_comment(forum, answer, comment=html2plaintext(body))
+        return self.post_new(forum, question, content=body)
 
     @http.route('/forum/<model("forum.forum"):forum>/post/<model("forum.post"):post>/convert_to_comment', type='http', auth="user", multilang=True, website=True)
     def convert_answer_to_comment(self, forum, post, **kwarg):
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index bd8b47f0817..e75b85387b0 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -92,7 +92,8 @@
                         </div>
                         <div class="panel-body">
                             <t t-raw="forum.description"/><br/>
-                            <a t-attf-href="/forum/#{slug(forum)}/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                            <a t-if="not header.get('is_guidelines')" t-attf-href="/forum/#{slug(forum)}/faq" class="fa fa-arrow-right"> Read Guidelines</a>
+                            <a t-if="header.get('is_guidelines')" t-attf-href="/forum/#{slug(forum)}" class="fa fa-arrow-right"> Back to <span t-field="forum.name"/></a>
                         </div>
                     </div>
                     <div t-if="header.get('question_data')">
@@ -208,7 +209,7 @@
 <template id="forum_index" name="Forum">
     <t t-call="website_forum.header">
         <h1 class="page-header mt0">
-            <t t-esc="len(question_ids)"/> <span>Questions</span>
+            <t t-esc="question_count"/> <span>Questions</span>
             <t t-esc="search"/>
             <small class="dropdown" t-if="filters in ('all', 'unanswered','followed', 'tag')">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -332,12 +333,12 @@
             users having a high karma can see closed questions to moderate
             them.
         </p>
-        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(post)}/close" method="post" role="form" class="form-horizontal mt32 mb64">
+        <form t-attf-action="/forum/#{ slug(forum) }/question/#{slug(question)}/close" method="post" role="form" class="form-horizontal mt32 mb64">
             <input name="post_id" t-att-value="question.id" type="hidden"/>
             <div class="form-group">
                 <label class="col-md-3 control-label" for="reason">Question:</label>
                 <div class="col-md-8 mt8">
-                    <span t-field="post.name"/>
+                    <span t-field="question.name"/>
                 </div>
             </div>
             <div class="form-group">
@@ -354,7 +355,7 @@
                 <div class="col-md-offset-3 col-md-8">
                     <button class="btn btn-primary">Close question</button>
                     <span class="text-muted">or</span>
-                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(post) }">back to question</a>
+                    <a class="btn btn-link" t-attf-href="/forum/#{ slug(forum) }/question/#{ slug(question) }">back to question</a>
                 </div>
             </div>
         </form>
@@ -451,7 +452,7 @@
                                 <a class="text-muted fa fa-times" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/ask_for_close"> Close</a>
                             </li>
                             <li t-if="question.state == 'close' and ((user.id == question.create_uid.id and can_close_own) or can_close_all)">
-                                <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)/reopen">reopen</a>
+                                <a class="text-muted fa fa-undo" t-attf-href="/forum/#{ slug(forum) }/question/#{slug(question)}/reopen"> Reopen</a>
                             </li>
                             <li t-if="(user.id == question.create_uid.id and can_edit_own) or can_edit_all">
                                 <a class="text-muted fa fa-edit" t-attf-href="/forum/#{ slug(forum) }/post/#{slug(question)}/edit"> Edit</a>
@@ -467,7 +468,7 @@
                     <div>
                         <span t-field="question.create_uid.image" t-field-options='{"widget": "image", "class":"pull-left img img-circle img-avatar"}'/>
                         <div>
-                            <a t-attf-href="/forum/#{ slug(forum) }/user/#{ user.id }"
+                            <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
                                 t-field="question.create_uid"
                                 t-field-options='{"widget": "contact", "country_image": true, "fields": ["name", "country_id"]}'
                                 style="display: inline-block;"/>

From 5f5fd653db5608da3facb0d9179c8555b7027a0a Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Tue, 6 May 2014 07:27:15 +0000
Subject: [PATCH 053/106] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140506072715-4m7kz3factf743c9
---
 addons/account/i18n/nl.po |  8 ++++----
 addons/stock/i18n/hr.po   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 089d94953d5..ea39418274e 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2013-06-14 22:29+0000\n"
-"PO-Revision-Date: 2014-04-20 06:40+0000\n"
+"PO-Revision-Date: 2014-05-05 10:40+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-21 05:08+0000\n"
-"X-Generator: Launchpad (build 16985)\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:26+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5133,7 +5133,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Alle geboekte boekingen"
+msgstr "Alleen definitieve boekingen"
 
 #. module: account
 #: field:report.aged.receivable,name:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 7e484eca201..f387ab46671 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2014-02-06 15:56+0000\n"
-"PO-Revision-Date: 2014-03-05 10:52+0000\n"
+"PO-Revision-Date: 2014-05-05 09:49+0000\n"
 "Last-Translator: Marko Carevic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-06 06:15+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-05-06 07:27+0000\n"
+"X-Generator: Launchpad (build 16996)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -1070,7 +1070,7 @@ msgstr "Pošiljke u dolasku"
 #: help:stock.picking.in,date:0
 #: help:stock.picking.out,date:0
 msgid "Creation date, usually the time of the order."
-msgstr "Datum kreiranja, obično vrijeme naloga"
+msgstr "Datum naloga"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1754,7 +1754,7 @@ msgstr ""
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr "Datum kreiranja"
+msgstr "Datum naloga"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -4558,7 +4558,7 @@ msgstr "_Primjeni"
 #: field:stock.picking.in,max_date:0
 #: field:stock.picking.out,max_date:0
 msgid "Max. Expected Date"
-msgstr "Max. Expected Date"
+msgstr "Krajnji očekivani datum"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0

From 6b26a3896bb255e4271994cc9bf12c3a4b32b191 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 09:51:26 +0200
Subject: [PATCH 054/106] [FIX] website_sale: manifest typo

bzr revid: dle@openerp.com-20140506075126-mv6g869aqdl1yt5g
---
 addons/website_sale/static/description/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/static/description/index.html b/addons/website_sale/static/description/index.html
index f6a9d50443e..8a006ff9c56 100644
--- a/addons/website_sale/static/description/index.html
+++ b/addons/website_sale/static/description/index.html
@@ -122,7 +122,7 @@
 <section class="oe_container oe_dark">
     <div class="oe_row">
         <h2 class="oe_slogan">Fine Tune Your Catalog</h2>
-        <h3 class="oe_slogan">Boost Sales by Emphasazing Best Products</h3>
+        <h3 class="oe_slogan">Boost Sales by Emphasizing Best Products</h3>
         <div class="oe_span6">
           <p class='oe_mt32'>
 			  Get a full control on how you display your products in

From 8065294976436c3dfabde1c5f392e71eaaa8ff8a Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 6 May 2014 10:05:25 +0200
Subject: [PATCH 055/106] [IMP] sale: add comment on onchange_fiscal_position
 and update taxes of order lines only if a product is defined

bzr revid: chm@openerp.com-20140506080525-4scwvtk7os8b63d0
---
 addons/sale/sale.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 7de5eb906e0..fa95f169d26 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -627,6 +627,12 @@ class sale_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def onchange_fiscal_position(self, cr, uid, ids, fiscal_position, order_lines, context=None):
+        '''Update taxes of order lines for each line where a product is defined
+
+        :param list ids: not used
+        :param int fiscal_position: sale order fiscal position
+        :param list order_lines: command list for one2many write method
+        '''
         order_line = []
         fiscal_obj = self.pool.get('account.fiscal.position')
         product_obj = self.pool.get('product.product')
@@ -640,14 +646,13 @@ class sale_order(osv.osv):
             # create    (0, 0,  { fields })
             # update    (1, ID, { fields })
             if line[0] in [0, 1]:
-                taxes_id = None
+                prod = None
                 if line[2].get('product_id'):
-                    taxes_id = product_obj.browse(cr, uid, line[2]['product_id'], context=context).taxes_id
+                    prod = product_obj.browse(cr, uid, line[2]['product_id'], context=context)
                 elif line[1]:
-                    # don't change taxes if they are no product defined
-                    taxes_id = line_obj.browse(cr, uid, line[1], context=context).product_id.taxes_id
-                if taxes_id:
-                    line[2]['tax_id'] = [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, taxes_id)]]
+                    prod =  line_obj.browse(cr, uid, line[1], context=context).product_id
+                if prod and prod.taxes_id:
+                    line[2]['tax_id'] = [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, prod.taxes_id)]]
                 order_line.append(line)
 
             # link      (4, ID)
@@ -655,9 +660,11 @@ class sale_order(osv.osv):
             elif line[0] in [4, 6]:
                 line_ids = line[0] == 4 and [line[1]] or line[2]
                 for line_id in line_ids:
-                    taxes_id = line_obj.browse(cr, uid, line_id, context=context).product_id.taxes_id
-                    order_line.append([1, line_id, {'tax_id': [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, taxes_id)]]}])
-
+                    prod = line_obj.browse(cr, uid, line_id, context=context).product_id
+                    if prod and prod.taxes_id:
+                        order_line.append([1, line_id, {'tax_id': [[6, 0, fiscal_obj.map_tax(cr, uid, fpos, prod.taxes_id)]]}])
+                    else:
+                        order_line.append([4, line_id])
             else:
                 order_line.append(line)
         return {'value': {'order_line': order_line}}

From ae6a0fcb735a9b75f9c379377ecb5346297be66d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 11:06:49 +0200
Subject: [PATCH 056/106] [FIX] account_analytic_analysis: split
 _prepare_invoice into two methods, one for the 'generic' data for invoices
 (customers, fiscal position, etc) and one for generate the recurring invoice
 line, so they can be reused in other methods

bzr revid: dle@openerp.com-20140506090649-141s4io4329ybu69
---
 .../account_analytic_analysis.py              | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a25950783ad..d69cd04b6be 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -652,11 +652,10 @@ class account_analytic_account(osv.osv):
             'nodestroy': True,
         }
 
-    def _prepare_invoice(self, cr, uid, contract, context=None):
+    def _prepare_invoice_data(self, cr, uid, contract, context=None):
         context = context or {}
 
         journal_obj = self.pool.get('account.journal')
-        fpos_obj = self.pool.get('account.fiscal.position')
 
         if not contract.partner_id:
             raise osv.except_osv(_('No Customer Defined!'),_("You must first select a Customer for Contract %s!") % contract.name )
@@ -677,7 +676,7 @@ class account_analytic_account(osv.osv):
         elif contract.company_id:
             currency_id = contract.company_id.currency_id.id
 
-        inv_data = {
+        invoice = {
            'account_id': contract.partner_id.property_account_receivable.id,
            'type': 'out_invoice',
            'partner_id': contract.partner_id.id,
@@ -689,20 +688,23 @@ class account_analytic_account(osv.osv):
            'payment_term': partner_payment_term,
            'company_id': contract.company_id.id or False,
         }
+        return invoice
 
-        invoice_line_vals = []
+    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position, context=None):
+        fpos_obj = self.pool.get('account.fiscal.position')
+        invoice_lines = []
         for line in contract.recurring_invoice_line_ids:
 
             res = line.product_id
             account_id = res.property_account_income.id
             if not account_id:
                 account_id = res.categ_id.property_account_income_categ.id
-            account_id = fpos_obj.map_account(cr, uid, fpos, account_id)
+            account_id = fpos_obj.map_account(cr, uid, fiscal_position, account_id)
 
             taxes = res.taxes_id or False
-            tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
+            tax_id = fpos_obj.map_tax(cr, uid, fiscal_position, taxes)
 
-            invoice_line_vals.append({
+            invoice_lines.append((0, 0, {
                 'name': line.name,
                 'account_id': account_id,
                 'account_analytic_id': contract.id,
@@ -710,13 +712,14 @@ class account_analytic_account(osv.osv):
                 'quantity': line.quantity,
                 'uos_id': line.uom_id.id or False,
                 'product_id': line.product_id.id or False,
-                # 'invoice_id' : invoice_id,
                 'invoice_line_tax_id': [(6, 0, tax_id)],
-            })
+            }))
+        return invoice_lines
 
-        inv_data['invoice_line'] = [(0, 0, line_vals) for line_vals in invoice_line_vals]
-
-        return inv_data
+    def _prepare_invoice(self, cr, uid, contract, context=None):
+        invoice = self._prepare_invoice_data(cr, uid, contract, context=context)
+        invoice['invoice_line'] = self._prepare_invoice_lines(cr, uid, contract, invoice['fiscal_position'], context=context)
+        return invoice
 
     def recurring_create_invoice(self, cr, uid, ids, context=None):
         return self._recurring_create_invoice(cr, uid, ids, context=context)

From bde55baaa92da0565f654b99dd614ead7faea1c7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 11:37:16 +0200
Subject: [PATCH 057/106] [IMP] gamification: performance improvement on the
 goal computation

Removing the inheritance to mail.thread will avoid posting message at creation and other tracking mechanism at each write. Updating a challenge with a large number of users will be significantly faster.

bzr revid: mat@openerp.com-20140506093716-xvpe1n2ase2zix0v
---
 addons/gamification/models/challenge.py | 11 +++++++----
 addons/gamification/models/goal.py      |  4 +---
 addons/gamification/views/goal.xml      |  4 ----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index ecb4c495d94..a6c467f0177 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -355,10 +355,13 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
-                if to_remove_ids:
-                    self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=None)
-                if to_add_ids:
-                    self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
+                if challenge.report_message_frequency != 'never':
+                    if to_remove_ids:
+                        self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
+                    if to_add_ids:
+                        self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
+                else:
+                    self.message_unsubscribe_users(cr, uid, [challenge.id], old_user_ids, context=context)
 
         return True
 
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index af9a763236d..7fcf8e5f981 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -138,7 +138,6 @@ class gamification_goal(osv.Model):
 
     _name = 'gamification.goal'
     _description = 'Gamification goal instance'
-    _inherit = 'mail.thread'
 
     def _get_completion(self, cr, uid, ids, field_name, arg, context=None):
         """Return the percentage of completeness of the goal, between 0 and 100"""
@@ -226,8 +225,7 @@ class gamification_goal(osv.Model):
                 temp_obj = self.pool.get('email.template')
                 template_id = self.pool['ir.model.data'].get_object(cr, uid, 'gamification', 'email_template_goal_reminder', context)
                 body_html = temp_obj.render_template(cr, uid, template_id.body_html, 'gamification.goal', goal.id, context=context)
-
-                self.message_post(cr, uid, goal.id, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
+                self.pool['mail.thread'].message_post(cr, uid, 0, body=body_html, partner_ids=[goal.user_id.partner_id.id], context=context, subtype='mail.mt_comment')
                 return {'to_update': True}
         return {}
 
diff --git a/addons/gamification/views/goal.xml b/addons/gamification/views/goal.xml
index 528d5db0511..884467404ce 100644
--- a/addons/gamification/views/goal.xml
+++ b/addons/gamification/views/goal.xml
@@ -86,10 +86,6 @@
                             </group>
                         </group>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </div>
                 </form>
             </field>
         </record>

From ccf4d142b0674dc6894eff5c9e1c4ac77d78d18d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 12:29:42 +0200
Subject: [PATCH 058/106] [FIX] gamification: avoid recomputing every goal for
 every challenge

bzr revid: mat@openerp.com-20140506102942-obopc9j5a2136cxh
---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index a6c467f0177..f4704f2de29 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -396,9 +396,9 @@ class gamification_challenge(osv.Model):
         :param list(int) ids: the list of challenge concerned"""
 
         goal_obj = self.pool.get('gamification.goal')
-        to_update = []
         for challenge in self.browse(cr, uid, ids, context=context):
             (start_date, end_date) = start_end_date_for_period(challenge.period)
+            to_update = []
 
             # if no periodicity, use challenge dates
             if not start_date and challenge.start_date:

From 697dcae728c045ae0cbfb9d48821a8417856e25c Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:21:09 +0200
Subject: [PATCH 059/106] [IMP] gamification: move write in goal update inside
 the first loop to be able to group the computation by definition (and
 potentially apply intermediate commits)

bzr revid: mat@openerp.com-20140506112109-z4rsx5umet5x6n26
---
 addons/gamification/models/goal.py | 31 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 7fcf8e5f981..2cbb8869eb7 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -241,7 +241,6 @@ class gamification_goal(osv.Model):
             context = {}
 
         goals_by_definition = {}
-        goals_to_write = {}
         all_goals = {}
         for goal in self.browse(cr, uid, ids, context=context):
             if goal.state in ('draft', 'canceled'):
@@ -249,10 +248,10 @@ class gamification_goal(osv.Model):
                 continue
 
             goals_by_definition.setdefault(goal.definition_id, []).append(goal)
-            goals_to_write[goal.id] = {}
             all_goals[goal.id] = goal
 
         for definition, goals in goals_by_definition.items():
+            goals_to_write = dict((goal.id, {}) for goal in goals)
             if definition.computation_mode == 'manually':
                 for goal in goals:
                     goals_to_write[goal.id].update(self._check_remind_delay(cr, uid, goal, context))
@@ -343,22 +342,22 @@ class gamification_goal(osv.Model):
                         if new_value != goal.current:
                             goals_to_write[goal.id]['current'] = new_value
 
-        for goal_id, value in goals_to_write.items():
-            if not value:
-                continue
-            goal = all_goals[goal_id]
+            for goal_id, value in goals_to_write.items():
+                if not value:
+                    continue
+                goal = all_goals[goal_id]
 
-            # check goal target reached
-            if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
-              or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
-                value['state'] = 'reached'
+                # check goal target reached
+                if (goal.definition_condition == 'higher' and value.get('current', goal.current) >= goal.target_goal) \
+                  or (goal.definition_condition == 'lower' and value.get('current', goal.current) <= goal.target_goal):
+                    value['state'] = 'reached'
 
-            # check goal failure
-            elif goal.end_date and fields.date.today() > goal.end_date:
-                value['state'] = 'failed'
-                value['closed'] = True
-            if value:
-                self.write(cr, uid, [goal.id], value, context=context)
+                # check goal failure
+                elif goal.end_date and fields.date.today() > goal.end_date:
+                    value['state'] = 'failed'
+                    value['closed'] = True
+                if value:
+                    self.write(cr, uid, [goal.id], value, context=context)
         return True
 
     def action_start(self, cr, uid, ids, context=None):

From a233e26f710bd6cc990d8d1897f379cb93580e87 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:38:31 +0200
Subject: [PATCH 060/106] [IMP] gamification: commit for each goal definition
 in cron

bzr revid: mat@openerp.com-20140506113831-iut3aqbwfwbnertv
---
 addons/gamification/models/challenge.py | 6 ++++++
 addons/gamification/models/goal.py      | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index f4704f2de29..e7176e8cb09 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -264,6 +264,9 @@ class gamification_challenge(osv.Model):
         - Create the missing goals (eg: modified the challenge to add lines)
         - Update every running challenge
         """
+        if context is None:
+            context = {}
+
         # start scheduled challenges
         planned_challenge_ids = self.search(cr, uid, [
             ('state', '=', 'draft'),
@@ -281,6 +284,9 @@ class gamification_challenge(osv.Model):
         if not ids:
             ids = self.search(cr, uid, [('state', '=', 'inprogress')], context=context)
 
+        # in cron mode, will do intermediate commits
+        # TODO in trunk: replace by parameter
+        context.update({'commit_gamification': True})
         return self._update_all(cr, uid, ids, context=context)
 
     def _update_all(self, cr, uid, ids, context=None):
diff --git a/addons/gamification/models/goal.py b/addons/gamification/models/goal.py
index 2cbb8869eb7..b4a47a0d07a 100644
--- a/addons/gamification/models/goal.py
+++ b/addons/gamification/models/goal.py
@@ -239,6 +239,7 @@ class gamification_goal(osv.Model):
         the target value being reached, the goal is set as failed."""
         if context is None:
             context = {}
+        commit = context.get('commit_gamification', False)
 
         goals_by_definition = {}
         all_goals = {}
@@ -358,6 +359,8 @@ class gamification_goal(osv.Model):
                     value['closed'] = True
                 if value:
                     self.write(cr, uid, [goal.id], value, context=context)
+            if commit:
+                cr.commit()
         return True
 
     def action_start(self, cr, uid, ids, context=None):

From 409bf269d3f6f6c34b0469bc52feb86730519e64 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 13:52:45 +0200
Subject: [PATCH 061/106] [FIX] gamification: be sure that not challenge get
 subscribers depending of the report_message_frequency

bzr revid: mat@openerp.com-20140506115245-ktuxhcsml466ym6u
---
 addons/gamification/models/challenge.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index e7176e8cb09..b1f297abde0 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -240,6 +240,11 @@ class gamification_challenge(osv.Model):
 
         write_res = super(gamification_challenge, self).write(cr, uid, ids, vals, context=context)
 
+        if vals.get('report_message_frequency', 'never') != 'never':
+            # _recompute_challenge_users do not set users for challenges with no reports, subscribing them now
+            for challenge in self.browse(cr, uid, ids, context=context):
+                self.message_subscribe(cr, uid, [challenge.id], [user.partner_id.id for user in challenge.user_ids], context=context)
+
         if vals.get('state') == 'inprogress':
             self._recompute_challenge_users(cr, uid, ids, context=context)
             self._generate_goals_from_challenge(cr, uid, ids, context=context)

From 69ec02b2d4af803f43654577aadfbba63adc1e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 May 2014 14:30:01 +0200
Subject: [PATCH 062/106] [FIX] website_forum: more fixes : - display tag name
 in 'filter' bar when filtering on a tag - display active tag in a blue color
 - order answers: correct first, then most upvoted

bzr revid: tde@openerp.com-20140506123001-fz5gt6i9zw6ondcu
---
 addons/website_forum/models/forum.py                   | 1 +
 addons/website_forum/static/src/css/website_forum.css  | 3 +++
 addons/website_forum/static/src/css/website_forum.sass | 2 ++
 addons/website_forum/views/website_forum.xml           | 9 ++++++---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 7a8385d1a82..061b9e55eb8 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -70,6 +70,7 @@ class Post(osv.Model):
     _name = 'forum.post'
     _description = 'Forum Post'
     _inherit = ['mail.thread', 'website.seo.metadata']
+    _order = "is_correct DESC, vote_count DESC"
 
     def _get_user_vote(self, cr, uid, ids, field_name, arg, context):
         res = dict.fromkeys(ids, 0)
diff --git a/addons/website_forum/static/src/css/website_forum.css b/addons/website_forum/static/src/css/website_forum.css
index ab8ea684aae..b90c1786e24 100644
--- a/addons/website_forum/static/src/css/website_forum.css
+++ b/addons/website_forum/static/src/css/website_forum.css
@@ -21,6 +21,9 @@
   background-color: #cccccc;
   margin-left: 4px;
 }
+.question .badge-active {
+  background-color: #428bca;
+}
 
 .oe_grey {
   background-color: #eeeeee;
diff --git a/addons/website_forum/static/src/css/website_forum.sass b/addons/website_forum/static/src/css/website_forum.sass
index da2df1460aa..f8e46f06b79 100644
--- a/addons/website_forum/static/src/css/website_forum.sass
+++ b/addons/website_forum/static/src/css/website_forum.sass
@@ -17,6 +17,8 @@
   .badge
     background-color: #ccc
     margin-left: 4px
+  .badge-active
+    background-color: #428bca
 
 .oe_grey
   background-color: #eeeeee
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index e75b85387b0..c73486d7d39 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -145,8 +145,11 @@
                     <span t-if="not question.active"><b> [Deleted]</b></span>
                     <span t-if="question.state == 'close'"><b> [Closed]</b></span>
             </div>
-            <t t-foreach="question.tag_ids" t-as="tag">
-                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{ tag.id }/questions" class="badge pull-right" t-field="tag.name"/>
+            <t t-foreach="question.tag_ids" t-as="question_tag">
+                <a t-attf-href="/forum/#{ slug(forum) }/tag/#{slug(question_tag)}/questions">
+                    <span t-attf-class="pull-right badge #{tag and tag.name == question_tag.name and 'badge-active' ''}" t-field="question_tag.name"
+                        style="margin-right: 4px;"/>
+                </a>
             </t>
             <div class="text-muted">
                 by <a t-attf-href="/forum/#{ slug(forum) }/user/#{ question.create_uid.id }"
@@ -216,7 +219,7 @@
                   <t t-if="filters == 'all'">All</t>
                   <t t-if="filters == 'unanswered'">Unanswered</t>
                   <t t-if="filters == 'followed'">Followed</t>
-                  <t t-if="filters == 'tag'">Tag</t>
+                  <t t-if="tag"><span t-field="tag.name"/></t>
                   <t t-if="sorting == 'date'"> by activity date</t>
                   <t t-if="sorting == 'answered'"> by most answered</t>
                   <t t-if="sorting == 'vote'"> by most voted</t>

From 687d675de5eb01dd2e1ef803c79acfb30d9dabc7 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 15:48:05 +0200
Subject: [PATCH 063/106] [FIX] gamification: using batch mode to check rewards

bzr revid: mat@openerp.com-20140506134805-4nsurv82cg9anfvm
---
 addons/gamification/models/challenge.py | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index b1f297abde0..5668f5d8682 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -712,34 +712,35 @@ class gamification_challenge(osv.Model):
             rewarded_users = []
             challenge_ended = end_date == yesterday.strftime(DF) or force
             if challenge.reward_id and challenge_ended or challenge.reward_realtime:
-                for user in challenge.user_ids:
-                    reached_goal_ids = self.pool.get('gamification.goal').search(cr, uid, [
-                        ('challenge_id', '=', challenge.id),
-                        ('user_id', '=', user.id),
-                        ('start_date', '=', start_date),
-                        ('end_date', '=', end_date),
-                        ('state', '=', 'reached')
-                    ], context=context)
-                    if len(reached_goal_ids) == len(challenge.line_ids):
+                # not using start_date as intemportal goals have a start date but no end_date
+                reached_goals = self.pool.get('gamification.goal').read_group(cr, uid, [
+                    ('challenge_id', '=', challenge.id),
+                    ('end_date', '=', end_date),
+                    ('state', '=', 'reached')
+                ], fields=['user_id'], groupby=['user_id'], context=context)
+                for reach_goals_user in reached_goals:
+                    if reach_goals_user['user_id_count'] == len(challenge.line_ids):
                         # the user has succeeded every assigned goal
+                        user_id = reach_goals_user['user_id'][0]
                         if challenge.reward_realtime:
                             badges = self.pool['gamification.badge.user'].search(cr, uid, [
                                 ('challenge_id', '=', challenge.id),
                                 ('badge_id', '=', challenge.reward_id.id),
-                                ('user_id', '=', user.id),
+                                ('user_id', '=', user_id),
                             ], count=True, context=context)
                             if badges > 0:
                                 # has already recieved the badge for this challenge
                                 continue
-                        self.reward_user(cr, uid, user.id, challenge.reward_id.id, challenge.id, context=context)
-                        rewarded_users.append(user)
+                        self.reward_user(cr, uid, user_id, challenge.reward_id.id, challenge.id, context=context)
+                        rewarded_users.append(user_id)
 
             if challenge_ended:
                 # open chatter message
                 message_body = _("The challenge %s is finished." % challenge.name)
 
                 if rewarded_users:
-                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user.name for user in rewarded_users])))
+                    user_names = self.pool['res.users'].name_get(cr, uid, rewarded_users, context=context)
+                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user for user in user_names])))
                 else:
                     message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 

From 3cdb9803d4095165054c3224a8e90d87e2f81005 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 15:59:53 +0200
Subject: [PATCH 064/106] [IMP] unsubscribing at each cron run is overkill

bzr revid: mat@openerp.com-20140506135953-3hssq2lycvy1c3df
---
 addons/gamification/models/challenge.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 5668f5d8682..4c1823c655c 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -366,13 +366,12 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
+                # TODO for trunk: use proper parameter
                 if challenge.report_message_frequency != 'never':
                     if to_remove_ids:
                         self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
                     if to_add_ids:
                         self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
-                else:
-                    self.message_unsubscribe_users(cr, uid, [challenge.id], old_user_ids, context=context)
 
         return True
 

From 3fa27518556355c108e8a47b66b3475e22430956 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Tue, 6 May 2014 16:38:34 +0200
Subject: [PATCH 065/106] [FIX] name_get returns tuple

bzr revid: mat@openerp.com-20140506143834-od28gkhbpbhsgde4
---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 4c1823c655c..d3297a048d3 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -739,7 +739,7 @@ class gamification_challenge(osv.Model):
 
                 if rewarded_users:
                     user_names = self.pool['res.users'].name_get(cr, uid, rewarded_users, context=context)
-                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([user for user in user_names])))
+                    message_body += _("<br/>Reward (badge %s) for every succeeding user was sent to %s." % (challenge.reward_id.name, ", ".join([name for (user_id, name) in user_names])))
                 else:
                     message_body += _("<br/>Nobody has succeeded to reach every goal, no badge is rewared for this challenge.")
 

From c941eb8ca424e906669ddabc467568439f363ca6 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Tue, 6 May 2014 17:07:32 +0200
Subject: [PATCH 066/106] [FIX] code cleanup (addon purchase)

remove useless one2many field in product.product, and improves the way
purchase_count is computed

bzr revid: ged@openerp.com-20140506150732-e0ztuzqm7hqu183p
---
 addons/purchase/purchase.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 272ea77e7e3..4e98282d444 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1296,15 +1296,13 @@ class product_product(osv.Model):
     _inherit = 'product.product'
     
     def _purchase_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for purchase in self.browse(cr, uid, ids, context=context):
-                res[purchase.id] = len(purchase.purchase_ids)
-        except:
-            pass
-        return res
+        Purchase = self.pool['purchase.order']
+        return {
+            product_id: Purchase.search_count(cr,uid, [('order_line.product_id', '=', product_id)], context=context) 
+            for product_id in ids
+        }
+
     _columns = {
-        'purchase_ids': fields.one2many('purchase.order', 'product_id', 'Purchases'),
         'purchase_count': fields.function(_purchase_count, string='# Purchases', type='integer'),
     }
 

From d1bba709b44b59c7936f48f5cf9680cfe4ef5a3e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Tue, 6 May 2014 17:34:59 +0200
Subject: [PATCH 067/106] [FIX] account_analytic_analysis: recurring invoices,
 map_tax and map_account methods of fiscal position model expect a browse
 record

bzr revid: dle@openerp.com-20140506153459-0vv6rcttihl628l3
---
 addons/account_analytic_analysis/account_analytic_analysis.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index d69cd04b6be..6c71f940e8a 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -690,8 +690,9 @@ class account_analytic_account(osv.osv):
         }
         return invoice
 
-    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position, context=None):
+    def _prepare_invoice_lines(self, cr, uid, contract, fiscal_position_id, context=None):
         fpos_obj = self.pool.get('account.fiscal.position')
+        fiscal_position = fpos_obj.browse(cr, uid,  fiscal_position_id, context=context)
         invoice_lines = []
         for line in contract.recurring_invoice_line_ids:
 

From cea55917424b7500b97ef2db09f19a636441708a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 May 2014 09:43:10 +0200
Subject: [PATCH 068/106] [FIX] runbot color

bzr revid: fme@openerp.com-20140507074310-bt0r1vt6rsgy9wqe
---
 openerp/addons/base/ir/ir_ui_view.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index f5ebbe4d63a..026f9161c36 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -885,7 +885,7 @@ class view(osv.osv):
         # TODO: remove this as soon as the following branch is merged
         #       lp:~openerp-dev/openerp-web/trunk-module-closure-style-msh
         from openerp.addons.web.controllers.main import module_boot
-        qcontext['modules'] = simplejson.dumps(module_boot())
+        qcontext['modules'] = simplejson.dumps(module_boot()) if request else None
 
         def loader(name):
             return self.read_template(cr, uid, name, context=context)

From 0a9a393010499f1f0e69bfb39d5f6f1238c95ffb Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 09:56:45 +0200
Subject: [PATCH 069/106] [FIX] code cleanup (addon fleet)

improve the _count_all method by removing try/catch/pass and by
using search_count instead of the one2many relation.

Also, removes now useless one2many fields costs_ids and odometer_ids

bzr revid: ged@openerp.com-20140507075645-2tp5zgayeea9ehv2
---
 addons/fleet/fleet.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 0e964cafc80..6c5f097d4d1 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -315,18 +315,21 @@ class fleet_vehicle(osv.Model):
         return model_id
     
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'odometer_count': 0, 'fuel_logs_count': 0, 'service_count': 0, 'contract_count': 0, 'cost_count': 0,}), ids))
-        try:
-            for costs in self.browse(cr, uid, ids, context=context):
-                res[costs.id] = {'odometer_count': len(costs.odometer_ids),
-                'fuel_logs_count': len(costs.log_fuel),
-                'service_count': len(costs.log_services),
-                'contract_count': len(costs.log_contracts),
-                'cost_count': len(costs.costs_ids)
-                }
-        except:
-            pass
-        return res
+        Odometer = self.pool['fleet.vehicle.odometer']
+        LogFuel = self.pool['fleet.vehicle.log.fuel']
+        LogService = self.pool['fleet.vehicle.log.services']
+        LogContract = self.pool['fleet.vehicle.log.contract']
+        Cost = self.pool['fleet.vehicle.cost']
+        return {
+            vehicle_id: {
+                'odometer_count': Odometer.search_count(cr, uid, [('vehicle_id', '=', vehicle_id)], context=context),
+                'fuel_logs_count': LogFuel.search_count(cr, uid, [('vehicle_id', '=', vehicle_id)], context=context),
+                'service_count': LogService.search_count(cr, uid, [('vehicle_id', '=', vehicle_id)], context=context),
+                'contract_count': LogContract.search_count(cr, uid, [('vehicle_id', '=', vehicle_id)], context=context),
+                'cost_count': Cost.search_count(cr, uid, [('vehicle_id', '=', vehicle_id), ('parent_id', '=', False)], context=context)
+            }
+            for vehicle_id in ids
+        }
 
     _name = 'fleet.vehicle'
     _description = 'Information on a vehicle'
@@ -341,8 +344,6 @@ class fleet_vehicle(osv.Model):
         'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
         'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
         'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
-        'costs_ids': fields.one2many('fleet.vehicle.cost', 'vehicle_id', 'Costs'),
-        'odometer_ids': fields.one2many('fleet.vehicle.odometer', 'vehicle_id', 'Odometer'),
         'cost_count': fields.function(_count_all, type='integer', string="Costs" , multi=True),
         'contract_count': fields.function(_count_all, type='integer', string='Contracts', multi=True),
         'service_count': fields.function(_count_all, type='integer', string='Services', multi=True),

From b08e0b0fe177572351faa9514becdfd495bf3c19 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 10:17:23 +0200
Subject: [PATCH 070/106] [FIX] code cleanup (addon crm_claim)

improves the _claim_count method by removing try/except/pass and by using
search_count. Also, removes the now useless one2many field claims_ids (strangely, it was defined before
_claim_count, but was not used.

bzr revid: ged@openerp.com-20140507081723-7pi1t33xxjb6hbwy
---
 addons/crm_claim/crm_claim.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index d55036193c4..4d44b90c2f2 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -191,15 +191,13 @@ class crm_claim(osv.osv):
 class res_partner(osv.osv):
     _inherit = 'res.partner'
     def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for partner in self.browse(cr, uid, ids, context=context):
-                res[partner.id] = len(partner.claims_ids)
-        except:
-            pass
-        return res
+        Claim = self.pool['crm.claim']
+        return {
+            partner_id: Claim.search_count(cr,uid, [('partner_id', '=', partner_id)], context=context)  
+            for partner_id in ids
+        }
+
     _columns = {
-        'claims_ids': fields.one2many('crm.claim', 'partner_id', 'Claims'),
         'claim_count': fields.function(_claim_count, string='# Claims', type='integer'),
     }
 

From cc041c516a8696c3487b6a7d7c90b07cdc4019f3 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 10:35:56 +0200
Subject: [PATCH 071/106] [FIX] code cleanup (addon hr_holidays)

improves th _leaves_count method, and remove an useless one2many field
(leaves_ids)

bzr revid: ged@openerp.com-20140507083556-rqm5sllj8fc3qfev
---
 addons/hr_holidays/hr_holidays.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 67f09faf9c4..2385983f020 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -550,13 +550,11 @@ class hr_employee(osv.osv):
         return result
 
     def _leaves_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for employee in self.browse(cr, uid, ids, context=context):
-                res[employee.id] = len(employee.leave_ids)
-        except:
-            pass
-        return res
+        Holidays = self.pool['hr.holidays']
+        return {
+            employee_id: Holidays.search_count(cr,uid, [('employee_id', '=', employee_id)], context=context) 
+            for employee_id in ids
+        }
 
     _columns = {
         'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
@@ -566,7 +564,6 @@ class hr_employee(osv.osv):
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
         'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
-        'leave_ids': fields.one2many('hr.holidays', 'employee_id', 'Leaves'),
         'leaves_count': fields.function(_leaves_count, type='integer', string='Leaves'),
 
     }

From ff7ad5e9185015e0d42fd044b893ec57e883a90a Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 10:55:35 +0200
Subject: [PATCH 072/106] [FIX] code cleanup (addon project)

improves the _task_count method by removing try clause and using
search_count

bzr revid: ged@openerp.com-20140507085535-16w47y51r6q3yqza
---
 addons/project/res_partner.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 79af0413385..dd0c5fe0767 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -23,13 +23,11 @@ from openerp.osv import fields,osv
 
 class res_partner(osv.osv):
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for partner in self.browse(cr, uid, ids, context):
-                res[partner.id] = len(partner.task_ids)
-        except:
-            pass
-        return res
+        Task = self.pool['project.task']
+        return {
+            partner_id: Task.search_count(cr,uid, [('partner_id', '=', partner_id)], context=context)
+            for partner_id in ids
+        }
     
     """ Inherits partner and adds Tasks information in the partner form """
     _inherit = 'res.partner'
@@ -46,6 +44,4 @@ class res_partner(osv.osv):
         return super(res_partner, self).copy(
                 cr, uid, record_id, default=default, context=context)
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 943f2d4e4ed6f35c3a8a696a9b16ef04c84b8dc1 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 11:03:28 +0200
Subject: [PATCH 073/106] [FIX] code cleanup (addon hr_evaluation)

improves _appraisal_count method and remove now useless one2many field appraisal_ids

bzr revid: ged@openerp.com-20140507090328-wyl9gbfzdc540d1k
---
 addons/hr_evaluation/hr_evaluation.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 5cd960038aa..b52802cd297 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -104,19 +104,15 @@ class hr_employee(osv.Model):
     _inherit="hr.employee"
     
     def _appraisal_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for employee in self.browse(cr, uid, ids, context=context):
-                res[employee.id] = len(employee.appraisal_ids)
-        except:
-            pass
-        return res
-
+        Evaluation = self.pool['hr.evaluation.interview']
+        return {
+            employee_id: Evaluation.search_count(cr, uid, [('user_to_review_id', '=', employee_id)], context=context)
+            for employee_id in ids
+        }
 
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
-        'appraisal_ids': fields.one2many('hr.evaluation.interview', 'user_to_review_id', 'Appraisal Interviews'),
         'appraisal_count': fields.function(_appraisal_count, type='integer', string='Appraisal Interviews'),
     }
 

From d8fef2825e751f33020678a3a1e7bce6d6bdee7b Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 11:08:41 +0200
Subject: [PATCH 074/106] [FIX] code cleanup (addon account_analytic_default)

improves the _rules_count method (remove try/catch and better logic), and
removes now useless one2many field rules_ids

bzr revid: ged@openerp.com-20140507090841-jptga7kjrverd25n
---
 .../account_analytic_default.py                     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 1faf75d5eee..ac8698ae342 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -117,15 +117,12 @@ class sale_order_line(osv.osv):
 class product_product(osv.Model):
     _inherit = 'product.product'
     def _rules_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for rule in self.browse(cr, uid, ids, context=context):
-                res[rule.id] = len(rule.rules_ids)
-        except:
-            pass
-        return res
+        Analytic = self.pool['account.analytic.default']
+        return {
+            product_id: Analytic.search_count(cr, uid, [('product_id', '=', product_id)], context=context)
+            for product_id in ids
+        }
     _columns = {
-        'rules_ids': fields.one2many('account.analytic.default', 'product_id', 'Analytic Rules '),
         'rules_count': fields.function(_rules_count, string='# Analytic Rules', type='integer'),
     }
 

From 2d924f3e22b877acfb2ae258e1d8d02f88e30007 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 11:23:03 +0200
Subject: [PATCH 075/106] [FIX] code cleanup (addon sale)

improves the _sales_count method in product.product by removing try/catch and by using better logic.  Also, removes now useless sales_ids one2many field.

bzr revid: ged@openerp.com-20140507092303-a2g4gq2mq3obelye
---
 addons/sale/sale.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 9d938a42a0b..5e3f27805a4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1027,15 +1027,12 @@ class account_invoice(osv.Model):
 class product_product(osv.Model):
     _inherit = 'product.product'
     def _sales_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for sale in self.browse(cr, uid, ids, context=context):
-                res[sale.id] = len(sale.sales_ids)
-        except:
-            pass
-        return res
+        SaleOrderLine = self.pool['sale.order.line']
+        return {
+            product_id: SaleOrderLine.search_count(cr,uid, [('product_id', '=', product_id)], context=context)
+            for product_id in ids
+        }
     _columns = {
-        'sales_ids': fields.one2many('sale.order.line', 'product_id', 'Sales '),
         'sales_count': fields.function(_sales_count, string='# Sales', type='integer'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From ca5e95b7ef87cc5e8a330bbe909ce9bd5c3f2c52 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 11:34:42 +0200
Subject: [PATCH 076/106] [FIX] code cleanup (addon stock)

improves the _move_count method by removing try statement and using better logic.  Also, removes now useless one2many field (move_ids)

bzr revid: ged@openerp.com-20140507093442-ew1gc06r58tbl9ug
---
 addons/stock/product.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 863b7111bb0..ae31909cfc1 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -353,13 +353,11 @@ class product_product(osv.osv):
                 res[id][f] = stock.get(id, 0.0)
         return res
     def _move_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for move in self.browse(cr, uid, ids, context=context):
-                res[move.id] = len(move.move_ids)
-        except:
-            pass
-        return res
+        Move = self.pool['stock.move']
+        return {
+            product_id: Move.search_count(cr, uid, [('product_id', '=', product_id)], context=context)
+            for product_id in ids
+        }
     _columns = {
         'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
         'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
@@ -420,7 +418,6 @@ class product_product(osv.osv):
                                         help="If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves." \
                                              "The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products."
                                         , required=True),
-        'move_ids': fields.one2many('stock.move', 'product_id', 'Moves'),
         'move_count': fields.function(_move_count, string='# Moves', type='integer'),
     }
 

From 88cef3a8ebb7812241a948be5ad25a980a4fdb23 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 11:45:53 +0200
Subject: [PATCH 077/106] [FIX] code cleanup (addon crm)

remove unused fields meeting_count and meeting_ids

bzr revid: ged@openerp.com-20140507094553-fwj05122ncr3uic1
---
 addons/crm/crm_phonecall.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index be92fcad2bf..5b06493c60e 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,14 +32,6 @@ class crm_phonecall(osv.osv):
     _order = "id desc"
     _inherit = ['mail.thread']
     
-    def _meeting_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for meeting in self.browse(cr, uid, ids, context=context):
-                res[meeting.id] = len(meeting.meeting_ids)
-        except:
-            pass
-        return res
     _columns = {
         'date_action_last': fields.datetime('Last Action', readonly=1),
         'date_action_next': fields.datetime('Next Action', readonly=1),
@@ -74,8 +66,6 @@ class crm_phonecall(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
         'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'),
-        'meeting_ids': fields.one2many('calendar.event', 'phonecall_id', 'Phonecalls'),
-        'meeting_count': fields.function(_meeting_count, string='# Meetings', type='integer'),
     }
 
     def _get_default_state(self, cr, uid, context=None):

From fd50793820dfb2996ca5009b4fc5f8d1a7b4831f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 11:56:16 +0200
Subject: [PATCH 078/106] [IMP] gamification: avoid subscription hacks and send
 directly relevant messages to followers of the challenge, remove the goals of
 users not matching the user domain anymore

bzr revid: mat@openerp.com-20140507095616-1xvetgj4qel7iqii
---
 addons/gamification/models/challenge.py | 35 +++++++++++--------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index d3297a048d3..63c23f30cff 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -217,15 +217,7 @@ class gamification_challenge(osv.Model):
                 vals['user_ids'] = []
             vals['user_ids'] += [(4, user_id) for user_id in user_ids]
 
-        create_res = super(gamification_challenge, self).create(cr, uid, vals, context=context)
-
-        # subscribe new users to the challenge
-        if vals.get('user_ids'):
-            # done with browse after super to be sure catch all after orm process
-            challenge = self.browse(cr, uid, create_res, context=context)
-            self.message_subscribe_users(cr, uid, [challenge.id], [user.id for user in challenge.user_ids], context=context)
-
-        return create_res
+        return super(gamification_challenge, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int,long)):
@@ -366,13 +358,6 @@ class gamification_challenge(osv.Model):
                 if write_op:
                     self.write(cr, uid, [challenge.id], {'user_ids': write_op}, context=context)
 
-                # TODO for trunk: use proper parameter
-                if challenge.report_message_frequency != 'never':
-                    if to_remove_ids:
-                        self.message_unsubscribe_users(cr, uid, [challenge.id], to_remove_ids, context=context)
-                    if to_add_ids:
-                        self.message_subscribe_users(cr, uid, [challenge.id], to_add_ids, context=context)
-
         return True
 
 
@@ -439,7 +424,15 @@ class gamification_challenge(osv.Model):
 
                 cr.execute(query, query_params)
                 user_with_goal_ids = cr.dictfetchall()
-                user_without_goal_ids = list(set([user.id for user in challenge.user_ids]) - set([user['user_id'] for user in user_with_goal_ids]))
+
+                participant_user_ids = [user.id for user in challenge.user_ids]
+                user_without_goal_ids = list(set(participant_user_ids) - set([user['user_id'] for user in user_with_goal_ids]))
+                user_squating_challenge_ids = list(set([user['user_id'] for user in user_with_goal_ids]) - set(participant_user_ids))
+                if user_squating_challenge_ids:
+                    # users that used to match the challenge 
+                    goal_to_remove_ids = goal_obj.search(cr, uid, [('challenge_id', '=', challenge.id), ('user_id', 'in', user_squating_challenge_ids)], context=context)
+                    goal_obj.unlink(cr, uid, goal_to_remove_ids, context=context)
+
 
                 values = {
                     'definition_id': line.definition_id.id,
@@ -627,9 +620,10 @@ class gamification_challenge(osv.Model):
             ctx.update({'challenge_lines': lines_boards})
             body_html = temp_obj.render_template(cr, uid, challenge.report_template_id.body_html, 'gamification.challenge', challenge.id, context=ctx)
 
-            # send to every follower of the challenge
+            # send to every follower and participant of the challenge
             self.message_post(cr, uid, challenge.id,
                 body=body_html,
+                partner_ids=[user.partner_id.id for user in challenge.user_ids],
                 context=context,
                 subtype='mail.mt_comment')
             if challenge.report_message_group_id:
@@ -760,7 +754,10 @@ class gamification_challenge(osv.Model):
                         self.reward_user(cr, uid, third_user.id, challenge.reward_second_id.id, challenge.id, context=context)
                         message_body += "<br/> 3. %s - %s" % (third_user.name, challenge.reward_third_id.name)
 
-                self.message_post(cr, uid, challenge.id, body=message_body, context=context)
+                self.message_post(cr, uid, challenge.id,
+                    partner_ids=[user.partner_id.id for user in challenge.user_ids],
+                    body=message_body,
+                    context=context)
 
         return True
 

From 9f3abe3ea4d040b0ded7c4384077d799ecb24ab2 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 12:09:54 +0200
Subject: [PATCH 079/106] [FIX] code cleanup (addon crm)

improves the method to count opportunities/meetings/phonecalls in res_partner.py.  It was bugged in two different way: the phonecall_count field was counting the number of meetings and not of phone calls, and it was in the try statement, so it might give an incorrect value if an exception occurs in the computation of opportunity/meeting

Also, remove useless meeting_ids one2many field in crm_lead.py and improves the method meeting_count

bzr revid: ged@openerp.com-20140507100954-1aqnd93iu5wsixob
---
 addons/crm/crm_lead.py    | 13 +++++--------
 addons/crm/res_partner.py |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index db7ca79ff11..a9311c3be6a 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -216,13 +216,11 @@ class crm_lead(format_address, osv.osv):
                 res[lead.id][field] = abs(int(duration))
         return res
     def _meeting_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for meeting in self.browse(cr, uid, ids, context=context):
-                res[meeting.id] = len(meeting.meeting_ids)
-        except:
-            pass
-        return res
+        Event = self.pool['calendar.event']
+        return {
+            opp_id: Event.search_count(cr,uid, [('opportunity_id', '=', opp_id)], context=context)
+            for opp_id in ids
+        }
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null', track_visibility='onchange',
             select=True, help="Linked partner (optional). Usually created when converting the lead."),
@@ -297,7 +295,6 @@ class crm_lead(format_address, osv.osv):
         'payment_mode': fields.many2one('crm.payment.mode', 'Payment Mode', \
                             domain="[('section_id','=',section_id)]"),
         'planned_cost': fields.float('Planned Costs'),
-        'meeting_ids': fields.one2many('calendar.event', 'opportunity_id', 'Opportunities'),
         'meeting_count': fields.function(_meeting_count, string='# Meetings', type='integer'),
     }
 
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index b34e5c7dbb9..bb216e2040e 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -33,10 +33,11 @@ class res_partner(osv.osv):
                 res[partner.id] = {
                     'opportunity_count': len(partner.opportunity_ids),
                     'meeting_count': len(partner.meeting_ids),
-                    'phonecall_count': len(partner.meeting_ids),
                 }
         except:
             pass
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id]['phonecall_count'] = len(partner.phonecall_ids)
         return res
 
     _columns = {

From 883f695b6794e3b5ce6f938b4e04e4de45090a07 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Wed, 7 May 2014 12:24:14 +0200
Subject: [PATCH 080/106] [FIX] auth_oauth: missing field body in formview

The body is the field used to actually display the 'log in with ...'
As not shown in the view, when adding a new provider, this field was empty and therefore wasnt visible on the login form...

bzr revid: dle@openerp.com-20140507102414-vz7ur7zvh4ptuk2e
---
 addons/auth_oauth/auth_oauth_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index ffc39752ec6..5c889d3a686 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -11,6 +11,7 @@
                             <field name="name" />
                             <field name="client_id" />
                             <field name="enabled" />
+                            <field name="body" />
                         </group>
                         <group>
                             <field name="auth_endpoint" />

From 95ba80f174a71cbf14b1d94f1c02527fe8d04a9f Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 12:25:50 +0200
Subject: [PATCH 081/106] [FIX] warning: make blocking warning actually doing
 something (opw 607380)

Instead of raising an exception (which only interupt the call of the onchange methods), return a dictionnary to set the forbidden partner or product to an empty value.
The call is not blocking in a way it forbid to create a record that uses this partner/product but it make it not possible to select it through the web interface.

bzr revid: mat@openerp.com-20140507102550-sms5nbf0u7pdkci9
---
 addons/warning/warning.py | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index a3627e0021d..c1a2f92a9fd 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -63,14 +63,14 @@ class sale_order(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part, context=context)
         if partner.sale_warn != 'no-message':
-            if partner.sale_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.sale_warn_msg)
             title =  _("Warning for %s") % partner.name
             message = partner.sale_warn_msg
             warning = {
                     'title': title,
                     'message': message,
             }
+            if partner.sale_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
 
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part, context=context)
 
@@ -92,14 +92,15 @@ class purchase_order(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.purchase_warn != 'no-message':
-            if partner.purchase_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.purchase_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.purchase_warn_msg
             warning = {
                 'title': title,
                 'message': message
                 }
+            if partner.purchase_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(purchase_order, self).onchange_partner_id(cr, uid, ids, part)
 
         if result.get('warning',False):
@@ -126,15 +127,16 @@ class account_invoice(osv.osv):
         message = False
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id)
         if partner.invoice_warn != 'no-message':
-            if partner.invoice_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.invoice_warn_msg)
-
             title = _("Warning for %s") % partner.name
             message = partner.invoice_warn_msg
             warning = {
                 'title': title,
                 'message': message
                 }
+
+            if partner.invoice_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice=date_invoice, payment_term=payment_term, 
             partner_bank_id=partner_bank_id, company_id=company_id)
@@ -158,14 +160,15 @@ class stock_picking(osv.osv):
         title = False
         message = False
         if partner.picking_warn != 'no-message':
-            if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
                 'title': title,
                 'message': message
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -188,14 +191,15 @@ class stock_picking_in(osv.osv):
         title = False
         message = False
         if partner.picking_warn != 'no-message':
-            if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
                 'title': title,
                 'message': message
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -214,14 +218,15 @@ class stock_picking_out(osv.osv):
         title = False
         message = False
         if partner.picking_warn != 'no-message':
-            if partner.picking_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (partner.name), partner.picking_warn_msg)
             title = _("Warning for %s") % partner.name
             message = partner.picking_warn_msg
             warning = {
                 'title': title,
                 'message': message
             }
+            if partner.picking_warn == 'block':
+                return {'value': {'partner_id': False}, 'warning': warning}
+
         result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -262,12 +267,12 @@ class sale_order_line(osv.osv):
         message = False
 
         if product_info.sale_line_warn != 'no-message':
-            if product_info.sale_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.sale_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.sale_line_warn_msg
             warning['title'] = title
             warning['message'] = message
+            if product_info.sale_line_warn == 'block':
+                return {'value': {'product_id': False}, 'warning': warning}
 
         result =  super(sale_order_line, self).product_id_change( cr, uid, ids, pricelist, product, qty,
             uom, qty_uos, uos, name, partner_id,
@@ -295,12 +300,12 @@ class purchase_order_line(osv.osv):
         message = False
 
         if product_info.purchase_line_warn != 'no-message':
-            if product_info.purchase_line_warn == 'block':
-                raise osv.except_osv(_('Alert for %s!') % (product_info.name), product_info.purchase_line_warn_msg)
             title = _("Warning for %s") % product_info.name
             message = product_info.purchase_line_warn_msg
             warning['title'] = title
             warning['message'] = message
+            if product_info.purchase_line_warn == 'block':
+                return {'value': {'product_id': False}, 'warning': warning}
 
         result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order, fiscal_position_id)

From 7a492f6202d469278b1c6766b8c43d0343bb788b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 May 2014 12:30:56 +0200
Subject: [PATCH 082/106] [IMP] mail: type fixes

* _get_tracked_fields should return a dict even when there's no tracked field
  (return an empty dict)

* in write, only call _get_tracked_fields once, initialize to None instead of
  a list (especially since it should be a dict in the first place)

bzr revid: xmo@openerp.com-20140507103056-ykr9f57yxpw1c542
---
 addons/mail/mail_thread.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 112dff6bac6..79bf92cb68d 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -385,7 +385,7 @@ class mail_thread(osv.AbstractModel):
         if not context.get('mail_notrack'):
             tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
             if tracked_fields:
-                initial_values = {thread_id: dict((item, False) for item in tracked_fields)}
+                initial_values = {thread_id: dict.fromkeys(tracked_fields, False)}
                 self.message_track(cr, uid, [thread_id], tracked_fields, initial_values, context=track_ctx)
         return thread_id
 
@@ -398,25 +398,24 @@ class mail_thread(osv.AbstractModel):
         track_ctx = dict(context)
         if 'lang' not in track_ctx:
             track_ctx['lang'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).lang
+
+        tracked_fields = None
         if not context.get('mail_notrack'):
             tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=track_ctx)
-        else:
-            tracked_fields = []
+
         if tracked_fields:
             records = self.browse(cr, uid, ids, context=track_ctx)
-            initial_values = dict((this.id, dict((key, getattr(this, key)) for key in tracked_fields.keys())) for this in records)
+            initial_values = dict((record.id, dict((key, getattr(record, key)) for key in tracked_fields))
+                                  for record in records)
 
         # Perform write, update followers
         result = super(mail_thread, self).write(cr, uid, ids, values, context=context)
         self.message_auto_subscribe(cr, uid, ids, values.keys(), context=context, values=values)
 
-        if not context.get('mail_notrack'):
-            # Perform the tracking
-            tracked_fields = self._get_tracked_fields(cr, uid, values.keys(), context=context)
-        else:
-            tracked_fields = None
+        # Perform the tracking
         if tracked_fields:
             self.message_track(cr, uid, ids, tracked_fields, initial_values, context=track_ctx)
+
         return result
 
     def unlink(self, cr, uid, ids, context=None):
@@ -453,14 +452,15 @@ class mail_thread(osv.AbstractModel):
             :return list: a list of (field_name, column_info obj), containing
                 always tracked fields and modified on_change fields
         """
-        lst = []
+        tracked_fields = []
         for name, column_info in self._all_columns.items():
             visibility = getattr(column_info.column, 'track_visibility', False)
             if visibility == 'always' or (visibility == 'onchange' and name in updated_fields) or name in self._track:
-                lst.append(name)
-        if not lst:
-            return lst
-        return self.fields_get(cr, uid, lst, context=context)
+                tracked_fields.append(name)
+
+        if tracked_fields:
+            return self.fields_get(cr, uid, tracked_fields, context=context)
+        return {}
 
     def message_track(self, cr, uid, ids, tracked_fields, initial_values, context=None):
 
@@ -1871,4 +1871,4 @@ class mail_thread(osv.AbstractModel):
         message_obj.write(cr, uid, msg_ids_comment, {"res_id" : new_res_id, "model" : new_model}, context=context)
         message_obj.write(cr, uid, msg_ids_not_comment, {"res_id" : new_res_id, "model" : new_model, "subtype_id" : None}, context=context)
         
-        return True
\ No newline at end of file
+        return True

From 0f9917c9a3245aa21efc427d3d7a7b1402c92c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 7 May 2014 13:06:37 +0200
Subject: [PATCH 083/106] [FIX] service: wrapper: fixed context fetching.
 Indeed call_kw set its context in kwargs of kwargs, leading to a
 kwargception.

bzr revid: tde@openerp.com-20140507110637-qlj1rj8lrcpkejf6
---
 openerp/service/model.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerp/service/model.py b/openerp/service/model.py
index d65cbd77333..2bbba4ef72a 100644
--- a/openerp/service/model.py
+++ b/openerp/service/model.py
@@ -54,7 +54,8 @@ def check(f):
                 if args and isinstance(args[-1], dict):
                     ctx = args[-1]
             elif isinstance(kwargs, dict):
-                ctx = kwargs.get('context', {})
+                # kwargception because call_kw set its context in kwargs['kwargs']
+                ctx = kwargs.get('context', kwargs.get('kwargs', {}).get('context', {}))
 
             uid = 1
             if args and isinstance(args[0], (long, int)):

From ada19d175d530b616f88e7c3d81ec194f7ad6a0d Mon Sep 17 00:00:00 2001
From: Kersten Jeremy <jke@openerp.com>
Date: Wed, 7 May 2014 14:01:44 +0200
Subject: [PATCH 084/106] [FIX] POS - Write the state to Paid before the
 create_picking. It's allow to stay in a valid state in workflow. And let the
 current stock picking out to 'Ready for delivery'

bzr revid: jke@openerp.com-20140507120144-m177kqxa3fbfl37r
---
 addons/point_of_sale/point_of_sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 3480ab47221..0a2b96fd273 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1167,8 +1167,8 @@ class pos_order(osv.osv):
         return self.write(cr, uid, ids, {'state': 'payment'}, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.create_picking(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'paid'}, context=context)
+        self.create_picking(cr, uid, ids, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):

From aeebac88d96a259d3da132891d16795fb3b943d5 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 14:13:10 +0200
Subject: [PATCH 085/106] [FIX] code cleanup (addon account)

improve the logic of _journal_item_count (removes try/except/pass, use search_count) and remove useless one2many field in res_partner (journal_item_ids)

bzr revid: ged@openerp.com-20140507121310-ya6m71fvs40rf90d
---
 addons/account/partner.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/account/partner.py b/addons/account/partner.py
index df4c1ec4888..cafd5505cad 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -172,18 +172,15 @@ class res_partner(osv.osv):
         return result
 
     def _journal_item_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'journal_item_count': 0, 'contracts_count': 0 }), ids))
-
-        # the user may not have access rights 
-        try:
-            for partner in self.browse(cr, uid, ids, context=context):
-                res[partner.id] = {
-                    'journal_item_count': len(partner.journal_item_ids),
-                    'contracts_count': len(partner.contract_ids)
-                }
-        except:
-            pass
-        return res
+        MoveLine = self.pool('account.move.line')
+        AnalyticAccount = self.pool('account.analytic.account')
+        return {
+            partner_id: {
+                'journal_item_count': MoveLine.search_count(cr, uid, [('partner_id', '=', partner_id)], context=context),
+                'contracts_count': AnalyticAccount.search_count(cr,uid, [('partner_id', '=', partner_id)], context=context)
+            }
+            for partner_id in ids
+        }
 
     def has_something_to_reconcile(self, cr, uid, partner_id, context=None):
         '''
@@ -215,7 +212,6 @@ class res_partner(osv.osv):
         'debit_limit': fields.float('Payable Limit'),
         'total_invoiced': fields.function(_invoice_total, string="Total Invoiced", type='float'),
         'contracts_count': fields.function(_journal_item_count, string="Contracts", type='integer', multi="invoice_journal"),
-        'journal_item_ids': fields.one2many('account.move.line', 'partner_id', 'Journal Items'),
         'journal_item_count': fields.function(_journal_item_count, string="Journal Items", type="integer", multi="invoice_journal"),
         'property_account_payable': fields.property(
             type='many2one',

From 4373f85773f625768eccfc72c3a27978ee718340 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 May 2014 14:14:13 +0200
Subject: [PATCH 086/106] [FIX] Do not self close empty elements that are not
 html void elements

bzr revid: fme@openerp.com-20140507121413-o7jqhexbm1wmitt6
---
 addons/web/static/lib/qweb/qweb-benchmark.xml |  2 +-
 addons/web/static/lib/qweb/qweb2.js           | 11 ++++++++---
 addons/web/static/src/xml/base.xml            |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/lib/qweb/qweb-benchmark.xml b/addons/web/static/lib/qweb/qweb-benchmark.xml
index 71452572e51..8d1e913f3e2 100644
--- a/addons/web/static/lib/qweb/qweb-benchmark.xml
+++ b/addons/web/static/lib/qweb/qweb-benchmark.xml
@@ -29,7 +29,7 @@
     <div t-if="testing || true" t-att-class="novar || 'yes'" style="display: none">
         <t t-set="novar"></t>
         <t t-set="style">height: 200px; border: 1px solid red;</t>
-        <div t-att="{ 'style' : style, 'disabled' : 'false', 'readonly' : novar or undefined }" t-opentag="true"/>
+        <div t-att="{ 'style' : style, 'disabled' : 'false', 'readonly' : novar or undefined }"/>
         <t t-foreach="{'my': 'first', 'my2': 'second' }" t-as="v">
             * <t t-esc="v"/> : <t t-esc="v_value"/>
         </t>
diff --git a/addons/web/static/lib/qweb/qweb2.js b/addons/web/static/lib/qweb/qweb2.js
index 0289af91a60..78e4fd8b544 100644
--- a/addons/web/static/lib/qweb/qweb2.js
+++ b/addons/web/static/lib/qweb/qweb2.js
@@ -37,6 +37,7 @@ var QWeb2 = {
         'lt': '<',
         'lte': '<='
     },
+    VOID_ELEMENTS: 'area,base,br,col,embed,hr,img,input,keygen,link,menuitem,meta,param,source,track,wbr'.split(','),
     tools: {
         exception: function(message, context) {
             context = context || {};
@@ -218,6 +219,7 @@ QWeb2.Engine = (function() {
         this.jQuery = window.jQuery;
         this.reserved_words = QWeb2.RESERVED_WORDS.slice(0);
         this.actions_precedence = QWeb2.ACTIONS_PRECEDENCE.slice(0);
+        this.void_elements = QWeb2.VOID_ELEMENTS.slice(0);
         this.word_replacement = QWeb2.tools.extend({}, QWeb2.WORD_REPLACEMENT);
         this.preprocess_node = null;
         for (var i = 0; i < arguments.length; i++) {
@@ -480,6 +482,7 @@ QWeb2.Element = (function() {
         this._bottom = [];
         this._indent = 1;
         this.process_children = true;
+        this.is_void_element = ~QWeb2.tools.arrayIndexOf(this.engine.void_elements, this.tag);
         var childs = this.node.childNodes;
         if (childs) {
             for (var i = 0, ilen = childs.length; i < ilen; i++) {
@@ -677,11 +680,13 @@ QWeb2.Element = (function() {
                         this.top("r.push(context.engine.tools.gen_attribute(['" + m[1] + "', (" + (this.string_interpolation(v)) + ")]));");
                     }
                 }
-                if (this.children.length || this.actions.opentag === 'true') {
+                if (this.actions.opentag === 'true' || (!this.children.length && this.is_void_element)) {
+                    // We do not enforce empty content on void elements
+                    // because QWeb rendering is not necessarily html.
+                    this.top_string("/>");
+                } else {
                     this.top_string(">");
                     this.bottom_string("</" + this.tag + ">");
-                } else {
-                    this.top_string("/>");
                 }
             }
         },
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 18a55656df2..75d4bdbb1c6 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -496,7 +496,7 @@
                         </h2>
                 </td>
                 <td colspan="2">
-                        <div class="oe_view_manager_view_search" t-opentag="true"/>
+                        <div class="oe_view_manager_view_search"/>
                 </td>
             </tr>
             <tr class="oe_header_row">

From 5e5333a1e9956d207def489076d4e26073fcd037 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 14:52:48 +0200
Subject: [PATCH 087/106] [FIX] code cleanup (addon mrp)

change the way bom_count, bom_strct and mo_count are computed, removes the try/except/pass statements, improves the logic.

Also, for some reason, bom_strct is the same as bom_count, but I don't really know what it is supposed to be, and the Bom Structure and Bill of materials buttons leads to views with the same number of items.

bzr revid: ged@openerp.com-20140507125248-ctv491ktx008v9ic
---
 addons/mrp/mrp.py | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 537e3f5bfda..5e5afd9de7c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1111,24 +1111,22 @@ class mrp_production_product_line(osv.osv):
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    def _bom_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'bom_count': 0, 'mo_count': 0, 'bom_strct':0}), ids))
-        try:
-            for bom in self.browse(cr, uid, ids, context=context):
-                res[bom.id] = {
-                    'bom_count': len(bom.bom_ids),
-                    'mo_count': len(bom.mo_ids),
-                    'bom_strct':len(bom.bom_ids),
-                }
-        except:
-            pass
-        return res
+    def _bom_orders_count(self, cr, uid, ids, field_name, arg, context=None):
+        Bom = self.pool('mrp.bom')
+        Production = self.pool('mrp.production')
+        return {
+            product_id: {
+                'bom_count': Bom.search_count(cr, uid, [('product_id', '=', product_id), ('bom_id', '=', False)], context=context),
+                'mo_count': Production.search_count(cr,uid, [('product_id', '=', product_id)], context=context),
+                'bom_strct': Bom.search_count(cr, uid, [('product_id', '=', product_id), ('bom_id', '=', False)], context=context),
+            }
+            for product_id in ids
+        }
     _columns = {
         'bom_ids': fields.one2many('mrp.bom', 'product_id', 'Bill of Materials'),
-        'mo_ids': fields.one2many('mrp.production', 'product_id', 'Manufacturing Orders'),
-        'bom_count': fields.function(_bom_count, string='# Bill of Material', type='integer', multi="bom_count"),
-        'bom_strct': fields.function(_bom_count, string='# Bill of Material Structure', type='integer', multi="bom_count"),
-        'mo_count': fields.function(_bom_count, string='# Manufacturing Orders', type='integer', multi="bom_count"),
+        'bom_count': fields.function(_bom_orders_count, string='# Bill of Material', type='integer', multi="_bom_order_count"),
+        'bom_strct': fields.function(_bom_orders_count, string='# Bill of Material Structure', type='integer', multi="_bom_order_count"),
+        'mo_count': fields.function(_bom_orders_count, string='# Manufacturing Orders', type='integer', multi="_bom_order_count"),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 626915508d3ad0b855a4ca74e3e5c42c68804b5f Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 15:16:29 +0200
Subject: [PATCH 088/106] [FIX] code cleanup (addon hr_recruitment)

remove try/except/pass in method _count_all, improves the logic

bzr revid: ged@openerp.com-20140507131629-knp2kvw2zs1k200x
---
 addons/hr_recruitment/hr_recruitment.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 753b0bac183..ef48b6005e9 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -530,15 +530,14 @@ class hr_job(osv.osv):
         return res
 
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'documents_count': 0, 'application_count': 0,}), ids))
-        try:
-            for job in self.browse(cr, uid, ids, context=context):
-                res[job.id] = {'documents_count': len(job.document_ids),
-                'application_count': len(job.applicant_ids),
-                }
-        except:
-            pass
-        return res
+        Applicant = self.pool['hr.applicant']
+        return {
+            job_id: {
+                'application_count': Applicant.search_count(cr,uid, [('job_id', '=', job_id)], context=context),
+                'documents_count': len(self._get_attached_docs(cr, uid, [job_id], field_name, arg, context=context)[job_id])
+            }
+            for job_id in ids
+        }
 
     _columns = {
         'survey_id': fields.many2one('survey.survey', 'Interview Form', help="Choose an interview form for this job position and you will be able to print/answer this interview from all applicants who apply for this job"),

From e83709bdcc90eaafb65bbb98fcc76ddcbde5e12d Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 15:29:49 +0200
Subject: [PATCH 089/106] [FIX] code cleanup (addon project_issue)

improves the code of _issue_count (both in partner and in project).  This makes the issue_ids field in res_partner useless,
so issue_ids is also removed.

bzr revid: ged@openerp.com-20140507132949-tbtd4pl33zwhzgwd
---
 addons/project_issue/project_issue.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 098826c0a06..e07d4dbe957 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -490,10 +490,11 @@ class project(osv.Model):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
 
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
-        res={}
-        for issues in self.browse(cr, uid, ids, context):
-            res[issues.id] = len(issues.issue_ids)
-        return res
+        Issue = self.pool['project.issue']
+        return {
+            project_id: Issue.search_count(cr,uid, [('project_id', '=', project_id), ('stage_id.fold', '=', False)], context=context)
+            for project_id in ids
+        }
     _columns = {
         'project_escalation_id': fields.many2one('project.project', 'Project Escalation',
             help='If any issue is escalated from the current Project, it will be listed under the project selected here.',
@@ -570,18 +571,15 @@ class project_project(osv.Model):
 
 class res_partner(osv.osv):
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for partner in self.browse(cr, uid, ids, context=context):
-                res[partner.id] = len(partner.issue_ids)
-        except:
-            pass
-        return res
+        Issue = self.pool['project.issue']
+        return {
+            partner_id: Issue.search_count(cr,uid, [('partner_id', '=', partner_id)])
+            for partner_id in ids
+        }
     
     """ Inherits partner and adds Issue information in the partner form """
     _inherit = 'res.partner'
     _columns = {
-        'issue_ids': fields.one2many('project.issue', 'partner_id', 'Issues'),
         'issue_count': fields.function(_issue_count, string='# Issues', type='integer'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From e0fb0a643429cb85f8f0e920460d0c3d810c772a Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Wed, 7 May 2014 15:35:52 +0200
Subject: [PATCH 090/106] [FIX] account: when creating partial reconcilation
 after unreconciliating one invoice, make sure we create this partial
 reconcilation only if we have at least two lines

bzr revid: mat@openerp.com-20140507133552-v4qsdp7qdp9iwewi
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 61619276df7..4da965167ba 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1029,7 +1029,7 @@ class account_move_line(osv.osv):
             if opening_reconciliation:
                 obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
             obj_move_rec.unlink(cr, uid, unlink_ids)
-            if all_moves:
+            if len(all_moves) >= 2:
                 obj_move_line.reconcile_partial(cr, uid, all_moves, 'auto',context=context)
         return True
 

From 643871c20f096223b38ef69e846dcaa9f1e44051 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 7 May 2014 15:41:27 +0200
Subject: [PATCH 091/106] [FIX] website_forum: set config parameter via
 dedicated function

bzr revid: chs@openerp.com-20140507134127-xmp9kza1mvy37jf1
---
 addons/website_forum/data/forum_data.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 245169c23e9..a387a8de7ae 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -13,10 +13,7 @@
             <field name="sequence" type="int">35</field>
         </record>
 
-        <record id="default_allow_auth_signup" model="ir.config_parameter"> 
-            <field name="key">auth_signup.allow_uninvited</field>
-            <field name="value" eval="True"/>
-        </record>
+        <function model="ir.config_parameter" name="set_param" eval="('auth_signup.allow_uninvited', True)" />
 
         <!-- JUMP TO FORUM AT INSTALL -->
         <record id="action_open_forum" model="ir.actions.act_url">

From c13b9a1262b2c575d08f0fe96100b016254330c9 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 15:41:34 +0200
Subject: [PATCH 092/106] [FIX] code cleanup (addon procurement)

improves the _orderpoint_count method.  Also, as a bonus, the preexisting orderpoint_ids is not used
in any other place, so it can be removed as well

bzr revid: ged@openerp.com-20140507134134-isaor8ulq4pf5wrt
---
 addons/procurement/procurement.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index a34e4171e75..94f428e3df5 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -615,15 +615,12 @@ class product_template(osv.osv):
 class product_product(osv.osv):
     _inherit="product.product"
     def _orderpoint_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for orderpoint in self.browse(cr, uid, ids, context=context):
-                res[orderpoint.id] = len(orderpoint.orderpoint_ids)
-        except:
-            pass
-        return res
+        OrderPoints = self.pool('stock.warehouse.orderpoint')
+        return {
+            product_id: OrderPoints.search_count(cr, uid, [('product_id', '=', product_id)], context=context)
+            for product_id in ids
+        }
     _columns = {
-        'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
         'orderpoint_count': fields.function(_orderpoint_count, string='# Orderpoints', type='integer'),
     }
 

From 3be9d940f7f6c65e50545c07cdc26d414513dbfd Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 15:45:44 +0200
Subject: [PATCH 093/106] [FIX] code cleanup (addon account_asset)

simplify the method _entry_count by using search_count and by removing try/except/pass

bzr revid: ged@openerp.com-20140507134544-oi3y8hwf16nituki
---
 addons/account_asset/account_asset.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index ebeb0cb8e25..0ba7182d0d4 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -238,13 +238,11 @@ class account_asset_asset(osv.osv):
                 val['value_residual'] = purchase_value - salvage_value
         return {'value': val}    
     def _entry_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for entry in self.browse(cr, uid, ids, context=context):
-                res[entry.id] = len(entry.account_move_line_ids)
-        except:
-            pass
-        return res
+        MoveLine = self.pool('account.move.line')
+        return {
+            asset_id: MoveLine.search_count(cr, uid, [('asset_id', '=', asset_id)], context=context)
+            for asset_id in ids
+        }
     _columns = {
         'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
         'entry_count': fields.function(_entry_count, string='# Asset Entries', type='integer'),

From 104110de33389ed479b9e94a1128f0d55e00bf71 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 15:58:26 +0200
Subject: [PATCH 094/106] [FIX] code cleanup (addon hr_payroll)

remove try/except/pass in _count_detail_payslip and in _payslip_count, improves these methods and remove the now useless field payslip_ids

bzr revid: ged@openerp.com-20140507135826-xlo5gn7iq612lonp
---
 addons/hr_payroll/hr_payroll.py | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index e2cb1b3ad3f..1a34758fb50 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -261,11 +261,8 @@ class hr_payslip(osv.osv):
     
     def _count_detail_payslip(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        try:
-            for details in self.browse(cr, uid, ids, context=context):
-                res[details.id] = len(details.line_ids)
-        except:
-            pass
+        for details in self.browse(cr, uid, ids, context=context):
+            res[details.id] = len(details.line_ids)
         return res
 
     _columns = {
@@ -285,7 +282,6 @@ class hr_payslip(osv.osv):
             \n* If the payslip is under verification, the status is \'Waiting\'. \
             \n* If the payslip is confirmed then status is set to \'Done\'.\
             \n* When user cancel payslip the status is \'Rejected\'.'),
-#        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'worked_days_line_ids': fields.one2many('hr.payslip.worked_days', 'payslip_id', 'Payslip Worked Days', required=False, readonly=True, states={'draft': [('readonly', False)]}),
@@ -983,19 +979,16 @@ class hr_employee(osv.osv):
         return res
 
     def _payslip_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for employee in self.browse(cr, uid, ids, context=context):
-                res[employee.id] = len(employee.payslip_ids)
-        except:
-            pass
-        return res
+        Payslip = self.pool['hr.payslip']
+        return {
+            employee_id: Payslip.search_count(cr,uid, [('employee_id', '=', employee_id)], context=context)
+            for employee_id in ids
+        }
 
     _columns = {
         'slip_ids':fields.one2many('hr.payslip', 'employee_id', 'Payslips', required=False, readonly=True),
         'total_wage': fields.function(_calculate_total_wage, method=True, type='float', string='Total Basic Salary', digits_compute=dp.get_precision('Payroll'), help="Sum of all current contract's wage of employee."),
         'payslip_count': fields.function(_payslip_count, type='integer', string='Payslips'),
-        'payslip_ids': fields.one2many('hr.payslip', 'employee_id', 'Payslips'),
     }
 
 

From 188241ce00fb4e10315e568e3dabe6cbad0fce56 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 16:07:18 +0200
Subject: [PATCH 095/106] [FIX] code cleanup (addon hr_contract)

simplify the method _contracts_count, remove try/except/pass statements

bzr revid: ged@openerp.com-20140507140718-waw1di92qicsch2z
---
 addons/hr_contract/hr_contract.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index d641c490ec2..798ee46832d 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -39,13 +39,11 @@ class hr_employee(osv.osv):
         return res
 
     def _contracts_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for employee in self.browse(cr, uid, ids, context=context):
-                res[employee.id] = len(employee.contract_ids)
-        except:
-            pass
-        return res
+        Contract = self.pool['hr.contract']
+        return {
+            employee_id: Contract.search_count(cr,uid, [('employee_id', '=', employee_id)], context=context)
+            for employee_id in ids
+        }
 
     _columns = {
         'manager': fields.boolean('Is a Manager'),

From ad0ed2c4d809c927047836dd8f7318c7751205e8 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 16:17:25 +0200
Subject: [PATCH 096/106] [FIX] code cleanup (addon hr_timesheet_sheet)

remove try/except/statement that should not be here, uses search_count when appropriate, and remove a now useless one2many field

bzr revid: ged@openerp.com-20140507141725-h2z9u72roscf407n
---
 .../hr_timesheet_sheet/hr_timesheet_sheet.py  | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index b771714c9b7..fe677561b2c 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -134,15 +134,15 @@ class hr_timesheet_sheet(osv.osv):
         return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
     
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'timesheet_activity_count': 0, 'attendance_count': 0,}), ids))
-        try:
-           for datas in self.browse(cr, uid, ids, context=context):
-                res[datas.id] = {'timesheet_activity_count': len(datas.timesheet_activity_ids),
-                'attendance_count': len(datas.attendances_ids),
-                }
-        except:
-            pass
-        return res
+        Timesheet = self.pool['hr.analytic.timesheet']
+        Attendance = self.pool['hr.attendance']
+        return {
+            sheet_id: {
+                'timesheet_activity_count': Timesheet.search_count(cr,uid, [('sheet_id','=', sheet_id)], context=context),
+                'attendance_count': Attendance.search_count(cr,uid, [('sheed_id', '=', sheet_id)], context=context)
+            }
+            for sheet_id in ids
+        }
 
     _columns = {
         'name': fields.char('Note', size=64, select=1,
@@ -174,7 +174,6 @@ class hr_timesheet_sheet(osv.osv):
         'account_ids': fields.one2many('hr_timesheet_sheet.sheet.account', 'sheet_id', 'Analytic accounts', readonly=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'department_id':fields.many2one('hr.department','Department'),
-        'timesheet_activity_ids': fields.one2many('hr.analytic.timesheet', 'sheet_id', 'Timesheet Activities'),
         'timesheet_activity_count': fields.function(_count_all, type='integer', string='Timesheet Activities', multi=True),
         'attendance_count': fields.function(_count_all, type='integer', string="Attendances", multi=True),
     }
@@ -610,17 +609,14 @@ class hr_employee(osv.osv):
     _description = 'Employee'
 
     def _timesheet_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,0), ids))
-        try:
-            for employee in self.browse(cr, uid, ids, context=context):
-                res[employee.id] = len(employee.timesheet_ids)
-        except:
-            pass
-        return res
+        Sheet = self.pool['hr_timesheet_sheet.sheet']
+        return {
+            employee_id: Sheet.search_count(cr,uid, [('employee_id', '=', employee_id)], context=context)
+            for employee_id in ids
+        }
 
     _columns = {
-        'timesheet_ids': fields.one2many('hr_timesheet_sheet.sheet', 'employee_id', 'Timesheets'),
-        'timesheet_count': fields.function(_timesheet_count, type='integer', string='Timsheets'),
+        'timesheet_count': fields.function(_timesheet_count, type='integer', string='Timesheets'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From eb1d98143548d55b7cdb1e46e3cc7d3ef99021a5 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Wed, 7 May 2014 16:45:32 +0200
Subject: [PATCH 097/106] [FIX] code cleanup (addon purchase)

simplify a few _count methods by removing useless try/except/pass and by using search_count when appropriate.  It allows us to remove two one2many fields as well.

bzr revid: ged@openerp.com-20140507144532-dgm9mfgt9k5p10jr
---
 addons/purchase/partner.py  | 34 ++++++++++++----------------------
 addons/purchase/purchase.py | 16 +++++++---------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index b7757c2f91f..36ad724f0c4 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -25,22 +25,16 @@ class res_partner(osv.osv):
     _name = 'res.partner'
     _inherit = 'res.partner'
 
-    def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'purchase_order_count': 0, 'supplier_invoice_count': 0}), ids))
-        invoice_ids = self.pool.get('account.invoice').search(cr,uid, [('type', '=', 'in_invoice'), ('partner_id', '=', ids[0])])
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = {
-                    'purchase_order_count': len(partner.purchase_order_ids),
-                    'supplier_invoice_count': len(invoice_ids),
-                }
-        return res
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-
-        default.update({'purchase_order_ids': []})
-
-        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
+    def _purchase_invoice_count(self, cr, uid, ids, field_name, arg, context=None):
+        PurchaseOrder = self.pool['purchase.order']
+        Invoice = self.pool['account.invoice']
+        return {
+            partner_id: {
+                'purchase_order_count': PurchaseOrder.search_count(cr,uid, [('partner_id', '=', partner_id)], context=context),
+                'supplier_invoice_count': Invoice.search_count(cr,uid, [('partner_id', '=', partner_id), ('type','=','in_invoice')], context=context)
+            }
+            for partner_id in ids
+        }
 
     def _commercial_fields(self, cr, uid, context=None):
         return super(res_partner, self)._commercial_fields(cr, uid, context=context) + ['property_product_pricelist_purchase']
@@ -52,13 +46,9 @@ class res_partner(osv.osv):
           domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
-        'purchase_order_count': fields.function(_purchase_order_count, string='# of Purchase Order', type='integer', multi="count"),
-        'purchase_order_ids': fields.one2many('purchase.order','partner_id','Purchase Order'),
-        'invoice_ids': fields.one2many('account.invoice','partner_id','Supplier Invoices'),
-        'supplier_invoice_count': fields.function(_purchase_order_count, string='# Supplier Invoices', type='integer', multi="count"),
+        'purchase_order_count': fields.function(_purchase_invoice_count, string='# of Purchase Order', type='integer', multi="count"),
+        'supplier_invoice_count': fields.function(_purchase_invoice_count, string='# Supplier Invoices', type='integer', multi="count"),
     }
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 4e98282d444..457523d6d97 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -148,15 +148,13 @@ class purchase_order(osv.osv):
         return res and res[0] or False  
 
     def _count_all(self, cr, uid, ids, field_name, arg, context=None):
-        res = dict(map(lambda x: (x,{'shipment_count': 0, 'invoice_count': 0,}), ids))
-        try:
-            for data in self.browse(cr, uid, ids, context=context):
-                res[data.id] = {'shipment_count': len(data.picking_ids),
-                'invoice_count': len(data.invoice_ids),
-                }
-        except:
-            pass
-        return res
+        return {
+            purchase.id: {
+                'shipment_count': len(purchase.picking_ids),
+                'invoice_count': len(purchase.invoice_ids),                
+            }
+            for purchase in self.browse(cr, uid, ids, context=context)
+        }
 
     STATE_SELECTION = [
         ('draft', 'Draft PO'),

From 9a271eef168df0df94e0d8cecf85f037320187ef Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 7 May 2014 18:42:07 +0200
Subject: [PATCH 098/106] [FIX] mail: correct code indentation introduced
 during previous forward-port

bzr revid: chs@openerp.com-20140507164207-kmme4tsrd4w1m7l1
---
 addons/mail/mail_mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index c4466a9f0c4..9811fcd6aef 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -293,7 +293,7 @@ class mail_mail(osv.Model):
                 # /!\ can't use mail.state here, as mail.refresh() will cause an error
                 # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1
                 self._postprocess_sent_message(cr, uid, mail, context=context, mail_sent=mail_sent)
-                    _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
+                _logger.info('Mail with ID %r and Message-Id %r successfully sent', mail.id, mail.message_id)
             except MemoryError:
                 # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job
                 # instead of marking the mail as failed

From 7654b7699c304594e2130ecf7a1ef33e0c68960f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 May 2014 18:51:26 +0200
Subject: [PATCH 099/106] [REM] QWeb does not self close empty divs anymore

See web Rev#4011

bzr revid: fme@openerp.com-20140507165126-e32a6qne8slgin09
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 06af2303239..ec7b0fa2911 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -187,7 +187,7 @@
                         </span>
                     </t>
                 </td>
-                <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
+                <td><div class="oe_view_manager_view_search"/></td>
             </tr>
           </tbody>
         </table>

From 95e1bd0612d69b875e840f1d37e9c0e4a7b43a54 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 May 2014 19:08:16 +0200
Subject: [PATCH 100/106] [REM] completetly removed
 website#preprocess_request()

bzr revid: fme@openerp.com-20140507170816-rrnh1nlqf97pfy3k
---
 addons/website/models/ir_http.py | 1 -
 addons/website/models/website.py | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index e137bfa6207..2a774939c60 100644
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -61,7 +61,6 @@ class ir_http(orm.AbstractModel):
             if first_pass:
                 request.lang = request.website.default_lang_code
             request.context['lang'] = request.lang
-            request.website.preprocess_request(request)
             if not func:
                 path = request.httprequest.path.split('/')
                 langs = [lg[0] for lg in request.website.get_languages()]
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 3b14cd1e9c4..3320ad9a038 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -198,9 +198,6 @@ class website(osv.osv):
         # TODO: Select website, currently hard coded
         return self.pool['website'].browse(cr, uid, 1, context=context)
 
-    def preprocess_request(self, cr, uid, ids, request, context=None):
-        pass
-
     def is_publisher(self, cr, uid, ids, context=None):
         Access = self.pool['ir.model.access']
         is_website_publisher = Access.check(cr, uid, 'ir.ui.view', 'write', False, context)

From a47d8d9640bf6e8e2878e938bae312373119f541 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 7 May 2014 20:08:51 +0200
Subject: [PATCH 101/106] [REV] partial revert of revision 9408
 ged@openerp.com-20140502144544-c5j7bzlm9i4clv4l where we wrongly beleive than
 stock depends on crm_claim... :( That code will probably be back _in the
 right module_

bzr revid: qdp-launchpad@openerp.com-20140507180851-lgkb8n4pscizbwvw
---
 addons/stock/stock.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5f7aeb0ef1e..5e527a77fb9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -636,11 +636,7 @@ class stock_picking(osv.osv):
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         return new_id
-    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        claim = self.pool.get('crm.claim').search(cr, uid, [('ref', '=',('stock.picking.out,' + str(ids[0])))], context=context)
-        res[ids[0]] = len(claim)
-        return res
+
     _columns = {
         'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'origin': fields.char('Source Document', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
@@ -684,7 +680,6 @@ class stock_picking(osv.osv):
             ("none", "Not Applicable")], "Invoice Control",
             select=True, required=True, readonly=True, track_visibility='onchange', states={'draft': [('readonly', False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
-        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),
     }
     _defaults = {
         'name': lambda self, cr, uid, context: '/',
@@ -3138,8 +3133,6 @@ class stock_picking_out(osv.osv):
         out_defaults = super(stock_picking_out, self).default_get(cr, uid, fields_list, context=context)
         defaults.update(out_defaults)
         return defaults
-    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
-        return super(stock_picking_out, self)._claim_count(cr, uid, ids, field_name, arg, context=context)
     
     _columns = {
         'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
@@ -3157,7 +3150,6 @@ class stock_picking_out(osv.osv):
                  * Ready to Deliver: products reserved, simply waiting for confirmation.\n
                  * Delivered: has been processed, can't be modified or cancelled anymore\n
                  * Cancelled: has been cancelled, can't be confirmed anymore"""),
-        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),
     }
     _defaults = {
         'type': 'out',

From 80aa26963ecab647963506c918b5286f3c8e877e Mon Sep 17 00:00:00 2001
From: Launchpad Translations on behalf of openerp <>
Date: Thu, 8 May 2014 05:38:46 +0000
Subject: [PATCH 102/106] Launchpad automatic translations update.

bzr revid: launchpad_translations_on_behalf_of_openerp-20140508053846-issswyvoac14767d
---
 addons/calendar/i18n/zh_CN.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po
index 6c5eaf61576..1193e76da1a 100644
--- a/addons/calendar/i18n/zh_CN.po
+++ b/addons/calendar/i18n/zh_CN.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-07 06:27+0000\n"
+"X-Launchpad-Export-Date: 2014-05-08 05:38+0000\n"
 "X-Generator: Launchpad (build 16996)\n"
 "Language: zh_CN\n"
 

From b73e2e95ec04c772f0c304950f40f4f8ccd903c8 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 8 May 2014 09:27:41 +0200
Subject: [PATCH 103/106] [FIX] add missing claim_count field to
 stock.picking.out

The claim_count field was incorrectly added into addon stock instead
of addon claim_from_delivery.  The commit adding the claim_count field
in stock.py was reverted, but claim_count is still needed in
claim_delivery_view.xml.

bzr revid: ged@openerp.com-20140508072741-sr3a9ishpqtkczlq
---
 addons/claim_from_delivery/__init__.py      |  1 +
 addons/claim_from_delivery/stock_picking.py | 26 +++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 addons/claim_from_delivery/stock_picking.py

diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py
index 5e947ee409d..c21aa0d3c3a 100644
--- a/addons/claim_from_delivery/__init__.py
+++ b/addons/claim_from_delivery/__init__.py
@@ -18,6 +18,7 @@
 #
 ##############################################################################
 
+import stock_picking
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/claim_from_delivery/stock_picking.py b/addons/claim_from_delivery/stock_picking.py
new file mode 100644
index 00000000000..9c3121d067c
--- /dev/null
+++ b/addons/claim_from_delivery/stock_picking.py
@@ -0,0 +1,26 @@
+from openerp.osv import fields, osv
+
+
+class stock_picking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+        Claim = self.pool['crm.claim']
+        return {
+            id: Claim.search_count(cr, uid, [('ref', '=',('stock.picking.out,' + str(ids[0])))], context=context)
+            for id in ids
+        }
+
+    _columns = {
+        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),    
+    }
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+
+    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+        return super(stock_picking_out, self)._claim_count(cr, uid, ids, field_name, arg, context=context)
+
+    _columns = {
+        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),    
+    }

From cf87afbe0ac4a85ce71693bb5939dfc04a0dd2a8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 8 May 2014 09:50:25 +0200
Subject: [PATCH 104/106] [FIX] configuration file dbfilter's option has no
 effect

lp bug: https://launchpad.net/bugs/940439 fixed

bzr revid: fme@openerp.com-20140508075025-yszqmzie1z4n7l4j
---
 openerp/tools/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 6b21bda8b4f..588c2dedf9f 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -153,7 +153,7 @@ class configmanager(object):
 
         # WEB
         group = optparse.OptionGroup(parser, "Web interface Configuration")
-        group.add_option("--db-filter", dest="dbfilter", default='.*',
+        group.add_option("--db-filter", dest="dbfilter", my_default='.*',
                          help="Filter listed database", metavar="REGEXP")
         parser.add_option_group(group)
 

From 131f91db15ea658df19003a4e37fe22a8655e927 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 8 May 2014 09:59:57 +0200
Subject: [PATCH 105/106] [IMP] change claim_count in claim_count_out (addon
 claim_from_delivery)

also, simplify the implementation.  The empty method _claim_count in
stock_picking_out is due to the weird way inheritance works in openerp,
and the fact that stock.picking.out only call the method in its parent

bzr revid: ged@openerp.com-20140508075957-lyqvng5i155b28cy
---
 addons/claim_from_delivery/claim_delivery_view.xml | 2 +-
 addons/claim_from_delivery/stock_picking.py        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index 852d602c269..6f9ca5e4a66 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -18,7 +18,7 @@
                     <div class="oe_right oe_button_box">
                         <button class="oe_inline oe_stat_button" type="action" 
                                 name="%(action_claim_from_delivery)d" icon="fa-comments" >
-                                <field string="Claims" name="claim_count" widget="statinfo"/>
+                                <field string="Claims" name="claim_count_out" widget="statinfo"/>
                         </button>
                     </div>
                 </xpath>
diff --git a/addons/claim_from_delivery/stock_picking.py b/addons/claim_from_delivery/stock_picking.py
index 9c3121d067c..3a3404bfa93 100644
--- a/addons/claim_from_delivery/stock_picking.py
+++ b/addons/claim_from_delivery/stock_picking.py
@@ -12,15 +12,15 @@ class stock_picking(osv.osv):
         }
 
     _columns = {
-        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),    
+        'claim_count_out': fields.function(_claim_count, string='Claims', type='integer'),    
     }
 
 class stock_picking_out(osv.osv):
     _inherit = 'stock.picking.out'
 
     def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
-        return super(stock_picking_out, self)._claim_count(cr, uid, ids, field_name, arg, context=context)
+        pass
 
     _columns = {
-        'claim_count': fields.function(_claim_count, string='Claims', type='integer'),    
+        'claim_count_out': fields.function(_claim_count, string='Claims', type='integer'),    
     }

From 8e16385aec5954dcb181f85da36b0fd88d6d9438 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Thu, 8 May 2014 10:31:49 +0200
Subject: [PATCH 106/106] [IMP] change the method name _claim_count into
 _claim_count_out

also, add a comment to explain why it is necessary to add a _claim_count_out method in
stock_picking_out even though it will not be called.

bzr revid: ged@openerp.com-20140508083149-rdophw2iihzntfpr
---
 addons/claim_from_delivery/stock_picking.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/claim_from_delivery/stock_picking.py b/addons/claim_from_delivery/stock_picking.py
index 3a3404bfa93..6929809bfe2 100644
--- a/addons/claim_from_delivery/stock_picking.py
+++ b/addons/claim_from_delivery/stock_picking.py
@@ -4,7 +4,7 @@ from openerp.osv import fields, osv
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
-    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
+    def _claim_count_out(self, cr, uid, ids, field_name, arg, context=None):
         Claim = self.pool['crm.claim']
         return {
             id: Claim.search_count(cr, uid, [('ref', '=',('stock.picking.out,' + str(ids[0])))], context=context)
@@ -12,15 +12,19 @@ class stock_picking(osv.osv):
         }
 
     _columns = {
-        'claim_count_out': fields.function(_claim_count, string='Claims', type='integer'),    
+        'claim_count_out': fields.function(_claim_count_out, string='Claims', type='integer'),    
     }
 
+# Because of the way inheritance works in the ORM (bug), and the way stock.picking.out
+# is defined (inherit from stock.picking, dispatch read to stock.picking), it is necessary
+# to add the field claim_count_out to this class, even though the _claim_count_out method
+# in stock_picking_out will not be called (but its existence will be checked).
 class stock_picking_out(osv.osv):
     _inherit = 'stock.picking.out'
 
-    def _claim_count(self, cr, uid, ids, field_name, arg, context=None):
-        pass
+    def _claim_count_out(self, cr, uid, ids, field_name, arg, context=None):
+        return super(stock_picking_out, self)._claim_count_out(cr, uid, ids, field_name, arg, context=context)
 
     _columns = {
-        'claim_count_out': fields.function(_claim_count, string='Claims', type='integer'),    
+        'claim_count_out': fields.function(_claim_count_out, string='Claims', type='integer'),    
     }