From 19de91d4b9da23bf27b44b45bca814a5e1ad5405 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Wed, 15 Feb 2012 17:33:31 +0530
Subject: [PATCH 01/37] [FIX]purchase: removed wait ad wait_auth which
 unnecessary

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

bzr revid: mma@tinyerp.com-20120215120331-7uc0ybsv90oayfw2
---
 addons/purchase/purchase.py                         | 1 -
 addons/purchase/purchase_view.xml                   | 3 +--
 addons/purchase_requisition/purchase_requisition.py | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 5432067191d..b7c757c7468 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -143,7 +143,6 @@ class purchase_order(osv.osv):
 
     STATE_SELECTION = [
         ('draft', 'Request for Quotation'),
-        ('wait', 'Waiting'),
         ('confirmed', 'Waiting Approval'),
         ('approved', 'Approved'),
         ('except_picking', 'Shipping Exception'),
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index ec53ae76a7a..c72c985d8fa 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,13 +196,12 @@
                             </group>
                             <group col="11" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                                <button name="purchase_cancel" states="draft,confirmed" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                                <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
                                 <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
                             </group>
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index c43bd524090..db11c2d90e5 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -67,7 +67,7 @@ class purchase_requisition(osv.osv):
         purchase_order_obj = self.pool.get('purchase.order')
         for purchase in self.browse(cr, uid, ids, context=context):
             for purchase_id in purchase.purchase_ids:
-                if str(purchase_id.state) in('draft','wait'):
+                if str(purchase_id.state) in('draft'):
                     purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True

From c991a76c6dd239e7bbf9726255da107a9f44ac13 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 28 Feb 2012 15:03:44 +0530
Subject: [PATCH 02/37] [IMP]purchase: Removed wait in cancel

bzr revid: mma@tinyerp.com-20120228093344-zh8t0kvcy3dzzj9g
---
 addons/purchase/purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c72c985d8fa..f5901375213 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -198,7 +198,7 @@
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+                                <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>

From 7cb6f34e8817a991803ab16fc995b1617b311c02 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:24:01 +0200
Subject: [PATCH 03/37] [REF] remove sale and purchase precision and replace it
 by price unit precision. Add discount precision.

bzr revid: benoit.guillot@akretion.com.br-20120710122401-mt3fvdlqy7d2zz5y
---
 addons/product/pricelist.py     |  8 ++++----
 addons/product/product.py       | 14 +++++++-------
 addons/product/product_data.xml |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ea29292f445..2e86192bc7a 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -408,18 +408,18 @@ class product_pricelist_item(osv.osv):
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Sale Price')),
+            digits_compute= dp.get_precision('Price Unit')),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
-            digits_compute= dp.get_precision('Sale Price'),
+            digits_compute= dp.get_precision('Price Unit'),
             help="Sets the price so that it is a multiple of this value.\n" \
               "Rounding is applied after the discount and before the surcharge.\n" \
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Sale Price')),
+            digits_compute= dp.get_precision('Price Unit')),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Sale Price')),
+            digits_compute= dp.get_precision('Price Unit')),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }
diff --git a/addons/product/product.py b/addons/product/product.py
index a81074aa56e..4506387cd1c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -297,8 +297,8 @@ class product_template(osv.osv):
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
-        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Sale Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Price Unit'), help="Base price for computing the customer price. Sometimes called the catalog price."),
+        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Price Unit'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
@@ -510,8 +510,8 @@ class product_product(osv.osv):
         'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
         'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Sale Price')),
-        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Sale Price')),
+        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Price Unit')),
+        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Price Unit')),
         'code': fields.function(_product_code, type='char', string='Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Reference', size=64, select=True),
@@ -520,8 +520,8 @@ class product_product(osv.osv):
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
         'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
-        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
-        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
+        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Price Unit')),
+        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Price Unit')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True),
         'color': fields.integer('Color Index'),
@@ -845,7 +845,7 @@ class pricelist_partnerinfo(osv.osv):
         'name': fields.char('Description', size=64),
         'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
         'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier Unit of Measure if any or in the default Unit of Measure of the product otherrwise."),
-        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
+        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Price Unit'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
     }
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 8f10b7b2762..27ef14923ee 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -144,12 +144,12 @@ parameter) will see those record just disappear.
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
 
-        <record forcecreate="True" id="decimal_sale" model="decimal.precision">
-            <field name="name">Sale Price</field>
+        <record forcecreate="True" id="decimal_price" model="decimal.precision">
+            <field name="name">Price Unit</field>
             <field name="digits">2</field>
         </record>
-        <record forcecreate="True" id="decimal_purchase" model="decimal.precision">
-            <field name="name">Purchase Price</field>
+        <record forcecreate="True" id="decimal_discount" model="decimal.precision">
+            <field name="name">Discount</field>
             <field name="digits">2</field>
         </record>
         <record forcecreate="True" id="decimal_account" model="decimal.precision">

From e67b4b6949986cc9358bd048186d2bd0294a2b99 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:24:31 +0200
Subject: [PATCH 04/37] [REF] replace sale price precision by price unit and
 account precision. Remove sale precision from config view

bzr revid: benoit.guillot@akretion.com.br-20120710122431-z6kfajvt7yik9kt2
---
 addons/sale/res_config.py                       |  9 ---------
 addons/sale/res_config_view.xml                 |  1 -
 addons/sale/sale.py                             | 12 ++++++------
 addons/sale/wizard/sale_make_invoice_advance.py |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index d43bc75be7a..94c92574edd 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -95,7 +95,6 @@ class sale_configuration(osv.osv_memory):
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
-        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices  like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like:  0.0231 EUR per unit."),
     }
     def _check_decimal(self, cr, uid, ids, context=None):
         for decimal in self.browse(cr, uid, ids, context=context):
@@ -136,14 +135,6 @@ class sale_configuration(osv.osv_memory):
         'time_unit': _get_default_time_unit,
     }
 
-    def get_default_dp(self, cr, uid, fields, context=None):
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_sale')
-        return {'decimal_precision': dp.digits}
-
-    def set_default_dp(self, cr, uid, ids, context=None):
-        config = self.browse(cr, uid, ids[0], context)
-        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_sale')
-        dp.write({'digits': config.decimal_precision})
 
     def set_sale_defaults(self, cr, uid, ids, context=None):
         ir_values = self.pool.get('ir.values')
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 2078c141b69..7874d18bd34 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -33,7 +33,6 @@
                             <field name="group_sale_pricelist"/>
                             <field name="group_multiple_shops"/>
                             <field name="module_warning"/>
-                            <field name="decimal_precision"/>
                         </group>
                         <group>
                             <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0a3ebbe72ac..746276a9c1a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -247,19 +247,19 @@ class sale_order(osv.osv):
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
         'note': fields.text('Terms and conditions'),
 
-        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The amount without tax."),
-        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums', help="The tax amount."),
-        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Sale Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
@@ -1113,8 +1113,8 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit'), readonly=True, states={'draft': [('readonly', False)]}),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
             help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
@@ -1126,7 +1126,7 @@ class sale_order_line(osv.osv):
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
         'product_packaging': fields.many2one('product.packaging', 'Packaging'),
         'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
-        'discount': fields.float('Discount (%)', digits=(16, 2), readonly=True, states={'draft': [('readonly', False)]}),
+        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}),
         'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index f3d9bd65a91..47c6236d9a4 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -36,7 +36,7 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     _columns = {
         'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."),
-        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), required=True, help="The amount to be invoiced in advance."),
+        'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Account'), required=True, help="The amount to be invoiced in advance."),
         'qtty': fields.float('Quantity', digits=(16, 2), required=True),
         'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amound in Advance, Use Percentage if you want to give percentage of Total Invoice Amount."),
     }

From 1686d1ee3e81581d00e5fee53a71b457275ee172 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:24:57 +0200
Subject: [PATCH 05/37] [REF] replace purchase price precision by price unit
 and account precision. Remove purchase precision from config view

bzr revid: benoit.guillot@akretion.com.br-20120710122457-nv77lhcit0fxyu04
---
 addons/purchase/purchase.py         | 10 +++++-----
 addons/purchase/res_config.py       |  9 ---------
 addons/purchase/res_config_view.xml |  2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index e74ca83a92b..461682016fb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -190,15 +190,15 @@ class purchase_order(osv.osv):
                 'purchase.order.line': (_get_order, ['date_planned'], 10),
             }
         ),
-        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The amount without tax"),
-        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
+        'amount_tax': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums", help="The tax amount"),
-        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Purchase Price'), string='Total',
+        'amount_total': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums",help="The total amount"),
@@ -804,8 +804,8 @@ class purchase_order_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Purchase Price')),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Purchase Price')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index c5e72db9f1a..be9afaaf36b 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -59,21 +59,12 @@ class purchase_config_settings(osv.osv_memory):
             help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
             You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
-        'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices   like: 9.99 EUR, whereas a decimal precision of 4 will allow prices  like:  0.0231 EUR per unit."),
     }
 
     _defaults = {
         'default_invoice_method': 'manual',
     }
 
-    def get_default_dp(self, cr, uid, fields, context=None):
-        dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase')
-        return {'decimal_precision': dp.digits}
-
-    def set_default_dp(self, cr, uid, ids, context=None):
-        config = self.browse(cr, uid, ids[0], context)
-        dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase')
-        dp.write({'digits': config.decimal_precision})
 
 
 
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 1e8588bf618..aa2383d7b1d 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -14,7 +14,7 @@
                     </header>
                     <group string="Invoicing">
                         <field name="default_invoice_method"/>
-                        <field name="decimal_precision"/>
+
                     </group>
                     <group string="Purchase Order">
                         <group>

From 0cabce52dc924270f0e92bff287ff2f2e2296106 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:25:52 +0200
Subject: [PATCH 06/37] [REF] add price unit, discount and unity of mesure
 precision for fields in invoice line

bzr revid: benoit.guillot@akretion.com.br-20120710122552-e32ugjdjbe6h2uh9
---
 addons/account/account_invoice.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index c6011979f8d..be016d6700c 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1351,11 +1351,11 @@ class account_invoice_line(osv.osv):
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
             digits_compute= dp.get_precision('Account'), store=True),
-        'quantity': fields.float('Quantity', required=True),
-        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
+        'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
+        'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'note': fields.text('Notes'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),

From 05cb32962c67cee707619a793cc86cd3dd7e5ea9 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:28:46 +0200
Subject: [PATCH 07/37] [REF] ref decimal precision on expense fields

bzr revid: benoit.guillot@akretion.com.br-20120710122846-8582vh8p8bimgufo
---
 addons/hr_expense/hr_expense.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index b1192701dfb..dbf3c34f4c1 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -72,7 +72,7 @@ class hr_expense_expense(osv.osv):
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
-        'amount': fields.function(_amount, string='Total Amount'),
+        'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')),
         'invoice_id': fields.many2one('account.invoice', "Employee's Invoice"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'department_id':fields.many2one('hr.department','Department'),
@@ -258,8 +258,8 @@ class hr_expense_line(osv.osv):
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
         'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
-        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Account')),
-        'unit_quantity': fields.float('Quantities' ),
+        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Price Unit')),
+        'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
         'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
         'description': fields.text('Description'),

From 0c82624467e1c26b98da03247ebf501c80b7ea0d Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 14:34:00 +0200
Subject: [PATCH 08/37] [REF] replace sale price precision by price unit
 precision

bzr revid: benoit.guillot@akretion.com.br-20120710123400-w634cm3p75v8gcxm
---
 addons/hr_timesheet_invoice/report/report_analytic.py | 2 +-
 addons/marketing_campaign/marketing_campaign.py       | 6 +++---
 addons/marketing_campaign/report/campaign_analysis.py | 4 ++--
 addons/membership/membership.py                       | 4 ++--
 addons/membership/wizard/membership_invoice.py        | 2 +-
 addons/mrp_repair/mrp_repair.py                       | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index 0ff758189ff..5a6b5cd472b 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -72,7 +72,7 @@ class report_account_analytic_line_to_invoice(osv.osv):
         'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
         'product_uom_id':fields.many2one('product.uom', 'Unit of Measure', readonly=True),
         'unit_amount': fields.float('Units', readonly=True),
-        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Sale Price')),
+        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Price Unit')),
         'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Account')),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 417bd694624..ea8d5552e41 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -120,7 +120,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    'Status',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Price Unit')),
     }
 
     _defaults = {
@@ -435,8 +435,8 @@ class marketing_campaign_activity(osv.osv):
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_to_id',
                                             'Previous Activities'),
-        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Purchase Price')),
-        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
+        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Price Unit')),
+        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Account')),
         'signal': fields.char('Signal', size=128,
                               help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
         'keep_if_condition_not_met': fields.boolean("Don't Delete Workitems",
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 0330cd1f7d3..d469be9c25e 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -63,8 +63,8 @@ class campaign_analysis(osv.osv):
         'country_id': fields.related('partner_id', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
         'total_cost' : fields.function(_total_cost, string='Cost',
-                                    type="float", digits_compute=dp.get_precision('Purchase Price')),
-        'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
+                                    type="float", digits_compute=dp.get_precision('Account')),
+        'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Account')),
         'count' : fields.integer('# of Actions', readonly=True),
         'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index dc4eadbada9..bf127cb3c5d 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True,  help='Amount for the membership'),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit'), required=True,  help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
@@ -447,7 +447,7 @@ Partner()
 class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price')),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit')),
     }
 
 product_template()
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index d0be223158f..80bfdfd50e2 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -29,7 +29,7 @@ class membership_invoice(osv.osv_memory):
     _description = "Membership Invoice"
     _columns = {
         'product_id': fields.many2one('product.product','Membership', required=True),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Sale Price'), required=True),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit'), required=True),
     }
     def onchange_product(self, cr, uid, ids, product_id=False):
         """This function returns value of  product's member price based on product id.
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 6f14ba22bea..1cb1aa884ce 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -640,8 +640,8 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'to_invoice': fields.boolean('To Invoice'),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price')),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits=(16,2), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
@@ -735,7 +735,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True),
         'price_unit': fields.float('Unit Price', required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Sale Price')),
+        'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'repair_fee_line_tax', 'repair_fee_line_id', 'tax_id', 'Taxes'),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
         'to_invoice': fields.boolean('To Invoice'),

From dfa4806290c120191fe826570d071c72eec10e64 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 21:54:38 +0200
Subject: [PATCH 09/37] [FIX] remove useless code

bzr revid: benoit.guillot@akretion.com.br-20120710195438-m7k2kkwbukzmc3bs
---
 addons/sale/res_config.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 94c92574edd..3dcbcfe8257 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -96,15 +96,6 @@ class sale_configuration(osv.osv_memory):
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
     }
-    def _check_decimal(self, cr, uid, ids, context=None):
-        for decimal in self.browse(cr, uid, ids, context=context):
-            if decimal.decimal_precision > 20:
-                return False
-        return True
-
-    _constraints = [
-        (_check_decimal, 'Digits must be between 0 to 20 ', ['decimal_precision']),
-    ]
 
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')

From 9c3eefeaa2d1b701f5554f834e43d9aa2bbe4d75 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 21:55:00 +0200
Subject: [PATCH 10/37] [IMP] add decimal precision on quantities

bzr revid: benoit.guillot@akretion.com.br-20120710195500-x02qvubxb8tlrjue
---
 addons/mrp_repair/mrp_repair.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 1cb1aa884ce..62336aa4d4c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -643,7 +643,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
-        'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits=(16,2), required=True),
+        'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number',domain="[('product_id','=',product_id)]"),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line', readonly=True),
@@ -732,7 +732,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Reference', required=True, ondelete='cascade', select=True),
         'name': fields.char('Description', size=64, select=True,required=True),
         'product_id': fields.many2one('product.product', 'Product'),
-        'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
         'price_unit': fields.float('Unit Price', required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),

From 40647cd70fdb563dfac6195749961f15cd5e1095 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Tue, 10 Jul 2012 21:55:36 +0200
Subject: [PATCH 11/37] [FIX] fix a bug in trunk

bzr revid: benoit.guillot@akretion.com.br-20120710195536-3hgyx3ozn0t9hnms
---
 addons/mail/static/src/js/mail.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 88f0b9ade43..c6a142e8596 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -540,11 +540,12 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id ||
-                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('.oe_mail_thread').hide();
-                return;
-            }
+            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
+//            if (! this.view.datarecord.id ||
+//                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+//                this.$element.find('.oe_mail_thread').hide();
+//                return;
+//            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget

From df01b9a032f71f975ea1b867ff6759e3603b59f8 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 01:17:00 +0200
Subject: [PATCH 12/37] [FIX] replace sale price precision by price unit in the
 method prepare_order_line_invoice_line

bzr revid: benoit.guillot@akretion.com.br-20120710231700-m4kdn9khr4di6oy0
---
 addons/sale/sale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 746276a9c1a..11af165880f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1205,7 +1205,7 @@ class sale_order_line(osv.osv):
             pu = 0.0
             if uosqty:
                 pu = round(line.price_unit * line.product_uom_qty / uosqty,
-                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Sale Price'))
+                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Price Unit'))
             fpos = line.order_id.fiscal_position or False
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
             if not account_id:

From 65cde7728ebcaf06e60d3a0c34bdbbad2ecf01c0 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 01:18:47 +0200
Subject: [PATCH 13/37] [ADD] add decimal precision on price fields in the
 module delivery

bzr revid: benoit.guillot@akretion.com.br-20120710231847-9ni8g0bbn380l3m3
---
 addons/delivery/delivery.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 75eb766f011..1b0b55ff175 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -237,8 +237,8 @@ class delivery_grid_line(osv.osv):
         'max_value': fields.float('Maximum Value', required=True),
         'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
         'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True),
-        'list_price': fields.float('Sale Price', required=True),
-        'standard_price': fields.float('Cost Price', required=True),
+        'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Price Unit'), required=True),
+        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Price Unit'), required=True),
     }
     _defaults = {
         'type': lambda *args: 'weight',

From 5b280dded9fb69f4a30e562fd80958aecf3296b4 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 11:00:27 +0200
Subject: [PATCH 14/37] [FIX] fix typo

bzr revid: benoit.guillot@akretion.com.br-20120711090027-iq2cmu2tae7e62m7
---
 addons/mail/static/src/js/mail.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index c6a142e8596..2140bbe474a 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -540,12 +540,11 @@ openerp.mail = function(session) {
             this._super.apply(this, arguments);
             var self = this;
             this.reinit();
-            if (! this.view.datarecord.id) { this.$element.find('.oe_mail_thread').hide(); return; }
-//            if (! this.view.datarecord.id ||
-//                instance.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-//                this.$element.find('.oe_mail_thread').hide();
-//                return;
-//            }
+            if (! this.view.datarecord.id ||
+                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$element.find('.oe_mail_thread').hide();
+                return;
+            }
             // fetch followers
             var fetch_sub_done = this.fetch_subscribers();
             // create and render Thread widget

From 915510435954a6ebeb726cc9de6c15f2b43cfd1e Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 11:01:36 +0200
Subject: [PATCH 15/37] [FIX] fix bad precision for report

bzr revid: benoit.guillot@akretion.com.br-20120711090136-2k1tuzxtdtx0drlk
---
 addons/mrp/report/price.py                 | 2 +-
 addons/product/report/product_pricelist.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 9b3b724306f..98fa605380e 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -138,7 +138,7 @@ class report_custom(report_rml):
                 </row>
         """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Unit of Measure'), _('Supplier Price per Unit of Measure'))
 
-        purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
+        purchase_price_digits = rml_obj.get_digits(dp='Price Unit')
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 7e9748c2523..42f41fe8ff8 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -112,7 +112,7 @@ class product_pricelist(report_sxw.rml_parse):
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):
-        sale_price_digits = self.get_digits(dp='Sale Price')
+        sale_price_digits = self.get_digits(dp='Price Unit')
         pool = pooler.get_pool(self.cr.dbname)
         price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:

From 58b4fdb0965935af496a1899a5552ed719362d9b Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 12:08:02 +0200
Subject: [PATCH 16/37] [FIX] fix forgetting of import decimal_precision,
 reported by the runbot !

bzr revid: benoit.guillot@akretion.com.br-20120711100802-mo5qlxwzrf3v8mnb
---
 addons/delivery/delivery.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 1b0b55ff175..48fab9cd5a6 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -22,6 +22,7 @@
 import time
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class delivery_carrier(osv.osv):
     _name = "delivery.carrier"

From dc3ae0488b93fc219d0a56cdae1545b4c7d16961 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 15:06:15 +0200
Subject: [PATCH 17/37] [IMP] replace 'Price Unit name by 'Product Price'

bzr revid: benoit.guillot@akretion.com.br-20120711130615-25ascb8dfllo4r7j
---
 addons/account/account_invoice.py                  |  2 +-
 addons/delivery/delivery.py                        |  4 ++--
 addons/hr_expense/hr_expense.py                    |  2 +-
 .../hr_timesheet_invoice/report/report_analytic.py |  2 +-
 addons/marketing_campaign/marketing_campaign.py    |  4 ++--
 addons/membership/membership.py                    |  4 ++--
 addons/membership/wizard/membership_invoice.py     |  2 +-
 addons/mrp/report/price.py                         |  2 +-
 addons/mrp_repair/mrp_repair.py                    |  2 +-
 addons/product/pricelist.py                        |  8 ++++----
 addons/product/product.py                          | 14 +++++++-------
 addons/product/product_data.xml                    |  2 +-
 addons/product/report/product_pricelist.py         |  2 +-
 addons/purchase/purchase.py                        |  2 +-
 addons/sale/sale.py                                |  4 ++--
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index be016d6700c..93e77d3c5a1 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1351,7 +1351,7 @@ class account_invoice_line(osv.osv):
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
             digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 48fab9cd5a6..dd51e062b3a 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -238,8 +238,8 @@ class delivery_grid_line(osv.osv):
         'max_value': fields.float('Maximum Value', required=True),
         'price_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Price Type', required=True),
         'variable_factor': fields.selection([('weight','Weight'),('volume','Volume'),('wv','Weight * Volume'), ('price','Price')], 'Variable Factor', required=True),
-        'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Price Unit'), required=True),
-        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Price Unit'), required=True),
+        'list_price': fields.float('Sale Price', digits_compute= dp.get_precision('Product Price'), required=True),
+        'standard_price': fields.float('Cost Price', digits_compute= dp.get_precision('Product Price'), required=True),
     }
     _defaults = {
         'type': lambda *args: 'weight',
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index dbf3c34f4c1..1d5fd244632 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -258,7 +258,7 @@ class hr_expense_line(osv.osv):
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
         'total_amount': fields.function(_amount, string='Total', digits_compute=dp.get_precision('Account')),
-        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Price Unit')),
+        'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Product Price')),
         'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
         'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index 5a6b5cd472b..469e13e71b6 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -72,7 +72,7 @@ class report_account_analytic_line_to_invoice(osv.osv):
         'account_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True),
         'product_uom_id':fields.many2one('product.uom', 'Unit of Measure', readonly=True),
         'unit_amount': fields.float('Units', readonly=True),
-        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Price Unit')),
+        'sale_price': fields.float('Sale price', readonly=True, digits_compute=dp.get_precision('Product Price')),
         'amount': fields.float('Amount', readonly=True, digits_compute=dp.get_precision('Account')),
         'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'), ('05','May'), ('06','June'),
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index ea8d5552e41..8806ead1e24 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -120,7 +120,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    'Status',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Price Unit')),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Product Price')),
     }
 
     _defaults = {
@@ -435,7 +435,7 @@ class marketing_campaign_activity(osv.osv):
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_to_id',
                                             'Previous Activities'),
-        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Price Unit')),
+        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Product Price')),
         'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Account')),
         'signal': fields.char('Signal', size=128,
                               help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index bf127cb3c5d..d394dee19f7 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,7 +146,7 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit'), required=True,  help='Amount for the membership'),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True,  help='Amount for the membership'),
         'account_invoice_line': fields.many2one('account.invoice.line', 'Account Invoice line', readonly=True),
         'account_invoice_id': fields.related('account_invoice_line', 'invoice_id', type='many2one', relation='account.invoice', string='Invoice', readonly=True),
         'state': fields.function(_state,
@@ -447,7 +447,7 @@ Partner()
 class product_template(osv.osv):
     _inherit = 'product.template'
     _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit')),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price')),
     }
 
 product_template()
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 80bfdfd50e2..4ef16b99d82 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -29,7 +29,7 @@ class membership_invoice(osv.osv_memory):
     _description = "Membership Invoice"
     _columns = {
         'product_id': fields.many2one('product.product','Membership', required=True),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Price Unit'), required=True),
+        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True),
     }
     def onchange_product(self, cr, uid, ids, product_id=False):
         """This function returns value of  product's member price based on product id.
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 98fa605380e..527505d8ea5 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -138,7 +138,7 @@ class report_custom(report_rml):
                 </row>
         """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Unit of Measure'), _('Supplier Price per Unit of Measure'))
 
-        purchase_price_digits = rml_obj.get_digits(dp='Price Unit')
+        purchase_price_digits = rml_obj.get_digits(dp='Product Price')
 
         for product in product_pool.browse(cr, uid, ids, context=context):
             product_uom_name = to_xml(product.uom_id.name)
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 62336aa4d4c..9d7861630d6 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -640,7 +640,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'to_invoice': fields.boolean('To Invoice'),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'repair_operation_line_tax', 'repair_operation_line_id', 'tax_id', 'Taxes'),
         'product_uom_qty': fields.float('Quantity (Unit of Measure)', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 2e86192bc7a..46d765eeeb2 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -408,18 +408,18 @@ class product_pricelist_item(osv.osv):
         'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Price Unit')),
+            digits_compute= dp.get_precision('Product Price')),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
-            digits_compute= dp.get_precision('Price Unit'),
+            digits_compute= dp.get_precision('Product Price'),
             help="Sets the price so that it is a multiple of this value.\n" \
               "Rounding is applied after the discount and before the surcharge.\n" \
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Price Unit')),
+            digits_compute= dp.get_precision('Product Price')),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Price Unit')),
+            digits_compute= dp.get_precision('Product Price')),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }
diff --git a/addons/product/product.py b/addons/product/product.py
index 4506387cd1c..fe00d346116 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -297,8 +297,8 @@ class product_template(osv.osv):
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
-        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Price Unit'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Price Unit'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
+        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
@@ -510,8 +510,8 @@ class product_product(osv.osv):
         'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
         'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
-        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Price Unit')),
-        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Price Unit')),
+        'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
+        'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
         'code': fields.function(_product_code, type='char', string='Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
         'default_code' : fields.char('Reference', size=64, select=True),
@@ -520,8 +520,8 @@ class product_product(osv.osv):
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
         'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
-        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Price Unit')),
-        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Price Unit')),
+        'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
+        'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True),
         'color': fields.integer('Color Index'),
@@ -845,7 +845,7 @@ class pricelist_partnerinfo(osv.osv):
         'name': fields.char('Description', size=64),
         'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
         'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier Unit of Measure if any or in the default Unit of Measure of the product otherrwise."),
-        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Price Unit'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
+        'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Product Price'), help="This price will be considered as a price for the supplier Unit of Measure if any or the default Unit of Measure of the product otherwise"),
     }
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 27ef14923ee..b9e084305fc 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -145,7 +145,7 @@ parameter) will see those record just disappear.
         </record>
 
         <record forcecreate="True" id="decimal_price" model="decimal.precision">
-            <field name="name">Price Unit</field>
+            <field name="name">Product Price</field>
             <field name="digits">2</field>
         </record>
         <record forcecreate="True" id="decimal_discount" model="decimal.precision">
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 42f41fe8ff8..c19c12c06d7 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -112,7 +112,7 @@ class product_pricelist(report_sxw.rml_parse):
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):
-        sale_price_digits = self.get_digits(dp='Price Unit')
+        sale_price_digits = self.get_digits(dp='Product Price')
         pool = pooler.get_pool(self.cr.dbname)
         price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
         if price_dict[pricelist_id]:
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 461682016fb..8004cd57f37 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -804,7 +804,7 @@ class purchase_order_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
         'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit')),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'notes': fields.text('Notes'),
         'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 11af165880f..ec88a379af6 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1113,7 +1113,7 @@ class sale_order_line(osv.osv):
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('procurement.order', 'Procurement'),
-        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Price Unit'), readonly=True, states={'draft': [('readonly', False)]}),
+        'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), readonly=True, states={'draft': [('readonly', False)]}),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft': [('readonly', False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft': [('readonly', False)]},
@@ -1205,7 +1205,7 @@ class sale_order_line(osv.osv):
             pu = 0.0
             if uosqty:
                 pu = round(line.price_unit * line.product_uom_qty / uosqty,
-                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Price Unit'))
+                        self.pool.get('decimal.precision').precision_get(cr, uid, 'Product Price'))
             fpos = line.order_id.fiscal_position or False
             account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, account_id)
             if not account_id:

From ae2c24909c707a07a95fc4293889fd14407504a2 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 15:45:08 +0200
Subject: [PATCH 18/37] [IMP] modif decimal on report for purchase and sale
 order

bzr revid: benoit.guillot@akretion.com.br-20120711134508-ldft5u32b98opxet
---
 addons/purchase/report/order.rml  | 10 +++++-----
 addons/sale/report/sale_order.rml | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 6c3250c59c6..6ceb2d73387 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -274,10 +274,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Product Price') ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
           </td>
         </tr>
         <tr>
@@ -323,7 +323,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Purchase Price'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id ) ]]</para>
         </td>
       </tr>
       <tr>
@@ -336,7 +336,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Purchase Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -349,7 +349,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Purchase Price') , currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Bold_9_Right">[[ formatLang(o.amount_total, digits=get_digits(dp='Account') , currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 31f823888d6..6030820b6f7 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -266,13 +266,13 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ), digits=get_digits(dp='Product Price')]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang(line.discount) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line.discount), digits=get_digits(dp='Discount')]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price'), currency_obj=o.pricelist_id.currency_id) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] </para>
           </td>
         </tr>
         <tr>
@@ -318,7 +318,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -331,7 +331,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -344,7 +344,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>

From b18ed241e1801af516ee94b0a64423a8b1d57b80 Mon Sep 17 00:00:00 2001
From: Benoit Guillot <benoit.guillot@akretion.com.br>
Date: Wed, 11 Jul 2012 15:57:03 +0200
Subject: [PATCH 19/37] [FIX] fix report

bzr revid: benoit.guillot@akretion.com.br-20120711135703-kuhxzsshe141owyl
---
 addons/sale/report/sale_order.rml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 6030820b6f7..ca770c15df3 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -266,10 +266,10 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_unit ), digits=get_digits(dp='Product Price')]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit , digits=get_digits(dp='Product Price'))]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang(line.discount), digits=get_digits(dp='Discount')]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line.discount, digits=get_digits(dp='Discount'))]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] </para>

From 7341bd30cc02a4360406864a17fd2e8b801cd6b3 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 13:46:19 +0200
Subject: [PATCH 20/37] Added html field type

bzr revid: nicolas.vanhoren@openerp.com-20120813114619-lqr9zu0rkz6737rp
---
 openerp/osv/fields.py | 3 +++
 openerp/osv/orm.py    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 4ff23956050..b361ab664b6 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -227,6 +227,9 @@ class char(_column):
 class text(_column):
     _type = 'text'
 
+class html(text):
+    _type = 'html'
+
 import __builtin__
 
 class float(_column):
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 563c514726c..069664cfebe 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -545,6 +545,7 @@ FIELDS_TO_PGTYPES = {
     fields.boolean: 'bool',
     fields.integer: 'int4',
     fields.text: 'text',
+    fields.html: 'text',
     fields.date: 'date',
     fields.datetime: 'timestamp',
     fields.binary: 'bytea',

From 11780a2267e699b5fdfd183cad539f051737ec6e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 14:53:07 +0200
Subject: [PATCH 21/37] Added some code to sanitize html

bzr revid: nicolas.vanhoren@openerp.com-20120813125307-d8cycdvtd7ad0f8e
---
 openerp/osv/fields.py          | 6 ++++++
 openerp/tools/html_sanitize.py | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 openerp/tools/html_sanitize.py

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index b361ab664b6..249f9d5015d 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -45,6 +45,7 @@ import openerp.tools as tools
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
+from openerp.tools.html_sanitize import html_sanitize
 
 _logger = logging.getLogger(__name__)
 
@@ -229,6 +230,11 @@ class text(_column):
 
 class html(text):
     _type = 'html'
+    _symbol_c = '%s'
+    def _symbol_f(x):
+        return html_sanitize(x)
+        
+    _symbol_set = (_symbol_c, _symbol_f)
 
 import __builtin__
 
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
new file mode 100644
index 00000000000..4e6fb1540b1
--- /dev/null
+++ b/openerp/tools/html_sanitize.py
@@ -0,0 +1,4 @@
+
+
+def html_sanitize(x):
+    return x

From e5fb45a329db25bb6b6312cd377ddd2a44e7e1b0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 16:22:32 +0200
Subject: [PATCH 22/37] First working version of the html sanitizer

bzr revid: nicolas.vanhoren@openerp.com-20120813142232-xn7h0ov7mb3pls4o
---
 openerp/tests/test_html_sanitize.py | 33 +++++++++++++++++++++++++
 openerp/tools/__init__.py           |  1 +
 openerp/tools/html_sanitize.py      | 37 ++++++++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100755 openerp/tests/test_html_sanitize.py

diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_html_sanitize.py
new file mode 100755
index 00000000000..906c78d1dcf
--- /dev/null
+++ b/openerp/tests/test_html_sanitize.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+import unittest
+from openerp.tools.html_sanitize import html_sanitize
+
+test_case = """
+<font size="2" style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; ">test1</font>
+<div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; font-style: normal; ">
+<b>test2</b></div><div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; ">
+<i>test3</i></div><div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; ">
+<u>test4</u></div><div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; font-size: 12px; ">
+<strike>test5</strike></div><div style="color: rgb(31, 31, 31); font-family: monospace; font-variant: normal; line-height: normal; ">
+<font size="5">test6</font></div><div><ul><li><font color="#1f1f1f" face="monospace" size="2">test7</font></li><li>
+<font color="#1f1f1f" face="monospace" size="2">test8</font></li></ul><div><ol><li><font color="#1f1f1f" face="monospace" size="2">test9</font>
+</li><li><font color="#1f1f1f" face="monospace" size="2">test10</font></li></ol></div></div>
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><div><div><font color="#1f1f1f" face="monospace" size="2">
+test11</font></div></div></div></blockquote><blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;">
+<blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><font color="#1f1f1f" face="monospace" size="2">
+test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></font></div></blockquote></blockquote>
+<font color="#1f1f1f" face="monospace" size="2"><a href="http://google.com">google</a></font>
+"""
+
+class TestSanitizer(unittest.TestCase):
+
+    def test_simple(self):
+        x = "yop"
+        self.assertEqual(x, html_sanitize(x))
+    
+    def test_test_case(self):
+        res = html_sanitize(test_case)
+        print res
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/openerp/tools/__init__.py b/openerp/tools/__init__.py
index a6eeb14ba96..a0ca411a9df 100644
--- a/openerp/tools/__init__.py
+++ b/openerp/tools/__init__.py
@@ -33,6 +33,7 @@ from pdf_utils import *
 from yaml_import import *
 from sql import *
 from float_utils import *
+from html_sanitize import *
 
 #.apidoc title: Tools
 
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 4e6fb1540b1..d25d4466bb9 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,4 +1,39 @@
 
+from pyquery import PyQuery as pq
 
 def html_sanitize(x):
-    return x
+    root = pq("<div />")
+    root.html(x)
+    result = handle_element(root[0])
+    new = pq(result)
+    return new.html()
+
+def handle_element(el):
+    if type(el) == str or type(el) == unicode:
+        return [el]
+    else:
+        new = pq("<%s />" % el.tag)[0]
+        for i in children(el):
+            append_to(handle_element(i), new)
+        return [new]
+    
+def children(el):
+    res = []
+    if el.text is not None:
+        res.append(el.text)
+    for i in el.getchildren():
+        res.append(i)
+        if i.tail is not None:
+            res.append(i.tail)
+    return res
+
+def append_to(new_ones, el):
+    for i in new_ones:
+        if type(i) == str or type(i) == unicode:
+            children = el.getchildren()
+            if len(children) == 0:
+                el.text = i
+            else:
+                children[-1].tail = i
+        else:
+            el.append(i)
\ No newline at end of file

From 10155376c431c408ee8cdcb627d18c3db82a32d5 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 16:37:55 +0200
Subject: [PATCH 23/37] Did better stuff

bzr revid: nicolas.vanhoren@openerp.com-20120813143755-g9ccs0iubcwvm02i
---
 openerp/tools/html_sanitize.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index d25d4466bb9..3d7206e64a3 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -8,14 +8,28 @@ def html_sanitize(x):
     new = pq(result)
     return new.html()
 
+to_remove = set(["script", "head", "meta", "title", "link"])
+to_unwrap = set(["html", "body"])
+
+def handle_a(el, new):
+    new.set("href", el.get("href", "#"))
+special = {
+    "a": handle_a,
+}
+
 def handle_element(el):
     if type(el) == str or type(el) == unicode:
         return [el]
-    else:
-        new = pq("<%s />" % el.tag)[0]
-        for i in children(el):
-            append_to(handle_element(i), new)
-        return [new]
+    if el.tag in to_remove:
+        return []
+    if el.tag in to_unwrap:
+        return reduce(lambda x,y: x+y, [handle_element(x) for x in children(el)])
+    new = pq("<%s />" % el.tag)[0]
+    for i in children(el):
+        append_to(handle_element(i), new)
+    if el.tag in special:
+        special[el.tag](el, new)
+    return [new]
     
 def children(el):
     res = []

From 8dfa86afd9e78616740d45c121c98cd3fdf05cd8 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 16:44:01 +0200
Subject: [PATCH 24/37] removed images

bzr revid: nicolas.vanhoren@openerp.com-20120813144401-cll0enjblqkh8ina
---
 openerp/tools/html_sanitize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 3d7206e64a3..2010459ca12 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -8,7 +8,7 @@ def html_sanitize(x):
     new = pq(result)
     return new.html()
 
-to_remove = set(["script", "head", "meta", "title", "link"])
+to_remove = set(["script", "head", "meta", "title", "link", "img"])
 to_unwrap = set(["html", "body"])
 
 def handle_a(el, new):

From dc170d1a9a0749588cf94f30990cc9b245ef7e2b Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 17:52:05 +0200
Subject: [PATCH 25/37] Added protection against javascript in <a>

bzr revid: nicolas.vanhoren@openerp.com-20120813155205-uohwb39ejn66bgmv
---
 openerp/tests/test_html_sanitize.py | 1 +
 openerp/tools/html_sanitize.py      | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_html_sanitize.py
index 906c78d1dcf..3efb4a43ca5 100755
--- a/openerp/tests/test_html_sanitize.py
+++ b/openerp/tests/test_html_sanitize.py
@@ -17,6 +17,7 @@ test11</font></div></div></div></blockquote><blockquote style="margin: 0 0 0 40p
 <blockquote style="margin: 0 0 0 40px; border: none; padding: 0px;"><div><font color="#1f1f1f" face="monospace" size="2">
 test12</font></div><div><font color="#1f1f1f" face="monospace" size="2"><br></font></div></blockquote></blockquote>
 <font color="#1f1f1f" face="monospace" size="2"><a href="http://google.com">google</a></font>
+<a href="javascript:alert('malicious code')">test link</a>
 """
 
 class TestSanitizer(unittest.TestCase):
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 2010459ca12..74d83a2c453 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -1,5 +1,6 @@
 
 from pyquery import PyQuery as pq
+import re
 
 def html_sanitize(x):
     root = pq("<div />")
@@ -11,8 +12,12 @@ def html_sanitize(x):
 to_remove = set(["script", "head", "meta", "title", "link", "img"])
 to_unwrap = set(["html", "body"])
 
+javascript_regex = re.compile("""^\s*javascript\s*\:.*$""")
 def handle_a(el, new):
-    new.set("href", el.get("href", "#"))
+    href = el.get("href", "#")
+    if javascript_regex.search(href):
+        href = "#"
+    new.set("href", href)
 special = {
     "a": handle_a,
 }

From 2522955ef51c01f0429e409b4f7d268993821253 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 18:17:34 +0200
Subject: [PATCH 26/37] Added pyquery dependency

bzr revid: nicolas.vanhoren@openerp.com-20120813161734-7akxglc5908ant25
---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 6e1adadde82..259207d9a77 100755
--- a/setup.py
+++ b/setup.py
@@ -102,6 +102,7 @@ setuptools.setup(
           'mako',
           'psycopg2',
           'pydot',
+          'pyquery',
           'python-dateutil < 2',
           'python-ldap',
           'python-openid',

From cfaeed15816fe9e9b4e65de164b6bbf637d29ea9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 09:14:57 +0200
Subject: [PATCH 27/37] Removed print in test

bzr revid: nicolas.vanhoren@openerp.com-20120814071457-hw8d5yp6xzporiuo
---
 openerp/tests/test_html_sanitize.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_html_sanitize.py
index 3efb4a43ca5..85001996ee1 100755
--- a/openerp/tests/test_html_sanitize.py
+++ b/openerp/tests/test_html_sanitize.py
@@ -27,8 +27,7 @@ class TestSanitizer(unittest.TestCase):
         self.assertEqual(x, html_sanitize(x))
     
     def test_test_case(self):
-        res = html_sanitize(test_case)
-        print res
+        html_sanitize(test_case)
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file

From f111a51f10b23307191ec9aac85438eef596be83 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 11:44:01 +0200
Subject: [PATCH 28/37] Fixed problem when message is false (i think)

bzr revid: nicolas.vanhoren@openerp.com-20120814094401-uv548xbylkfq8bun
---
 openerp/tools/html_sanitize.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index 74d83a2c453..e8896774dc1 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -3,6 +3,8 @@ from pyquery import PyQuery as pq
 import re
 
 def html_sanitize(x):
+    if not x:
+        return x
     root = pq("<div />")
     root.html(x)
     result = handle_element(root[0])

From 63ae87fb4cc5931e900806677b29366c0c9876fd Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 14:14:25 +0200
Subject: [PATCH 29/37] Fixed encoding problems

bzr revid: nicolas.vanhoren@openerp.com-20120814121425-jq3ieebbsa7rcds5
---
 openerp/tests/test_html_sanitize.py | 4 ++++
 openerp/tools/html_sanitize.py      | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/openerp/tests/test_html_sanitize.py b/openerp/tests/test_html_sanitize.py
index 85001996ee1..90ccc88cc1d 100755
--- a/openerp/tests/test_html_sanitize.py
+++ b/openerp/tests/test_html_sanitize.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 import unittest
 from openerp.tools.html_sanitize import html_sanitize
 
@@ -28,6 +29,9 @@ class TestSanitizer(unittest.TestCase):
     
     def test_test_case(self):
         html_sanitize(test_case)
+        
+    def test_crm(self):
+        html_sanitize("Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci")
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file
diff --git a/openerp/tools/html_sanitize.py b/openerp/tools/html_sanitize.py
index e8896774dc1..5164ceb276e 100644
--- a/openerp/tools/html_sanitize.py
+++ b/openerp/tools/html_sanitize.py
@@ -6,6 +6,8 @@ def html_sanitize(x):
     if not x:
         return x
     root = pq("<div />")
+    if type(x) == str:
+        x = unicode(x, "utf8", "replace")
     root.html(x)
     result = handle_element(root[0])
     new = pq(result)

From 183b85f750e8911d22d10304ad00c7b5c95e2fcf Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 15:31:07 +0200
Subject: [PATCH 30/37] [IMP] Removed OldWidget in data.js

bzr revid: nicolas.vanhoren@openerp.com-20120814133107-prmdonwh6f7gu276
---
 addons/web/static/src/js/data.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 2589afe5503..1cdb4a713f1 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -439,7 +439,7 @@ instance.web.data = {
     })
 };
 
-instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends openerp.web.DataGroup# */{
+instance.web.DataGroup =  instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataGroup# */{
     /**
      * Management interface between views and grouped collections of OpenERP
      * records.
@@ -451,9 +451,9 @@ instance.web.DataGroup =  instance.web.OldWidget.extend( /** @lends openerp.web.
      * content of the current grouping level.
      *
      * @constructs instance.web.DataGroup
-     * @extends instance.web.OldWidget
+     * @extends instance.web.CallbackEnabled
      *
-     * @param {instance.web.OldWidget} parent widget
+     * @param {instance.web.CallbackEnabled} parent widget
      * @param {String} model name of the model managed by this DataGroup
      * @param {Array} domain search domain for this DataGroup
      * @param {Object} context context of the DataGroup's searches
@@ -524,13 +524,13 @@ instance.web.StaticDataGroup = instance.web.GrouplessDataGroup.extend( /** @lend
     }
 });
 
-instance.web.DataSet =  instance.web.OldWidget.extend( /** @lends openerp.web.DataSet# */{
+instance.web.DataSet =  instance.web.CallbackEnabled.extend( /** @lends openerp.web.DataSet# */{
     /**
      * DateaManagement interface between views and the collection of selected
      * OpenERP records (represents the view's state?)
      *
      * @constructs instance.web.DataSet
-     * @extends instance.web.OldWidget
+     * @extends instance.web.CallbackEnabled
      *
      * @param {String} model the OpenERP model this dataset will manage
      */

From 3ebfaedd64e27de71bf7a39d33b14dd9518680ee Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 15:42:46 +0200
Subject: [PATCH 31/37] [IMP] removed a lot of OldWidget usage

bzr revid: nicolas.vanhoren@openerp.com-20120814134246-y2awqbt2i1hcan61
---
 addons/web/static/src/js/search.js                  | 4 ++--
 addons/web/static/src/js/view_form.js               | 4 ++--
 addons/web_kanban/static/src/js/kanban.js           | 4 ++--
 addons/web_tests/static/src/js/web_tests.js         | 2 +-
 addons/web_view_editor/static/src/js/view_editor.js | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index d8611b924cf..0e3a5eb0dee 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1737,11 +1737,11 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
     }
 });
 
-instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
+instance.web.search.ExtendedSearchProposition = instance.web.Widget.extend(/** @lends instance.web.search.ExtendedSearchProposition# */{
     template: 'SearchView.extended_search.proposition',
     /**
      * @constructs instance.web.search.ExtendedSearchProposition
-     * @extends instance.web.OldWidget
+     * @extends instance.web.Widget
      *
      * @param parent
      * @param fields
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index af8cc791ac2..17574caf90b 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2173,7 +2173,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     }
 });
 
-instance.web.DateTimeWidget = instance.web.OldWidget.extend({
+instance.web.DateTimeWidget = instance.web.Widget.extend({
     template: "web.datepicker",
     jqueryui_object: 'datetimepicker',
     type_of_date: "datetime",
@@ -4097,7 +4097,7 @@ instance.web.form.Many2ManyQuickCreate = instance.web.Widget.extend({
 /**
  * Class with everything which is common between FormOpenPopup and SelectCreatePopup.
  */
-instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
+instance.web.form.AbstractFormPopup = instance.web.Widget.extend({
     template: "AbstractFormPopup.render",
     /**
      *  options:
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 36394894167..0f55975ff33 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -343,7 +343,7 @@ function get_class(name) {
     return new instance.web.Registry({'tmp' : name}).get_object("tmp");
 }
 
-instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
+instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
     template: 'KanbanView.group_header',
     init: function (parent, records, group, dataset) {
         var self = this;
@@ -517,7 +517,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
     }
 });
 
-instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({
+instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
     template: 'KanbanView.record',
     init: function (parent, record) {
         this._super(parent);
diff --git a/addons/web_tests/static/src/js/web_tests.js b/addons/web_tests/static/src/js/web_tests.js
index e006567c707..ffc32a93aaf 100644
--- a/addons/web_tests/static/src/js/web_tests.js
+++ b/addons/web_tests/static/src/js/web_tests.js
@@ -2,7 +2,7 @@ openerp.web_tests = function (instance) {
     instance.web.client_actions.add(
         'buncha-forms', 'instance.web_tests.BunchaForms');
     instance.web_tests = {};
-    instance.web_tests.BunchaForms = instance.web.OldWidget.extend({
+    instance.web_tests.BunchaForms = instance.web.Widget.extend({
         init: function (parent) {
             this._super(parent);
             this.dataset = new instance.web.DataSetSearch(this, 'test.listview.relations');
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index cfdd5d6bfea..5e04134d1ce 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -19,7 +19,7 @@ instance.web.ViewManagerAction.include({
         }
     }
 })
-instance.web_view_editor.ViewEditor =   instance.web.OldWidget.extend({
+instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
     init: function(parent, element_id, dataset, view, options) {
         this._super(parent);
         this.element_id = element_id;

From 6229869bc18b57fe27de48973e6a84bc0c228703 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Tue, 14 Aug 2012 15:53:24 +0200
Subject: [PATCH 32/37] Removed remaining usages

bzr revid: nicolas.vanhoren@openerp.com-20120814135324-7s3nmywqyikgvvui
---
 addons/web/static/src/js/coresetup.js         | 26 ------------
 addons/web_kanban/static/src/js/kanban.js     |  6 ++-
 .../web_mobile/static/src/js/chrome_mobile.js | 42 +++++++++++++++----
 .../web_mobile/static/src/js/form_mobile.js   |  2 +-
 .../web_mobile/static/src/js/list_mobile.js   |  2 +-
 5 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 6ba62162e93..44e2d3aba78 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -11,32 +11,6 @@ if (!console.debug) {
 
 openerp.web.coresetup = function(instance) {
 
-/**
- * @deprecated use :class:`instance.web.Widget`
- */
-instance.web.OldWidget = instance.web.Widget.extend({
-    init: function(parent, element_id) {
-        this._super(parent);
-        this.element_id = element_id;
-        this.element_id = this.element_id || _.uniqueId('widget-');
-
-        var tmp = document.getElementById(this.element_id);
-        this.setElement(tmp || this._make_descriptive());
-    },
-    renderElement: function() {
-        var rendered = this.render();
-        if (rendered) {
-            this.replaceElement($(rendered));
-        }
-        return this;
-    },
-    render: function (additional) {
-        if (this.template)
-            return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
-        return null;
-    }
-});
-
 /** Session openerp specific RPC class */
 instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Session# */{
     init: function() {
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index 0f55975ff33..fe14b4c697f 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -563,7 +563,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
         });
         return new_record;
     },
-    render: function() {
+    renderElement: function() {
         this.qweb_context = {
             record: this.record,
             widget: this,
@@ -574,9 +574,11 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
                 this.qweb_context[p] = _.bind(this[p], this);
             }
         }
-        return this._super({
+        var $el = instance.web.qweb.render(this.template, {
+            'widget': this,
             'content': this.view.qweb.render('kanban-box', this.qweb_context)
         });
+        this.replaceElement($el);
     },
     bind_events: function() {
         var self = this;
diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js
index 029e4bce49b..fce7aed6d48 100644
--- a/addons/web_mobile/static/src/js/chrome_mobile.js
+++ b/addons/web_mobile/static/src/js/chrome_mobile.js
@@ -11,7 +11,33 @@ instance.web_mobile.mobilewebclient = function(element_id) {
     return client;
 };
 
-instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({
+/**
+ * @deprecated use :class:`instance.web.Widget`
+ */
+instance.web_mobile.MobileWidget = instance.web.Widget.extend({
+    init: function(parent, element_id) {
+        this._super(parent);
+        this.element_id = element_id;
+        this.element_id = this.element_id || _.uniqueId('widget-');
+
+        var tmp = document.getElementById(this.element_id);
+        this.setElement(tmp || this._make_descriptive());
+    },
+    renderElement: function() {
+        var rendered = this.render();
+        if (rendered) {
+            this.replaceElement($(rendered));
+        }
+        return this;
+    },
+    render: function (additional) {
+        if (this.template)
+            return instance.web.qweb.render(this.template, _.extend({widget: this}, additional || {}));
+        return null;
+    }
+});
+
+instance.web_mobile.MobileWebClient = instance.web_mobile.MobileWidget.extend({
 
     template: "WebClient",
 
@@ -31,7 +57,7 @@ instance.web_mobile.MobileWebClient = instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Login =  instance.web.OldWidget.extend({
+instance.web_mobile.Login =  instance.web_mobile.MobileWidget.extend({
 
     template: "Login",
 
@@ -118,7 +144,7 @@ instance.web_mobile.Login =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Header =  instance.web.OldWidget.extend({
+instance.web_mobile.Header =  instance.web_mobile.MobileWidget.extend({
 
     template: "Header",
 
@@ -130,7 +156,7 @@ instance.web_mobile.Header =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Footer =  instance.web.OldWidget.extend({
+instance.web_mobile.Footer =  instance.web_mobile.MobileWidget.extend({
 
     template: "Footer",
 
@@ -142,7 +168,7 @@ instance.web_mobile.Footer =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Shortcuts =  instance.web.OldWidget.extend({
+instance.web_mobile.Shortcuts =  instance.web_mobile.MobileWidget.extend({
 
     template: "Shortcuts",
 
@@ -181,7 +207,7 @@ instance.web_mobile.Shortcuts =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Menu =  instance.web.OldWidget.extend({
+instance.web_mobile.Menu =  instance.web_mobile.MobileWidget.extend({
 
     template: "Menu",
 
@@ -247,7 +273,7 @@ instance.web_mobile.Menu =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Secondary =  instance.web.OldWidget.extend({
+instance.web_mobile.Secondary =  instance.web_mobile.MobileWidget.extend({
 
     template: "Menu.secondary",
 
@@ -304,7 +330,7 @@ instance.web_mobile.Secondary =  instance.web.OldWidget.extend({
     }
 });
 
-instance.web_mobile.Options =  instance.web.OldWidget.extend({
+instance.web_mobile.Options =  instance.web_mobile.MobileWidget.extend({
 
     template: "Options",
 
diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js
index c3c2025ac1f..6b3cd09175e 100644
--- a/addons/web_mobile/static/src/js/form_mobile.js
+++ b/addons/web_mobile/static/src/js/form_mobile.js
@@ -4,7 +4,7 @@
 
 openerp.web_mobile.form_mobile = function (instance) {
 
-instance.web_mobile.FormView = instance.web.OldWidget.extend({
+instance.web_mobile.FormView = instance.web_mobile.MobileWidget.extend({
 
     template: 'FormView',
 
diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js
index abe5620a0a3..b48753c82f2 100644
--- a/addons/web_mobile/static/src/js/list_mobile.js
+++ b/addons/web_mobile/static/src/js/list_mobile.js
@@ -4,7 +4,7 @@
 
 openerp.web_mobile.list_mobile = function (instance) {
 
-instance.web_mobile.ListView = instance.web.OldWidget.extend({
+instance.web_mobile.ListView = instance.web_mobile.MobileWidget.extend({
 
     template: 'ListView',
 

From b7a562905272f7d2959e3ca24ea792c3f886710e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 14 Aug 2012 16:30:03 +0200
Subject: [PATCH 33/37] [FIX] invocation of import and export dialogs

bzr revid: xmo@openerp.com-20120814143003-ss974ub0yym09gyt
---
 addons/web/static/src/js/views.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 7c9dfe1d543..7f2a0b10bbe 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1331,12 +1331,10 @@ instance.web.View = instance.web.Widget.extend({
     do_search: function(view) {
     },
     on_sidebar_import: function() {
-        var import_view = new instance.web.DataImport(this, this.dataset);
-        import_view.start();
+        new instance.web.DataImport(this, this.dataset).open();
     },
     on_sidebar_export: function() {
-        var export_view = new instance.web.DataExport(this, this.dataset);
-        export_view.start();
+        new instance.web.DataExport(this, this.dataset).open();
     },
     on_sidebar_translate: function() {
         return this.do_action({

From 8c43267c4a6f8705b4e0c75b00e5131eb7f909f7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 14 Aug 2012 15:11:59 +0200
Subject: [PATCH 34/37] [FIX] unknow route must return 404 not 500

bzr revid: chs@openerp.com-20120814131159-0ie5h6tnxdgebpva
---
 addons/web/common/http.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/common/http.py b/addons/web/common/http.py
index 9b86bbe5364..f9e66e31503 100644
--- a/addons/web/common/http.py
+++ b/addons/web/common/http.py
@@ -565,8 +565,8 @@ class Root(object):
             while ps:
                 c = controllers_path.get(ps)
                 if c:
-                    m = getattr(c, meth)
-                    if getattr(m, 'exposed', False):
+                    m = getattr(c, meth, None)
+                    if m and getattr(m, 'exposed', False):
                         _logger.debug("Dispatching to %s %s %s", ps, c, meth)
                         return m
                 ps, _slash, meth = ps.rpartition('/')

From 63e4d9b572f27a5cdfa347e159ebc7e39f240ce1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 14 Aug 2012 17:29:00 +0200
Subject: [PATCH 35/37] [IMP] sed -i '' -e 's/connection/session/g'

bzr revid: chs@openerp.com-20120814152900-8r84kyz0qy1hwkvz
---
 addons/web/static/src/js/chrome.js         | 20 ++++++++--------
 addons/web/static/src/js/corelib.js        |  6 ++---
 addons/web/static/src/js/coresetup.js      | 10 ++++----
 addons/web/static/src/js/data.js           | 10 ++++----
 addons/web/static/src/js/search.js         |  2 +-
 addons/web/static/src/js/test_support.js   | 12 +++++-----
 addons/web/static/src/js/view_form.js      |  6 ++---
 addons/web/static/src/js/view_list.js      |  4 ++--
 addons/web/static/test/evals.js            |  8 +++----
 addons/web/static/test/fulltest/dataset.js | 28 +++++++++++-----------
 addons/web/static/test/list-editable.js    | 14 +++++------
 addons/web/static/test/search.js           | 20 ++++++++--------
 addons/web/static/test/testing.js          | 12 +++++-----
 addons/web_kanban/static/src/js/kanban.js  |  6 ++---
 14 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 49621cc3410..c632ce5cd0b 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -193,7 +193,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
     on_traceback: function(error) {
         var self = this;
         var buttons = {};
-        if (instance.connection.openerp_entreprise) {
+        if (instance.session.openerp_entreprise) {
             buttons[_t("Send OpenERP Enterprise Report")] = function() {
                 var $this = $(this);
                 var issuename = $('#issuename').val();
@@ -224,7 +224,7 @@ instance.web.CrashManager = instance.web.CallbackEnabled.extend({
             min_height: '600px',
             buttons: buttons
         }).open();
-        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.connection, error: error}));
+        dialog.$element.html(QWeb.render('CrashManager.error', {session: instance.session, error: error}));
     },
     on_javascript_exception: function(exception) {
         this.on_traceback({
@@ -269,7 +269,7 @@ instance.web.Loading = instance.web.Widget.extend({
 
         this.count += increment;
         if (this.count > 0) {
-            if (instance.connection.debug) {
+            if (instance.session.debug) {
                 this.$element.text(_.str.sprintf( _t("Loading (%d)"), this.count));
             } else {
                 this.$element.text(_t("Loading"));
@@ -882,8 +882,8 @@ instance.web.UserMenu =  instance.web.Widget.extend({
             var func = new instance.web.Model("res.users").get_func("read");
             return func(self.session.uid, ["name", "company_id"]).pipe(function(res) {
                 var topbar_name = res.name;
-                if(instance.connection.debug)
-                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.connection.db);
+                if(instance.session.debug)
+                    topbar_name = _.str.sprintf("%s (%s)", topbar_name, instance.session.db);
                 if(res.company_id[0] > 1)
                     topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]);
                 self.$element.find('.oe_topbar_name').text(topbar_name);
@@ -900,7 +900,7 @@ instance.web.UserMenu =  instance.web.Widget.extend({
     on_menu_settings: function() {
         var self = this;
         self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) {
-            result.result.res_id = instance.connection.uid;
+            result.result.res_id = instance.session.uid;
             self.getParent().action_manager.do_action(result.result);
         });
     },
@@ -927,7 +927,7 @@ instance.web.Client = instance.web.Widget.extend({
     },
     start: function() {
         var self = this;
-        return instance.connection.session_bind(this.origin).pipe(function() {
+        return instance.session.session_bind(this.origin).pipe(function() {
             var $e = $(QWeb.render(self._template, {}));
             self.replaceElement($e);
             self.bind_events();
@@ -970,7 +970,7 @@ instance.web.Client = instance.web.Widget.extend({
     show_common: function() {
         var self = this;
         this.crashmanager =  new instance.web.CrashManager();
-        instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error);
+        instance.session.on_rpc_error.add(this.crashmanager.on_rpc_error);
         self.notification = new instance.web.Notification(this);
         self.notification.appendTo(self.$element);
         self.loading = new instance.web.Loading(self);
@@ -1067,7 +1067,7 @@ instance.web.WebClient = instance.web.Client.extend({
     do_reload: function() {
         var self = this;
         return this.session.session_reload().pipe(function () {
-            instance.connection.load_modules(true).pipe(
+            instance.session.load_modules(true).pipe(
                 self.menu.proxy('do_reload')); });
 
     },
@@ -1174,7 +1174,7 @@ instance.web.EmbeddedClient = instance.web.Client.extend({
     start: function() {
         var self = this;
         return $.when(this._super()).pipe(function() {
-            return instance.connection.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
+            return instance.session.session_authenticate(self.dbname, self.login, self.key, true).pipe(function() {
                 return self.rpc("/web/action/load", { action_id: self.action_id }, function(result) {
                     var action = result.result;
                     action.flags = _.extend({
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index a46d6314ebe..5da12043994 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -692,7 +692,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
         instance.web.WidgetMixin.init.call(this,parent);
         // FIXME: this should not be
         this.setElement(this._make_descriptive());
-        this.session = instance.connection;
+        this.session = instance.session;
     },
     /**
      * Renders the element. The default implementation renders the widget using QWeb,
@@ -841,7 +841,7 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
     rpc: function(url, data, success, error) {
         var def = $.Deferred().then(success, error);
         var self = this;
-        instance.connection.rpc(url, data). then(function() {
+        instance.session.rpc(url, data). then(function() {
             if (!self.isDestroyed())
                 def.resolve.apply(def, arguments);
         }, function() {
@@ -863,7 +863,7 @@ instance.web.Registry = instance.web.Class.extend({
      *
      * An object path is simply a dotted name from the instance root to the
      * object pointed to (e.g. ``"instance.web.Session"`` for an OpenERP
-     * connection object).
+     * session object).
      *
      * @constructs instance.web.Registry
      * @param {Object} mapping a mapping of keys to object-paths
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 44e2d3aba78..d5b87d8a81d 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -514,7 +514,7 @@ $.async_when = function() {
 // special tweak for the web client
 var old_async_when = $.async_when;
 $.async_when = function() {
-    if (instance.connection.synch)
+    if (instance.session.synch)
         return $.when.apply(this, arguments);
     else
         return old_async_when.apply(this, arguments);
@@ -559,7 +559,7 @@ instance.web.unblockUI = function() {
 }
 
 /** Setup default session */
-instance.connection = new instance.web.Session();
+instance.session = new instance.web.Session();
 
 /** Configure default qweb */
 instance.web._t = new instance.web.TranslationDataBase().build_translation_function();
@@ -578,8 +578,8 @@ instance.web._lt = function (s) {
     return {toString: function () { return instance.web._t(s); }}
 };
 instance.web.qweb = new QWeb2.Engine();
-instance.web.qweb.default_dict['__debug__'] = instance.connection.debug; // Which one ?
-instance.web.qweb.debug = instance.connection.debug;
+instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ?
+instance.web.qweb.debug = instance.session.debug;
 instance.web.qweb.default_dict = {
     '_' : _,
     '_t' : instance.web._t
@@ -636,7 +636,7 @@ var _t = instance.web._t;
     _t('%d years ago');
 }
 
-instance.connection.on('module_loaded', this, function () {
+instance.session.on('module_loaded', this, function () {
     // provide timeago.js with our own translator method
     $.timeago.settings.translator = instance.web._t;
 });
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 1cdb4a713f1..e360c922918 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -58,7 +58,7 @@ instance.web.Query = instance.web.Class.extend({
     },
     _execute: function () {
         var self = this;
-        return instance.connection.rpc('/web/dataset/search_read', {
+        return instance.session.rpc('/web/dataset/search_read', {
             model: this._model.name,
             fields: this._fields || false,
             domain: this._model.domain(this._filter),
@@ -233,7 +233,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
             kwargs = args;
             args = [];
         }
-        return instance.connection.rpc('/web/dataset/call_kw', {
+        return instance.session.rpc('/web/dataset/call_kw', {
             model: this.name,
             method: method,
             args: args,
@@ -256,7 +256,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      * @param {String} signal signal to trigger on the workflow
      */
     exec_workflow: function (id, signal) {
-        return instance.connection.rpc('/web/dataset/exec_workflow', {
+        return instance.session.rpc('/web/dataset/exec_workflow', {
             model: this.name,
             id: id,
             signal: signal
@@ -282,7 +282,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      */
     context: function (context) {
         return new instance.web.CompoundContext(
-            instance.connection.user_context, this._context, context || {});
+            instance.session.user_context, this._context, context || {});
     },
     /**
      * Button action caller, needs to perform cleanup if an action is returned
@@ -292,7 +292,7 @@ instance.web.Model = instance.web.Class.extend(/** @lends openerp.web.Model# */{
      * FIXME: remove when evaluator integrated
      */
     call_button: function (method, args) {
-        return instance.connection.rpc('/web/dataset/call_button', {
+        return instance.session.rpc('/web/dataset/call_button', {
             model: this.name,
             method: method,
             domain_id: null,
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 0e3a5eb0dee..a7625631aa5 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -1613,7 +1613,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({
             }
             var filter = {
                 name: $name.val(),
-                user_id: private_filter ? instance.connection.uid : false,
+                user_id: private_filter ? instance.session.uid : false,
                 model_id: self.view.model,
                 context: results.context,
                 domain: results.domain
diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
index d46366326b7..314a12c91c6 100644
--- a/addons/web/static/src/js/test_support.js
+++ b/addons/web/static/src/js/test_support.js
@@ -1,12 +1,12 @@
 openerp.test_support = {
-    setup_connection: function (connection) {
+    setup_session: function (session) {
         var origin = location.protocol+"//"+location.host;
-        _.extend(connection, {
+        _.extend(session, {
             origin: origin,
             prefix: origin,
             server: origin, // keep chs happy
             //openerp.web.qweb.default_dict['_s'] = this.origin;
-            rpc_function: connection.rpc_json,
+            rpc_function: session.rpc_json,
             session_id: false,
             uid: false,
             username: false,
@@ -22,7 +22,7 @@ openerp.test_support = {
             shortcuts: [],
             active_id: null
         });
-        return connection.session_reload();
+        return session.session_reload();
     },
     module: function (title, tested_core, nonliterals) {
         var conf = QUnit.config.openerp = {};
@@ -31,10 +31,10 @@ openerp.test_support = {
                 QUnit.stop();
                 var oe = conf.openerp = window.openerp.init();
                 window.openerp.web[tested_core](oe);
-                var done = openerp.test_support.setup_connection(oe.connection);
+                var done = openerp.test_support.setup_session(oe.session);
                 if (nonliterals) {
                     done = done.pipe(function () {
-                        return oe.connection.rpc('/tests/add_nonliterals', {
+                        return oe.session.rpc('/tests/add_nonliterals', {
                             domains: nonliterals.domains || [],
                             contexts: nonliterals.contexts || []
                         }).then(function (r) {
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 17574caf90b..cfd01b7fbdd 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1656,7 +1656,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
                         template = 'WidgetLabel.tooltip';
                     }
                     return QWeb.render(template, {
-                        debug: instance.connection.debug,
+                        debug: instance.session.debug,
                         widget: widget
                 })},
                 gravity: $.fn.tipsy.autoBounds(50, 'nw'),
@@ -1733,7 +1733,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({
     start: function() {
         this._super.apply(this, arguments);
         this.$element.click(this.on_click);
-        if (this.node.attrs.help || instance.connection.debug) {
+        if (this.node.attrs.help || instance.session.debug) {
             this.do_attach_tooltip();
         }
         this.setupFocus(this.$element);
@@ -1930,7 +1930,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w
             }, this));
         }
         this.$label = this.view.$element.find('label[for=' + this.id_for_label + ']');
-        if (instance.connection.debug) {
+        if (instance.session.debug) {
             this.do_attach_tooltip(this, this.$label[0] || this.$element);
             this.$label.off('dblclick').on('dblclick', function() {
                 console.log("Field '%s' of type '%s' in View: %o", self.name, (self.node.attrs.widget || self.field.type), self.view);
diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js
index 986b0e49faf..95dfa78fd63 100644
--- a/addons/web/static/src/js/view_list.js
+++ b/addons/web/static/src/js/view_list.js
@@ -2059,7 +2059,7 @@ instance.web.list.Button = instance.web.list.Column.extend({
                 title: this.string || '',
                 additional_attributes: isNaN(row_data["id"].value) && instance.web.BufferedDataSet.virtual_id_regex.test(row_data["id"].value) ?
                     'disabled="disabled" class="oe_list_button_disabled"' : '',
-                prefix: instance.connection.prefix,
+                prefix: instance.session.prefix,
                 icon: this.icon,
                 alt: this.string || ''
             });
@@ -2086,7 +2086,7 @@ instance.web.list.Binary = instance.web.list.Column.extend({
         var text = _t("Download");
         var download_url = _.str.sprintf(
                 '/web/binary/saveas?session_id=%s&model=%s&field=%s&id=%d',
-                instance.connection.session_id, options.model, this.id, options.id);
+                instance.session.session_id, options.model, this.id, options.id);
         if (this.filename) {
             download_url += '&filename_field=' + this.filename;
             if (row_data[this.filename]) {
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 7bc6554e074..757d98c5bcc 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
         // Context n should have base evaluation context + all of contexts
         // 0..n-1 in its own evaluation context
         var active_id = 4;
-        var result = openerp.connection.test_eval_contexts([
+        var result = openerp.session.test_eval_contexts([
             {
                 "__contexts": [
                     {
@@ -56,7 +56,7 @@ $(document).ready(function () {
         });
     });
     test('non-literal_eval_contexts', function () {
-        var result = openerp.connection.test_eval_contexts([{
+        var result = openerp.session.test_eval_contexts([{
             "__ref": "compound_context",
             "__contexts": [
                 {"__ref": "context", "__debug": "{'type':parent.type}",
@@ -141,9 +141,9 @@ $(document).ready(function () {
     });
     test('current_date', function () {
         var current_date = openerp.web.date_to_str(new Date());
-        var result = openerp.connection.test_eval_domains(
+        var result = openerp.session.test_eval_domains(
             [[],{"__ref":"domain","__debug":"[('name','>=',current_date),('name','<=',current_date)]","__id":"5dedcfc96648"}],
-            openerp.connection.test_eval_get_context());
+            openerp.session.test_eval_get_context());
         deepEqual(result, [
             ['name', '>=', current_date],
             ['name', '<=', current_date]
diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index 9f7ab101869..b659d60b267 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -7,7 +7,7 @@ $(document).ready(function () {
     t.module('Dataset shortcuts', 'data');
     t.test('read_index', function (openerp) {
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'some.model');
+            {session: openerp.session}, 'some.model');
         ds.ids = [10, 20, 30, 40, 50];
         ds.index = 2;
         t.expect(ds.read_index(['a', 'b', 'c']), function (result) {
@@ -24,7 +24,7 @@ $(document).ready(function () {
     });
     t.test('default_get', function (openerp) {
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'some.model', {foo: 'bar'});
+            {session: openerp.session}, 'some.model', {foo: 'bar'});
         t.expect(ds.default_get(['a', 'b', 'c']), function (result) {
             strictEqual(result.method, 'default_get');
             strictEqual(result.model, 'some.model');
@@ -38,7 +38,7 @@ $(document).ready(function () {
         });
     });
     t.test('create', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'some.model');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'some.model');
         t.expect(ds.create({foo: 1, bar: 2}), function (r) {
             strictEqual(r.method, 'create');
 
@@ -51,7 +51,7 @@ $(document).ready(function () {
         });
     });
     t.test('write', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.write(42, {foo: 1}), function (r) {
             strictEqual(r.method, 'write');
 
@@ -69,7 +69,7 @@ $(document).ready(function () {
 //        });
     });
     t.test('unlink', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.unlink([42]), function (r) {
             strictEqual(r.method, 'unlink');
 
@@ -81,7 +81,7 @@ $(document).ready(function () {
         });
     });
     t.test('call', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.call('frob', ['a', 'b', 42]), function (r) {
             strictEqual(r.method, 'frob');
 
@@ -92,7 +92,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_get', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_get([1, 2], null), function (r) {
             strictEqual(r.method, 'name_get');
 
@@ -104,7 +104,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_search, name', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_search('bob'), function (r) {
             strictEqual(r.method, 'name_search');
 
@@ -119,7 +119,7 @@ $(document).ready(function () {
         });
     });
     t.test('name_search, domain & operator', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_search(0, [['foo', '=', 3]], 'someop'), function (r) {
             strictEqual(r.method, 'name_search');
 
@@ -134,7 +134,7 @@ $(document).ready(function () {
         });
     });
     t.test('exec_workflow', function (openerp) {
-        var ds = new openerp.web.DataSet({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.exec_workflow(42, 'foo'), function (r) {
             strictEqual(r['service'], 'object');
             strictEqual(r.method, 'exec_workflow');
@@ -147,7 +147,7 @@ $(document).ready(function () {
     });
 
     t.test('DataSetSearch#read_slice', function (openerp) {
-        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod');
         t.expect(ds.read_slice(['foo', 'bar'], {
             domain: [['foo', '>', 42], ['qux', '=', 'grault']],
             context: {peewee: 'herman'},
@@ -167,7 +167,7 @@ $(document).ready(function () {
         });
     });
     t.test('DataSetSearch#read_slice sorted', function (openerp) {
-        var ds = new openerp.web.DataSetSearch({session: openerp.connection}, 'mod');
+        var ds = new openerp.web.DataSetSearch({session: openerp.session}, 'mod');
         ds.sort('foo');
         ds.sort('foo');
         ds.sort('bar');
@@ -194,7 +194,7 @@ $(document).ready(function () {
     });
     t.test('Dataset', function (openerp) {
         var ds = new openerp.web.DataSetSearch(
-            {session: openerp.connection}, 'mod');
+            {session: openerp.session}, 'mod');
         var c = new openerp.web.CompoundContext(
             {a: 'foo', b: 3, c: 5}, openerp.contexts[0]);
         t.expect(ds.read_slice(['foo', 'bar'], {
@@ -220,7 +220,7 @@ $(document).ready(function () {
             parent: {model: 'qux'}
         };
         var ds = new openerp.web.DataSet(
-            {session: openerp.connection}, 'mod',
+            {session: openerp.session}, 'mod',
              new openerp.web.CompoundContext({})
                  .set_eval_context(eval_context));
         var domain = new openerp.web.CompoundDomain(openerp.domains[0])
diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 62f31a55833..2a4dee3b6e7 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -87,10 +87,10 @@ $(document).ready(function () {
             });
     });
     asyncTest('toggle-edition-save', 4, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
-        instance.connection.responses['/web/dataset/call_kw:read'] = function () {
+        instance.session.responses['/web/dataset/call_kw:read'] = function () {
             return { result: [{
                 id: 42,
                 a: false,
@@ -125,7 +125,7 @@ $(document).ready(function () {
             })
     });
     asyncTest('toggle-edition-cancel', 2, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
         var e = new instance.web.list.Editor({
@@ -153,7 +153,7 @@ $(document).ready(function () {
             })
     });
     asyncTest('toggle-save-required', 2, function () {
-        instance.connection.responses['/web/dataset/call_kw:create'] = function () {
+        instance.session.responses['/web/dataset/call_kw:create'] = function () {
             return { result: 42 };
         };
         var e = new instance.web.list.Editor({
@@ -191,7 +191,7 @@ $(document).ready(function () {
             baseSetup();
 
             var records = {};
-            _.extend(instance.connection.responses, {
+            _.extend(instance.session.responses, {
                 '/web/listview/load': function () {
                     return {result: {
                         type: 'tree',
@@ -227,7 +227,7 @@ $(document).ready(function () {
     });
     asyncTest('newrecord', 6, function () {
         var got_defaults = false;
-        instance.connection.responses['/web/dataset/call_kw:default_get'] = function (params) {
+        instance.session.responses['/web/dataset/call_kw:default_get'] = function (params) {
             var fields = params.params.args[0];
             deepEqual(
                 fields, ['a', 'b', 'c'],
@@ -267,7 +267,7 @@ $(document).ready(function () {
     module('list-edition-events', {
         setup: function () {
             baseSetup();
-            _.extend(instance.connection.responses, {
+            _.extend(instance.session.responses, {
                 '/web/listview/load': function () {
                     return {result: {
                         type: 'tree',
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 548eef612b5..6dc37f31d08 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -164,8 +164,8 @@ $(document).ready(function () {
         instance.dummy = {};
         instance.dummy.DummyWidget = instance.web.search.Field.extend(
             dummy_widget_attributes || {});
-        if (!('/web/searchview/load' in instance.connection.responses)) {
-            instance.connection.responses['/web/searchview/load'] = function () {
+        if (!('/web/searchview/load' in instance.session.responses)) {
+            instance.session.responses['/web/searchview/load'] = function () {
                 return {result: {fields_view: {
                     type: 'search',
                     fields: {
@@ -186,10 +186,10 @@ $(document).ready(function () {
                 }}};
             };
         }
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: []};
         };
-        instance.connection.responses['/web/searchview/fields_get'] = function () {
+        instance.session.responses['/web/searchview/fields_get'] = function () {
             return {result: {fields: {
                 dummy: {type: 'char', string: 'Dummy'}
             }}};
@@ -321,7 +321,7 @@ $(document).ready(function () {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, 'name_get',
                   "m2o should resolve default id");
             equal(req.params.model, f.attrs.relation,
@@ -357,7 +357,7 @@ $(document).ready(function () {
             {attrs: {name: 'dummy', string: 'Dummy'}},
             {relation: 'dummy.model.name'},
             view);
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
            return {result: []};
         };
         f.facet_for_defaults({dummy: id})
@@ -573,7 +573,7 @@ $(document).ready(function () {
             });
     });
     asyncTest("M2O", 15, function () {
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, "name_search");
             equal(req.params.model, "dummy.model");
             deepEqual(req.params.args, []);
@@ -607,7 +607,7 @@ $(document).ready(function () {
             });
     });
     asyncTest("M2O no match", 5, function () {
-        instance.connection.responses['/web/dataset/call_kw'] = function (req) {
+        instance.session.responses['/web/dataset/call_kw'] = function (req) {
             equal(req.params.method, "name_search");
             equal(req.params.model, "dummy.model");
             deepEqual(req.params.args, []);
@@ -1070,7 +1070,7 @@ $(document).ready(function () {
     });
     asyncTest('checkboxing', 6, function () {
         var view = makeSearchView();
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: [{
                 name: "filter name",
                 user_id: 42
@@ -1099,7 +1099,7 @@ $(document).ready(function () {
     });
     asyncTest('removal', 1, function () {
         var view = makeSearchView();
-        instance.connection.responses['/web/searchview/get_filters'] = function () {
+        instance.session.responses['/web/searchview/get_filters'] = function () {
             return {result: [{
                 name: "filter name",
                 user_id: 42
diff --git a/addons/web/static/test/testing.js b/addons/web/static/test/testing.js
index e9525fc82a0..1be8e94e74b 100644
--- a/addons/web/static/test/testing.js
+++ b/addons/web/static/test/testing.js
@@ -33,28 +33,28 @@ openerp.testing = (function () {
             instance.web.qweb.add_template(doc);
         },
         /**
-         * Alter provided instance's ``connection`` attribute to make response
+         * Alter provided instance's ``session`` attribute to make response
          * mockable:
          *
          * * The ``responses`` parameter can be used to provide a map of (RPC)
          *   paths (e.g. ``/web/view/load``) to a function returning a response
          *   to the query.
-         * * ``instance,connection`` grows a ``responses`` attribute which is
+         * * ``instance.session`` grows a ``responses`` attribute which is
          *   a map of the same (and is in fact initialized to the ``responses``
          *   parameter if one is provided)
          *
          * Note that RPC requests to un-mocked URLs will be rejected with an
          * error message: only explicitly specified urls will get a response.
          *
-         * Mocked connections will *never* perform an actual RPC connection.
+         * Mocked sessions will *never* perform an actual RPC connection.
          *
          * @param instance openerp instance being initialized
          * @param {Object} [responses]
          */
         mockifyRPC: function (instance, responses) {
-            var connection = instance.connection;
-            connection.responses = responses || {};
-            connection.rpc_function = function (url, payload) {
+            var session = instance.session;
+            session.responses = responses || {};
+            session.rpc_function = function (url, payload) {
                 var fn = this.responses[url.url + ':' + payload.params.method]
                       || this.responses[url.url];
 
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index fe14b4c697f..6c70ecfb8ec 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -32,7 +32,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         this.aggregates = {};
         this.group_operators = ['avg', 'max', 'min', 'sum', 'count'];
         this.qweb = new QWeb2.Engine();
-        this.qweb.debug = instance.connection.debug;
+        this.qweb.debug = instance.session.debug;
         this.qweb.default_dict = _.clone(QWeb.default_dict);
         this.has_been_loaded = $.Deferred();
         this.search_domain = this.search_context = this.search_group_by = null;
@@ -132,7 +132,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
                         node.children = [{
                             tag: 'img',
                             attrs: {
-                                src: instance.connection.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
+                                src: instance.session.prefix + '/web/static/src/img/icons/' + node.attrs['data-icon'] + '.png',
                                 width: '16',
                                 height: '16'
                             }
@@ -760,7 +760,7 @@ instance.web_kanban.KanbanRecord = instance.web.Widget.extend({
             url = "/web/static/src/img/placeholder.png";
         } else {
             id = escape(JSON.stringify(id));
-            url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
+            url = instance.session.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id;
             if (cache !== undefined) {
                 // Set the cache duration in seconds.
                 url += '&cache=' + parseInt(cache, 10);

From c5dc5cef00cd596d6c0b6c9899bf1d8de16e9026 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Tue, 14 Aug 2012 17:30:53 +0200
Subject: [PATCH 36/37] [IMP] sed -i '' -e 's/connection/session/g'

bzr revid: chs@openerp.com-20120814153053-3bznfj7woq2xi1f1
---
 .../static/src/js/reset_password.js                  |  2 +-
 addons/auth_signup/static/src/js/auth_signup.js      |  4 ++--
 addons/edi/static/src/js/edi.js                      |  6 +++---
 addons/point_of_sale/static/src/js/pos_widgets.js    |  2 +-
 addons/share/static/src/js/share.js                  | 12 ++++++------
 addons/web_linkedin/static/src/js/linkedin.js        |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js
index 41b48c7e59b..13cf070a548 100644
--- a/addons/auth_reset_password/static/src/js/reset_password.js
+++ b/addons/auth_reset_password/static/src/js/reset_password.js
@@ -31,7 +31,7 @@ openerp.auth_reset_password = function(instance) {
         },
         do_reset_password: function(db, email) {
             var self = this;
-            instance.connection.session_authenticate(db, 'anonymous', 'anonymous', true).pipe(function () {
+            instance.session.session_authenticate(db, 'anonymous', 'anonymous', true).pipe(function () {
                 var func = new instance.web.Model("res.users").get_func("send_reset_password_request");
                 return func(email).then(function(res) {
                     // show message
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 7384fe1e5f5..9dda111f044 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -12,7 +12,7 @@ openerp.auth_signup = function(instance) {
                     return false;
                 }
 
-                var cnx = instance.connection;
+                var cnx = instance.session;
                 if (cnx.session_is_valid()) {
                     self._signup();
                 } else {
@@ -83,7 +83,7 @@ openerp.auth_signup = function(instance) {
                         type: 'ir.actions.client',
                         tag: 'login',
                         params: {
-                            db: instance.connection.db,
+                            db: instance.session.db,
                             login: email,
                             password: password,
                             login_successful: function() {
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 24bf17a2f88..78e90852c38 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -6,7 +6,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         this._super();
         this.db = db;
         this.token = token;
-        this.session = openerp.connection;
+        this.session = openerp.session;
         this.template = "EdiEmpty";
         this.content = "";
         this.sidebar = "";
@@ -108,7 +108,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
 });
 
 openerp.edi.edi_view = function (db, token) {
-    openerp.connection.session_bind().then(function () {
+    openerp.session.session_bind().then(function () {
         new openerp.edi.EdiView(null,db,token).appendTo($("body").addClass('openerp'));
     });
 }
@@ -188,7 +188,7 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
 });
 
 openerp.edi.edi_import = function (url) {
-    openerp.connection.session_bind().then(function () {
+    openerp.session.session_bind().then(function () {
         new openerp.edi.EdiImport(null,url).appendTo($("body").addClass('openerp'));
     });
 }
diff --git a/addons/point_of_sale/static/src/js/pos_widgets.js b/addons/point_of_sale/static/src/js/pos_widgets.js
index bebbb3c1591..9a27be29381 100644
--- a/addons/point_of_sale/static/src/js/pos_widgets.js
+++ b/addons/point_of_sale/static/src/js/pos_widgets.js
@@ -674,7 +674,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 self.$('.loader img').hide();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
                     .pipe( _.bind(function(res){
-                        return instance.connection.rpc('/web/action/load', {'action_id': res[0]['res_id']})
+                        return instance.session.rpc('/web/action/load', {'action_id': res[0]['res_id']})
                             .pipe(_.bind(function(result){
                                 var action = result.result;
                                 this.do_action(action);
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 33aa3d1aab9..6cc12a5bfa8 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -35,19 +35,19 @@ openerp.share = function(session) {
     }
 
     function has_share(yes, no) {
-        if (!session.connection.share_flag) {
-            session.connection.share_flag = $.Deferred(function() {
+        if (!session.session.share_flag) {
+            session.session.share_flag = $.Deferred(function() {
                 var func = new session.web.Model("share.wizard").get_func("has_share");
-                func(session.connection.uid).pipe(function(res) {
+                func(session.session.uid).pipe(function(res) {
                     if(res) {
-                        session.connection.share_flag.resolve();
+                        session.session.share_flag.resolve();
                     } else {
-                        session.connection.share_flag.reject();
+                        session.session.share_flag.reject();
                     }
                 });
             });
         }
-        session.connection.share_flag.done(yes).fail(no);
+        session.session.share_flag.done(yes).fail(no);
     }
 
     /* Extend the Sidebar to add Share and Embed links in the 'More' menu */
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 977e7a60cbb..c15b995bff9 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -78,7 +78,7 @@ openerp.web_linkedin = function(instance) {
             }, _.bind(this.linkedin_disabled, this));
         },
         linkedin_disabled: function() {
-            if (instance.connection.uid !== 1) {
+            if (instance.session.uid !== 1) {
                 instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
                     title: _t("LinkedIn is not enabled"),
                     buttons: [

From 7290d5880d7c5c34c8341ba893d062b0c91739a9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 14 Aug 2012 18:57:50 +0200
Subject: [PATCH 37/37] fix

bzr revid: fp@openerp.com-20120814165750-k2mmj30200jaee3m
---
 openerp/addons/base/test/test_osv_expression.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 4cbfad926ad..d607b17f801 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -1,12 +1,5 @@
 -
     Testing for hierarchical search in M2M
--
-    !python {model: res.partner }: |
-        ids = self.search(cr, uid, [('category_id', 'child_of',ref('res_partner_category_1'))])
-        assert len(ids) >= 1, ids
-
--
-    Test hierarchical search in M2M with child ID1
 -
     !python {model: res.partner }: |
         ids = self.search(cr, uid, [('category_id', 'child_of',ref('res_partner_category_0'))])