From ff4fe2c05e35ccbf435583474a942512363b4cb5 Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Wed, 21 May 2014 16:34:34 +0530
Subject: [PATCH 001/137] [FIX]: change correct label and fields in Event
 Analysis.

---
 addons/event/report/report_event_registration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 595d3947687..1ce3591a105 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -37,7 +37,7 @@ class report_event_registration(osv.osv):
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
-        'nbevent': fields.integer('Number Of Events'),
+        'nbevent': fields.integer('Number of Registrations in Events'),
         'event_type': fields.many2one('event.type', 'Event Type'),
         'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True),
         'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True),
@@ -68,7 +68,7 @@ class report_event_registration(osv.osv):
                 to_char(e.date_begin, 'YYYY-MM-DD') AS event_date,
                 to_char(e.date_begin, 'YYYY') AS year,
                 to_char(e.date_begin, 'MM') AS month,
-                count(e.id) AS nbevent,
+                count(r.id) AS nbevent,
                 CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
                 CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
                 e.type AS event_type,

From a77123fcccff56c5745abf1737122cb846fd711c Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Thu, 22 May 2014 11:49:09 +0530
Subject: [PATCH 002/137] [FIX]: Bad display in kanban view with a group by in
 Event.

---
 addons/event/static/src/css/event.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index ff5bfaba19b..53c03cc03f0 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -1,7 +1,7 @@
 .oe_event_date{
   border-top-left-radius:3px;
   border-top-right-radius:3px;
-  font-size: 48px;
+  font-size: 36px;
   height: auto;
   font-weight: bold;
   text-align: center;

From 6d65ff1f99f14cdbc32f2f0a31a9930ea9f1a086 Mon Sep 17 00:00:00 2001
From: Pariket Trivedi <ptr@openerp.com>
Date: Thu, 22 May 2014 11:56:28 +0530
Subject: [PATCH 003/137] [FIX]:IE9 Kanban: The 'show more' button is not
 display correctly.

---
 addons/web/static/src/css/base.css  | 3 +++
 addons/web/static/src/css/base.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 8c2da02d969..d7c40480e11 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3392,6 +3392,9 @@ body.oe_single_form .oe_single_form_container {
 .openerp_ie .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8');
 }
+.openerp_ie .oe_webclient {
+  height: auto !important;
+}
 
 @media print {
   .openerp {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index b18e4fc65d8..090cf3de0fe 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2736,6 +2736,8 @@ body.oe_single_form
     // jquery ui for ie
     .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button
         filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#EFEFEF', endColorstr='#D8D8D8')
+    .oe_webclient
+        height: auto !important
 // }}}
 
 // @media print {{{

From 9376d1693853f6d2f0f7995851c55faf03120dc1 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Jun 2014 09:58:09 +0200
Subject: [PATCH 004/137] [IMP] Put cost method only once, make sure extra
 moves get moves in consequent pickings, default buy route on template

---
 addons/procurement/procurement.py     |  2 +-
 addons/purchase/purchase.py           | 15 +++++++--------
 addons/stock/stock.py                 | 14 ++++++++++----
 addons/stock_account/product_view.xml |  6 +-----
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index beedac5fe96..d1ce6047e76 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -64,7 +64,7 @@ class procurement_group(osv.osv):
     }
     _defaults = {
         'name': lambda self, cr, uid, c: self.pool.get('ir.sequence').get(cr, uid, 'procurement.group') or '',
-        'move_type': lambda self, cr, uid, c: 'one'
+        'move_type': lambda self, cr, uid, c: 'direct'
     }
 
 class procurement_rule(osv.osv):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 22b1af1d26a..08362899ccf 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1358,6 +1358,10 @@ class product_template(osv.Model):
     _name = 'product.template'
     _inherit = 'product.template'
     
+    def _get_buy_route(self, cr, uid, context=None):
+        buy_route = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'route_warehouse0_buy')[1]
+        return [buy_route]
+
     def _purchase_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
         for template in self.browse(cr, uid, ids, context=context):
@@ -1369,6 +1373,7 @@ class product_template(osv.Model):
     }
     _defaults = {
         'purchase_ok': 1,
+        'route_ids': _get_buy_route,
     }
 
 class product_product(osv.Model):
@@ -1446,15 +1451,9 @@ class account_invoice_line(osv.Model):
             readonly=True),
     }
 
-class product_product(osv.osv):
-    _inherit = "product.product"
+class product_template(osv.osv):
+    _inherit = "product.template"
 
-    def _get_buy_route(self, cr, uid, context=None):
-        buy_route = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'route_warehouse0_buy')[1]
-        return [buy_route]
 
-    _defaults = {
-        'route_ids': _get_buy_route,
-    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e640c6daec4..a8697dd435d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1248,6 +1248,7 @@ class stock_picking(osv.osv):
         '''
         move_obj = self.pool.get('stock.move')
         operation_obj = self.pool.get('stock.pack.operation')
+        moves = []
         for op in picking.pack_operation_ids:
             for product_id, remaining_qty in operation_obj._get_remaining_prod_quantities(cr, uid, op, context=context).items():
                 if remaining_qty > 0:
@@ -1260,9 +1261,12 @@ class stock_picking(osv.osv):
                         'product_uom': product.uom_id.id,
                         'product_uom_qty': remaining_qty,
                         'name': _('Extra Move: ') + product.name,
-                        'state': 'confirmed',
+                        'state': 'draft',
                     }
-                    move_obj.create(cr, uid, vals, context=context)
+                    moves.append(move_obj.create(cr, uid, vals, context=context))
+        if moves:
+            move_obj.action_confirm(cr, uid, moves, context=context)
+        return moves
 
     def rereserve_quants(self, cr, uid, picking, move_ids=[], context=None):
         """ Unreserve quants then try to reassign quants."""
@@ -1289,11 +1293,13 @@ class stock_picking(osv.osv):
             else:
                 need_rereserve, all_op_processed = self.picking_recompute_remaining_quantities(cr, uid, picking, context=context)
                 #create extra moves in the picking (unexpected product moves coming from pack operations)
+                todo_move_ids = []
                 if not all_op_processed:
-                    self._create_extra_moves(cr, uid, picking, context=context)
+                    todo_move_ids += self._create_extra_moves(cr, uid, picking, context=context)
+                    
                 picking.refresh()
                 #split move lines eventually
-                todo_move_ids = []
+                
                 toassign_move_ids = []
                 for move in picking.move_lines:
                     remaining_qty = move.remaining_qty
diff --git a/addons/stock_account/product_view.xml b/addons/stock_account/product_view.xml
index 32ef9c66acc..a703b4126d6 100644
--- a/addons/stock_account/product_view.xml
+++ b/addons/stock_account/product_view.xml
@@ -30,11 +30,7 @@
                         <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </group>
-		</xpath>
-		<xpath expr="//field[@name='standard_price']" position='replace'>
-                    <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
-                    <field name="cost_method" groups="stock_account.group_inventory_valuation"/>
-		</xpath>
+                </xpath>
             </field>
         </record>
 

From fb9f0a18862cd68f92b33e599330806a84277572 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Jun 2014 10:59:33 +0200
Subject: [PATCH 005/137] [IMP] Previously done changes for qty_available stat
 button

---
 addons/stock/product.py | 4 ++--
 addons/stock/stock.py   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index 0cf7df5e836..bcaa19f241e 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -171,13 +171,13 @@ class product_product(osv.osv):
     def _product_available_text(self, cr, uid, ids, field_names=None, arg=False, context=None):
         res = {}
         for product in self.browse(cr, uid, ids, context=context):
-            res[product.id] = str(product.qty_available) +  _(" In Stock")
+            res[product.id] = str(product.qty_available) +  _(" On Hand")
         return res
 
     _columns = {
         'reception_count': fields.function(_stock_move_count, string="Reception", type='integer', multi='pickings'),
         'delivery_count': fields.function(_stock_move_count, string="Delivery", type='integer', multi='pickings'),
-        'qty_in_stock': fields.function(_product_available_text, type='char'),
+        'qty_available_text': fields.function(_product_available_text, type='char'),
         'qty_available': fields.function(_product_available, multi='qty_available',
             type='float', digits_compute=dp.get_precision('Product Unit of Measure'),
             string='Quantity On Hand',
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a8697dd435d..71512f633d0 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3524,7 +3524,6 @@ class stock_location_path(osv.osv):
 # -------------------------
 
 from openerp.report import report_sxw
-report_sxw.report_sxw('report.stock.quant.package.barcode', 'stock.quant.package', 'addons/stock/report/package_barcode.rml')
 
 class stock_package(osv.osv):
     """

From 18696cd7bca1df91df5da8cd221585b8b7c6dcd2 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Jun 2014 11:12:45 +0200
Subject: [PATCH 006/137] [IMP] Change logos and use qty_available_text

---
 addons/stock/product_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index b482f2aeab3..5b229927d84 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -202,13 +202,13 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                    <button class="oe_stat_button"
                            name="%(product_open_quants)d"
-                           icon="fa-bank"
+                           icon="fa-building-o"
                            type="action"  attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_locations">
-                    <div><field name="qty_in_stock"/></div>
+                    <div><field name="qty_available_text"/></div>
                     </button>
                    <button class="oe_inline oe_stat_button" string="Moves" name= "%(act_product_stock_move_open)d" type="action" attrs="{'invisible':[('type', '=', 'service')]}" groups="stock.group_stock_user" icon="fa-arrows-v"/>
                    <button class="oe_inline oe_stat_button" name="%(product_open_orderpoint)d" type="action" 
-                        attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-pinterest" string="Reordering Rules"/>
+                        attrs="{'invisible':[('type', '=', 'service')]}" icon="fa-refresh" string="Reordering Rules"/>
                 </xpath>
             </field>
         </record>

From e4521e46817281c80cca5e85b8f5f758720b4f0b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Jun 2014 13:35:45 +0200
Subject: [PATCH 007/137] [ADD] Add sequence handle for picking types and
 action_view_routes for product_product

---
 addons/stock/product.py     | 6 ++++++
 addons/stock/stock_view.xml | 1 +
 2 files changed, 7 insertions(+)

diff --git a/addons/stock/product.py b/addons/stock/product.py
index bcaa19f241e..1cd677706f6 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -277,6 +277,12 @@ class product_product(osv.osv):
                         res['fields']['qty_available']['string'] = _('Produced Qty')
         return res
 
+
+    def action_view_routes(self, cr, uid, ids, context=None):
+        template_obj = self.pool.get("product.template")
+        templ_ids = list(set([x.product_tmpl_id.id for x in self.browse(cr, uid, ids, context=context)]))
+        return template_obj.action_view_routes(cr, uid, templ_ids, context=context)
+
 class product_template(osv.osv):
     _name = 'product.template'
     _inherit = 'product.template'
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e94231ba901..2503c8de248 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1354,6 +1354,7 @@
             <field name="model">stock.picking.type</field>
             <field name="arch" type="xml">
                 <tree string="Picking Types">
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="warehouse_id"/>
                     <field name="sequence_id"/>

From c8a8f3c78d4d773a8ab3a3d752edcfc73400b21f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 2 Jun 2014 18:20:18 +0200
Subject: [PATCH 008/137] [IMP] FEFO takes FIFO if no lot, location_id and
 dest_id by default for pack op

---
 addons/product_expiry/product_expiry.py        |  2 +-
 addons/stock/stock.py                          |  6 +++++-
 addons/stock/views/report_location_barcode.xml | 11 ++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index e311356dbbd..6979344bbcc 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -92,7 +92,7 @@ class stock_quant(osv.osv):
 
     def apply_removal_strategy(self, cr, uid, location, product, qty, domain, removal_strategy, context=None):
         if removal_strategy == 'fefo':
-            order = 'removal_date, id'
+            order = 'removal_date, in_date, id'
             return self._quants_get_order(cr, uid, location, product, qty, domain, order, context=context)
         return super(stock_quant, self).apply_removal_strategy(cr, uid, location, product, qty, domain, removal_strategy, context=context)
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 71512f633d0..aae9676a8a3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3871,11 +3871,15 @@ class stock_pack_operation(osv.osv):
             self.write(cr, uid, [operation_id], {'qty_done': qty}, context=context)
         else:
             #no existing operation found for the given domain and picking => create a new one
+            picking_obj = self.pool.get("stock.picking")
+            picking = picking_obj.browse(cr, uid, picking_id, context=context)
             values = {
                 'picking_id': picking_id,
                 'product_qty': 0,
+                'location_id': picking.location_id.id, 
+                'location_dest_id': picking.location_dest_id.id,
                 'qty_done': 1,
-            }
+                }
             for key in domain:
                 var_name, dummy, value = key
                 uom_id = False
diff --git a/addons/stock/views/report_location_barcode.xml b/addons/stock/views/report_location_barcode.xml
index d9065e0d207..7e6466ed5c8 100644
--- a/addons/stock/views/report_location_barcode.xml
+++ b/addons/stock/views/report_location_barcode.xml
@@ -7,18 +7,15 @@
             <t>
                 <div class="page">
                     <div class="oe_structure"/>
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <img class="image" t-att-src="'data:image/png;base64,%s' % res_company.logo" style="border:auto;"/>
-                        </div>
-                    </div>
                     <div class="row">
                         <div class="col-xs-6 mt6">
                             <table class="table table-condensed" style="border-bottom: 3px solid black !important;"><thead><th> </th></thead></table>
                             <img t-if="not o.loc_barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px"/>
                             <img t-if="o.loc_barcode" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.loc_barcode, 600, 100)" style="width:300px;height:50px"/>
-                            <p class="text-center" t-if="not o.loc_barcode" t-field="o.name"></p>
-                            <p class="text-center" t-if="o.loc_barcode" t-field="o.loc_barcode"></p>
+                            <p>
+                            <span t-if="not o.loc_barcode" t-field="o.name"/>
+                            <span t-if="o.loc_barcode" t-field="o.loc_barcode"/>
+                            </p>
                         </div>
                     </div>
                 </div>

From ac943b03072904c63279190cb478971eaf9432e9 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 3 Jun 2014 09:21:57 +0200
Subject: [PATCH 009/137] [IMP] Change mrp lots to depend on lots and not on
 packing

---
 addons/mrp/mrp_view.xml                        | 4 ++--
 addons/mrp/wizard/mrp_product_produce_view.xml | 4 ++--
 addons/mrp/wizard/stock_move_view.xml          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 464a7032ed2..959ac698153 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -747,7 +747,7 @@
                                     <field name="move_lines2" nolabel="1" options="{'reload_on_button': true}">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in ('confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
-                                           <field name="restrict_lot_id" context="{'product_id': product_id}" groups="stock.group_tracking_lot"/>
+                                           <field name="restrict_lot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                            <field name="product_qty" readonly="1"/>
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                            <field name="state" invisible="1"/>
@@ -775,7 +775,7 @@
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
                                             <field name="product_qty" readonly="1"/>
-                                            <field name="restrict_lot_id" groups="stock.group_tracking_lot"/>
+                                            <field name="restrict_lot_id" groups="stock.group_production_lot"/>
                                             <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
                                             <field name="scrapped" invisible="1"/>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 4a52e9b74ed..6f9d916cb39 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -18,7 +18,7 @@
                         <field name="lot_id" domain="[('product_id', '=', product_id)]"
                                     context="{'default_product_id':product_id}"
                                     attrs="{'required': [('track_production', '=', True), ('mode', '=', 'consume_produce')]}"
-                                    groups="stock.group_tracking_lot"/>
+                                    groups="stock.group_production_lot"/>
                     </group>
                     <group string="To Consume">
                         <field name="consume_lines">
@@ -27,7 +27,7 @@
                                 <field name="product_qty"/>
                                 <field name="lot_id" domain="[('product_id', '=', product_id)]"
                                     context="{'default_product_id':product_id}"
-                                    groups="stock.group_tracking_lot"/>
+                                    groups="stock.group_production_lot"/>
                             </tree>
                         </field>
                     </group>
diff --git a/addons/mrp/wizard/stock_move_view.xml b/addons/mrp/wizard/stock_move_view.xml
index 556f0549e2f..cc0971d2ae6 100644
--- a/addons/mrp/wizard/stock_move_view.xml
+++ b/addons/mrp/wizard/stock_move_view.xml
@@ -15,7 +15,7 @@
                             <field name="product_qty" class="oe_inline"/>
                             <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_tracking_lot"
+                        <field name="restrict_lot_id" domain="[('product_id','=',product_id)]" groups="stock.group_production_lot"
                             context="{'default_product_id': product_id}"/>
                         <field name="location_id" groups="stock.group_locations"/>
                     </group>

From 74eb6624207758f565842b1d5ee1c621b85105dc Mon Sep 17 00:00:00 2001
From: fka-odoo <fka@openerp.com>
Date: Tue, 3 Jun 2014 19:04:07 +0530
Subject: [PATCH 010/137] [FIX] display_name is not compute for non-active
 partner

---
 addons/account_report_company/account_report_company.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_report_company/account_report_company.py b/addons/account_report_company/account_report_company.py
index 6915657ba84..fe5d237adf2 100644
--- a/addons/account_report_company/account_report_company.py
+++ b/addons/account_report_company/account_report_company.py
@@ -31,7 +31,7 @@ class res_partner(osv.Model):
         return dict(self.name_get(cr, uid, ids, context=context))
 
     _display_name_store_triggers = {
-        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+        'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)], context=dict(active_test=False)),
                         ['parent_id', 'is_company', 'name'], 10)
     }
 

From 271885716f7303551d74e0989183e5f27d35da54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ana=C3=ABl=20Closson?= <acl@odoo.com>
Date: Tue, 3 Jun 2014 16:19:05 +0200
Subject: [PATCH 011/137] [FIX] sale: cannot filter on paid = False

---
 addons/sale/sale.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 0664b6521c1..dc79c435ee0 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -128,13 +128,12 @@ class sale_order(osv.osv):
         sale_clause = ''
         no_invoiced = False
         for arg in args:
-            if arg[1] == '=':
-                if arg[2]:
-                    clause += 'AND inv.state = \'paid\''
-                else:
-                    clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\'  AND inv.state <> \'paid\'  AND rel.order_id = sale.id '
-                    sale_clause = ',  sale_order AS sale '
-                    no_invoiced = True
+            if (arg[1] == '=' and arg[2]) or (arg[1] == '!=' and not arg[2]):
+                clause += 'AND inv.state = \'paid\''
+            else:
+                clause += 'AND inv.state != \'cancel\' AND sale.state != \'cancel\'  AND inv.state <> \'paid\'  AND rel.order_id = sale.id '
+                sale_clause = ',  sale_order AS sale '
+                no_invoiced = True
 
         cursor.execute('SELECT rel.order_id ' \
                 'FROM sale_order_invoice_rel AS rel, account_invoice AS inv '+ sale_clause + \

From 8796e07afcecfccfe5b09cf0f9cb79e93024f1e6 Mon Sep 17 00:00:00 2001
From: Ravi Gohil <rgo@tinyerp.com>
Date: Mon, 9 Jun 2014 18:20:02 +0530
Subject: [PATCH 012/137] [FIX] mail: Speep improvement when sending email
 using 'Send by Email' wizard. (Maintenance Case: 606994)

---
 addons/mail/mail_message.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 4280983f288..3f491df82b7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -881,9 +881,11 @@ class mail_message(osv.Model):
             fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', message.model),
                 ('res_id', '=', message.res_id),
-                ('subtype_ids', 'in', message.subtype_id.id)
                 ], context=context)
-            partners_to_notify |= set(fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context))
+            partners_to_notify |= set(
+                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                if message.subtype_id.id in [st.id for st in fo.subtype_ids]
+            )
         # remove me from notified partners, unless the message is written on my own wall
         if message.author_id and message.model == "res.partner" and message.res_id == message.author_id.id:
             partners_to_notify |= set([message.author_id])

From 2b9735f83a4b693a552a153fa15c0bcb64c4708b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 10 Jun 2014 10:22:00 +0200
Subject: [PATCH 013/137] [WIP] Change reports for barcodes (not fixed yet) +
 group lots

---
 addons/stock/product_view.xml              |  2 +-
 addons/stock/views/report_stockpicking.xml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 5b229927d84..c7414b1d8ab 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -193,7 +193,7 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <group name="status" position="before" version="7.0">
-                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
+                    <group name="lot" groups="stock.group_production_lot" string="Lots">
                         <field name="track_all" groups="stock.group_production_lot"/>
                         <field name="track_incoming" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
                         <field name="track_outgoing" groups="stock.group_production_lot" attrs="{'invisible': [('track_all', '=', True)]}"/>
diff --git a/addons/stock/views/report_stockpicking.xml b/addons/stock/views/report_stockpicking.xml
index 0b67ba94db6..d8d0ac40ec0 100644
--- a/addons/stock/views/report_stockpicking.xml
+++ b/addons/stock/views/report_stockpicking.xml
@@ -6,8 +6,8 @@
                 <t t-foreach="docs" t-as="o">
                     <t t-call="report.external_layout">
                         <div class="page">
-                            <div class="row"><div class="col-xs-4 pull-right">
-                            <img t-att-src="'/report/barcode/Code128/%s' % o.name"/>
+                            <div class="row"><div class="col-xs-12">
+                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s' % ('Code128', o.name)" style="width:300px;height:50px;text-align:right;"/>
                             </div></div>
                              <div t-if="o.picking_type_id.code=='incoming'">
                                  <span><strong>Supplier Address:</strong></span>
@@ -73,7 +73,7 @@
                                     <t t-if="o.picking_type_id.code != 'incoming'"><td><span t-field="move.location_id"/></td></t>
                                     <td>
                                         <span t-if="move.product_id and move.product_id.ean13">
-                                            <img t-att-src="'/report/barcode/EAN13/%s' % move.product_id.ean13"/>
+                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('EAN13', move.product_id.ean13, 600, 100)" style="width:300px;height:50px"/>
                                         </span>
                                     </td>
                                     <t t-if="o.picking_type_id.code != 'outgoing'"><td><span t-field="move.location_dest_id"/></td></t>
@@ -104,13 +104,13 @@
                                     </t>
                                     <td>
                                         <span t-if="pack_operation.lot_id">
-                                            <img t-att-src="'/report/barcode/Code128/%s' % pack_operation.lot_id.name"/>
+                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', pack_operation.lot_id.name, 600, 100)" style="width:300px;height:50px"/>
                                         </span>
                                         <span t-if="pack_operation.product_id and not pack_operation.lot_id and pack_operation.product_id.ean13">
-                                            <img t-att-src="'/report/barcode/EAN13/%s' % pack_operation.product_id.ean13"/>
+                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s' % ('EAN13', pack_operation.product_id.ean13)" style="width:300px;height:50px"/>
                                         </span>
                                         <span t-if="pack_operation.package_id and not pack_operation.product_id">
-                                            <img t-att-src="'/report/barcode/Code128/%s' % pack_operation.package_id.name"/>
+                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', pack_operation.package_id.name, 600, 100)" style="width:300px;height:50px"/>
                                         </span>
                                     </td>
                                     <t t-if="o.picking_type_id.code != 'outgoing'"><td><span t-field="pack_operation.location_dest_id"/>

From 8ea9bff31494f8cd266dce60b45c5c58d6a7a81e Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 10 Jun 2014 16:06:52 +0200
Subject: [PATCH 014/137] [IMP] Adapt barcodes on picking report, warehouse
 should be passed from move picking type if not defined, prodlot in
 mrp_repair, picking types

---
 addons/mrp_repair/views/report_mrprepairorder.xml |  6 ++++--
 addons/stock/security/stock_security.xml          |  2 +-
 addons/stock/stock.py                             |  2 +-
 addons/stock/views/report_stockpicking.xml        | 12 ++++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml
index 2897fee1fd9..a6d00ba5b15 100644
--- a/addons/mrp_repair/views/report_mrprepairorder.xml
+++ b/addons/mrp_repair/views/report_mrprepairorder.xml
@@ -30,7 +30,7 @@
 
                     <h2>
                         <span t-if="o.state != 'draft'">Repair Order N°:</span>
-                        <span t-if="o.state == 'draft'">Repair Quotation N°:</span>                        
+                        <span t-if="o.state == 'draft'">Repair Quotation N°:</span>
                         <span t-field="o.name"/>
                     </h2>
 
@@ -41,7 +41,9 @@
                         </div>
                         <div class="col-xs-3" groups="stock.group_production_lot">
                             <strong>Lot Number</strong>
-                            <span t-field="o.prodlot_id.name"/>
+                            <t t-if="o.lot_id">
+                                <span t-field="o.lot_id.name"/>
+                            </t>
                         </div>
                         <div t-if="o.guarantee_limit" class="col-xs-3">
                             <strong>Guarantee Limit:</strong>
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index f44d354f121..044ff1333cd 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -50,7 +50,7 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
     
-    <record model="ir.rule" id="stock_picking_rule">
+    <record model="ir.rule" id="stock_picking_type_rule">
         <field name="name">Stock Picking Type multi-company</field>
         <field name="model_id" search="[('model','=','stock.picking.type')]" model="ir.model"/>
         <field name="global" eval="True"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b65c718be50..e29f4ccb9a1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1789,7 +1789,7 @@ class stock_move(osv.osv):
             'move_dest_id': move.id,
             'group_id': group_id,
             'route_ids': [(4, x.id) for x in move.route_ids],
-            'warehouse_id': move.warehouse_id and move.warehouse_id.id or False,
+            'warehouse_id': move.warehouse_id.id or (move.picking_type_id and move.picking_type_id.warehouse_id.id or False),
             'priority': move.priority,
         }
 
diff --git a/addons/stock/views/report_stockpicking.xml b/addons/stock/views/report_stockpicking.xml
index d8d0ac40ec0..7d2bb125de2 100644
--- a/addons/stock/views/report_stockpicking.xml
+++ b/addons/stock/views/report_stockpicking.xml
@@ -6,16 +6,16 @@
                 <t t-foreach="docs" t-as="o">
                     <t t-call="report.external_layout">
                         <div class="page">
-                            <div class="row"><div class="col-xs-12">
-                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s' % ('Code128', o.name)" style="width:300px;height:50px;text-align:right;"/>
+                            <div class="row"><div class="col-xs-4 pull-right">
+                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', o.name, 600, 100)" style="width:300px;height:50px;"/>
                             </div></div>
-                             <div t-if="o.picking_type_id.code=='incoming'">
+                             <div t-if="o.picking_type_id.code=='incoming' and o.partner_id">
                                  <span><strong>Supplier Address:</strong></span>
                              </div>
-                             <div t-if="o.picking_type_id.code=='internal'">
+                             <div t-if="o.picking_type_id.code=='internal' and o.partner_id">
                                  <span><strong>Warehouse Address:</strong></span>
                              </div>
-                             <div t-if="o.picking_type_id.code=='outgoing'">
+                             <div t-if="o.picking_type_id.code=='outgoing' and o.partner_id">
                                  <span><strong>Customer Address:</strong></span>
                              </div>
                              <div t-if="o.partner_id" name="partner_header">
@@ -107,7 +107,7 @@
                                             <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', pack_operation.lot_id.name, 600, 100)" style="width:300px;height:50px"/>
                                         </span>
                                         <span t-if="pack_operation.product_id and not pack_operation.lot_id and pack_operation.product_id.ean13">
-                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s' % ('EAN13', pack_operation.product_id.ean13)" style="width:300px;height:50px"/>
+                                            <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('EAN13', pack_operation.product_id.ean13, 600, 100)" style="width:300px;height:50px"/>
                                         </span>
                                         <span t-if="pack_operation.package_id and not pack_operation.product_id">
                                             <img t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', pack_operation.package_id.name, 600, 100)" style="width:300px;height:50px"/>

From c1cab324028392547f6d21ed240cc1107916c2bc Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 10 Jun 2014 17:11:18 +0200
Subject: [PATCH 015/137] [FIX] Correction of stock valuation report

---
 .../stock_account/wizard/stock_valuation_history.py   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/stock_account/wizard/stock_valuation_history.py b/addons/stock_account/wizard/stock_valuation_history.py
index 42b40b56432..540a308c536 100644
--- a/addons/stock_account/wizard/stock_valuation_history.py
+++ b/addons/stock_account/wizard/stock_valuation_history.py
@@ -55,12 +55,13 @@ class stock_history(osv.osv):
                     product_tmpl_obj = self.pool.get("product.template")
                     lines_rec = self.browse(cr, uid, lines, context=context)
                     for line_rec in lines_rec:
-                        if not line_rec.product_id.id in prod_dict:
-                            if line_rec.product_id.cost_method == 'real':
-                                prod_dict[line_rec.product_id.id] = line_rec.price_unit_on_quant
-                            else:
+                        if line_rec.product_id.cost_method == 'real':
+                            price = line_rec.price_unit_on_quant
+                        else:
+                            if not line_rec.product_id.id in prod_dict:
                                 prod_dict[line_rec.product_id.id] = product_tmpl_obj.get_history_price(cr, uid, line_rec.product_id.product_tmpl_id.id, line_rec.company_id.id, date=date, context=context)
-                        inv_value += prod_dict[line_rec.product_id.id] * line_rec.quantity
+                            price = prod_dict[line_rec.product_id.id]
+                        inv_value += price * line_rec.quantity
                     line['inventory_value'] = inv_value
         return res
 

From f30cf0cf1bfa0ffd45a82f568edc33f9d8fb12b9 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 11 Jun 2014 14:05:13 +0200
Subject: [PATCH 016/137] [IMP] Run schedulers and minimum stock rules done by
 company + purchase order should change date when adding (to) lines

---
 addons/procurement/procurement.py             | 12 +++++++++---
 addons/procurement/wizard/schedulers_all.py   |  6 +++++-
 addons/purchase/purchase.py                   |  5 ++++-
 addons/stock/procurement.py                   | 15 +++++++++------
 addons/stock/wizard/orderpoint_procurement.py |  6 ++++--
 5 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 787178723ab..e45651a30a2 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -267,7 +267,7 @@ class procurement_order(osv.osv):
     #
     # Scheduler
     #
-    def run_scheduler(self, cr, uid, use_new_cursor=False, context=None):
+    def run_scheduler(self, cr, uid, use_new_cursor=False, company_id = False, context=None):
         '''
         Call the scheduler to check the procurement order. This is intented to be done for all existing companies at
         the same time, so we're running all the methods as SUPERUSER to avoid intercompany and access rights issues.
@@ -288,8 +288,11 @@ class procurement_order(osv.osv):
                 cr = openerp.registry(cr.dbname).cursor()
 
             # Run confirmed procurements
+            dom = [('state', '=', 'confirmed')]
+            if company_id:
+                dom += [('company_id', '=', company_id)]
             while True:
-                ids = self.search(cr, SUPERUSER_ID, [('state', '=', 'confirmed')], context=context)
+                ids = self.search(cr, SUPERUSER_ID, dom, context=context)
                 if not ids:
                     break
                 self.run(cr, SUPERUSER_ID, ids, context=context)
@@ -298,8 +301,11 @@ class procurement_order(osv.osv):
 
             # Check if running procurements are done
             offset = 0
+            dom = [('state', '=', 'running')]
+            if company_id:
+                dom += [('company_id', '=', company_id)]
             while True:
-                ids = self.search(cr, SUPERUSER_ID, [('state', '=', 'running')], offset=offset, context=context)
+                ids = self.search(cr, SUPERUSER_ID, dom, offset=offset, context=context)
                 if not ids:
                     break
                 done = self.check(cr, SUPERUSER_ID, ids, context=context)
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 5c712b3af38..34d4758c5d5 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -37,8 +37,12 @@ class procurement_compute_all(osv.osv_memory):
         """
         proc_obj = self.pool.get('procurement.order')
         #As this function is in a new thread, i need to open a new cursor, because the old one may be closed
+        
         new_cr = self.pool.cursor()
-        proc_obj.run_scheduler(new_cr, uid, use_new_cursor=new_cr.dbname, context=context)
+        user = self.pool.get('res.users').browse(new_cr, uid, uid, context=context)
+        comps = [x.id for x in user.company_ids]
+        for comp in comps:
+            proc_obj.run_scheduler(new_cr, uid, use_new_cursor=new_cr.dbname, company_id = comp, context=context)
         #close the new cursor
         new_cr.close()
         return {}
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2f86d674d75..f12e7026332 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1299,6 +1299,7 @@ class procurement_order(osv.osv):
                 res[procurement.id] = False
             else:
                 schedule_date = self._get_purchase_schedule_date(cr, uid, procurement, company, context=context)
+                purchase_date = self._get_purchase_order_date(cr, uid, procurement, company, schedule_date, context=context) 
                 line_vals = self._get_po_line_values_from_proc(cr, uid, procurement, partner, company, schedule_date, context=context)
                 #look for any other draft PO for the same supplier, to attach the new line on instead of creating a new draft one
                 available_draft_po_ids = po_obj.search(cr, uid, [
@@ -1306,6 +1307,9 @@ class procurement_order(osv.osv):
                     ('location_id', '=', procurement.location_id.id), ('company_id', '=', procurement.company_id.id), ('dest_address_id', '=', procurement.partner_dest_id.id)], context=context)
                 if available_draft_po_ids:
                     po_id = available_draft_po_ids[0]
+                    po_rec = po_obj.browse(cr, uid, po_id, context=context)
+                    if datetime.strptime(po_rec.date_order, DEFAULT_SERVER_DATE_FORMAT) > purchase_date:
+                        po_obj.write(cr, uid, [po_id], {'date_order': purchase_date}, context=context)
                     #look for any other PO line in the selected PO with same product and UoM to sum quantities instead of creating a new po line
                     available_po_line_ids = po_line_obj.search(cr, uid, [('order_id', '=', po_id), ('product_id', '=', line_vals['product_id']), ('product_uom', '=', line_vals['product_uom'])], context=context)
                     if available_po_line_ids:
@@ -1318,7 +1322,6 @@ class procurement_order(osv.osv):
                         po_line_id = po_line_obj.create(cr, SUPERUSER_ID, line_vals, context=context)
                         linked_po_ids.append(procurement.id)
                 else:
-                    purchase_date = self._get_purchase_order_date(cr, uid, procurement, company, schedule_date, context=context)
                     name = seq_obj.get(cr, uid, 'purchase.order') or _('PO: %s') % procurement.name
                     po_vals = {
                         'name': name,
diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index f53776d4b9a..04564bda56f 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -261,7 +261,7 @@ class procurement_order(osv.osv):
         result['domain'] = "[('group_id','in',[" + ','.join(map(str, list(group_ids))) + "])]"
         return result
 
-    def run_scheduler(self, cr, uid, use_new_cursor=False, context=None):
+    def run_scheduler(self, cr, uid, use_new_cursor=False, company_id=False, context=None):
         '''
         Call the scheduler in order to check the running procurements (super method), to check the minimum stock rules
         and the availability of moves. This function is intended to be run for all the companies at the same time, so
@@ -286,8 +286,7 @@ class procurement_order(osv.osv):
             move_obj = self.pool.get('stock.move')
 
             #Minimum stock rules
-            company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-            self._procure_orderpoint_confirm(cr, SUPERUSER_ID, use_new_cursor=False, company_id=company.id, context=context)
+            self._procure_orderpoint_confirm(cr, SUPERUSER_ID, use_new_cursor=False, company_id=company_id, context=context)
 
             #Search all confirmed stock_moves and try to assign them
             confirmed_ids = move_obj.search(cr, uid, [('state', '=', 'confirmed')], limit=None, order='priority desc, date_expected asc', context=context)
@@ -331,7 +330,7 @@ class procurement_order(osv.osv):
                 [order_point.product_id.id],
                 context={'location': order_point.location_id.id})[order_point.product_id.id]['virtual_available']
 
-    def _procure_orderpoint_confirm(self, cr, uid, use_new_cursor=False, company_id=False, context=None):
+    def _procure_orderpoint_confirm(self, cr, uid, use_new_cursor=False, company_id = False, context=None):
         '''
         Create procurement based on Orderpoint
 
@@ -341,14 +340,18 @@ class procurement_order(osv.osv):
         if context is None:
             context = {}
         if use_new_cursor:
-            cr = openerp.registry(cr.dbname).db.cursor()
+            cr = openerp.registry(cr.dbname).cursor()
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
 
         procurement_obj = self.pool.get('procurement.order')
         offset = 0
         ids = [1]
+        if company_id:
+            dom = [('company_id', '=', company_id)]
+        else:
+            dom = []
         while ids:
-            ids = orderpoint_obj.search(cr, uid, [('company_id', '=', company_id)], offset=offset, limit=100)
+            ids = orderpoint_obj.search(cr, uid, dom, offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):
                 prods = self._product_virtual_get(cr, uid, op)
                 if prods is None:
diff --git a/addons/stock/wizard/orderpoint_procurement.py b/addons/stock/wizard/orderpoint_procurement.py
index 2cbc794cde3..f898dac4305 100644
--- a/addons/stock/wizard/orderpoint_procurement.py
+++ b/addons/stock/wizard/orderpoint_procurement.py
@@ -43,8 +43,10 @@ class procurement_compute(osv.osv_memory):
         proc_obj = self.pool.get('procurement.order')
         #As this function is in a new thread, I need to open a new cursor, because the old one may be closed
         new_cr = self.pool.cursor()
-        for proc in self.browse(new_cr, uid, ids, context=context):
-            proc_obj._procure_orderpoint_confirm(new_cr, uid, use_new_cursor=new_cr.dbname, context=context)
+        user_obj = self.pool.get('res.users')
+        user = user_obj.browse(new_cr, uid, uid, context=context)
+        for comp in user.company_ids:
+            proc_obj._procure_orderpoint_confirm(new_cr, uid, use_new_cursor=new_cr.dbname, company_id = comp.id, context=context)
         #close the new cursor
         new_cr.close()
         return {}

From 15f5abcbbef8aa6da6590ec8848261349ebebf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 13:45:21 +0200
Subject: [PATCH 017/137] [IMP] mail, website_mail_group: discussion group
 improvements - added possibility in mail to have a model adding custom
 headers in emails sent for notifications for new messages - mail.group now
 add list-id and precedence: list in the headers to inform mailing systems
 that those mails are to be considered as mailing lists - website_mail_group
 adds some further data in the headers (subscribe, unsubscribe, archives) -
 groups page now display the number of message in the last month -
 notification emails are now queued after 50 recipients

---
 addons/mail/mail_followers.py                  |  4 ++--
 addons/mail/mail_group.py                      | 13 +++++++++++++
 addons/mail/mail_mail.py                       | 10 ++++++++--
 addons/mail/mail_thread.py                     | 10 ++++++++++
 addons/website_mail_group/__init__.py          |  1 +
 addons/website_mail_group/controllers/main.py  | 16 ++++++++++++++--
 addons/website_mail_group/models/__init__.py   |  1 +
 addons/website_mail_group/models/mail_group.py | 18 ++++++++++++++++++
 .../views/website_mail_group.xml               |  2 +-
 9 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 addons/website_mail_group/models/__init__.py
 create mode 100644 addons/website_mail_group/models/mail_group.py

diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index ffc49414b2e..e4028111a73 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -176,7 +176,7 @@ class mail_notification(osv.Model):
         references = message.parent_id.message_id if message.parent_id else False
 
         # create email values
-        max_recipients = 100
+        max_recipients = 50
         chunks = [email_pids[x:x + max_recipients] for x in xrange(0, len(email_pids), max_recipients)]
         email_ids = []
         for chunk in chunks:
@@ -188,7 +188,7 @@ class mail_notification(osv.Model):
                 'references': references,
             }
             email_ids.append(self.pool.get('mail.mail').create(cr, uid, mail_values, context=context))
-        if force_send and len(chunks) < 6:  # for more than 500 followers, use the queue system
+        if force_send and len(chunks) < 2:  # for more than 50 followers, use the queue system
             self.pool.get('mail.mail').send(cr, uid, email_ids, context=context)
         return True
 
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 4ae47a96774..186787c121a 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -211,3 +211,16 @@ class mail_group(osv.Model):
             return []
         else:
             return super(mail_group, self).get_suggested_thread(cr, uid, removed_suggested_threads, context)
+
+    def message_get_email_values(self, cr, uid, id, notif_mail=None, context=None):
+        res = super(mail_group, self).message_get_email_values(cr, uid, id, notif_mail=notif_mail, context=context)
+        group = self.browse(cr, uid, id, context=context)
+        res.update({
+            'headers': {
+                'Precedence': 'list',
+            }
+        })
+        if group.alias_domain:
+            res['headers']['List-Id'] = '%s.%s' % (group.alias_name, group.alias_domain)
+            res['headers']['List-Post'] = '<mailto:%s@%s>' % (group.alias_name, group.alias_domain)
+        return res
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index a4814140479..cc12bde2436 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -204,12 +204,15 @@ class mail_mail(osv.Model):
         """
         body = self.send_get_mail_body(cr, uid, mail, partner=partner, context=context)
         body_alternative = tools.html2plaintext(body)
-        return {
+        res = {
             'body': body,
             'body_alternative': body_alternative,
             'subject': self.send_get_mail_subject(cr, uid, mail, partner=partner, context=context),
             'email_to': self.send_get_mail_to(cr, uid, mail, partner=partner, context=context),
         }
+        if mail.model and mail.res_id and self.pool.get(mail.model) and hasattr(self.pool[mail.model], 'message_get_email_values'):
+            res.update(self.pool[mail.model].message_get_email_values(cr, uid, mail.res_id, mail, context=context))
+        return res
 
     def send(self, cr, uid, ids, auto_commit=False, raise_exception=False, context=None):
         """ Sends the selected emails immediately, ignoring their current
@@ -268,6 +271,9 @@ class mail_mail(osv.Model):
                 # build an RFC2822 email.message.Message object and send it without queuing
                 res = None
                 for email in email_list:
+                    email_headers = dict(headers)
+                    if email.get('headers'):
+                        email_headers.update(email['headers'])
                     msg = ir_mail_server.build_email(
                         email_from=mail.email_from,
                         email_to=email.get('email_to'),
@@ -282,7 +288,7 @@ class mail_mail(osv.Model):
                         object_id=mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
                         subtype='html',
                         subtype_alternative='plain',
-                        headers=headers)
+                        headers=email_headers)
                     res = ir_mail_server.send_email(cr, uid, msg,
                                                     mail_server_id=mail.mail_server_id.id,
                                                     context=context)
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 36d6ecbf630..4ad9ca63049 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -694,6 +694,16 @@ class mail_thread(osv.AbstractModel):
                 if record.alias_domain and record.alias_name else False
                 for record in self.browse(cr, SUPERUSER_ID, ids, context=context)]
 
+    def message_get_email_values(self, cr, uid, id, notif_mail=None, context=None):
+        """ Temporary method to create custom notification email values for a given
+        model and document. This should be better to have a headers field on
+        the mail.mail model, computed when creating the notification email, but
+        this cannot be done in a stable version.
+
+        TDE FIXME: rethink this ulgy thing. """
+        res = dict()
+        return res
+
     #------------------------------------------------------
     # Mail gateway
     #------------------------------------------------------
diff --git a/addons/website_mail_group/__init__.py b/addons/website_mail_group/__init__.py
index ee5959455ad..9f86759e32b 100644
--- a/addons/website_mail_group/__init__.py
+++ b/addons/website_mail_group/__init__.py
@@ -1 +1,2 @@
 import controllers
+import models
diff --git a/addons/website_mail_group/controllers/main.py b/addons/website_mail_group/controllers/main.py
index a28b808d9f2..59478b37fa3 100644
--- a/addons/website_mail_group/controllers/main.py
+++ b/addons/website_mail_group/controllers/main.py
@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import datetime
+from dateutil import relativedelta
 
-from openerp import tools
+from openerp import tools, SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.website.models.website import slug
 from openerp.addons.web.http import request
@@ -28,12 +29,23 @@ class MailGroup(http.Controller):
     def view(self, **post):
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
+        mail_message_obj = request.registry.get('mail.message')
         group_ids = group_obj.search(cr, uid, [('alias_id', '!=', False), ('alias_id.alias_name', '!=', False)], context=context)
-        values = {'groups': group_obj.browse(cr, uid, group_ids, context)}
+        groups = group_obj.browse(cr, uid, group_ids, context)
+        # compute statistics
+        month_date = datetime.datetime.today() - relativedelta.relativedelta(months=1)
+        group_data = dict.fromkeys(group_ids, dict())
+        for group in groups:
+            group_data[group.id]['monthly_message_nbr'] = mail_message_obj.search(
+                cr, SUPERUSER_ID,
+                [('model', '=', 'mail.group'), ('res_id', '=', group.id), ('date', '>=', month_date.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT))],
+                count=True, context=context)
+        values = {'groups': groups, 'group_data': group_data}
         return request.website.render('website_mail_group.mail_groups', values)
 
     @http.route(["/groups/subscription/"], type='json', auth="user")
     def subscription(self, group_id=0, action=False, **post):
+        """ TDE FIXME: seems dead code """
         cr, uid, context = request.cr, request.uid, request.context
         group_obj = request.registry.get('mail.group')
         if action:
diff --git a/addons/website_mail_group/models/__init__.py b/addons/website_mail_group/models/__init__.py
new file mode 100644
index 00000000000..ea8be51acde
--- /dev/null
+++ b/addons/website_mail_group/models/__init__.py
@@ -0,0 +1 @@
+import mail_group
diff --git a/addons/website_mail_group/models/mail_group.py b/addons/website_mail_group/models/mail_group.py
new file mode 100644
index 00000000000..804785b66f9
--- /dev/null
+++ b/addons/website_mail_group/models/mail_group.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv
+
+
+class MailGroup(osv.Model):
+    _inherit = 'mail.group'
+
+    def message_get_email_values(self, cr, uid, id, notif_mail=None, context=None):
+        res = super(MailGroup, self).message_get_email_values(cr, uid, id, notif_mail=notif_mail, context=context)
+        group = self.browse(cr, uid, id, context=context)
+        base_url = self.pool['ir.config_parameter'].get_param(cr, uid, 'web.base.url')
+        res['headers'].update({
+            'List-Archive': '<%s/groups/%s>' % (base_url, group.id),
+            'List-Subscribe': '<%s/groups>' % (base_url),
+            'List-Unsubscribe': '<%s/groups>' % (base_url),
+        })
+        return res
diff --git a/addons/website_mail_group/views/website_mail_group.xml b/addons/website_mail_group/views/website_mail_group.xml
index d52c34513b8..332c6e7b576 100644
--- a/addons/website_mail_group/views/website_mail_group.xml
+++ b/addons/website_mail_group/views/website_mail_group.xml
@@ -45,7 +45,7 @@
                 </div>
                 <div class="col-md-2">
                     <i class='fa fa-user'/> <t t-esc="len(group.message_follower_ids)"/> participants<br />
-                    <i class='fa fa-envelope-o'/> <t t-esc="len(group.message_ids)"/> messages
+                    <i class='fa fa-envelope-o'/> <t t-raw="group_data[group.id]['monthly_message_nbr']"/> messages / month
                 </div>
                 <div class="col-md-3">
                     <t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>

From 0b4921e4d6c075ff47dbe3356433b698b61008b3 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Jun 2014 12:24:48 +0200
Subject: [PATCH 018/137] parse_value: interger != float

Wwhen parsing a integer field, do not accept float values. '1' or '1.0' is ok but not '1.1'. (opw 608544)
---
 addons/web/static/src/js/formats.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 3280b9f4f75..0c3577b2671 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -228,7 +228,8 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
                 value = value.replace(instance.web._t.database.parameters.thousands_sep, "");
             } while(tmp !== value);
             tmp = Number(value);
-            if (isNaN(tmp))
+            // do not accept not numbers or float values
+            if (isNaN(tmp) || tmp % 1)
                 throw new Error(_.str.sprintf(_t("'%s' is not a correct integer"), value));
             return tmp;
         case 'float':

From b62191c17170918f99163fe2cb648dac3a21e070 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 12 Jun 2014 14:33:26 +0200
Subject: [PATCH 019/137] [IMP] Make sure we can receive multiple lots +
 warehouse manager should be able to create routes/warehouses

---
 addons/stock/security/ir.model.access.csv | 2 +-
 addons/stock/stock.py                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 9ce558781be..8a94f027408 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -60,7 +60,7 @@ access_stock_location_path_internal_user,stock location path internal user,model
 access_stock_location_path_sale_manager,stock.location.path partner salemanager,model_stock_location_path,base.group_sale_manager,1,1,1,1
 access_stock_location_path_stock_user,stock.location.path stock user,model_stock_location_path,stock.group_stock_user,1,1,1,1
 access_stock_location_path,stock.location.path,model_stock_location_path,base.group_sale_salesman,1,0,0,0
-access_stock_location_route,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,1,1,1
+access_stock_location_route_stock_manager,stock.location.route,model_stock_location_route,stock.group_stock_manager,1,1,1,1
 access_stock_location_route,stock.location.route,model_stock_location_route,base.group_user,1,0,0,0
 access_procurement_rule,procurement.rule.flow,model_procurement_rule,base.group_sale_salesman,1,0,0,0
 access_procurement_rule_internal,procurement.rule.flow internal,model_procurement_rule,base.group_user,1,0,0,0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e29f4ccb9a1..e224e55efac 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1377,7 +1377,7 @@ class stock_picking(osv.osv):
                     op = operation
                     if (operation.qty_done < operation.product_qty):
                         new_operation = stock_operation_obj.copy(cr, uid, operation.id, {'product_qty': operation.qty_done,'qty_done': operation.qty_done}, context=context)
-                        stock_operation_obj.write(cr, uid, operation.id, {'product_qty': operation.product_qty - operation.qty_done,'qty_done': 0}, context=context)
+                        stock_operation_obj.write(cr, uid, operation.id, {'product_qty': operation.product_qty - operation.qty_done,'qty_done': 0, 'lot_id': False}, context=context)
                         op = stock_operation_obj.browse(cr, uid, new_operation, context=context)
                     pack_operation_ids.append(op.id)
                     for record in op.linked_move_operation_ids:
@@ -3823,8 +3823,8 @@ class stock_pack_operation(osv.osv):
             if pack_op.qty_done < pack_op.product_qty:
                 # we split the operation in two
                 op = self.copy(cr, uid, pack_op.id, {'product_qty': pack_op.qty_done, 'qty_done': pack_op.qty_done}, context=context)
-                self.write(cr, uid, ids, {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0}, context=context)
-            processed_ids.append(op)      
+                self.write(cr, uid, ids, {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
+            processed_ids.append(op)
         self.write(cr, uid, processed_ids, {'processed': 'true'}, context=context)
 
     def create_and_assign_lot(self, cr, uid, id, name, context=None):

From 86acc1a62ffd1bdbbf79a6d315287baf5a5cea2b Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Thu, 12 Jun 2014 16:14:41 +0200
Subject: [PATCH 020/137] [FIX] orm: avoir errors reading twice a field

_read_flat: remove duplicated fields in read call
get many2one: as False is instance of int, check the value of x first to avoid calling a name_get with a list of False

When we were reading twice a m2o field where at least one result is null, the first call to name_get would set the value to False instead of None and then accepted by the filter 'isinstance(x, (int,long))'
---
 openerp/osv/fields.py | 2 +-
 openerp/osv/orm.py    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index 18aa3aad8c2..49421365852 100644
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -464,7 +464,7 @@ class many2one(_column):
         # we use uid=1 because the visibility of a many2one field value (just id and name)
         # must be the access right of the parent form and not the linked object itself.
         records = dict(obj.name_get(cr, SUPERUSER_ID,
-                                    list(set([x for x in res.values() if isinstance(x, (int,long))])),
+                                    list(set([x for x in res.values() if x and isinstance(x, (int,long))])),
                                     context=context))
         for id in res:
             if res[id] in records:
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 6e91ba46721..1dbac53511f 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3694,6 +3694,8 @@ class BaseModel(object):
             return []
         if fields_to_read is None:
             fields_to_read = self._columns.keys()
+        else:
+            fields_to_read = list(set(fields_to_read))
 
         # all inherited fields + all non inherited fields for which the attribute whose name is in load is True
         fields_pre = [f for f in fields_to_read if

From e95545dcf020982604214ea44217ce5cda5d7185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:32:32 +0200
Subject: [PATCH 021/137] [FIX] hr: typo in a field definition

---
 addons/hr/hr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 0b1da11dd18..dbb20cc8b76 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -196,7 +196,7 @@ class hr_employee(osv.osv):
                  "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Smal-sized photo", type="binary", multi="_get_image",
+            string="Small-sized photo", type="binary", multi="_get_image",
             store = {
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },

From 28ff7e38b909a7b020c51168b2ee1c4a9230667a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:35:41 +0200
Subject: [PATCH 022/137] [FIX] portal: typos in portal wall actions.

---
 addons/portal/portal_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 5c7fa14ce2a..ebaaa3f8424 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -39,7 +39,7 @@
             }"/>
             <field name="help" type="html">
                 <p>
-                    Youd don't have unread company's news.
+                    You don't have unread company's news.
                 </p>
             </field>
         </record>
@@ -71,7 +71,7 @@
             }"/>
             <field name="help" type="html">
                 <p>
-                    Youd don't have unread job offers.
+                    You don't have unread job offers.
                 </p>
             </field>
         </record>

From 4a508885ac043b25465aa5741955082aa66ce949 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 12 Jun 2014 20:03:50 +0200
Subject: [PATCH 023/137] [FIX] web: view_list_editable, on add an item, focus
 on the first cell of new row

Before, the focus was set on the first row, and, thererefore, if the list was enough long, it jumped out and the actual new row was hidden
---
 .../web/static/src/js/view_list_editable.js   | 40 +++----------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index c4aac5565ab..b97aef19815 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -127,15 +127,7 @@ openerp.web.list_editable = function (instance) {
             if (this.editable()) {
                 this.$el.find('table:first').show();
                 this.$el.find('.oe_view_nocontent').remove();
-                this.start_edition().then(function(){
-                    var fields = self.editor.form.fields;
-                    self.editor.form.fields_order.some(function(field){
-                        if (fields[field].$el.is(':visible')){
-                            fields[field].$el.find("input").select();
-                            return true;
-                        }
-                    });
-                });
+                this.start_edition();
             } else {
                 this._super();
             }
@@ -240,6 +232,7 @@ openerp.web.list_editable = function (instance) {
             return this.ensure_saved().then(function () {
                 var $recordRow = self.groups.get_row_for(record);
                 var cells = self.get_cells_for($recordRow);
+                var fields = {};
                 self.fields_for_resize.splice(0, self.fields_for_resize.length);
                 return self.with_event('edit', {
                     record: record.attributes,
@@ -253,10 +246,13 @@ openerp.web.list_editable = function (instance) {
 
                         // FIXME: need better way to get the field back from bubbling (delegated) DOM events somehow
                         field.$el.attr('data-fieldname', field_name);
+                        fields[field_name] = field;
                         self.fields_for_resize.push({field: field, cell: cell});
                     }, options).then(function () {
                         $recordRow.addClass('oe_edition');
                         self.resize_fields();
+                        var focus_field = options && options.focus_field ? options.focus_field : (self.visible_columns.length ? self.visible_columns[0].name : undefined);
+                        if (focus_field) fields[focus_field].$el.find('input').select();
                         return record.attributes;
                     });
                 }).fail(function () {
@@ -750,31 +746,6 @@ openerp.web.list_editable = function (instance) {
             throw new Error("is_editing's state filter must be either `new` or" +
                             " `edit` if provided");
         },
-        _focus_setup: function (focus_field) {
-            var form = this.form;
-
-            var field;
-            // If a field to focus was specified
-            if (focus_field
-                    // Is actually in the form
-                    && (field = form.fields[focus_field])
-                    // And is visible
-                    && field.$el.is(':visible')) {
-                // focus it
-                field.focus();
-                return;
-            }
-
-            _(form.fields_order).detect(function (name) {
-                // look for first visible field in fields_order, focus it
-                var field = form.fields[name];
-                if (!field.$el.is(':visible')) {
-                    return false;
-                }
-                // Stop as soon as a field got focused
-                return field.focus() !== false;
-            });
-        },
         edit: function (record, configureField, options) {
             // TODO: specify sequence of edit calls
             var self = this;
@@ -789,7 +760,6 @@ openerp.web.list_editable = function (instance) {
                 _(form.fields).each(function (field, name) {
                     configureField(name, field);
                 });
-                self._focus_setup(options && options.focus_field);
                 return form;
             });
         },

From 4e0559ef97dcb3422223b5a68ca8cbf9d8de79ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jun 2014 17:50:19 +0200
Subject: [PATCH 024/137] [FIX] hr_holidays: display float for leaves remaining
 / leaves taken in holiday type name get

---
 addons/hr_holidays/hr_holidays.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 07d4995998a..6a55403e960 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -104,7 +104,7 @@ class hr_holidays_status(osv.osv):
         for record in self.browse(cr, uid, ids, context=context):
             name = record.name
             if not record.limit:
-                name = name + ('  (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
+                name = name + ('  (%g/%g)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
             res.append((record.id, name))
         return res
 

From f9fc9fdf1c1ac429d2a1d217b3e3b0689e285248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jun 2014 09:07:28 +0200
Subject: [PATCH 025/137] [FIX] hr: working and home adresses should not be
 customers by default, only 'normal' adresses.

---
 addons/hr/hr_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 3e79c0ca7d6..0d90d5d4dc7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -35,7 +35,9 @@
                             <page string="Public Information">
                                 <group>
                                     <group string="Contact Information">
-                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="address_id" on_change="onchange_address_id(address_id)"
+                                            context="{'show_address': 1, 'default_customer': False}"
+                                            options='{"always_reload": True, "highlight_first_line": True}'/>
                                         <field name="work_email" widget="email"/>
                                         <field name="work_phone"/>
                                         <field name="mobile_phone"/>
@@ -64,7 +66,9 @@
                                         <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
                                     <group string="Contact Information">
-                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="address_home_id"
+                                            context="{'show_address': 1, 'default_customer': False}"
+                                            options='{"always_reload": True, "highlight_first_line": True}'/>
                                     </group>
                                     <group string="Status">
                                         <field name="gender"/>

From 2f43cf041de34b23f15974d09d9cb2b7b515fcc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jun 2014 09:25:48 +0200
Subject: [PATCH 026/137] [FIX] hr_holidays: date_from, date_to required in
 form view only for leave requests, not for allocation requests

---
 addons/hr_holidays/hr_holidays_view.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c39adcb3182..7c5db338bdb 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -63,13 +63,16 @@
                 <sheet string="Leave Request">
                     <group>
                         <group>
+                            <field name="type" invisible="1"/>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
                             <div>
                                 <group col="3">
-                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
-                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)"
+                                        attrs="{'required': [('type', '=', 'remove')]}" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)"
+                                        attrs="{'required': [('type', '=', 'remove')]}" class="oe_inline"/>
                                 </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days

From 390c811db87ab7404db420f9cd4e3b4e8db9e048 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 13 Jun 2014 12:03:48 +0200
Subject: [PATCH 027/137] [FIX] event: improve name from previous merge

---
 addons/event/report/report_event_registration.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 1ce3591a105..e29565f01d2 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -37,7 +37,7 @@ class report_event_registration(osv.osv):
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
         'register_max': fields.integer('Maximum Registrations'),
-        'nbevent': fields.integer('Number of Registrations in Events'),
+        'nbevent': fields.integer('Number of Registrations'),
         'event_type': fields.many2one('event.type', 'Event Type'),
         'registration_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Attended'), ('cancel', 'Cancelled')], 'Registration State', readonly=True, required=True),
         'event_state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Event State', readonly=True, required=True),

From 05c007df00c24fffff16521e1699cc389b1bf4d0 Mon Sep 17 00:00:00 2001
From: dhr-odoo <dhr@tinyerp.com>
Date: Fri, 13 Jun 2014 18:01:57 +0530
Subject: [PATCH 028/137] Resolved the traceback in Events > Ticket Type tab,
 when the product is removed

---
 addons/event_sale/event_sale.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ed99e6a39cc..69ad0cb6af6 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -245,7 +245,8 @@ class event_ticket(osv.osv):
     ]
 
     def onchange_product_id(self, cr, uid, ids, product_id=False, context=None):
-        return {'value': {'price': self.pool.get("product.product").browse(cr, uid, product_id).list_price or 0}}
+        price = self.pool.get("product.product").browse(cr, uid, product_id).list_price if product_id else 0
+        return {'value': {'price': price}}
 
 
 class event_registration(osv.osv):

From 98d9901c174ec4d2ff3cbbb487b3eea4f24481a2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 13 Jun 2014 16:17:51 +0200
Subject: [PATCH 029/137] [FIX] website_sale: retur the browse record of
 category insead of int

---
 addons/website_sale/controllers/main.py | 2 +-
 addons/website_sale/views/templates.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 23225186dc8..78b411b20e6 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -169,7 +169,7 @@ class website_sale(http.Controller):
 
         values = {
             'search': search,
-            'category': category and int(category),
+            'category': category,
             'attrib_values': attrib_values,
             'attrib_set': attrib_set,
             'pager': pager,
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 470ca8383f4..28f4d3e2418 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -240,7 +240,7 @@
 <!-- Add to cart button-->
 
 <template id="categories_recursive" name="Category list">
-  <li t-att-class="'active' if c.id == category else ''">
+  <li t-att-class="'active' if c.id == int(category or 0) else ''">
       <a t-att-href="keep('/shop/category/' + slug(c), category=0)" t-field="c.name"></a>
       <ul t-if="c.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
           <t t-foreach="c.child_id" t-as="c">

From e55fd50cb5a1edf14ea4af1b9cd502367fcfd159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 13 Jun 2014 16:32:08 +0200
Subject: [PATCH 030/137] [FIX] product_email_template: fixed a bug preventing
 from sending emails and therefore from validating invoices when having
 templates without attachments linnked to a product.

---
 addons/product_email_template/models/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product_email_template/models/invoice.py b/addons/product_email_template/models/invoice.py
index d9e82e42012..d5876b510f1 100644
--- a/addons/product_email_template/models/invoice.py
+++ b/addons/product_email_template/models/invoice.py
@@ -27,7 +27,7 @@ class account_invoice(osv.Model):
                     template_values = Composer.onchange_template_id(
                         cr, uid, composer_id, line.product_id.email_template_id.id, 'comment', 'account.invoice', invoice.id
                     )['value']
-                    template_values['attachment_ids'] = [(4, id) for id in template_values.get('attachment_ids', '[]')]
+                    template_values['attachment_ids'] = [(4, id) for id in template_values.get('attachment_ids', [])]
                     Composer.write(cr, uid, [composer_id], template_values, context=context)
                     Composer.send_mail(cr, uid, [composer_id], context=context)
         return True

From 8e223c8aba12256a44290b1fd710929473bdfd10 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Fri, 13 Jun 2014 17:44:03 +0200
Subject: [PATCH 031/137] [IMP] Invoice_state based on delivery wizard recheck
 + returns and invoice_state

---
 addons/purchase/purchase.py                   |  6 +-
 addons/stock_account/__openerp__.py           |  1 +
 addons/stock_account/stock.py                 | 18 +++--
 addons/stock_account/stock_account_view.xml   |  4 +-
 addons/stock_account/wizard/__init__.py       |  1 +
 .../wizard/stock_invoice_onshipping.py        | 66 +++++++++++++------
 .../wizard/stock_invoice_onshipping_view.xml  | 11 ----
 .../wizard/stock_return_picking.py            | 60 +++++++++++++++++
 .../wizard/stock_return_picking_view.xml      | 14 ++++
 9 files changed, 137 insertions(+), 44 deletions(-)
 create mode 100644 addons/stock_account/wizard/stock_return_picking.py
 create mode 100644 addons/stock_account/wizard/stock_return_picking_view.xml

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f12e7026332..bdd8af1afd8 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -700,6 +700,7 @@ class purchase_order(osv.osv):
             'origin': order.name,
             'route_ids': order.picking_type_id.warehouse_id and [(6, 0, [x.id for x in order.picking_type_id.warehouse_id.route_ids])] or [],
             'warehouse_id':order.picking_type_id.warehouse_id.id,
+            'invoice_state': order.invoice_method == 'picking' and '2binvoiced' or 'none'
         }
 
         diff_quantity = order_line.product_qty
@@ -709,9 +710,10 @@ class purchase_order(osv.osv):
             tmp.update({
                 'product_uom_qty': min(procurement_qty, diff_quantity),
                 'product_uos_qty': min(procurement_qty, diff_quantity),
-                'move_dest_id': procurement.move_dest_id.id,  # blabla
-                'group_id': procurement.group_id.id or group_id,  # blabla to check ca devrait etre bon et groupé dans le meme picking qd meme
+                'move_dest_id': procurement.move_dest_id.id,  #move destination is same as procurement destination
+                'group_id': procurement.group_id.id or group_id,  #move group is same as group of procurements if it exists, otherwise take another group
                 'procurement_id': procurement.id,
+                'invoice_state': procurement.rule_id.invoice_state or (procurement.location_id and procurement.location_id.usage == 'customer' and procurement.invoice_state) or (order.invoice_method == 'picking' and '2binvoiced') or 'none', #dropship case takes from sale
             })
             diff_quantity -= min(procurement_qty, diff_quantity)
             res.append(tmp)
diff --git a/addons/stock_account/__openerp__.py b/addons/stock_account/__openerp__.py
index a2dab1289f4..5c67002f61f 100644
--- a/addons/stock_account/__openerp__.py
+++ b/addons/stock_account/__openerp__.py
@@ -53,6 +53,7 @@ Dashboard / Reports for Warehouse Management includes:
         'wizard/stock_change_standard_price_view.xml',
         'wizard/stock_invoice_onshipping_view.xml',
         'wizard/stock_valuation_history_view.xml',
+        'wizard/stock_return_picking_view.xml',
         'product_data.xml',
         'product_view.xml',
         'stock_account_view.xml',
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index db08ba39eb4..44590353e1b 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -27,11 +27,10 @@ class stock_location_path(osv.osv):
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not Applicable")], "Invoice Status",
-            required=True,),
+            ("none", "Not Applicable")], "Invoice Status",),
     }
     _defaults = {
-        'invoice_state': 'none',
+        'invoice_state': '',
     }
 
 #----------------------------------------------------------
@@ -43,11 +42,10 @@ class procurement_rule(osv.osv):
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not Applicable")], "Invoice Status",
-            required=True),
+            ("none", "Not Applicable")], "Invoice Status",),
         }
     _defaults = {
-        'invoice_state': 'none',
+        'invoice_state': '',
     }
 
 #----------------------------------------------------------
@@ -61,16 +59,16 @@ class procurement_order(osv.osv):
         'invoice_state': fields.selection([("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")
-         ], "Invoice Control", required=True),
+         ], "Invoice Control"),
         }
 
     def _run_move_create(self, cr, uid, procurement, context=None):
         res = super(procurement_order, self)._run_move_create(cr, uid, procurement, context=context)
-        res.update({'invoice_state': (procurement.rule_id.invoice_state in ('none', False) and procurement.invoice_state or procurement.rule_id.invoice_state) or 'none'})
+        res.update({'invoice_state': procurement.rule_id.invoice_state or procurement.invoice_state or 'none'})
         return res
 
     _defaults = {
-        'invoice_state': 'none'
+        'invoice_state': ''
         }
 
 
@@ -92,7 +90,7 @@ class stock_move(osv.osv):
     }
 
     def _get_master_data(self, cr, uid, move, company, context=None):
-        ''' returns a tupple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
+        ''' returns a tuple (browse_record(res.partner), ID(res.users), ID(res.currency)'''
         return move.picking_id.partner_id, uid, company.currency_id.id
 
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index 3b3ab37b212..867f2eaee34 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -32,8 +32,8 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='do_partial_open_barcode']" position="after">
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','invoiced')]}" type="action" class="oe_highlight" groups="base.group_user" context="{'inv_type': 'out_refund'}"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create/Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
+                    <!--<button name="%(action_stock_invoice_onshipping)d" string="Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','invoiced')]}" type="action" class="oe_highlight" groups="base.group_user" context="{'inv_type': 'out_refund'}"/>-->
                 </xpath>
                 <xpath expr="//field[@name='move_type']" position="after">
                     <field name="invoice_state" groups="account.group_account_invoice"/>
diff --git a/addons/stock_account/wizard/__init__.py b/addons/stock_account/wizard/__init__.py
index 87f0841e3c5..09d08bb82d1 100644
--- a/addons/stock_account/wizard/__init__.py
+++ b/addons/stock_account/wizard/__init__.py
@@ -22,3 +22,4 @@
 import stock_change_standard_price
 import stock_invoice_onshipping
 import stock_valuation_history
+import stock_return_picking
diff --git a/addons/stock_account/wizard/stock_invoice_onshipping.py b/addons/stock_account/wizard/stock_invoice_onshipping.py
index f600b28f585..b0a98c75dc6 100644
--- a/addons/stock_account/wizard/stock_invoice_onshipping.py
+++ b/addons/stock_account/wizard/stock_invoice_onshipping.py
@@ -33,12 +33,32 @@ class stock_invoice_onshipping(osv.osv_memory):
         if context is None:
             context = {}
         journal_obj = self.pool.get('account.journal')
-        value = journal_obj.search(cr, uid, [('type', 'in',('sale','sale_Refund'))])
+        res_ids = context and context.get('active_ids', [])
+        pick_obj = self.pool.get('stock.picking')
+        pickings = pick_obj.browse(cr, uid, res_ids, context=context)
         vals = []
-        for jr_type in journal_obj.browse(cr, uid, value, context=context):
-            t1 = jr_type.id,jr_type.name
-            if t1 not in vals:
-                vals.append(t1)
+        for pick in pickings:
+            if not pick.move_lines:
+                continue
+            src_usage = pick.move_lines[0].location_id.usage
+            dest_usage = pick.move_lines[0].location_dest_id.usage
+            type = pick.picking_type_id.code
+            if type == 'outgoing' and dest_usage == 'supplier':
+                journal_type = 'purchase_refund'
+            elif type == 'outgoing' and dest_usage == 'customer':
+                journal_type = 'sale'
+            elif type == 'incoming' and src_usage == 'supplier':
+                journal_type = 'purchase'
+            elif type == 'incoming' and src_usage == 'customer':
+                journal_type = 'sale_refund'
+            else:
+                journal_type = 'sale'
+            journals = journal_obj.search(cr, uid, [('type', '=', journal_type)])
+            for jr_type in journal_obj.browse(cr, uid, journals, context=context):
+                t1 = str(jr_type.id),jr_type.name
+                print t1
+                if t1 not in vals:
+                    vals.append(t1)
         return vals
 
     _name = "stock.invoice.onshipping"
@@ -48,6 +68,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         'group': fields.boolean("Group by partner"),
         'inv_type': fields.selection([('out_invoice','Create Invoice'),('out_refund','Refund Invoice')], "Invoice Type"),
         'invoice_date': fields.date('Invoice Date'),
+        #'inv_t': fields.selection([('in_invoice', ''), ]),
     }
     _defaults = {
         'journal_id' : _get_journal,
@@ -71,21 +92,28 @@ class stock_invoice_onshipping(osv.osv_memory):
     def open_invoice(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        
         invoice_ids = self.create_invoice(cr, uid, ids, context=context)
         if not invoice_ids:
             raise osv.except_osv(_('Error!'), _('No invoice created!'))
 
-        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date', 'inv_type'])
-        inv_type = onshipdata_obj[0]['inv_type']
+        data = self.browse(cr, uid, ids[0], context=context)
 
         action_model = False
         action = {}
-
+        acc_journal = self.pool.get("account.journal")
+        journal = acc_journal.browse(cr, uid, int(data.journal_id), context=context)
+        journal2type = {'sale':'out_invoice', 'purchase':'in_invoice' , 'sale_refund':'out_refund', 'purchase_refund':'in_refund'}
+        inv_type = journal2type.get(journal.type) or 'out_invoice'
         data_pool = self.pool.get('ir.model.data')
-        if inv_type == "out_refund":
-            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree3")
-        elif inv_type == "out_invoice":
+        if inv_type == "out_invoice":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
+        elif inv_type == "in_invoice":
+            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree2")
+        elif inv_type == "out_refund":
+            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree3")
+        elif inv_type == "in_refund":
+            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree4")
 
         if action_model:
             action_pool = self.pool[action_model]
@@ -97,18 +125,18 @@ class stock_invoice_onshipping(osv.osv_memory):
     def create_invoice(self, cr, uid, ids, context=None):
         context = context or {}
         picking_pool = self.pool.get('stock.picking')
-        onshipdata_obj = self.read(cr, uid, ids, ['journal_id', 'group', 'invoice_date', 'inv_type'])
-
-        context['date_inv'] = onshipdata_obj[0]['invoice_date']
-        inv_type = onshipdata_obj[0]['inv_type']
+        data = self.browse(cr, uid, ids[0])
+        journal2type = {'sale':'out_invoice', 'purchase':'in_invoice', 'sale_refund':'out_refund', 'purchase_refund':'in_refund'}
+        context['date_inv'] = data.invoice_date
+        acc_journal = self.pool.get("account.journal")
+        journal = acc_journal.browse(cr, uid, int(data.journal_id), context=context)
+        inv_type = journal2type.get(journal.type) or 'out_invoice'
         context['inv_type'] = inv_type
 
         active_ids = context.get('active_ids', [])
-        if isinstance(onshipdata_obj[0]['journal_id'], tuple):
-            onshipdata_obj[0]['journal_id'] = onshipdata_obj[0]['journal_id'][0]
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = onshipdata_obj[0]['journal_id'],
-              group = onshipdata_obj[0]['group'],
+              journal_id = data.journal_id,
+              group = data.group,
               type = inv_type,
               context=context)
         return res
diff --git a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
index a37af929576..75892694bfa 100644
--- a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
@@ -23,17 +23,6 @@
             </field>
         </record>
 
-
-        <act_window name="Create Invoice"
-            res_model="stock.invoice.onshipping"
-            src_model="stock.picking"
-            key2="client_action_multi"
-            multi="True"
-            view_mode="form"
-            view_type="form"
-            target="new"
-            id="action_stock_invoice_onshipping"/>
-
         <act_window name="Create Draft Invoices"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking"
diff --git a/addons/stock_account/wizard/stock_return_picking.py b/addons/stock_account/wizard/stock_return_picking.py
new file mode 100644
index 00000000000..4ceaf35363e
--- /dev/null
+++ b/addons/stock_account/wizard/stock_return_picking.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+
+
+class stock_return_picking(osv.osv_memory):
+    _inherit = 'stock.return.picking'
+    _columns = {
+        'invoice_state': fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing')], 'Invoicing',required=True),
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
+        record_id = context and context.get('active_id', False) or False
+        pick_obj = self.pool.get('stock.picking')
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
+        if pick:
+            if 'invoice_state' in fields:
+                if pick.invoice_state=='invoiced':
+                    res.update({'invoice_state': '2binvoiced'})
+                else:
+                    res.update({'invoice_state': 'none'})
+        return res
+
+        
+
+    def _create_returns(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        data = self.browse(cr, uid, ids[0], context=context)
+        new_picking, picking_type_id = super(stock_return_picking, self)._create_returns(cr, uid, ids, context=context)
+        if data.invoice_state == '2binvoiced':
+            pick_obj = self.pool.get("stock.picking")
+            move_obj = self.pool.get("stock.move")
+            move_ids = [x.id for x in pick_obj.browse(cr, uid, new_picking, context=context).move_lines]
+            move_obj.write(cr, uid, move_ids, {'invoice_state': '2binvoiced'})
+        return new_picking, picking_type_id
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_account/wizard/stock_return_picking_view.xml b/addons/stock_account/wizard/stock_return_picking_view.xml
new file mode 100644
index 00000000000..8365c424b95
--- /dev/null
+++ b/addons/stock_account/wizard/stock_return_picking_view.xml
@@ -0,0 +1,14 @@
+<openerp>
+    <data>
+        <record id="view_stock_return_picking_form_inherit" model="ir.ui.view">
+            <field name="name">Return lines</field>
+            <field name="model">stock.return.picking</field>
+            <field name="inherit_id" ref="stock.view_stock_return_picking_form"/>
+            <field name="arch" type="xml">
+                <field name="product_return_moves" position="after">
+                    <field name="invoice_state"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From 0c627438ccd327a2750ce44424fcbc1c809ce193 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Fri, 13 Jun 2014 17:57:01 +0200
Subject: [PATCH 032/137] [FIX] Google Calendar - Split the last underscore
 because Google uses sometimes '_' in their own google_id. Retrieve the parent
 event_id to exclude when the exlusion has been done in google

---
 addons/google_calendar/google_calendar.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/google_calendar/google_calendar.py b/addons/google_calendar/google_calendar.py
index f36062b6be2..b8b60141e97 100644
--- a/addons/google_calendar/google_calendar.py
+++ b/addons/google_calendar/google_calendar.py
@@ -530,7 +530,7 @@ class google_calendar(osv.AbstractModel):
         for att in att_obj.browse(cr, uid, my_att_ids, context=context):
             event = att.event_id
 
-            base_event_id = att.google_internal_event_id.split('_')[0]
+            base_event_id = att.google_internal_event_id.rsplit('_', 1)[0]
 
             if base_event_id not in event_to_synchronize:
                 event_to_synchronize[base_event_id] = {}
@@ -552,7 +552,7 @@ class google_calendar(osv.AbstractModel):
 
         for event in all_event_from_google.values():
             event_id = event.get('id')
-            base_event_id = event_id.split('_')[0]
+            base_event_id = event_id.rsplit('_', 1)[0]
 
             if base_event_id not in event_to_synchronize:
                 event_to_synchronize[base_event_id] = {}
@@ -615,7 +615,7 @@ class google_calendar(osv.AbstractModel):
                     if actSrc == 'OE':
                         self.delete_an_event(cr, uid, current_event[0], context=context)
                     elif actSrc == 'GG':
-                            new_google_event_id = event.GG.event['id'].split('_')[1]
+                            new_google_event_id = event.GG.event['id'].rsplit('_', 1)[1]
                             if 'T' in new_google_event_id:
                                 new_google_event_id = new_google_event_id.replace('T', '')[:-1]
                             else:
@@ -623,7 +623,11 @@ class google_calendar(osv.AbstractModel):
 
                                 if event.GG.status:
                                     parent_event = {}
-                                    parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                                    if event_to_synchronize[base_event][0][1].OE.event_id:
+                                        parent_event['id'] = "%s-%s" % (event_to_synchronize[base_event][0][1].OE.event_id, new_google_event_id)
+                                    else:
+                                        main_ev = att_obj.search_read(cr, uid, [('google_internal_event_id', '=', event.GG.event['id'].rsplit('_', 1)[0])], fields=['event_id'], context=context)
+                                        parent_event['id'] = "%s-%s" % (main_ev[0].get('event_id')[0], new_google_event_id)
                                     res = self.update_from_google(cr, uid, parent_event, event.GG.event, "copy", context)
                                 else:
                                     if event_to_synchronize[base_event][0][1].OE.event_id:

From eb42616b98bcc9e236706790a05069682ef5f2d0 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Fri, 13 Jun 2014 18:07:57 +0200
Subject: [PATCH 033/137] [FIX] website_forum: tag pager url

When browsing a tag, the pager url was not matching the route of the controller
---
 addons/website_forum/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index b838795b076..e98af2f21ac 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -120,7 +120,7 @@ class WebsiteForum(http.Controller):
 
         question_count = Post.search(cr, uid, domain, count=True, context=context)
         if tag:
-            url = "/forum/%s/%s/questions" % (slug(forum), slug(tag))
+            url = "/forum/%s/tag/%s/questions" % (slug(forum), slug(tag))
         else:
             url = "/forum/%s" % slug(forum)
 

From f7c24269545578d65034051bab5fe77909015288 Mon Sep 17 00:00:00 2001
From: Salvatore Trimarchi <salvatore@trigluu.com>
Date: Sun, 15 Jun 2014 02:50:13 -0600
Subject: [PATCH 034/137] Update TAX amount eval change 12% to 15%

Update TAX amount eval thats change 12% to 15% in this year 2014
---
 addons/l10n_hn/l10n_hn_base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index 8b9acf5c50a..2ea77baab1b 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -25,7 +25,7 @@
         <record id="impuestos_plantilla_isv_por_cobrar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">ISV por Cobrar</field>
-        <field name="amount" eval="0.12"/>
+        <field name="amount" eval="0.15"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta110301"/>
             <field name="account_paid_id" ref="cta110301"/>
@@ -42,7 +42,7 @@
         <record id="impuestos_plantilla_isv_por_pagar" model="account.tax.template">
             <field name="chart_template_id" ref="cuentas_plantilla"/>
             <field name="name">ISV por Pagar</field>
-            <field name="amount" eval="0.12"/>
+            <field name="amount" eval="0.15"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="cta210201"/>
             <field name="account_paid_id" ref="cta210201"/>

From 0507ca5f31e3a5cf71e73da065cd625422994b0b Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 16 Jun 2014 10:22:38 +0200
Subject: [PATCH 035/137] [IMP] Calendar - Add an explicit /web in url from
 invitation mail since it required to works

---
 addons/calendar/static/src/js/base_calendar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/static/src/js/base_calendar.js b/addons/calendar/static/src/js/base_calendar.js
index eed958e20d9..37669840818 100644
--- a/addons/calendar/static/src/js/base_calendar.js
+++ b/addons/calendar/static/src/js/base_calendar.js
@@ -102,7 +102,7 @@ openerp.calendar = function(instance) {
             var self = this;
             var action_url = '';
 
-            action_url = _.str.sprintf('/?db=%s#id=%s&view_type=form&model=calendar.event', db, meeting_id);
+            action_url = _.str.sprintf('/web?db=%s#id=%s&view_type=form&model=calendar.event', db, meeting_id);
             
             var reload_page = function(){
                 return location.replace(action_url);

From 04d8d44b04358d8c54cadb8b1a6efa1c8d27c9be Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@openerp.com>
Date: Mon, 16 Jun 2014 14:11:01 +0530
Subject: [PATCH 036/137] [FIX] STOCK: Fixed the warning '' 'tree_view_ref'
 requires a fully-qualified external id (got: 'view_move_picking_tree' for
 model stock.move). Please use the complete 'module.view_id' form instead. ''

---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e94231ba901..06fabc97e5e 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -747,7 +747,7 @@
                                 </tree>
                             </field>
 -->
-                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id,'default_picking_id': active_id}"/>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'stock.view_move_picking_form', 'tree_view_ref':'stock.view_move_picking_tree', 'default_picking_type_id': picking_type_id,'default_picking_id': active_id}"/>
                             <field name="pack_operation_exist" invisible="1"/>
                             <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>

From 7107b646f65242c139baaa0febef6185edc8d774 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Mon, 16 Jun 2014 11:31:21 +0200
Subject: [PATCH 037/137] [IMP] Website Sale - ribbon - html class from
 product.style is not required, so we need to display it as empty in website
 to avoid an internal 500

---
 addons/website_sale/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 8035903f061..5d888714b19 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -98,7 +98,7 @@ class table_compute(object):
                     self.table[(pos/PPR)+y2][(pos%PPR)+x2] = False
             self.table[pos/PPR][pos%PPR] = {
                 'product': p, 'x':x, 'y': y,
-                'class': " ".join(map(lambda x: x.html_class, p.website_style_ids))
+                'class': " ".join(map(lambda x: x.html_class or '', p.website_style_ids))
             }
             if index<=PPG:
                 maxy=max(maxy,y+(pos/PPR))

From bdd8d5a937a1aa96cceefb32107d0309f52ccc6b Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 16 Jun 2014 12:32:17 +0200
Subject: [PATCH 038/137] [IMP] journal_id in onshipping should be many2one
 instead of selection hack

---
 addons/stock_account/stock_account_view.xml   |  2 +-
 .../wizard/stock_invoice_onshipping.py        | 71 ++++++++-----------
 .../wizard/stock_invoice_onshipping_view.xml  |  4 +-
 3 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index 867f2eaee34..ff16bf8e680 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -32,7 +32,7 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='do_partial_open_barcode']" position="after">
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create/Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
                     <!--<button name="%(action_stock_invoice_onshipping)d" string="Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','invoiced')]}" type="action" class="oe_highlight" groups="base.group_user" context="{'inv_type': 'out_refund'}"/>-->
                 </xpath>
                 <xpath expr="//field[@name='move_type']" position="after">
diff --git a/addons/stock_account/wizard/stock_invoice_onshipping.py b/addons/stock_account/wizard/stock_invoice_onshipping.py
index b0a98c75dc6..0f0c56cb5a3 100644
--- a/addons/stock_account/wizard/stock_invoice_onshipping.py
+++ b/addons/stock_account/wizard/stock_invoice_onshipping.py
@@ -24,55 +24,48 @@ from openerp.tools.translate import _
 
 class stock_invoice_onshipping(osv.osv_memory):
     def _get_journal(self, cr, uid, context=None):
-        res = self._get_journal_id(cr, uid, context=context)
-        if res:
-            return res[0][0]
-        return False
-
-    def _get_journal_id(self, cr, uid, context=None):
+        journal_obj = self.pool.get('account.journal')
+        journal_type = self._get_journal_type(cr, uid, context=context)
+        journals = journal_obj.search(cr, uid, [('type', '=', journal_type)])
+        return journals and journals[0] or False
+    
+    def _get_journal_type(self, cr, uid, context=None):
         if context is None:
             context = {}
-        journal_obj = self.pool.get('account.journal')
         res_ids = context and context.get('active_ids', [])
         pick_obj = self.pool.get('stock.picking')
         pickings = pick_obj.browse(cr, uid, res_ids, context=context)
         vals = []
-        for pick in pickings:
-            if not pick.move_lines:
-                continue
-            src_usage = pick.move_lines[0].location_id.usage
-            dest_usage = pick.move_lines[0].location_dest_id.usage
-            type = pick.picking_type_id.code
-            if type == 'outgoing' and dest_usage == 'supplier':
-                journal_type = 'purchase_refund'
-            elif type == 'outgoing' and dest_usage == 'customer':
-                journal_type = 'sale'
-            elif type == 'incoming' and src_usage == 'supplier':
-                journal_type = 'purchase'
-            elif type == 'incoming' and src_usage == 'customer':
-                journal_type = 'sale_refund'
-            else:
-                journal_type = 'sale'
-            journals = journal_obj.search(cr, uid, [('type', '=', journal_type)])
-            for jr_type in journal_obj.browse(cr, uid, journals, context=context):
-                t1 = str(jr_type.id),jr_type.name
-                print t1
-                if t1 not in vals:
-                    vals.append(t1)
-        return vals
+        pick = pickings and pickings[0]
+        if not pick or not pick.move_lines:
+            return 'sale'
+        src_usage = pick.move_lines[0].location_id.usage
+        dest_usage = pick.move_lines[0].location_dest_id.usage
+        type = pick.picking_type_id.code
+        if type == 'outgoing' and dest_usage == 'supplier':
+            journal_type = 'purchase_refund'
+        elif type == 'outgoing' and dest_usage == 'customer':
+            journal_type = 'sale'
+        elif type == 'incoming' and src_usage == 'supplier':
+            journal_type = 'purchase'
+        elif type == 'incoming' and src_usage == 'customer':
+            journal_type = 'sale_refund'
+        else:
+            journal_type = 'sale'
+        return journal_type
 
     _name = "stock.invoice.onshipping"
     _description = "Stock Invoice Onshipping"
     _columns = {
-        'journal_id': fields.selection(_get_journal_id, 'Destination Journal',required=True),
+        'journal_id': fields.many2one('account.journal', 'Destination Journal', required=True),
+        'journal_type': fields.selection([('purchase_refund', 'Refund Purchase'), ('purchase', 'Create Supplier Invoice'), 
+                                          ('sale_refund', 'Refund Sale'), ('sale', 'Create Customer Invoice')], 'Journal Type', readonly=True),
         'group': fields.boolean("Group by partner"),
-        'inv_type': fields.selection([('out_invoice','Create Invoice'),('out_refund','Refund Invoice')], "Invoice Type"),
         'invoice_date': fields.date('Invoice Date'),
-        #'inv_t': fields.selection([('in_invoice', ''), ]),
     }
     _defaults = {
+        'journal_type': _get_journal_type,
         'journal_id' : _get_journal,
-        'inv_type': lambda self,cr,uid,ctx: ctx.get('inv_type', 'out_invoice')
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -101,10 +94,9 @@ class stock_invoice_onshipping(osv.osv_memory):
 
         action_model = False
         action = {}
-        acc_journal = self.pool.get("account.journal")
-        journal = acc_journal.browse(cr, uid, int(data.journal_id), context=context)
+        
         journal2type = {'sale':'out_invoice', 'purchase':'in_invoice' , 'sale_refund':'out_refund', 'purchase_refund':'in_refund'}
-        inv_type = journal2type.get(journal.type) or 'out_invoice'
+        inv_type = journal2type.get(data.journal_type) or 'out_invoice'
         data_pool = self.pool.get('ir.model.data')
         if inv_type == "out_invoice":
             action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
@@ -129,13 +121,12 @@ class stock_invoice_onshipping(osv.osv_memory):
         journal2type = {'sale':'out_invoice', 'purchase':'in_invoice', 'sale_refund':'out_refund', 'purchase_refund':'in_refund'}
         context['date_inv'] = data.invoice_date
         acc_journal = self.pool.get("account.journal")
-        journal = acc_journal.browse(cr, uid, int(data.journal_id), context=context)
-        inv_type = journal2type.get(journal.type) or 'out_invoice'
+        inv_type = journal2type.get(data.journal_type) or 'out_invoice'
         context['inv_type'] = inv_type
 
         active_ids = context.get('active_ids', [])
         res = picking_pool.action_invoice_create(cr, uid, active_ids,
-              journal_id = data.journal_id,
+              journal_id = data.journal_id.id,
               group = data.group,
               type = inv_type,
               context=context)
diff --git a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
index 75892694bfa..9e43e324cea 100644
--- a/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock_account/wizard/stock_invoice_onshipping_view.xml
@@ -7,10 +7,10 @@
             <field name="arch" type="xml">
               <form string="Create invoice" version="7.0">
                   <h1>
-                      <field name="inv_type" readonly="1"/>
+                      <field name="journal_type" readonly="1"/>
                   </h1>
                   <group>
-                      <field name="journal_id"/>
+                      <field name="journal_id" domain="[('type','=',journal_type)]"/>
                       <field name="group"/>
                       <field name="invoice_date" />
                   </group>

From eb13d3ee5fbe1b699600269280f8775d19265a2f Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 16 Jun 2014 16:04:04 +0200
Subject: [PATCH 039/137] [IMP] Make sure there is a link between purchase
 order invoice and purchase order

---
 addons/purchase/stock.py        | 29 +++++++++++++++++++++++++++++
 addons/sale_stock/sale_stock.py |  2 +-
 addons/stock_account/stock.py   |  7 +------
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 69d970b7be6..6d752844240 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -55,6 +55,35 @@ class stock_move(osv.osv):
             })
         return super(stock_move, self).copy(cr, uid, id, default, context)
 
+
+    def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
+        invoice_line_id = super(stock_move, self)._create_invoice_line_from_vals(cr, uid, move, invoice_line_vals, context=context)
+        if move.purchase_line_id:
+            purchase_line = move.purchase_line_id
+            self.pool.get('purchase.order.line').write(cr, uid, [purchase_line.id], {
+                'invoice_lines': [(4, invoice_line_id)]
+            }, context=context)
+            self.pool.get('purchase.order').write(cr, uid, [purchase_line.order_id.id], {
+                'invoice_ids': [(4, invoice_line_vals['invoice_id'])],
+            })
+        return invoice_line_id
+
+    def _get_master_data(self, cr, uid, move, company, context=None):
+        if move.purchase_line_id:
+            purchase_order = move.purchase_line_id.order_id
+            return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.pricelist_id.currency_id.id
+        super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
+
+    def _get_invoice_line_vals(self, cr, uid, move, partner, inv_type, context=None):
+        res = super(stock_move, self)._get_invoice_line_vals(cr, uid, move, partner, inv_type, context=context)
+        if move.purchase_line_id:
+            purchase_line = move.purchase_line_id
+            res['invoice_line_tax_id'] = [(6, 0, [x.id for x in purchase_line.taxes_id])]
+            #res['account_analytic_id'] = purc_line.order_id.project_id and sale_line.order_id.project_id.id or False
+            res['price_unit'] = purchase_line.price_unit
+            #res['discount'] = sale_line.discount
+        return res
+
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index b3bbd253392..63f6068f3c2 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -388,7 +388,7 @@ class stock_move(osv.osv):
         return super(stock_move, self).action_cancel(cr, uid, ids, context=context)
 
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
-        invoice_line_id = self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
+        invoice_line_id = super(stock_move, self)._create_invoice_line_from_vals(cr, uid, move, invoice_line_vals, context=context)
         if move.procurement_id and move.procurement_id.sale_line_id:
             sale_line = move.procurement_id.sale_line_id
             self.pool.get('sale.order.line').write(cr, uid, [sale_line.id], {
diff --git a/addons/stock_account/stock.py b/addons/stock_account/stock.py
index 44590353e1b..56d851cec7a 100644
--- a/addons/stock_account/stock.py
+++ b/addons/stock_account/stock.py
@@ -202,7 +202,7 @@ class stock_picking(osv.osv):
         for picking in self.browse(cr, uid, ids, context=context):
             key = group and picking.id or True
             for move in picking.move_lines:
-                if move.procurement_id and (move.procurement_id.invoice_state == '2binvoiced') or move.invoice_state == '2binvoiced':
+                if move.invoice_state == '2binvoiced':
                     if (move.state != 'cancel') and not move.scrapped:
                         todo.setdefault(key, [])
                         todo[key].append(move)
@@ -257,12 +257,7 @@ class stock_picking(osv.osv):
             invoice_line_vals['origin'] = origin
 
             move_obj._create_invoice_line_from_vals(cr, uid, move, invoice_line_vals, context=context)
-
             move_obj.write(cr, uid, move.id, {'invoice_state': 'invoiced'}, context=context)
-            if move.procurement_id:
-                self.pool.get('procurement.order').write(cr, uid, [move.procurement_id.id], {
-                    'invoice_state': 'invoiced',
-                }, context=context)
 
         invoice_obj.button_compute(cr, uid, invoices.values(), context=context, set_total=(inv_type in ('in_invoice', 'in_refund')))
         return invoices.values()

From 63ea0df73ffd6bf659b2ef29cdc3d3387bec92ac Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 16:55:58 +0200
Subject: [PATCH 040/137] [FIX] account: default domain on journal_id field for
 invoices

Prior to this fix, the domain was set in the onchange methods onchange_company_id. Therefore, if the onchange was not triggered, the domain wasnt apply (e.g. while editing an existing invoice).
---
 addons/account/account_invoice.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 55ba1058d58..afd0077bbc8 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -298,7 +298,8 @@ class account_invoice(osv.osv):
             },
             multi='all'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}, track_visibility='always'),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]},
+                                      domain="[('type', 'in', {'out_invoice': ['sale'], 'out_refund': ['sale_refund'], 'in_refund': ['purchase_refund'], 'in_invoice': ['purchase']}.get(type, [])), ('company_id', '=', company_id)]"),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',

From cb903af2104f1218688c7f0f286b55b27ad1c898 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Mon, 16 Jun 2014 17:07:10 +0200
Subject: [PATCH 041/137] [IMP] Make sure pack operations split in the correct
 way in the bar code interface

---
 addons/stock/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e224e55efac..7fade0e0c8d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3823,7 +3823,7 @@ class stock_pack_operation(osv.osv):
             if pack_op.qty_done < pack_op.product_qty:
                 # we split the operation in two
                 op = self.copy(cr, uid, pack_op.id, {'product_qty': pack_op.qty_done, 'qty_done': pack_op.qty_done}, context=context)
-                self.write(cr, uid, ids, {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
+                self.write(cr, uid, pack_op.id, {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
             processed_ids.append(op)
         self.write(cr, uid, processed_ids, {'processed': 'true'}, context=context)
 

From 6b0025759512cab81e90219fd55d3ceef37bffc4 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 17:44:15 +0200
Subject: [PATCH 042/137] [FIX] account_analytic_analysis: product_id_change,
 variable price referenced before assignment in some cases

---
 addons/account_analytic_analysis/account_analytic_analysis.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 4409d99dd1a..af8f77b9566 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -73,6 +73,7 @@ class account_analytic_invoice_line(osv.osv):
 
         result = {}
         res = self.pool.get('product.product').browse(cr, uid, product, context=local_context)
+        price = False
         if price_unit is not False:
             price = price_unit
         elif pricelist_id:

From 98bf37f6e1a7726e0bdb0d997adc8086578ec66f Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 18:07:10 +0200
Subject: [PATCH 043/137] [FIX] mail: missing .id during forward port
 3c0292645fcb9604e3c4f08a37b7e8702d464065

---
 addons/mail/mail_message.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 84f0062cf5d..3517c1a47a3 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -977,7 +977,7 @@ class mail_message(osv.Model):
                     ('res_id', '=', message.res_id),
                 ], context=context)
             partners_to_notify |= set(
-                fo.partner_id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
+                fo.partner_id.id for fo in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)
                 if message.subtype_id.id in [st.id for st in fo.subtype_ids]
             )
         # remove me from notified partners, unless the message is written on my own wall

From 2db6a0080f9eeac7030d6d2d856574f2192d8aa5 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 22:40:31 +0200
Subject: [PATCH 044/137] [FIX] auth_oauth: quote redirect url in state

Otherwise, Firefox is splitting the state at the first &, which can potentially be located in the redict param of the state
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 08319b982fd..e3bd6c13580 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -70,7 +70,7 @@ class OAuthLogin(openerp.addons.web.controllers.main.Home):
         return dict(
             d=request.session.db,
             p=provider['id'],
-            r=request.httprequest.full_path
+            r=werkzeug.url_quote_plus(request.httprequest.full_path)
         )
 
     @http.route()

From a3cfe1728d048ee23d8c7a41c0f1df8a70f0aeec Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Mon, 16 Jun 2014 22:52:50 +0200
Subject: [PATCH 045/137] [FIX] auth_oauth: unquote redirect url from state

This is related to 2db6a0080f9eeac7030d6d2d856574f2192d8aa5. Looks like Firefox auto unquote, but not Chrome
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index e3bd6c13580..6743cf17e7b 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -116,7 +116,7 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
-                redirect = state.get('r')
+                redirect = werkzeug.url_unquote_plus(state.get('r'))
                 url = '/web'
                 if redirect and not redirect.startswith('/auth_oauth/signin') and \
                 (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):

From b58703857012d42f9a39363611894014c2166a8e Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 09:26:20 +0200
Subject: [PATCH 046/137] [FIX] auth_oauth: url_unquote_plus does not handle
 boolean

If the redirect param 'r' is not in the state, do no try to unquote it
---
 addons/auth_oauth/controllers/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 6743cf17e7b..214fdefe1fb 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -116,7 +116,7 @@ class OAuthController(http.Controller):
                 cr.commit()
                 action = state.get('a')
                 menu = state.get('m')
-                redirect = werkzeug.url_unquote_plus(state.get('r'))
+                redirect = werkzeug.url_unquote_plus(state['r']) if state.get('r') else False
                 url = '/web'
                 if redirect and not redirect.startswith('/auth_oauth/signin') and \
                 (not redirect.startswith('/web/login') or 'redirect' in urlparse.urlsplit(redirect).query):

From a7866c12bb63bb788bd0d2c9c895386c33c78a50 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 17 Jun 2014 09:54:46 +0200
Subject: [PATCH 047/137] [FIX] master data should return something

---
 addons/purchase/stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 6d752844240..40689551195 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -72,7 +72,7 @@ class stock_move(osv.osv):
         if move.purchase_line_id:
             purchase_order = move.purchase_line_id.order_id
             return purchase_order.partner_id, purchase_order.create_uid.id, purchase_order.pricelist_id.currency_id.id
-        super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
+        return super(stock_move, self)._get_master_data(cr, uid, move, company, context=context)
 
     def _get_invoice_line_vals(self, cr, uid, move, partner, inv_type, context=None):
         res = super(stock_move, self)._get_invoice_line_vals(cr, uid, move, partner, inv_type, context=context)

From b4cbac3cba20f9e8e3956c7104bd6589d78f953d Mon Sep 17 00:00:00 2001
From: kevin wang <kevin_327@163.com>
Date: Tue, 17 Jun 2014 10:48:44 +0200
Subject: [PATCH 048/137] [FIX] product: create works for internal reference
 and ean13 code in product.template

This is a temporary workaround until these fields are removed from the template or the view is more explicit about the meaning of this field (the one on the first variant)
Fix #542
---
 addons/product/product.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/product/product.py b/addons/product/product.py
index db86047c10a..b7090841dde 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -675,6 +675,17 @@ class product_template(osv.osv):
         if not context or "create_product_product" not in context:
             self.create_variant_ids(cr, uid, [product_template_id], context=context)
         self._set_standard_price(cr, uid, product_template_id, vals.get('standard_price', 0.0), context=context)
+
+        # TODO: this is needed to set given values to first variant after creation
+        # these fields should be moved to product as lead to confusion
+        related_vals = {}
+        if vals.get('ean13'):
+            related_vals['ean13'] = vals['ean13']
+        if vals.get('default_code'):
+            related_vals['default_code'] = vals['default_code']
+        if related_vals:
+            self.write(cr, uid, product_template_id, related_vals, context=context)
+
         return product_template_id
 
     def write(self, cr, uid, ids, vals, context=None):

From 8a48fa44285a2b5433ba48142934a78211d7de28 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 17 Jun 2014 11:39:27 +0200
Subject: [PATCH 049/137] [IMP] Can not delete/modify quants + can reuse lot in
 bar code interface

---
 addons/stock/stock.py       | 39 +++++++++++++++++++++++--------------
 addons/stock/stock_view.xml |  4 ++--
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 7fade0e0c8d..1e6e3feed22 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -272,27 +272,28 @@ class stock_quant(osv.osv):
 
     _columns = {
         'name': fields.function(_get_quant_name, type='char', string='Identifier'),
-        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete="restrict"),
-        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="restrict"),
-        'qty': fields.float('Quantity', required=True, help="Quantity of products in this quant, in the default unit of measure of the product"),
-        'package_id': fields.many2one('stock.quant.package', string='Package', help="The package containing this quant"),
-        'packaging_type_id': fields.related('package_id', 'packaging_id', type='many2one', relation='product.packaging', string='Type of packaging', store=True),
-        'reservation_id': fields.many2one('stock.move', 'Reserved for Move', help="The move the quant is reserved for"),
-        'lot_id': fields.many2one('stock.production.lot', 'Lot'),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete="restrict", readonly=True),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="restrict", readonly=True),
+        'qty': fields.float('Quantity', required=True, help="Quantity of products in this quant, in the default unit of measure of the product", readonly=True),
+        'package_id': fields.many2one('stock.quant.package', string='Package', help="The package containing this quant", readonly=True),
+        'packaging_type_id': fields.related('package_id', 'packaging_id', type='many2one', relation='product.packaging', string='Type of packaging', readonly=True, store=True),
+        'reservation_id': fields.many2one('stock.move', 'Reserved for Move', help="The move the quant is reserved for", readonly=True),
+        'lot_id': fields.many2one('stock.production.lot', 'Lot', readonly=True),
         'cost': fields.float('Unit Cost'),
-        'owner_id': fields.many2one('res.partner', 'Owner', help="This is the owner of the quant"),
+        'owner_id': fields.many2one('res.partner', 'Owner', help="This is the owner of the quant", readonly=True),
 
-        'create_date': fields.datetime('Creation Date'),
-        'in_date': fields.datetime('Incoming Date'),
+        'create_date': fields.datetime('Creation Date', readonly=True),
+        'in_date': fields.datetime('Incoming Date', readonly=True),
 
         'history_ids': fields.many2many('stock.move', 'stock_quant_move_rel', 'quant_id', 'move_id', 'Moves', help='Moves that operate(d) on this quant'),
-        'company_id': fields.many2one('res.company', 'Company', help="The company to which the quants belong", required=True),
+        'company_id': fields.many2one('res.company', 'Company', help="The company to which the quants belong", required=True, readonly=True),
         'inventory_value': fields.function(_calc_inventory_value, string="Inventory Value", type='float', readonly=True),
 
         # Used for negative quants to reconcile after compensated by a new positive one
-        'propagated_from_id': fields.many2one('stock.quant', 'Linked Quant', help='The negative quant this is coming from'),
-        'negative_move_id': fields.many2one('stock.move', 'Move Negative Quant', help='If this is a negative quant, this will be the move that caused this negative quant.'),
-        'negative_dest_location_id': fields.related('negative_move_id', 'location_dest_id', type='many2one', relation='stock.location', string="Negative Destination Location", help="Technical field used to record the destination location of a move that created a negative quant"),
+        'propagated_from_id': fields.many2one('stock.quant', 'Linked Quant', help='The negative quant this is coming from', readonly=True),
+        'negative_move_id': fields.many2one('stock.move', 'Move Negative Quant', help='If this is a negative quant, this will be the move that caused this negative quant.', readonly=True),
+        'negative_dest_location_id': fields.related('negative_move_id', 'location_dest_id', type='many2one', relation='stock.location', string="Negative Destination Location", readonly=True, 
+                                                    help="Technical field used to record the destination location of a move that created a negative quant"),
     }
 
     _defaults = {
@@ -606,6 +607,8 @@ class stock_quant(osv.osv):
             raise osv.except_osv(_('Error'), _('You cannot move to a location of type view %s.') % (location.name))
         return True
 
+    def unlink(self, cr, uid, ids, context=None):
+        raise osv.except_osv(_('Error!'), _('Do not delete quants!'))
 
 #----------------------------------------------------------
 # Stock Picking
@@ -3833,10 +3836,16 @@ class stock_pack_operation(osv.osv):
         obj = self.browse(cr,uid,id,context)
         product_id = obj.product_id.id
         val = {'product_id': product_id}
+        new_lot_id = False
         if name:
+            lots = self.pool.get('stock.production.lot').search(cr, uid, ['&', ('name', '=', name), ('product_id', '=', product_id)], context=context)
+            if lots:
+                new_lot_id = lots[0]
             val.update({'name': name})
+
         if not obj.lot_id:
-            new_lot_id = self.pool.get('stock.production.lot').create(cr, uid, val, context=context)
+            if not new_lot_id:
+                new_lot_id = self.pool.get('stock.production.lot').create(cr, uid, val, context=context)
             self.write(cr, uid, id, {'lot_id': new_lot_id}, context=context)
 
     def _search_and_increment(self, cr, uid, picking_id, domain, filter_visible=False, visible_op_ids=False, increment=True, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2503c8de248..4f6820afae4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -355,7 +355,7 @@
         <record model="ir.actions.act_window" id="location_open_quants">
             <field name="context">{'search_default_productgroup': 1}</field>
             <field name="domain">[('location_id', 'child_of', active_ids)]</field>
-            <field name="name">Quants</field>
+            <field name="name">Current Stock</field>
             <field name="res_model">stock.quant</field>
         </record>
 
@@ -1793,7 +1793,7 @@
         </record>
         <record model="ir.actions.act_window" id="product_open_quants">
             <field name="context">{'search_default_internal_loc': 1, 'search_default_product_id': active_id, 'search_default_locationgroup':1}</field>
-            <field name="name">Quants</field>
+            <field name="name">Current Stock</field>
             <field name="res_model">stock.quant</field>
         </record>
         

From f71addb14d3701255ca3de3413eb13cfbf24d751 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 17 Jun 2014 11:47:53 +0200
Subject: [PATCH 050/137] [IMP] no label on consume lines in wizard

---
 addons/mrp/wizard/mrp_product_produce_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index 6f9d916cb39..421e68a87e1 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -21,7 +21,7 @@
                                     groups="stock.group_production_lot"/>
                     </group>
                     <group string="To Consume">
-                        <field name="consume_lines">
+                        <field name="consume_lines" nolabel="1">
                             <tree string="Consume Lines" editable="top">
                                 <field name="product_id"/>
                                 <field name="product_qty"/>

From 7ad2eb354d89a59970add57feaa1b4945a883f4c Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Tue, 17 Jun 2014 11:45:30 +0200
Subject: [PATCH 051/137] [IMP] base: use current context when evaluation
 ir_actions' context

---
 openerp/addons/base/ir/ir_actions.py | 36 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index c41eae84ff8..7ae4240cd03 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -320,22 +320,26 @@ class ir_actions_act_window(osv.osv):
             ids = [ids]
         results = super(ir_actions_act_window, self).read(cr, uid, ids, fields=fields, context=context, load=load)
 
-        if not fields or 'help' in fields:
-            context = dict(context or {})
-            eval_dict = {
-                'active_model': context.get('active_model'),
-                'active_id': context.get('active_id'),
-                'active_ids': context.get('active_ids'),
-                'uid': uid,
-            }
-            for res in results:
-                model = res.get('res_model')
-                if model and self.pool.get(model):
-                    try:
-                        with tools.mute_logger("openerp.tools.safe_eval"):
-                            eval_context = eval(res['context'] or "{}", eval_dict) or {}
-                    except Exception:
-                        continue
+        context = dict(context or {})
+        eval_dict = {
+            'active_model': context.get('active_model'),
+            'active_id': context.get('active_id'),
+            'active_ids': context.get('active_ids'),
+            'uid': uid,
+            'context': context,
+        }
+        for res in results:
+            model = res.get('res_model')
+            if model and self.pool.get(model):
+                try:
+                    with tools.mute_logger("openerp.tools.safe_eval"):
+                        eval_context = eval(res['context'] or "{}", eval_dict) or {}
+                        res['context'] = str(eval_context)
+                except Exception:
+                    _logger.warning("ir_actions: Cannot evaluate context = %s with eval_dict = %s"
+                        % (res['context'] or "{}", eval_dict), exc_info=True)
+                    continue
+                if not fields or 'help' in fields:
                     custom_context = dict(context, **eval_context)
                     res['help'] = self.pool.get(model).get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
         if ids_int:

From 8fffbe7dc3587fee76a70bf8d3e0548a1768f2dc Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 17 Jun 2014 12:11:31 +0200
Subject: [PATCH 052/137] [IMP] Quant's deletion has to be possible for quant
 reconcile

---
 addons/stock/stock.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 1e6e3feed22..9c5310dcd6b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -607,9 +607,6 @@ class stock_quant(osv.osv):
             raise osv.except_osv(_('Error'), _('You cannot move to a location of type view %s.') % (location.name))
         return True
 
-    def unlink(self, cr, uid, ids, context=None):
-        raise osv.except_osv(_('Error!'), _('Do not delete quants!'))
-
 #----------------------------------------------------------
 # Stock Picking
 #----------------------------------------------------------

From a32e989fbadab7691191d8872e69970d4763b8fe Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 12:56:13 +0200
Subject: [PATCH 053/137] [FIX] web: save date(time) field value on key enter
 in editable list

In editable list, on keypress enter, the _next method is called, saving the current line and starting the edition of the next one
The _next is triggered before the date(time) field change event, and, therefore, the saved value of the date(time) field is the old one
---
 addons/web/static/src/js/view_form.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index e9f195b892a..fec7ce10607 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2422,6 +2422,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
     type_of_date: "datetime",
     events: {
         'change .oe_datepicker_master': 'change_datetime',
+        'keypress .oe_datepicker_master': 'change_datetime',
     },
     init: function(parent) {
         this._super(parent);
@@ -2540,8 +2541,8 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({
     format_client: function(v) {
         return instance.web.format_value(v, {"widget": this.type_of_date});
     },
-    change_datetime: function() {
-        if (this.is_valid_()) {
+    change_datetime: function(e) {
+        if ((e.type !== "keypress" || e.which === 13) && this.is_valid_()) {
             this.set_value_from_ui_();
             this.trigger("datetime_changed");
         }

From 58c13d28b2b907366da3c803e92698d37ea0f947 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 13:47:15 +0200
Subject: [PATCH 054/137] [FIX] account: report agedpartnerbalance, copy paste
 error

The t-foreach save the iterazied item as not_partner, not as partner
---
 addons/account/views/report_agedpartnerbalance.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/views/report_agedpartnerbalance.xml b/addons/account/views/report_agedpartnerbalance.xml
index 019f32a35de..c1f9047e330 100644
--- a/addons/account/views/report_agedpartnerbalance.xml
+++ b/addons/account/views/report_agedpartnerbalance.xml
@@ -99,7 +99,7 @@
                         </tr>
                         <tr t-foreach="get_lines_with_out_partner(data['form'])" t-as="not_partner">
                             <td>
-                                <span t-esc="partner['name']"/>
+                                <span t-esc="not_partner['name']"/>
                             </td>
                             <td class="text-right">
                                 <span t-esc="formatLang(not_partner['direction'], currency_obj=res_company.currency_id)"/>

From aef4d9b163fd8d985817b3379ff7dccc3b6b92a3 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Tue, 17 Jun 2014 14:53:31 +0200
Subject: [PATCH 055/137] [IMP] Drop shipping type should be outgoing by
 default, that way it will create customer invoices when the sale is invoices
 on delivery order

---
 addons/stock_dropshipping/stock_dropshipping.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/stock_dropshipping/stock_dropshipping.xml b/addons/stock_dropshipping/stock_dropshipping.xml
index ede1f00afed..de1de472d20 100644
--- a/addons/stock_dropshipping/stock_dropshipping.xml
+++ b/addons/stock_dropshipping/stock_dropshipping.xml
@@ -14,7 +14,7 @@
         <record id="picking_type_dropship" model="stock.picking.type">
             <field name="name">Dropship</field>
             <field name="sequence_id" ref="seq_picking_type_dropship"/>
-            <field name="code">incoming</field>
+            <field name="code">outgoing</field>
             <field name="default_location_src_id" ref="stock.stock_location_suppliers"/>
             <field name="default_location_dest_id" ref="stock.stock_location_customers"/>
         </record>
@@ -37,7 +37,6 @@
             <field name="procure_method">make_to_stock</field>
             <field name="route_id" ref="route_drop_shipping"/>
             <field name="picking_type_id" ref="picking_type_dropship"/>
-        </record>  
-        
+        </record>
     </data>
 </openerp>

From 9bb0abd641dea21da67c496b994f70ce1954ed1e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@openerp.com>
Date: Tue, 17 Jun 2014 14:22:59 +0530
Subject: [PATCH 056/137] [FIX] GAMIFICATION: Fixed the Attribute Error     '
 'str' object has no attribute 'strftime' '

---
 addons/gamification/models/challenge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 222e5cca49e..817f1566323 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -57,7 +57,7 @@ def start_end_date_for_period(period, default_start_date=False, default_end_date
         end_date = default_end_date
 
     if start_date and end_date:
-        return (start_date.strftime(DF), end_date.strftime(DF))
+        return (datetime.strftime(start_date, DF), datetime.strftime(end_date, DF))
     else:
         return (start_date, end_date)
 

From 481c64e077132c37acc0bb8c83dba6e937588032 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 17 Jun 2014 15:17:14 +0200
Subject: [PATCH 057/137] [IMP] Ir Action Server - Fix the domain for the field
 'Link Using field'.

---
 openerp/addons/base/ir/ir_actions.py  | 7 +++++++
 openerp/addons/base/ir/ir_actions.xml | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 748e209bb54..21ad57f5d03 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -462,6 +462,8 @@ class ir_actions_server(osv.osv):
                                    "based on the sequence. Low number means high priority."),
         'model_id': fields.many2one('ir.model', 'Base Model', required=True, ondelete='cascade',
                                     help="Base model on which the server action runs."),
+        'model_name': fields.related('model_id', 'model', type='char',
+                                     string='Model Name', readonly=True),
         'menu_ir_values_id': fields.many2one('ir.values', 'More Menu entry', readonly=True,
                                              help='More menu entry.'),
         # Client Action
@@ -620,6 +622,10 @@ class ir_actions_server(osv.osv):
             'wkf_field_id': False,
             'crud_model_id': model_id,
         }
+
+        if model_id:
+            values['model_name'] = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
+
         return {'value': values}
 
     def on_change_wkf_wonfig(self, cr, uid, ids, use_relational_model, wkf_field_id, wkf_model_id, model_id, context=None):
@@ -723,6 +729,7 @@ class ir_actions_server(osv.osv):
         crud_model_name = False
         if crud_model_id:
             crud_model_name = self.pool.get('ir.model').browse(cr, uid, crud_model_id, context).model
+        
         values = {'link_field_id': False, 'crud_model_name': crud_model_name}
         return {'value': values}
 
diff --git a/openerp/addons/base/ir/ir_actions.xml b/openerp/addons/base/ir/ir_actions.xml
index 7ac0252da80..c99975549c4 100644
--- a/openerp/addons/base/ir/ir_actions.xml
+++ b/openerp/addons/base/ir/ir_actions.xml
@@ -351,8 +351,9 @@
                                             Check to attach the newly created record to the record on which the server action runs.
                                         </p>
                                         <group>
+                                            <field name="model_name" invisible="1"/>
                                             <field name="link_field_id"
-                                                    domain="[('model_id', '=', model_id), ('relation', '=', crud_model_name), ('ttype', 'in', ['many2one'])]"
+                                                    domain="[('model_id', '=', crud_model_id), ('relation', '=', model_name), ('ttype', 'in', ['many2one'])]"
                                                     attrs="{'required': [('state', '=', 'object_create'), ('link_new_record', '=', True)],
                                                             'invisible': ['|', ('state', '!=', 'object_create'), ('link_new_record', '=', False)]}"/>
                                         </group>

From 3742b1ab3f5306e0dddb3d88d540c49b5e1a5bdd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Tue, 17 Jun 2014 15:43:56 +0200
Subject: [PATCH 058/137] [FIX] website: jquery attrbutes assignation is not
 supported by Firefox

Happens when trying to change an image in a a banner block
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index fcb957cafda..6ed5f1145b8 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1504,7 +1504,7 @@
                 url: this.link
             });
             this.media.renameNode("img");
-            this.media.$.attributes.src = this.link;
+            $(this.media).attr('src', this.link);
             return this._super();
         },
         clear: function () {

From 9b0d8c050380cedec45128dc45f245f3394aa344 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Jun 2014 10:24:37 +0200
Subject: [PATCH 059/137] [FIX] Session Expired message in backend

---
 openerp/addons/base/ir/ir_http.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index bd211d14cb8..13997c6cd2f 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -98,11 +98,13 @@ class ir_http(osv.AbstractModel):
         # check authentication level
         try:
             auth_method = self._authenticate(func.routing["auth"])
-        except Exception:
-            # force a Forbidden exception with the original traceback
-            return self._handle_exception(
-                convert_exception_to(
-                    werkzeug.exceptions.Forbidden))
+        except Exception, e:
+            # Json requests have their own exception handler
+            # therefore we should not alter their exception's type
+            if func.routing.get('type') != 'json':
+                # for the rest, convert to a Forbidden exception keeping the original traceback
+                e = convert_exception_to(werkzeug.exceptions.Forbidden)
+            return self._handle_exception(e)
 
         processing = self._postprocess_args(arguments)
         if processing:

From 0ce1ecd6db0a43f2623b30184fd882e1769bc551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Jun 2014 09:56:49 +0200
Subject: [PATCH 060/137] [FIX] mass_mailing: various fixes

---
 addons/mail/wizard/mail_compose_message.py | 5 +----
 addons/mass_mailing/models/mail_mail.py    | 3 ++-
 addons/mass_mailing/views/mass_mailing.xml | 1 +
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index cb068d566c1..e14a8f3dfe5 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -267,10 +267,7 @@ class mail_compose_message(osv.TransientModel):
             # mass mailing: rendering override wizard static values
             if mass_mail_mode and wizard.model:
                 # always keep a copy, reset record name (avoid browsing records)
-                mail_values.update(notification=True, record_name=False)
-                if hasattr(self.pool[wizard.model], 'message_new'):
-                    mail_values['model'] = wizard.model
-                    mail_values['res_id'] = res_id
+                mail_values.update(notification=True, model=wizard.model, res_id=res_id, record_name=False)
                 # auto deletion of mail_mail
                 if 'mail_auto_delete' in context:
                     mail_values['auto_delete'] = context.get('mail_auto_delete')
diff --git a/addons/mass_mailing/models/mail_mail.py b/addons/mass_mailing/models/mail_mail.py
index a67f88a2a28..0e44399a256 100644
--- a/addons/mass_mailing/models/mail_mail.py
+++ b/addons/mass_mailing/models/mail_mail.py
@@ -84,7 +84,8 @@ class MailMail(osv.Model):
     def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
         res = super(MailMail, self).send_get_email_dict(cr, uid, mail, partner, context=context)
         if mail.mailing_id and res.get('body') and res.get('email_to'):
-            email_to = tools.email_split(res.get('email_to')[0])
+            emails = tools.email_split(res.get('email_to')[0])
+            email_to = emails and emails[0] or False
             unsubscribe_url = self._get_unsubscribe_url(cr, uid, mail, email_to, context=context)
             if unsubscribe_url:
                 res['body'] = tools.append_content_to_html(res['body'], unsubscribe_url, plaintext=False, container_tag='p')
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index c7b6eb6f9de..8771a10f04f 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -591,6 +591,7 @@
                     <field name="mail_mail_id"/>
                     <field name="message_id"/>
                     <field name="sent"/>
+                    <field name="exception"/>
                     <field name="opened"/>
                     <field name="replied"/>
                     <field name="bounced"/>

From 86b80cf95eb658dad45f96bbf5238e7edb777d78 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 18 Jun 2014 11:12:27 +0200
Subject: [PATCH 061/137] [FIX] web: allow using dates and datetimes without
 leading zeros

---
 addons/web/static/src/js/formats.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 0c3577b2671..cf53d9fb3f0 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -264,6 +264,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
         case 'datetime':
             var datetime = Date.parseExact(
                     value, (date_pattern + ' ' + time_pattern));
+            if (datetime !== null)
+                return instance.web.datetime_to_str(datetime);
+            datetime = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), (date_pattern + ' ' + time_pattern));
             if (datetime !== null)
                 return instance.web.datetime_to_str(datetime);
             datetime = Date.parse(value);
@@ -272,6 +277,11 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
             throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value));
         case 'date':
             var date = Date.parseExact(value, date_pattern);
+            if (date !== null)
+                return instance.web.date_to_str(date);
+            date = Date.parseExact(value.replace(/\d+/g, function(m){
+                return m.length === 1 ? "0" + m : m ;
+            }), date_pattern);
             if (date !== null)
                 return instance.web.date_to_str(date);
             date = Date.parse(value);

From 1de1b3c272c61ab886bbc4164706094d53aaacb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 18 Jun 2014 11:26:55 +0200
Subject: [PATCH 062/137] [FIX] website: mobile preview should keep the current
 search; some pages depends strongly of the url parameters, notably the email
 designer page.

---
 addons/website/static/src/js/website.mobile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 98d9bdc957a..1dbe8a1ece9 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -20,7 +20,7 @@
             if (!window.location.origin) { // fix for ie9
                 window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
             }
-            document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + "#mobile-preview";
+            document.getElementById("mobile-viewport").src = window.location.origin + window.location.pathname + window.location.search + "#mobile-preview";
             this.$el.modal();
         },
         destroy: function () {

From d1e9633c46a755d3c758fb19860509acc355845d Mon Sep 17 00:00:00 2001
From: Ravi Gohil <rgo@tinyerp.com>
Date: Wed, 18 Jun 2014 15:49:38 +0530
Subject: [PATCH 063/137] [FIX] l10n_be_invoice_bba: Fixed the length of random
 generated code to ensure it generates 10 digit code so that it allows
 validation of invoice. (Maintenance Case: 608485)

---
 addons/l10n_be_invoice_bba/invoice.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 854593a87cc..499e6e6c4ac 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -141,7 +141,7 @@ class account_invoice(osv.osv):
                 elif algorithm == 'random':
                     if not self.check_bbacomm(reference):
                         base = random.randint(1, 9999999999)
-                        bbacomm = str(base).rjust(7, '0')
+                        bbacomm = str(base).rjust(10, '0')
                         base = int(bbacomm)
                         mod = base % 97 or 97
                         mod = str(mod).rjust(2, '0')

From bc3fc54fac248c829a6472bcdaf06347238195b0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 18 Jun 2014 12:25:13 +0200
Subject: [PATCH 064/137] [IMP] Tour: add tour in web module; tour became
 available in backend.

---
 addons/web/static/src/xml/base.xml            |   1 +
 addons/web/views/database_manager.html        |   1 +
 addons/web/views/webclient_templates.xml      |   1 +
 .../static/src/js/website.tour.banner.js      |   3 +-
 addons/website/static/src/js/website.tour.js  | 543 +-----------------
 .../website/static/src/xml/website.tour.xml   |  27 -
 addons/website/tests/test_ui.py               |   2 +-
 .../static/src/js/website.tour.blog.js        |   3 +-
 addons/website_blog/tests/test_ui.py          |   2 +-
 .../static/src/js/website.tour.event.js       |   3 +-
 addons/website_event/tests/test_ui.py         |   2 +-
 .../static/src/js/website.tour.event_sale.js  |   4 +-
 addons/website_event_sale/tests/test_ui.py    |  10 +-
 addons/website_report/views/layouts.xml       |   2 -
 .../static/src/js/website.tour.sale.js        |   7 +-
 .../static/src/js/website.tour.shop.js        |   3 +-
 .../website_sale/tests/test_sale_process.py   |  14 +-
 17 files changed, 41 insertions(+), 587 deletions(-)
 delete mode 100644 addons/website/static/src/xml/website.tour.xml

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 913783a2396..fb2fcbf303e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2038,4 +2038,5 @@
 </t>
 <t t-name="StatInfo">
     <strong><t t-esc="value"/></strong><br/><t t-esc="text"/></t>
+
 </templates>
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index 5734f60bc62..19ae6a23bb2 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -51,6 +51,7 @@
         <script src="/web/static/src/js/view_list_editable.js" type="text/javascript"></script>
         <script src="/web/static/src/js/view_tree.js" type="text/javascript"></script>
         <script src="/base/static/src/js/apps.js" type="text/javascript"></script>
+        <script src="/web/static/src/js/tour.js" type="text/javascript"></script>
         <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/>
         <link href="/web/static/lib/cleditor/jquery.cleditor.css" rel="stylesheet"/>
         <link href="/web/static/lib/jquery.textext/jquery.textext.css" rel="stylesheet"/>
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 2b022d86f30..7dc160995e4 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -22,6 +22,7 @@
 
             <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
             <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
+            <script type="text/javascript" src="/web/static/src/js/tour.js"></script>
             <script type="text/javascript" charset="utf-8">
                 openerp._modules = <t t-raw="modules"/>;
             </script>
diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 3d55220084e..c9295635941 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -1,10 +1,9 @@
 (function () {
     'use strict';
 
-    var website = openerp.website;
     var _t = openerp._t;
 
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'banner',
         name: _t("Build a page"),
         path: '/page/website.homepage',
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 0544d29df08..2d7a67fbe1a 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -1,535 +1,24 @@
 (function () {
     'use strict';
 
-// raise an error in test mode if openerp don't exist
-if (typeof openerp === "undefined") {
-    var error = "openerp is undefined"
-                + "\nhref: " + window.location.href
-                + "\nreferrer: " + document.referrer
-                + "\nlocalStorage: " + window.localStorage.getItem("tour");
-    if (typeof $ !== "undefined") {
-        error += '\n\n' + $("body").html();
-    }
-    throw new Error(error);
-}
-
-var website = window.openerp.website;
-
-// don't rewrite T in test mode
-if (typeof website.Tour !== "undefined") {
-    return;
-}
-
-// don't need template to use bootstrap Tour in automatic mode
-if (typeof QWeb2 !== "undefined") {
-    website.add_template_file('/website/static/src/xml/website.tour.xml');
-}
-
-if (website.EditorBar) {
-    website.EditorBar.include({
-        tours: [],
-        start: function () {
-            var self = this;
-            var menu = $('#help-menu');
-            _.each(T.tours, function (tour) {
-                if (tour.mode === "test") {
-                    return;
-                }
-                var $menuItem = $($.parseHTML('<li><a href="#">'+tour.name+'</a></li>'));
-                $menuItem.click(function () {
-                    T.reset();
-                    T.run(tour.id);
-                });
-                menu.append($menuItem);
+window.openerp.website.EditorBar.include({
+    tours: [],
+    start: function () {
+        var self = this;
+        var menu = $('#help-menu');
+        _.each(window.openerp.Tour.tours, function (tour) {
+            if (tour.mode === "test") {
+                return;
+            }
+            var $menuItem = $($.parseHTML('<li><a href="#">'+tour.name+'</a></li>'));
+            $menuItem.click(function () {
+                T.reset();
+                T.run(tour.id);
             });
-            return this._super();
-        }
-    });
-}
-
-
-/////////////////////////////////////////////////
-
-
-/* jQuery selector to match exact text inside an element
- *  :containsExact()     - case insensitive
- *  :containsExactCase() - case sensitive
- *  :containsRegex()     - set by user ( use: $(el).find(':containsRegex(/(red|blue|yellow)/gi)') )
- */
-$.extend($.expr[':'],{
-    containsExact: function(a,i,m){
-        return $.trim(a.innerHTML.toLowerCase()) === m[3].toLowerCase();
-    },
-    containsExactCase: function(a,i,m){
-        return $.trim(a.innerHTML) === m[3];
-    },
-    // Note all escaped characters need to be double escaped
-    // inside of the containsRegex, so "\(" needs to be "\\("
-    containsRegex: function(a,i,m){
-        var regreg =  /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})$/,
-        reg = regreg.exec(m[3]);
-        return reg ? new RegExp(reg[1], reg[2]).test($.trim(a.innerHTML)) : false;
+            menu.append($menuItem);
+        });
+        return this._super();
     }
 });
-$.ajaxSetup({
-    beforeSend:function(){
-        $.ajaxBusy = ($.ajaxBusy|0) + 1;
-    },
-    complete:function(){
-        $.ajaxBusy--;
-    }
-});
-
-/////////////////////////////////////////////////
-
-var localStorage = window.localStorage;
-
-var T = website.Tour = {
-    tours: {},
-    defaultDelay: 50,
-    retryRunningDelay: 1000,
-    errorDelay: 5000,
-    state: null,
-    $element: null,
-    timer: null,
-    testtimer: null,
-    currentTimer: null,
-    register: function (tour) {
-        if (tour.mode !== "test") tour.mode = "tutorial";
-        T.tours[tour.id] = tour;
-    },
-    run: function (tour_id, mode) {
-        var tour = T.tours[tour_id];
-        this.time = new Date().getTime();
-        if (tour.path && !window.location.href.match(new RegExp("("+T.getLang()+")?"+tour.path+"#?$", "i"))) {
-            var href = "/"+T.getLang()+tour.path;
-            console.log("Tour Begin from run method (redirection to "+href+")");
-            T.saveState(tour.id, mode || tour.mode, -1, 0);
-            window.location.href = href;
-        } else {
-            console.log("Tour Begin from run method");
-            T.saveState(tour.id, mode || tour.mode, 0, 0);
-            T.running();
-        }
-    },
-    registerSteps: function (tour) {
-        if (tour.register) {
-            return;
-        }
-        tour.register = true;
-
-        for (var index=0, len=tour.steps.length; index<len; index++) {
-            var step = tour.steps[index];
-            step.id = index;
-
-            if (!step.waitNot && index > 0 && tour.steps[index-1] &&
-                tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
-                step.waitNot = '.popover.tour.fade.in:visible';
-            }
-            if (!step.waitFor && index > 0 && tour.steps[index-1].snippet) {
-                step.waitFor = '.oe_overlay_options .oe_options:visible';
-            }
-
-
-            var snippet = step.element && step.element.match(/#oe_snippets (.*) \.oe_snippet_thumbnail/);
-            if (snippet) {
-                step.snippet = snippet[1];
-            } else if (step.snippet) {
-                step.element = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
-            }
-
-            if (!step.element) {
-                step.element = "body";
-                step.orphan = true;
-                step.backdrop = true;
-            }
-        }
-        if (tour.steps[index-1] &&
-            tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
-            var step = {
-                _title: "",
-                id: index,
-                waitNot: '.popover.tour.fade.in:visible'
-            };
-            tour.steps.push(step);
-        }
-
-        // rendering bootstrap tour and popover
-        if (tour.mode !== "test") {
-            for (var index=0, len=tour.steps.length; index<len; index++) {
-                var step = tour.steps[index];
-                step._title = step._title || step.title;
-                step.title = T.popoverTitle(tour, { title: step._title });
-                step.template = step.template || T.popover( step.popover );
-            }
-        }
-    },
-    closePopover: function () {
-        if (T.$element) {
-            T.$element.popover('destroy');
-            T.$element.removeData("tour");
-            T.$element.removeData("tour-step");
-            $(".tour-backdrop").remove();
-            $(".popover.tour").remove();
-            T.$element = null;
-        }
-    },
-    autoTogglePopover: function () {
-        var state = T.getState();
-        var step = state.step;
-
-        if (T.$element &&
-            T.$element.is(":visible") &&
-            T.$element.data("tour") === state.id &&
-            T.$element.data("tour-step") === step.id) {
-            T.repositionPopover();
-            return;
-        }
-
-        if (step.busy) {
-            return;
-        }
-
-        T.closePopover();
-
-        var $element = $(step.element).first();
-        if (!step.element || !$element.size() || !$element.is(":visible")) {
-            return;
-        }
-
-
-        T.$element = $element;
-        $element.data("tour", state.id);
-        $element.data("tour-step", step.id);
-        $element.popover({
-            placement: step.placement || "auto",
-            animation: true,
-            trigger: "manual",
-            title: step.title,
-            content: step.content,
-            html: true,
-            container: "body",
-            template: step.template,
-            orphan: step.orphan
-        }).popover("show");
-
-
-        var $tip = $element.data("bs.popover").tip();
-
-
-        // add popover style (orphan, static, backdrop)
-        if (step.orphan) {
-            $tip.addClass("orphan");
-        }
-
-        var node = $element[0];
-        var css;
-        do {
-            css = window.getComputedStyle(node);
-            if (!css || css.position == "fixed") {
-                $tip.addClass("fixed");
-                break;
-            }
-        } while ((node = node.parentNode) && node !== document);
-
-        if (step.backdrop) {
-            $("body").append('<div class="tour-backdrop"></div>');
-        }
-
-        if (step.backdrop || $element.parents("#website-top-navbar, .modal").size()) {
-            $tip.css("z-index", 2010);
-        }
-
-        // button click event
-        $tip.find("button")
-            .one("click", function () {
-                step.busy = true;
-                if (!$(this).is("[data-role='next']")) {
-                    clearTimeout(T.timer);
-                    T.endTour();
-                }
-                T.closePopover();
-            });
-
-        T.repositionPopover();
-    },
-    repositionPopover: function() {
-        var popover = T.$element.data("bs.popover");
-        var $tip = T.$element.data("bs.popover").tip();
-
-        if (popover.options.orphan) {
-            return $tip.css("top", $(window).outerHeight() / 2 - $tip.outerHeight() / 2);
-        }
-
-        var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset;
-        offsetWidth = $tip[0].offsetWidth;
-        offsetHeight = $tip[0].offsetHeight;
-        tipOffset = $tip.offset();
-        originalLeft = tipOffset.left;
-        originalTop = tipOffset.top;
-        offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight();
-        if (offsetBottom < 0) {
-            tipOffset.top = tipOffset.top + offsetBottom;
-        }
-        offsetRight = $("html").outerWidth() - tipOffset.left - $tip.outerWidth();
-        if (offsetRight < 0) {
-            tipOffset.left = tipOffset.left + offsetRight;
-        }
-        if (tipOffset.top < 0) {
-            tipOffset.top = 0;
-        }
-        if (tipOffset.left < 0) {
-            tipOffset.left = 0;
-        }
-        $tip.offset(tipOffset);
-        if (popover.options.placement === "bottom" || popover.options.placement === "top") {
-                var left = T.$element.offset().left + T.$element.outerWidth()/2 - tipOffset.left;
-                $tip.find(".arrow").css("left", left ? left + "px" : "");
-        } else if (popover.options.placement !== "auto") {
-                var top = T.$element.offset().top + T.$element.outerHeight()/2 - tipOffset.top;
-                $tip.find(".arrow").css("top", top ? top + "px" : "");
-        }
-    },
-    popoverTitle: function (tour, options) {
-        return openerp.qweb ? openerp.qweb.render('website.tour_popover_title', options) : options.title;
-    },
-    popover: function (options) {
-        return openerp.qweb ? openerp.qweb.render('website.tour_popover', options) : options.title;
-    },
-    getLang: function () {
-        return $("html").attr("lang").replace(/-/, '_');
-    },
-    getState: function () {
-        var state = JSON.parse(localStorage.getItem("tour") || 'false') || {};
-        if (state) { this.time = state.time; }
-        var tour_id,mode,step_id;
-        if (!state.id && window.location.href.indexOf("#tutorial.") > -1) {
-            state = {
-                "id": window.location.href.match(/#tutorial\.(.*)=true/)[1],
-                "mode": "tutorial",
-                "step_id": 0
-            };
-            window.location.hash = "";
-            console.log("Tour Begin from url hash");
-            T.saveState(state.id, state.mode, state.step_id, 0);
-        }
-        if (!state.id) {
-            return;
-        }
-        state.tour = T.tours[state.id];
-        state.step = state.tour && state.tour.steps[state.step_id === -1 ? 0 : state.step_id];
-        return state;
-    },
-    error: function (step, message) {
-        var state = T.getState();
-        message += '\n tour: ' + state.id
-            + '\n step: ' + step.id + ": '" + (step._title || step.title) + "'"
-            + '\n href: ' + window.location.href
-            + '\n referrer: ' + document.referrer
-            + '\n element: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
-            + '\n waitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
-            + '\n waitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
-            + "\n localStorage: " + JSON.stringify(localStorage)
-            + '\n\n' + $("body").html();
-        T.reset();
-        throw new Error(message);
-    },
-    lists: function () {
-        var tour_ids = [];
-        for (var k in T.tours) {
-            tour_ids.push(k);
-        }
-        return tour_ids;
-    },
-    saveState: function (tour_id, mode, step_id, number) {
-        localStorage.setItem("tour", JSON.stringify({"id":tour_id, "mode":mode, "step_id":step_id || 0, "time": this.time, "number": number+1}));
-    },
-    reset: function () {
-        var state = T.getState();
-        if (state) {
-            for (var k in state.tour.steps) {
-                state.tour.steps[k].busy = false;
-            }
-        }
-        localStorage.removeItem("tour");
-        clearTimeout(T.timer);
-        clearTimeout(T.testtimer);
-        T.closePopover();
-    },
-    running: function () {
-        function run () {
-            var state = T.getState();
-            if (!state) return;
-            if (state.tour) {
-                console.log("Tour '"+state.id+"' is running");
-                T.registerSteps(state.tour);
-                T.nextStep();
-            } else {
-                console.log("Tour '"+state.id+"' wait for running (tour undefined)");
-                setTimeout(T.running, state.mode === "test" ? T.defaultDelay : T.retryRunningDelay);
-            }
-        }
-        setTimeout(function () {
-            if ($.ajaxBusy) {
-                $(document).ajaxStop(run);
-            } else {
-                run();
-            }
-        },0);
-    },
-    check: function (step) {
-        return (step &&
-            (!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden"))) &&
-            (!step.waitNot || !$(step.waitNot).size()) &&
-            (!step.waitFor || $(step.waitFor).size()));
-    },
-    waitNextStep: function () {
-        var state = T.getState();
-        var time = new Date().getTime();
-        var timer;
-        var next = state.tour.steps[state.step.id+1];
-        var overlaps = state.mode === "test" ? T.errorDelay : 0;
-
-        window.onbeforeunload = function () {
-            clearTimeout(T.timer);
-            clearTimeout(T.testtimer);
-        };
-
-        function checkNext () {
-            T.autoTogglePopover();
-
-            clearTimeout(T.timer);
-            if (T.check(next)) {
-                clearTimeout(T.currentTimer);
-                // use an other timeout for cke dom loading
-                T.saveState(state.id, state.mode, state.step.id, 0);
-                setTimeout(function () {
-                    T.nextStep(next);
-                }, T.defaultDelay);
-            } else if (!overlaps || new Date().getTime() - time < overlaps) {
-                T.timer = setTimeout(checkNext, T.defaultDelay);
-            } else {
-                T.error(next, "Can't reach the next step");
-            }
-        }
-        checkNext();
-    },
-    nextStep: function (step) {
-        var state = T.getState();
-
-        if (!state) {
-            return;
-        }
-
-        step = step || state.step;
-        var next = state.tour.steps[step.id+1];
-
-        if (state.number > 3) {
-            T.error(next, "Cycling. Can't reach the next step");
-        }
-        
-        T.saveState(state.id, state.mode, step.id, state.number);
-
-        if (step.id !== state.step_id) {
-            console.log("Tour Step: '" + (step._title || step.title) + "' (" + (new Date().getTime() - this.time) + "ms)");
-        }
-
-        T.autoTogglePopover(true);
-
-        if (step.onload) {
-            step.onload();
-        }
-
-        if (next) {
-            setTimeout(function () {
-                    T.waitNextStep();
-                    if (state.mode === "test") {
-                        setTimeout(function(){
-                            T.autoNextStep(state.tour, step);
-                        }, T.defaultDelay);
-                    }
-            }, next.wait || 0);
-        } else {
-            T.endTour();
-        }
-    },
-    endTour: function () {
-        var state = T.getState();
-        var test = state.step.id >= state.tour.steps.length-1;
-        T.reset();
-        if (test) {
-            console.log('ok');
-        } else {
-            console.log('error');
-        }
-    },
-    autoNextStep: function (tour, step) {
-        clearTimeout(T.testtimer);
-
-        function autoStep () {
-            if (!step) return;
-
-            if (step.autoComplete) {
-                step.autoComplete(tour);
-            }
-
-            $(".popover.tour [data-role='next']").click();
-
-            var $element = $(step.element);
-            if (!$element.size()) return;
-
-            if (step.snippet) {
-
-                T.autoDragAndDropSnippet($element);
-            
-            } else if ($element.is(":visible")) {
-
-                $element.trigger($.Event("mouseenter", { srcElement: $element[0] }));
-                $element.trigger($.Event("mousedown", { srcElement: $element[0] }));
-        
-                var evt = document.createEvent("MouseEvents");
-                evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-                $element[0].dispatchEvent(evt);
-
-                // trigger after for step like: mouseenter, next step click on button display with mouseenter
-                setTimeout(function () {
-                    $element.trigger($.Event("mouseup", { srcElement: $element[0] }));
-                    $element.trigger($.Event("mouseleave", { srcElement: $element[0] }));
-                }, 1000);
-            }
-            if (step.sampleText) {
-            
-                $element.trigger($.Event("keydown", { srcElement: $element }));
-                if ($element.is("input") ) {
-                    $element.val(step.sampleText);
-                } if ($element.is("select")) {
-                    $element.find("[value='"+step.sampleText+"'], option:contains('"+step.sampleText+"')").attr("selected", true);
-                    $element.val(step.sampleText);
-                } else {
-                    $element.html(step.sampleText);
-                }
-                setTimeout(function () {
-                    $element.trigger($.Event("keyup", { srcElement: $element }));
-                    $element.trigger($.Event("change", { srcElement: $element }));
-                }, self.defaultDelay<<1);
-            
-            }
-        }
-        T.testtimer = setTimeout(autoStep, 100);
-    },
-    autoDragAndDropSnippet: function (selector) {
-        var $thumbnail = $(selector).first();
-        var thumbnailPosition = $thumbnail.position();
-        $thumbnail.trigger($.Event("mousedown", { which: 1, pageX: thumbnailPosition.left, pageY: thumbnailPosition.top }));
-        $thumbnail.trigger($.Event("mousemove", { which: 1, pageX: document.body.scrollWidth/2, pageY: document.body.scrollHeight/2 }));
-        var $dropZone = $(".oe_drop_zone").first();
-        var dropPosition = $dropZone.position();
-        $dropZone.trigger($.Event("mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top }));
-    }
-};
-
-//$(document).ready(T.running);
-website.ready().then(T.running);
-
 
 }());
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
deleted file mode 100644
index dcecef021bb..00000000000
--- a/addons/website/static/src/xml/website.tour.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<templates id="template" xml:space="preserve">
-    <t t-name="website.tour_popover">
-        <div t-attf-class="#{ fixed ? 'popover tour fixed' : 'popover tour' }">
-            <div class="arrow"></div>
-            <h3 class="popover-title"></h3>
-            <div class="popover-content"></div>
-            <t t-if="next or end">
-                <nav class="popover-navigation">
-                    <t t-if="next">
-                        <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
-                    </t>
-                    <small t-if="next &amp;&amp; end">
-                        <span class="text-muted"> or </span>
-                        <button class="btn-link" data-role="end" style="float: none; padding: 0"><t t-esc="end"/></button>
-                    </small>
-                    <t t-if="end &amp;&amp; ! next">
-                        <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
-                    </t>
-                </nav>
-            </t>
-        </div>
-    </t>
-    <t t-name="website.tour_popover_title">
-        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
-    </t>
-</templates>
diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index 7eb88d00df3..e2a49953034 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -8,6 +8,6 @@ class TestUi(openerp.tests.HttpCase):
         self.phantom_js("/", "console.log('ok')", "openerp.website.editor", login='admin')
 
     def test_04_admin_tour_banner(self):
-        self.phantom_js("/", "openerp.website.Tour.run('banner', 'test')", "openerp.website.Tour.tours.banner", login='admin')
+        self.phantom_js("/", "openerp.Tour.run('banner', 'test')", "openerp.Tour.tours.banner", login='admin')
 
 # vim:et:
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index 050bf549225..11a68e17b74 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -1,10 +1,9 @@
 (function () {
     'use strict';
 
-    var website = openerp.website;
     var _t = openerp._t;
 
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'blog',
         name: _t("Create a blog post"),
         steps: [
diff --git a/addons/website_blog/tests/test_ui.py b/addons/website_blog/tests/test_ui.py
index b34ef25c002..f6d0f025a45 100644
--- a/addons/website_blog/tests/test_ui.py
+++ b/addons/website_blog/tests/test_ui.py
@@ -2,5 +2,5 @@ import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
-        self.phantom_js("/", "openerp.website.Tour.run('blog', 'test')", "openerp.website.Tour.tours.blog")
+        self.phantom_js("/", "openerp.Tour.run('blog', 'test')", "openerp.Tour.tours.blog")
 
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 07a12d81f34..245fb2ee41e 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -1,10 +1,9 @@
 (function () {
     'use strict';
 
-    var website = openerp.website;
     var _t = openerp._t;
 
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'event',
         name: _t("Create an event"),
         steps: [
diff --git a/addons/website_event/tests/test_ui.py b/addons/website_event/tests/test_ui.py
index 96a17a91563..d353ffd28ea 100644
--- a/addons/website_event/tests/test_ui.py
+++ b/addons/website_event/tests/test_ui.py
@@ -2,5 +2,5 @@ import openerp.tests
 
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
-        self.phantom_js("/", "openerp.website.Tour.run('event', 'test')", "openerp.website.Tour.tours.event")
+        self.phantom_js("/", "openerp.Tour.run('event', 'test')", "openerp.Tour.tours.event")
 
diff --git a/addons/website_event_sale/static/src/js/website.tour.event_sale.js b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
index ea34fc35687..7b0bf1ab621 100644
--- a/addons/website_event_sale/static/src/js/website.tour.event_sale.js
+++ b/addons/website_event_sale/static/src/js/website.tour.event_sale.js
@@ -1,9 +1,7 @@
 (function () {
     'use strict';
 
-    var website = openerp.website;
-
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'event_buy_tickets',
         name: "Try to buy tickets for event",
         path: '/event',
diff --git a/addons/website_event_sale/tests/test_ui.py b/addons/website_event_sale/tests/test_ui.py
index 3c3e643912a..94869251fad 100644
--- a/addons/website_event_sale/tests/test_ui.py
+++ b/addons/website_event_sale/tests/test_ui.py
@@ -3,19 +3,19 @@ import os
 import openerp.tests
 
 inject = [
-    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
-    ("openerp.website.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.event_sale.js")),
+    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
+    ("openerp.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.event_sale.js")),
 ]
 
 @openerp.tests.common.at_install(False)
 @openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_admin(self):
-        self.phantom_js("/", "openerp.website.Tour.run('event_buy_tickets', 'test')", "openerp.website.Tour.tours.event_buy_tickets", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", inject=inject)
 
     def test_demo(self):
-        self.phantom_js("/", "openerp.website.Tour.run('event_buy_tickets', 'test')", "openerp.website.Tour.tours.event_buy_tickets", login="demo", password="demo", inject=inject);
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login="demo", password="demo", inject=inject);
 
     def test_public(self):
-        self.phantom_js("/", "openerp.website.Tour.run('event_buy_tickets', 'test')", "openerp.website.Tour.tours.event_buy_tickets", login=None, inject=inject);
+        self.phantom_js("/", "openerp.Tour.run('event_buy_tickets', 'test')", "openerp.Tour.tours.event_buy_tickets", login=None, inject=inject);
 
diff --git a/addons/website_report/views/layouts.xml b/addons/website_report/views/layouts.xml
index 9978d994821..03df41266be 100644
--- a/addons/website_report/views/layouts.xml
+++ b/addons/website_report/views/layouts.xml
@@ -62,8 +62,6 @@
         <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script> <!-- groups="base.group_website_designer" -->
         <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
-        <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script> <!-- groups="base.group_website_designer" -->
         <script type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
         <script type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index 8cfb4e2cdad..57365a826a6 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -1,9 +1,6 @@
 (function () {
     'use strict';
-
-    var website = openerp.website;
-
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'shop_customize',
         name: "Customize the page and search a product",
         path: '/shop',
@@ -37,7 +34,7 @@
         ]
     });
 
-    website.Tour.register({
+    openerp.Tour.register({
         id:   'shop_buy_product',
         name: "Try to buy products",
         path: '/shop',
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 3dd5b54b357..c39a8b2f9e8 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -1,10 +1,9 @@
 (function () {
     'use strict';
 
-    var website = openerp.website;
     var _t = openerp._t;
 
-    website.Tour.register({
+    openerp.Tour.register({
         id: 'shop',
         name: _t("Create a product"),
         steps: [
diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py
index b37b514a825..a57a2d64bca 100644
--- a/addons/website_sale/tests/test_sale_process.py
+++ b/addons/website_sale/tests/test_sale_process.py
@@ -3,22 +3,22 @@ import os
 import openerp.tests
 
 inject = [
-    ("openerp.website.Tour", os.path.join(os.path.dirname(__file__), '../../website/static/src/js/website.tour.js')),
-    ("openerp.website.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
+    ("openerp.Tour", os.path.join(os.path.dirname(__file__), '../../web/static/src/js/tour.js')),
+    ("openerp.Tour.ShopTest", os.path.join(os.path.dirname(__file__), "../static/src/js/website.tour.sale.js")),
 ]
 
 @openerp.tests.common.at_install(False)
 @openerp.tests.common.post_install(True)
 class TestUi(openerp.tests.HttpCase):
     def test_01_admin_shop_tour(self):
-        self.phantom_js("/", "openerp.website.Tour.run('shop', 'test')", "openerp.website.Tour.tours.shop", login="admin")
+        self.phantom_js("/", "openerp.Tour.run('shop', 'test')", "openerp.Tour.tours.shop", login="admin")
 
     def test_02_admin_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run('shop_customize', 'test')", "openerp.website.Tour.tours.shop_customize", login="admin", inject=inject)
-        self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", login="admin", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_customize', 'test')", "openerp.Tour.tours.shop_customize", login="admin", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="admin", inject=inject)
 
     def test_03_demo_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", login="demo", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", login="demo", inject=inject)
 
     def test_04_public_checkout(self):
-        self.phantom_js("/", "openerp.website.Tour.run('shop_buy_product', 'test')", "openerp.website.Tour.tours.shop_buy_product", inject=inject)
+        self.phantom_js("/", "openerp.Tour.run('shop_buy_product', 'test')", "openerp.Tour.tours.shop_buy_product", inject=inject)

From 1c8e3c315686646d62e05cf11c7cac01a7ce7d0f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 18 Jun 2014 12:25:53 +0200
Subject: [PATCH 065/137] [IMP] Tour: add tour in web module; tour became
 available in backend.

---
 addons/web/static/src/js/tour.js           | 540 +++++++++++++++++++++
 addons/web/static/src/xml/website.tour.xml |  27 ++
 2 files changed, 567 insertions(+)
 create mode 100644 addons/web/static/src/js/tour.js
 create mode 100644 addons/web/static/src/xml/website.tour.xml

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
new file mode 100644
index 00000000000..634fa5c9421
--- /dev/null
+++ b/addons/web/static/src/js/tour.js
@@ -0,0 +1,540 @@
+(function () {
+    'use strict';
+
+// raise an error in test mode if openerp don't exist
+if (typeof openerp === "undefined") {
+    var error = "openerp is undefined"
+                + "\nhref: " + window.location.href
+                + "\nreferrer: " + document.referrer
+                + "\nlocalStorage: " + window.localStorage.getItem("tour");
+    if (typeof $ !== "undefined") {
+        error += '\n\n' + $("body").html();
+    }
+    throw new Error(error);
+}
+
+var website = openerp.website;
+
+// don't rewrite T in test mode
+if (typeof openerp.Tour !== "undefined") {
+    return;
+}
+
+/////////////////////////////////////////////////
+
+
+/* jQuery selector to match exact text inside an element
+ *  :containsExact()     - case insensitive
+ *  :containsExactCase() - case sensitive
+ *  :containsRegex()     - set by user ( use: $(el).find(':containsRegex(/(red|blue|yellow)/gi)') )
+ */
+$.extend($.expr[':'],{
+    containsExact: function(a,i,m){
+        return $.trim(a.innerHTML.toLowerCase()) === m[3].toLowerCase();
+    },
+    containsExactCase: function(a,i,m){
+        return $.trim(a.innerHTML) === m[3];
+    },
+    // Note all escaped characters need to be double escaped
+    // inside of the containsRegex, so "\(" needs to be "\\("
+    containsRegex: function(a,i,m){
+        var regreg =  /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})$/,
+        reg = regreg.exec(m[3]);
+        return reg ? new RegExp(reg[1], reg[2]).test($.trim(a.innerHTML)) : false;
+    }
+});
+$.ajaxSetup({
+    beforeSend:function(){
+        $.ajaxBusy = ($.ajaxBusy|0) + 1;
+    },
+    complete:function(){
+        $.ajaxBusy--;
+    }
+});
+
+/////////////////////////////////////////////////
+
+var localStorage = window.localStorage;
+
+var Tour = {
+    tours: {},
+    defaultDelay: 50,
+    retryRunningDelay: 1000,
+    errorDelay: 5000,
+    state: null,
+    $element: null,
+    timer: null,
+    testtimer: null,
+    currentTimer: null,
+    register: function (tour) {
+        if (tour.mode !== "test") tour.mode = "tutorial";
+        Tour.tours[tour.id] = tour;
+    },
+    run: function (tour_id, mode) {
+        var tour = Tour.tours[tour_id];
+        if (!tour) {
+            throw new Error("Can't run '"+tour_id+"' (tour undefined)");
+        }
+        this.time = new Date().getTime();
+        if (tour.path && !window.location.href.match(new RegExp("("+Tour.getLang()+")?"+tour.path+"#?$", "i"))) {
+            var href = "/"+Tour.getLang()+tour.path;
+            console.log("Tour Begin from run method (redirection to "+href+")");
+            Tour.saveState(tour.id, mode || tour.mode, -1, 0);
+            window.location.href = href;
+        } else {
+            console.log("Tour Begin from run method");
+            Tour.saveState(tour.id, mode || tour.mode, 0, 0);
+            Tour.running();
+        }
+    },
+    registerSteps: function (tour) {
+        if (tour.register) {
+            return;
+        }
+        tour.register = true;
+
+        for (var index=0, len=tour.steps.length; index<len; index++) {
+            var step = tour.steps[index];
+            step.id = index;
+
+            if (!step.waitNot && index > 0 && tour.steps[index-1] &&
+                tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
+                step.waitNot = '.popover.tour.fade.in:visible';
+            }
+            if (!step.waitFor && index > 0 && tour.steps[index-1].snippet) {
+                step.waitFor = '.oe_overlay_options .oe_options:visible';
+            }
+
+
+            var snippet = step.element && step.element.match(/#oe_snippets (.*) \.oe_snippet_thumbnail/);
+            if (snippet) {
+                step.snippet = snippet[1];
+            } else if (step.snippet) {
+                step.element = '#oe_snippets '+step.snippet+' .oe_snippet_thumbnail';
+            }
+
+            if (!step.element) {
+                step.element = "body";
+                step.orphan = true;
+                step.backdrop = true;
+            }
+        }
+        if (tour.steps[index-1] &&
+            tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
+            var step = {
+                _title: "",
+                id: index,
+                waitNot: '.popover.tour.fade.in:visible'
+            };
+            tour.steps.push(step);
+        }
+
+        // rendering bootstrap tour and popover
+        if (tour.mode !== "test") {
+            for (var index=0, len=tour.steps.length; index<len; index++) {
+                var step = tour.steps[index];
+                step._title = step._title || step.title;
+                step.title = Tour.popoverTitle(tour, { title: step._title });
+                step.template = step.template || Tour.popover( step.popover );
+            }
+        }
+    },
+    closePopover: function () {
+        if (Tour.$element) {
+            Tour.$element.popover('destroy');
+            Tour.$element.removeData("tour");
+            Tour.$element.removeData("tour-step");
+            $(".tour-backdrop").remove();
+            $(".popover.tour").remove();
+            Tour.$element = null;
+        }
+    },
+    autoTogglePopover: function () {
+        var state = Tour.getState();
+        var step = state.step;
+
+        if (Tour.$element &&
+            Tour.$element.is(":visible") &&
+            Tour.$element.data("tour") === state.id &&
+            Tour.$element.data("tour-step") === step.id) {
+            Tour.repositionPopover();
+            return;
+        }
+
+        if (step.busy) {
+            return;
+        }
+
+        Tour.closePopover();
+
+        var $element = $(step.element).first();
+        if (!step.element || !$element.size() || !$element.is(":visible")) {
+            return;
+        }
+
+
+        Tour.$element = $element;
+        $element.data("tour", state.id);
+        $element.data("tour-step", step.id);
+        $element.popover({
+            placement: step.placement || "auto",
+            animation: true,
+            trigger: "manual",
+            title: step.title,
+            content: step.content,
+            html: true,
+            container: "body",
+            template: step.template,
+            orphan: step.orphan
+        }).popover("show");
+
+
+        var $tip = $element.data("bs.popover").tip();
+
+
+        // add popover style (orphan, static, backdrop)
+        if (step.orphan) {
+            $tip.addClass("orphan");
+        }
+
+        var node = $element[0];
+        var css;
+        do {
+            css = window.getComputedStyle(node);
+            if (!css || css.position == "fixed") {
+                $tip.addClass("fixed");
+                break;
+            }
+        } while ((node = node.parentNode) && node !== document);
+
+        if (step.backdrop) {
+            $("body").append('<div class="tour-backdrop"></div>');
+        }
+
+        if (step.backdrop || $element.parents("#website-top-navbar, .oe_navbar, .modal").size()) {
+            $tip.css("z-index", 2010);
+        }
+
+        // button click event
+        $tip.find("button")
+            .one("click", function () {
+                step.busy = true;
+                if (!$(this).is("[data-role='next']")) {
+                    clearTimeout(Tour.timer);
+                    Tour.endTour();
+                }
+                Tour.closePopover();
+            });
+
+        Tour.repositionPopover();
+    },
+    repositionPopover: function() {
+        var popover = Tour.$element.data("bs.popover");
+        var $tip = Tour.$element.data("bs.popover").tip();
+
+        if (popover.options.orphan) {
+            return $tip.css("top", $(window).outerHeight() / 2 - $tip.outerHeight() / 2);
+        }
+
+        var offsetBottom, offsetHeight, offsetRight, offsetWidth, originalLeft, originalTop, tipOffset;
+        offsetWidth = $tip[0].offsetWidth;
+        offsetHeight = $tip[0].offsetHeight;
+        tipOffset = $tip.offset();
+        originalLeft = tipOffset.left;
+        originalTop = tipOffset.top;
+        offsetBottom = $(document).outerHeight() - tipOffset.top - $tip.outerHeight();
+        if (offsetBottom < 0) {
+            tipOffset.top = tipOffset.top + offsetBottom;
+        }
+        offsetRight = $("html").outerWidth() - tipOffset.left - $tip.outerWidth();
+        if (offsetRight < 0) {
+            tipOffset.left = tipOffset.left + offsetRight;
+        }
+        if (tipOffset.top < 0) {
+            tipOffset.top = 0;
+        }
+        if (tipOffset.left < 0) {
+            tipOffset.left = 0;
+        }
+        $tip.offset(tipOffset);
+        if (popover.options.placement === "bottom" || popover.options.placement === "top") {
+                var left = Tour.$element.offset().left + Tour.$element.outerWidth()/2 - tipOffset.left;
+                $tip.find(".arrow").css("left", left ? left + "px" : "");
+        } else if (popover.options.placement !== "auto") {
+                var top = Tour.$element.offset().top + Tour.$element.outerHeight()/2 - tipOffset.top;
+                $tip.find(".arrow").css("top", top ? top + "px" : "");
+        }
+    },
+    _load_template: false,
+    load_template: function () {
+        // don't need template to use bootstrap Tour in automatic mode
+        Tour._load_template = true;
+        if (typeof QWeb2 === "undefined") return $.when();
+        var def = $.Deferred();
+        openerp.qweb.add_template('/web/static/src/xml/website.tour.xml', function(err) {
+            if (err) {
+                def.reject(err);
+            } else {
+                def.resolve();
+            }
+        });
+        return def;
+    },
+    popoverTitle: function (tour, options) {
+        return typeof QWeb2 !== "undefined" ? openerp.qweb.render('tour.popover_title', options) : options.title;
+    },
+    popover: function (options) {
+        return typeof QWeb2 !== "undefined" ? openerp.qweb.render('tour.popover', options) : options.title;
+    },
+    getLang: function () {
+        return $("html").attr("lang").replace(/-/, '_');
+    },
+    getState: function () {
+        var state = JSON.parse(localStorage.getItem("tour") || 'false') || {};
+        if (state) { this.time = state.time; }
+        var tour_id,mode,step_id;
+        if (!state.id && window.location.href.indexOf("#tutorial.") > -1) {
+            state = {
+                "id": window.location.href.match(/#tutorial\.(.*)=true/)[1],
+                "mode": "tutorial",
+                "step_id": 0
+            };
+            window.location.hash = "";
+            console.log("Tour Begin from url hash");
+            Tour.saveState(state.id, state.mode, state.step_id, 0);
+        }
+        if (!state.id) {
+            return;
+        }
+        state.tour = Tour.tours[state.id];
+        state.step = state.tour && state.tour.steps[state.step_id === -1 ? 0 : state.step_id];
+        return state;
+    },
+    error: function (step, message) {
+        var state = Tour.getState();
+        message += '\n tour: ' + state.id
+            + '\n step: ' + step.id + ": '" + (step._title || step.title) + "'"
+            + '\n href: ' + window.location.href
+            + '\n referrer: ' + document.referrer
+            + '\n element: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
+            + '\n waitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
+            + '\n waitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
+            + "\n localStorage: " + JSON.stringify(localStorage)
+            + '\n\n' + $("body").html();
+        Tour.reset();
+        throw new Error(message);
+    },
+    lists: function () {
+        var tour_ids = [];
+        for (var k in Tour.tours) {
+            tour_ids.push(k);
+        }
+        return tour_ids;
+    },
+    saveState: function (tour_id, mode, step_id, number, wait) {
+        localStorage.setItem("tour", JSON.stringify({
+            "id":tour_id,
+            "mode":mode,
+            "step_id":step_id || 0,
+            "time": this.time,
+            "number": number+1,
+            "wait": wait || 0
+        }));
+    },
+    reset: function () {
+        var state = Tour.getState();
+        if (state) {
+            for (var k in state.tour.steps) {
+                state.tour.steps[k].busy = false;
+            }
+        }
+        localStorage.removeItem("tour");
+        clearTimeout(Tour.timer);
+        clearTimeout(Tour.testtimer);
+        Tour.closePopover();
+    },
+    running: function () {
+        function run () {
+            var state = Tour.getState();
+            if (!state) return;
+            if (!Tour._load_template) {
+                Tour.load_template().then(Tour.running);
+            }
+            else if (state.tour) {
+                console.log("Tour '"+state.id+"' is running");
+                Tour.registerSteps(state.tour);
+                Tour.nextStep();
+            } else {
+                if (state.wait > 10) {
+                    Tour.error(step, "Tour '"+state.id+"' undefined");
+                }
+                Tour.saveState(state.id, state.mode, step.id, state.number, state.wait+1);
+                console.log("Tour '"+state.id+"' wait for running (tour undefined)");
+                setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
+            }
+        }
+        setTimeout(function () {
+            if ($.ajaxBusy) {
+                $(document).ajaxStop(run);
+            } else {
+                run();
+            }
+        },0);
+    },
+    check: function (step) {
+        return (step &&
+            (!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden"))) &&
+            (!step.waitNot || !$(step.waitNot).size()) &&
+            (!step.waitFor || $(step.waitFor).size()));
+    },
+    waitNextStep: function () {
+        var state = Tour.getState();
+        var time = new Date().getTime();
+        var timer;
+        var next = state.tour.steps[state.step.id+1];
+        var overlaps = state.mode === "test" ? Tour.errorDelay : 0;
+
+        window.onbeforeunload = function () {
+            clearTimeout(Tour.timer);
+            clearTimeout(Tour.testtimer);
+        };
+
+        function checkNext () {
+            Tour.autoTogglePopover();
+
+            clearTimeout(Tour.timer);
+            if (Tour.check(next)) {
+                clearTimeout(Tour.currentTimer);
+                // use an other timeout for cke dom loading
+                Tour.saveState(state.id, state.mode, state.step.id, 0);
+                setTimeout(function () {
+                    Tour.nextStep(next);
+                }, Tour.defaultDelay);
+            } else if (!overlaps || new Date().getTime() - time < overlaps) {
+                Tour.timer = setTimeout(checkNext, Tour.defaultDelay);
+            } else {
+                Tour.error(next, "Can't reach the next step");
+            }
+        }
+        checkNext();
+    },
+    nextStep: function (step) {
+        var state = Tour.getState();
+
+        if (!state) {
+            return;
+        }
+
+        step = step || state.step;
+        var next = state.tour.steps[step.id+1];
+
+        if (state.number > 3) {
+            Tour.error(next, "Cycling. Can't reach the next step");
+        }
+        
+        Tour.saveState(state.id, state.mode, step.id, state.number);
+
+        if (step.id !== state.step_id) {
+            console.log("Tour Step: '" + (step._title || step.title) + "' (" + (new Date().getTime() - this.time) + "ms)");
+        }
+
+        Tour.autoTogglePopover(true);
+
+        if (step.onload) {
+            step.onload();
+        }
+
+        if (next) {
+            setTimeout(function () {
+                    Tour.waitNextStep();
+                    if (state.mode === "test") {
+                        setTimeout(function(){
+                            Tour.autoNextStep(state.tour, step);
+                        }, Tour.defaultDelay);
+                    }
+            }, next.wait || 0);
+        } else {
+            Tour.endTour();
+        }
+    },
+    endTour: function () {
+        var state = Tour.getState();
+        var test = state.step.id >= state.tour.steps.length-1;
+        Tour.reset();
+        if (test) {
+            console.log('ok');
+        } else {
+            console.log('error');
+        }
+    },
+    autoNextStep: function (tour, step) {
+        clearTimeout(Tour.testtimer);
+
+        function autoStep () {
+            if (!step) return;
+
+            if (step.autoComplete) {
+                step.autoComplete(tour);
+            }
+
+            $(".popover.tour [data-role='next']").click();
+
+            var $element = $(step.element);
+            if (!$element.size()) return;
+
+            if (step.snippet) {
+
+                Tour.autoDragAndDropSnippet($element);
+            
+            } else if ($element.is(":visible")) {
+
+                $element.trigger($.Event("mouseenter", { srcElement: $element[0] }));
+                $element.trigger($.Event("mousedown", { srcElement: $element[0] }));
+        
+                var evt = document.createEvent("MouseEvents");
+                evt.initMouseEvent("click", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+                $element[0].dispatchEvent(evt);
+
+                // trigger after for step like: mouseenter, next step click on button display with mouseenter
+                setTimeout(function () {
+                    $element.trigger($.Event("mouseup", { srcElement: $element[0] }));
+                    $element.trigger($.Event("mouseleave", { srcElement: $element[0] }));
+                }, 1000);
+            }
+            if (step.sampleText) {
+            
+                $element.trigger($.Event("keydown", { srcElement: $element }));
+                if ($element.is("input") ) {
+                    $element.val(step.sampleText);
+                } if ($element.is("select")) {
+                    $element.find("[value='"+step.sampleText+"'], option:contains('"+step.sampleText+"')").attr("selected", true);
+                    $element.val(step.sampleText);
+                } else {
+                    $element.html(step.sampleText);
+                }
+                setTimeout(function () {
+                    $element.trigger($.Event("keyup", { srcElement: $element }));
+                    $element.trigger($.Event("change", { srcElement: $element }));
+                }, self.defaultDelay<<1);
+            
+            }
+        }
+        Tour.testtimer = setTimeout(autoStep, 100);
+    },
+    autoDragAndDropSnippet: function (selector) {
+        var $thumbnail = $(selector).first();
+        var thumbnailPosition = $thumbnail.position();
+        $thumbnail.trigger($.Event("mousedown", { which: 1, pageX: thumbnailPosition.left, pageY: thumbnailPosition.top }));
+        $thumbnail.trigger($.Event("mousemove", { which: 1, pageX: document.body.scrollWidth/2, pageY: document.body.scrollHeight/2 }));
+        var $dropZone = $(".oe_drop_zone").first();
+        var dropPosition = $dropZone.position();
+        $dropZone.trigger($.Event("mouseup", { which: 1, pageX: dropPosition.left, pageY: dropPosition.top }));
+    }
+};
+openerp.Tour = Tour;
+
+/////////////////////////////////////////////////
+
+$(document).ready(Tour.running);
+
+}());
diff --git a/addons/web/static/src/xml/website.tour.xml b/addons/web/static/src/xml/website.tour.xml
new file mode 100644
index 00000000000..d3d3fb8c57a
--- /dev/null
+++ b/addons/web/static/src/xml/website.tour.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="tour.popover">
+        <div t-attf-class="#{ fixed ? 'popover tour fixed' : 'popover tour' }">
+            <div class="arrow"></div>
+            <h3 class="popover-title"></h3>
+            <div class="popover-content"></div>
+            <t t-if="next or end">
+                <nav class="popover-navigation">
+                    <t t-if="next">
+                        <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
+                    </t>
+                    <small t-if="next &amp;&amp; end">
+                        <span class="text-muted"> or </span>
+                        <button class="btn-link" data-role="end" style="float: none; padding: 0"><t t-esc="end"/></button>
+                    </small>
+                    <t t-if="end &amp;&amp; ! next">
+                        <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
+                    </t>
+                </nav>
+            </t>
+        </div>
+    </t>
+    <t t-name="tour.popover_title">
+        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
+    </t>
+</templates>

From 8d282f3b4fa0494cc26f3c10535f17b0feb2b1cd Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Wed, 18 Jun 2014 13:02:00 +0200
Subject: [PATCH 066/137] [FIX] account_analytic_analysis: force company of
 contract when creating recurring invoices

When creating the recurring invoices of the contracts, the invoices accounts(ir.property) must be set according to the company of the contract, not according to the company of the user creating the invoices
---
 .../account_analytic_analysis.py              | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 736a531cc66..a03329ddf65 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -22,7 +22,6 @@ from dateutil.relativedelta import relativedelta
 import datetime
 import logging
 import time
-import traceback
 
 from openerp.osv import osv, fields
 from openerp.osv.orm import intersect, except_orm
@@ -746,29 +745,31 @@ class account_analytic_account(osv.osv):
             contract_ids = ids
         else:
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
-        for contract in self.browse(cr, uid, contract_ids, context=context):
-            try:
-                invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
-                invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
-                next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
-                interval = contract.recurring_interval
-                if contract.recurring_rule_type == 'daily':
-                    new_date = next_date+relativedelta(days=+interval)
-                elif contract.recurring_rule_type == 'weekly':
-                    new_date = next_date+relativedelta(weeks=+interval)
-                elif contract.recurring_rule_type == 'yearly':
-                    new_date = next_date+relativedelta(years=+interval)
-                else:
-                    new_date = next_date+relativedelta(months=+interval)
-                self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
-                if automatic:
-                    cr.commit()
-            except Exception:
-                if automatic:
-                    cr.rollback()
-                    _logger.error(traceback.format_exc())
-                else:
-                    raise
+        cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
+        for company_id, ids in cr.fetchall():
+            for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
+                try:
+                    invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                    invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
+                    next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
+                    interval = contract.recurring_interval
+                    if contract.recurring_rule_type == 'daily':
+                        new_date = next_date+relativedelta(days=+interval)
+                    elif contract.recurring_rule_type == 'weekly':
+                        new_date = next_date+relativedelta(weeks=+interval)
+                    elif contract.recurring_rule_type == 'yearly':
+                        new_date = next_date+relativedelta(years=+interval)
+                    else:
+                        new_date = next_date+relativedelta(months=+interval)
+                    self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+                    if automatic:
+                        cr.commit()
+                except Exception:
+                    if automatic:
+                        cr.rollback()
+                        _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
+                    else:
+                        raise
         return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):

From fd0e0323ba55388a2c21e1d0f349339f0df96ecd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 18 Jun 2014 13:11:17 +0200
Subject: [PATCH 067/137] [FIX] Tour: error log fail; template of modal

---
 addons/web/static/src/js/tour.js           | 19 +++++++++++--------
 addons/web/static/src/xml/website.tour.xml |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 634fa5c9421..7e4eabeedda 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -73,7 +73,7 @@ var Tour = {
     run: function (tour_id, mode) {
         var tour = Tour.tours[tour_id];
         if (!tour) {
-            throw new Error("Can't run '"+tour_id+"' (tour undefined)");
+            Tour.error(null, "Can't run '"+tour_id+"' (tour undefined)");
         }
         this.time = new Date().getTime();
         if (tour.path && !window.location.href.match(new RegExp("("+Tour.getLang()+")?"+tour.path+"#?$", "i"))) {
@@ -313,12 +313,12 @@ var Tour = {
     error: function (step, message) {
         var state = Tour.getState();
         message += '\n tour: ' + state.id
-            + '\n step: ' + step.id + ": '" + (step._title || step.title) + "'"
+            + (step ? '\n step: ' + step.id + ": '" + (step._title || step.title) + "'" : '' )
             + '\n href: ' + window.location.href
             + '\n referrer: ' + document.referrer
-            + '\n element: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden")))
-            + '\n waitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size())
-            + '\n waitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size())
+            + (step ? '\n element: ' + Boolean(!step.element || ($(step.element).size() && $(step.element).is(":visible") && !$(step.element).is(":hidden"))) : '' )
+            + (step ? '\n waitNot: ' + Boolean(!step.waitNot || !$(step.waitNot).size()) : '' )
+            + (step ? '\n waitFor: ' + Boolean(!step.waitFor || $(step.waitFor).size()) : '' )
             + "\n localStorage: " + JSON.stringify(localStorage)
             + '\n\n' + $("body").html();
         Tour.reset();
@@ -343,7 +343,7 @@ var Tour = {
     },
     reset: function () {
         var state = Tour.getState();
-        if (state) {
+        if (state && state.tour) {
             for (var k in state.tour.steps) {
                 state.tour.steps[k].busy = false;
             }
@@ -366,9 +366,9 @@ var Tour = {
                 Tour.nextStep();
             } else {
                 if (state.wait > 10) {
-                    Tour.error(step, "Tour '"+state.id+"' undefined");
+                    Tour.error(state.step, "Tour '"+state.id+"' undefined");
                 }
-                Tour.saveState(state.id, state.mode, step.id, state.number, state.wait+1);
+                Tour.saveState(state.id, state.mode, state.step_id, state.number, state.wait+1);
                 console.log("Tour '"+state.id+"' wait for running (tour undefined)");
                 setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
             }
@@ -454,6 +454,9 @@ var Tour = {
                     }
             }, next.wait || 0);
         } else {
+            setTimeout(function(){
+                Tour.autoNextStep(state.tour, step);
+            }, Tour.defaultDelay);
             Tour.endTour();
         }
     },
diff --git a/addons/web/static/src/xml/website.tour.xml b/addons/web/static/src/xml/website.tour.xml
index d3d3fb8c57a..cae823bd04e 100644
--- a/addons/web/static/src/xml/website.tour.xml
+++ b/addons/web/static/src/xml/website.tour.xml
@@ -2,7 +2,7 @@
 <templates id="template" xml:space="preserve">
     <t t-name="tour.popover">
         <div t-attf-class="#{ fixed ? 'popover tour fixed' : 'popover tour' }">
-            <div class="arrow"></div>
+            <div class="arrow" t-if="!next"></div>
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <t t-if="next or end">

From 624f256f61b1a766463398ebdb2d989bd7eaf938 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Jun 2014 14:31:16 +0200
Subject: [PATCH 068/137] Changed as per the recommandation of Sir Odo

---
 openerp/addons/base/ir/ir_http.py | 33 ++++++++++++++++---------------
 openerp/http.py                   | 13 ++++++++++--
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 13997c6cd2f..4b488103060 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -71,17 +71,23 @@ class ir_http(osv.AbstractModel):
             request.uid = request.session.uid
 
     def _authenticate(self, auth_method='user'):
-        if request.session.uid:
-            try:
-                request.session.check_security()
-                # what if error in security.check()
-                #   -> res_users.check()
-                #   -> res_users.check_credentials()
-            except (openerp.exceptions.AccessDenied, openerp.http.SessionExpiredException):
-                # All other exceptions mean undetermined status (e.g. connection pool full),
-                # let them bubble up
-                request.session.logout()
-        getattr(self, "_auth_method_%s" % auth_method)()
+        try:
+            if request.session.uid:
+                try:
+                    request.session.check_security()
+                    # what if error in security.check()
+                    #   -> res_users.check()
+                    #   -> res_users.check_credentials()
+                except (openerp.exceptions.AccessDenied, openerp.http.SessionExpiredException):
+                    # All other exceptions mean undetermined status (e.g. connection pool full),
+                    # let them bubble up
+                    request.session.logout()
+            getattr(self, "_auth_method_%s" % auth_method)()
+        except (openerp.exceptions.AccessDenied, openerp.http.SessionExpiredException):
+            raise
+        except Exception:
+            _logger.exception("Exception during request Authentication.")
+            raise openerp.exceptions.AccessDenied()
         return auth_method
 
     def _handle_exception(self, exception):
@@ -99,11 +105,6 @@ class ir_http(osv.AbstractModel):
         try:
             auth_method = self._authenticate(func.routing["auth"])
         except Exception, e:
-            # Json requests have their own exception handler
-            # therefore we should not alter their exception's type
-            if func.routing.get('type') != 'json':
-                # for the rest, convert to a Forbidden exception keeping the original traceback
-                e = convert_exception_to(werkzeug.exceptions.Forbidden)
             return self._handle_exception(e)
 
         processing = self._postprocess_args(arguments)
diff --git a/openerp/http.py b/openerp/http.py
index ec979fd1793..3bc2bc3c8ea 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -208,8 +208,6 @@ class WebRequest(object):
            to abitrary responses. Anything returned (except None) will
            be used as response.""" 
         self._failed = exception # prevent tx commit
-        if isinstance(exception, werkzeug.exceptions.HTTPException):
-            return exception
         raise
 
     def _call_function(self, *args, **kwargs):
@@ -456,6 +454,17 @@ class HttpRequest(WebRequest):
         params.pop('session_id', None)
         self.params = params
 
+    def _handle_exception(self, exception):
+        """Called within an except block to allow converting exceptions
+           to abitrary responses. Anything returned (except None) will
+           be used as response."""
+        try:
+            return super(HttpRequest, self)._handle_exception(exception)
+        except Exception, e:
+            if isinstance(e, werkzeug.exceptions.HTTPException):
+                return e
+            raise
+
     def dispatch(self):
         # TODO: refactor this correctly. This is a quick fix for pos demo.
         if request.httprequest.method == 'OPTIONS' and request.func and request.func.routing.get('cors'):

From 4bad513d29596abf2c614834a7592758186f0851 Mon Sep 17 00:00:00 2001
From: Anael Closson <acl@odoo.com>
Date: Wed, 18 Jun 2014 14:33:35 +0200
Subject: [PATCH 069/137] [FIX] mail: more robust parsing of
 In-Reply-To/References (OPW 608919)

When parsing incoming messages, ignore white-space around
In-Reply-To headers, and extract message-id items inside
the References header using a regex.
This actually serves as a workaround for broken MTAs
mangling References (such as outlook.com nesting past ones
with commas, violating RFC2822).

Closes #516 as a manual rebase.
---
 addons/mail/mail_thread.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index a264d58df7e..8324b608c71 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -33,6 +33,7 @@ import pytz
 import socket
 import time
 import xmlrpclib
+import re
 from email.message import Message
 
 from openerp import tools
@@ -46,6 +47,8 @@ from openerp.tools.translate import _
 _logger = logging.getLogger(__name__)
 
 
+mail_header_msgid_re = re.compile('<[^<>]+>')
+
 def decode_header(message, header, separator=' '):
     return separator.join(map(decode, filter(None, message.get_all(header, []))))
 
@@ -1259,13 +1262,13 @@ class mail_thread(osv.AbstractModel):
             msg_dict['date'] = stored_date.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
 
         if message.get('In-Reply-To'):
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To'].strip()))])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
 
         if message.get('References') and 'parent_id' not in msg_dict:
-            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
-                                                                         [x.strip() for x in decode(message['References']).split()])])
+            msg_list =  mail_header_msgid_re.findall(decode(message['References']))
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in', [x.strip() for x in msg_list])])
             if parent_ids:
                 msg_dict['parent_id'] = parent_ids[0]
 

From ffe85901831f3e15b439362c4ca6ad0095eecfa3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 18 Jun 2014 15:12:52 +0200
Subject: [PATCH 070/137] [FIX] tour: check if the tour is already finish
 before check next step

---
 addons/web/static/src/js/tour.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 7e4eabeedda..2289162732e 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -446,12 +446,14 @@ var Tour = {
 
         if (next) {
             setTimeout(function () {
+                if (Tour.getState()) {
                     Tour.waitNextStep();
-                    if (state.mode === "test") {
-                        setTimeout(function(){
-                            Tour.autoNextStep(state.tour, step);
-                        }, Tour.defaultDelay);
-                    }
+                }
+                if (state.mode === "test") {
+                    setTimeout(function(){
+                        Tour.autoNextStep(state.tour, step);
+                    }, Tour.defaultDelay);
+                }
             }, next.wait || 0);
         } else {
             setTimeout(function(){

From 9f36a77b7b3832f84d1c181e114f89a5b47554ce Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 18 Jun 2014 15:27:20 +0200
Subject: [PATCH 071/137] [FIX] website: wrong cycling error message

---
 addons/web/static/src/js/tour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 2289162732e..4705fb80af8 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -368,7 +368,7 @@ var Tour = {
                 if (state.wait > 10) {
                     Tour.error(state.step, "Tour '"+state.id+"' undefined");
                 }
-                Tour.saveState(state.id, state.mode, state.step_id, state.number, state.wait+1);
+                Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
                 console.log("Tour '"+state.id+"' wait for running (tour undefined)");
                 setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
             }

From f29ff5ef70fdf5035bee05ddb9e2bea33454fa0b Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 18 Jun 2014 15:22:44 +0200
Subject: [PATCH 072/137] [FIX] auth_crypt: encrypt all passwords at
 installation

When `base_crypt` was updated for v7, the auto-encryption
at installation was dropped, with user passwords only
encrypted on-demand whenever the user would connect.

It is important to encrypt all passwords immediately to
prevent password compromission for user who do not
login often or even for deactivated users who are not
allowed to login anymore.

Fixes https://bugs.launchpad.net/openobject-addons/+bug/1280152

Based on LP merge proposal by Nicolas Bessi (Camptocamp):
https://code.launchpad.net/~camptocamp/openobject-addons/improve_auth_crypt_3_please_launchpad_work-nbi/+merge/206476
---
 addons/auth_crypt/auth_crypt.py | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 4651d27fe7d..c5bd5799017 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -117,10 +117,22 @@ def sh256crypt(cls, password, salt, magic=magic_sha256):
 class res_users(osv.osv):
     _inherit = "res.users"
 
+    def init(self, cr):
+        """Encrypt all passwords at module installation"""
+        cr.execute("SELECT id, password FROM res_users WHERE password IS NOT NULL and password != ''")
+        for user in cr.fetchall():
+            self._set_encrypted_password(cr, user[0], user[1])
+
+    def _set_encrypted_password(self, cr, uid, plain_password):
+        """Set an encrypted password for a given user"""
+        salt = gen_salt()
+        stored_password_crypt = md5crypt(plain_password, salt)
+        cr.execute("UPDATE res_users SET password = '', password_crypt = %s WHERE id = %s",
+                   (stored_password_crypt, uid))
+
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
-            encrypted = md5crypt(value, gen_salt())
-            cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
+            self._set_encrypted_password(cr, id, value)
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
@@ -144,9 +156,7 @@ class res_users(osv.osv):
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
             if stored_password and not stored_password_crypt:
-                salt = gen_salt()
-                stored_password_crypt = md5crypt(stored_password, salt)
-                cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
+                self._set_encrypted_password(cr, uid, stored_password)
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:

From 4c785069bc16257c568e65e601d3808fe8248546 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Jun 2014 15:40:09 +0200
Subject: [PATCH 073/137] Bring back exception conversion to Forbidden

---
 openerp/addons/base/ir/ir_http.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 4b488103060..867abf178dc 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -105,7 +105,10 @@ class ir_http(osv.AbstractModel):
         try:
             auth_method = self._authenticate(func.routing["auth"])
         except Exception, e:
-            return self._handle_exception(e)
+            # force a Forbidden exception with the original traceback
+            return self._handle_exception(
+                convert_exception_to(
+                    werkzeug.exceptions.Forbidden))
 
         processing = self._postprocess_args(arguments)
         if processing:

From ce3645c9d9379451aaf9dbc5aa06ae4ba52afa7e Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Wed, 18 Jun 2014 16:33:53 +0200
Subject: [PATCH 074/137] [IMP] Corrections on pull request

---
 addons/purchase/purchase.py | 8 ++++++--
 addons/purchase/stock.py    | 2 --
 addons/stock/procurement.py | 5 +----
 addons/stock/stock.py       | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index bdd8af1afd8..09cc4c301a4 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1310,6 +1310,7 @@ class procurement_order(osv.osv):
                 if available_draft_po_ids:
                     po_id = available_draft_po_ids[0]
                     po_rec = po_obj.browse(cr, uid, po_id, context=context)
+                    #if the product has to be ordered earlier those in the existing PO, we replace the purchase date on the order to avoid ordering it too late
                     if datetime.strptime(po_rec.date_order, DEFAULT_SERVER_DATE_FORMAT) > purchase_date:
                         po_obj.write(cr, uid, [po_id], {'date_order': purchase_date}, context=context)
                     #look for any other PO line in the selected PO with same product and UoM to sum quantities instead of creating a new po line
@@ -1369,8 +1370,11 @@ class product_template(osv.Model):
     _inherit = 'product.template'
     
     def _get_buy_route(self, cr, uid, context=None):
-        buy_route = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'purchase', 'route_warehouse0_buy')[1]
-        return [buy_route]
+        
+        buy_route = self.pool.get('ir.model.data').xmlid_to_res_id(cr, uid, 'purchase.route_warehouse0_buy')
+        if buy_route:
+            return [buy_route]
+        return []
 
     def _purchase_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 40689551195..26d2ff1002f 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -79,9 +79,7 @@ class stock_move(osv.osv):
         if move.purchase_line_id:
             purchase_line = move.purchase_line_id
             res['invoice_line_tax_id'] = [(6, 0, [x.id for x in purchase_line.taxes_id])]
-            #res['account_analytic_id'] = purc_line.order_id.project_id and sale_line.order_id.project_id.id or False
             res['price_unit'] = purchase_line.price_unit
-            #res['discount'] = sale_line.discount
         return res
 
 class stock_picking(osv.osv):
diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index e9a4a46e3d0..7a835fb2f4d 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -346,10 +346,7 @@ class procurement_order(osv.osv):
         procurement_obj = self.pool.get('procurement.order')
         offset = 0
         ids = [1]
-        if company_id:
-            dom = [('company_id', '=', company_id)]
-        else:
-            dom = []
+        dom = company_id and [('company_id', '=', company_id)] or False
         while ids:
             ids = orderpoint_obj.search(cr, uid, dom, offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9c5310dcd6b..7e529b9047a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3823,7 +3823,7 @@ class stock_pack_operation(osv.osv):
             if pack_op.qty_done < pack_op.product_qty:
                 # we split the operation in two
                 op = self.copy(cr, uid, pack_op.id, {'product_qty': pack_op.qty_done, 'qty_done': pack_op.qty_done}, context=context)
-                self.write(cr, uid, pack_op.id, {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
+                self.write(cr, uid, [pack_op.id], {'product_qty': pack_op.product_qty - pack_op.qty_done, 'qty_done': 0, 'lot_id': False}, context=context)
             processed_ids.append(op)
         self.write(cr, uid, processed_ids, {'processed': 'true'}, context=context)
 

From fef8077df31988f984d8f80ce8050a05bbe145eb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 18 Jun 2014 16:56:46 +0200
Subject: [PATCH 075/137] git commit -a -mm

---
 openerp/addons/base/ir/ir_http.py | 2 +-
 openerp/http.py                   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/openerp/addons/base/ir/ir_http.py b/openerp/addons/base/ir/ir_http.py
index 867abf178dc..122b9d9bb26 100644
--- a/openerp/addons/base/ir/ir_http.py
+++ b/openerp/addons/base/ir/ir_http.py
@@ -104,7 +104,7 @@ class ir_http(osv.AbstractModel):
         # check authentication level
         try:
             auth_method = self._authenticate(func.routing["auth"])
-        except Exception, e:
+        except Exception:
             # force a Forbidden exception with the original traceback
             return self._handle_exception(
                 convert_exception_to(
diff --git a/openerp/http.py b/openerp/http.py
index 3bc2bc3c8ea..d32d00326f7 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -460,10 +460,8 @@ class HttpRequest(WebRequest):
            be used as response."""
         try:
             return super(HttpRequest, self)._handle_exception(exception)
-        except Exception, e:
-            if isinstance(e, werkzeug.exceptions.HTTPException):
-                return e
-            raise
+        except werkzeug.exceptions.HTTPException, e:
+            return e
 
     def dispatch(self):
         # TODO: refactor this correctly. This is a quick fix for pos demo.

From 3b925793a356adc562725a79a48ad5959cfb846c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paulius=20Sladkevi=C4=8Dius?= <komsas@gmail.com>
Date: Wed, 18 Jun 2014 18:56:49 +0300
Subject: [PATCH 076/137] reconcile_partial() return reconcile record id

It should be similar like it's done with reconcile(). That would help a lot when needs to make automatic partial reconciliations.
---
 addons/account/account_move_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 3d8d8302f32..97489b78a64 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -823,7 +823,7 @@ class account_move_line(osv.osv):
             'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
         }, context=context)
         move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
-        return True
+        return r_id
 
     def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
         account_obj = self.pool.get('account.account')

From db40033a39f047e67e53d2db5ae8245bbae37669 Mon Sep 17 00:00:00 2001
From: dhr-odoo <dhr@tinyerp.com>
Date: Fri, 13 Jun 2014 16:08:12 +0530
Subject: [PATCH 077/137] Removed widge=selection from account_id field in line
 in Purchase Receipt, as it only displays limited records(100) from the limit
 set in the name_search

---
 addons/account_voucher/voucher_sales_purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 97f96f75901..2dd53832529 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -248,7 +248,7 @@
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>

From cf417524706d3fcc53720b0c54ce3c41940761b9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 08:39:22 +0200
Subject: [PATCH 078/137] [IMP] auth_crypt: port to passlib instead of using
 embedded/hand-rolled md5crypt

---
 addons/auth_crypt/auth_crypt.py | 127 ++------------------------------
 setup.py                        |   2 +
 setup/debian/control            |   1 +
 3 files changed, 10 insertions(+), 120 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 4651d27fe7d..28b72efb82c 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -1,127 +1,20 @@
-#
-# Implements encrypting functions.
-#
-# Copyright (c) 2008, F S 3 Consulting Inc.
-#
-# Maintainer:
-# Alec Joseph Rivera (agi<at>fs3.ph)
-# refactored by Antony Lesuisse <al<at>openerp.com>
-#
-
-import hashlib
-import hmac
 import logging
-from random import sample
-from string import ascii_letters, digits
+
+from passlib.hash import md5_crypt
 
 import openerp
 from openerp.osv import fields, osv
 
 _logger = logging.getLogger(__name__)
 
-magic_md5 = '$1$'
-magic_sha256 = '$5$'
-
-def gen_salt(length=8, symbols=None):
-    if symbols is None:
-        symbols = ascii_letters + digits
-    return ''.join(sample(symbols, length))
-
-def md5crypt( raw_pw, salt, magic=magic_md5 ):
-    """ md5crypt FreeBSD crypt(3) based on but different from md5
-
-    The md5crypt is based on Mark Johnson's md5crypt.py, which in turn is
-    based on  FreeBSD src/lib/libcrypt/crypt.c (1.2)  by  Poul-Henning Kamp.
-    Mark's port can be found in  ActiveState ASPN Python Cookbook.  Kudos to
-    Poul and Mark. -agi
-
-    Original license:
-
-    * "THE BEER-WARE LICENSE" (Revision 42):
-    *
-    * <phk@login.dknet.dk>  wrote  this file.  As  long as  you retain  this
-    * notice  you can do  whatever you want with this stuff. If we meet some
-    * day,  and you think this stuff is worth it,  you can buy me  a beer in
-    * return.
-    *
-    * Poul-Henning Kamp
-    """
-    raw_pw = raw_pw.encode('utf-8')
-    salt = salt.encode('utf-8')
-    hash = hashlib.md5()
-    hash.update( raw_pw + magic + salt )
-    st = hashlib.md5()
-    st.update( raw_pw + salt + raw_pw)
-    stretch = st.digest()
-
-    for i in range( 0, len( raw_pw ) ):
-        hash.update( stretch[i % 16] )
-
-    i = len( raw_pw )
-
-    while i:
-        if i & 1:
-            hash.update('\x00')
-        else:
-            hash.update( raw_pw[0] )
-        i >>= 1
-
-    saltedmd5 = hash.digest()
-
-    for i in range( 1000 ):
-        hash = hashlib.md5()
-
-        if i & 1:
-            hash.update( raw_pw )
-        else:
-            hash.update( saltedmd5 )
-
-        if i % 3:
-            hash.update( salt )
-        if i % 7:
-            hash.update( raw_pw )
-        if i & 1:
-            hash.update( saltedmd5 )
-        else:
-            hash.update( raw_pw )
-
-        saltedmd5 = hash.digest()
-
-    itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
-
-    rearranged = ''
-    for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)):
-        v = ord( saltedmd5[a] ) << 16 | ord( saltedmd5[b] ) << 8 | ord( saltedmd5[c] )
-
-        for i in range(4):
-            rearranged += itoa64[v & 0x3f]
-            v >>= 6
-
-    v = ord( saltedmd5[11] )
-
-    for i in range( 2 ):
-        rearranged += itoa64[v & 0x3f]
-        v >>= 6
-
-    return magic + salt + '$' + rearranged
-
-def sh256crypt(cls, password, salt, magic=magic_sha256):
-    iterations = 1000
-    # see http://en.wikipedia.org/wiki/PBKDF2
-    result = password.encode('utf8')
-    for i in xrange(cls.iterations):
-        result = hmac.HMAC(result, salt, hashlib.sha256).digest() # uses HMAC (RFC 2104) to apply salt
-    result = result.encode('base64') # doesnt seem to be crypt(3) compatible
-    return '%s%s$%s' % (magic_sha256, salt, result)
 
 class res_users(osv.osv):
     _inherit = "res.users"
 
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
-            encrypted = md5crypt(value, gen_salt())
+            encrypted = md5_crypt.encrypt(value)
             cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
-        del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
         cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
@@ -141,25 +34,19 @@ class res_users(osv.osv):
     def check_credentials(self, cr, uid, password):
         # convert to base_crypt if needed
         cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
+        stored_password_crypt = None
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
             if stored_password and not stored_password_crypt:
-                salt = gen_salt()
-                stored_password_crypt = md5crypt(stored_password, salt)
+                stored_password_crypt = md5_crypt.encrypt(stored_password)
                 cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
             # check md5crypt
             if stored_password_crypt:
-                if stored_password_crypt[:len(magic_md5)] == magic_md5:
-                    salt = stored_password_crypt[len(magic_md5):11]
-                    if stored_password_crypt == md5crypt(password, salt):
-                        return
-                elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
-                    salt = stored_password_crypt[len(magic_md5):11]
-                    if stored_password_crypt == md5crypt(password, salt):
-                        return
+                if md5_crypt.verify(password, stored_password_crypt):
+                    return
             # Reraise password incorrect
             raise
 
diff --git a/setup.py b/setup.py
index f26abc26e40..041a8df178b 100644
--- a/setup.py
+++ b/setup.py
@@ -95,6 +95,7 @@ def py2exe_options():
                         "markupsafe",   # dependence of jinja2 and mako
                         "mock",
                         "openerp",
+                        "passlib",
                         "poplib",
                         "psutil",
                         "pychart",
@@ -163,6 +164,7 @@ setuptools.setup(
           'lxml', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'mako',
           'mock',
+          'passlib',
           'pillow', # windows binary http://www.lfd.uci.edu/~gohlke/pythonlibs/
           'psutil', # windows binary code.google.com/p/psutil/downloads/list
           'psycopg2 >= 2.2',
diff --git a/setup/debian/control b/setup/debian/control
index ced6043a650..0d19361ad8b 100644
--- a/setup/debian/control
+++ b/setup/debian/control
@@ -28,6 +28,7 @@ Depends:
  python-mako,
  python-mock,
  python-openid,
+ python-passlib,
  python-psutil,
  python-psycopg2,
  python-pybabel,

From d9d8c94412e2caf27a92d7f2d5cc2df033ba7756 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 08:46:15 +0200
Subject: [PATCH 079/137] [IMP] auth_crypt: upgrade default kdf to
 pbkdf2_sha512

Applies to new and yet-to-be-encrypted users, existing already-encrypted will
keep logging in as usual, their password storage will be upgraded on next
password *change*.
---
 addons/auth_crypt/auth_crypt.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 28b72efb82c..33bb82d49ef 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -1,19 +1,32 @@
 import logging
 
-from passlib.hash import md5_crypt
+from passlib.context import CryptContext
 
 import openerp
 from openerp.osv import fields, osv
 
 _logger = logging.getLogger(__name__)
 
+default_crypt_context = CryptContext(
+    # kdf which can be verified by the context. The default encryption kdf is
+    # the first of the list
+    ['pbkdf2_sha512', 'md5_crypt'],
+)
 
 class res_users(osv.osv):
     _inherit = "res.users"
 
+    def _crypt_context(self, cr, uid, id, context=None):
+        """ Passlib PasswordHash (or CryptContext) instance used to encrypt
+        and verify passwords. Can be overridden if technical, legal or
+        political matters require different kdfs than the provided default.
+        """
+        return default_crypt_context
+
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
-            encrypted = md5_crypt.encrypt(value)
+            encrypted = self._crypt_context(cr, uid, id, context=context)\
+                .encrypt(value)
             cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
 
     def get_pw( self, cr, uid, ids, name, args, context ):
@@ -38,14 +51,14 @@ class res_users(osv.osv):
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
             if stored_password and not stored_password_crypt:
-                stored_password_crypt = md5_crypt.encrypt(stored_password)
+                stored_password_crypt = self._crypt_context(cr, uid, id).encrypt(stored_password)
                 cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
             # check md5crypt
             if stored_password_crypt:
-                if md5_crypt.verify(password, stored_password_crypt):
+                if self._crypt_context(cr, uid, id).verify(password, stored_password_crypt):
                     return
             # Reraise password incorrect
             raise

From fc846655d68802d5429804d8ee1ca475f3b410d5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 09:12:17 +0200
Subject: [PATCH 080/137] [IMP] auth_crypt: automatically upgrde deprecated
 hashes on login

---
 addons/auth_crypt/auth_crypt.py | 37 ++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 33bb82d49ef..11537cd4c85 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -11,23 +11,41 @@ default_crypt_context = CryptContext(
     # kdf which can be verified by the context. The default encryption kdf is
     # the first of the list
     ['pbkdf2_sha512', 'md5_crypt'],
+    # deprecated algorithms are still verified as usual, but ``needs_update``
+    # will indicate that the stored hash should be replaced by a more recent
+    # algorithm. Passlib 1.6 supports an `auto` value which deprecates any
+    # algorithm but the default, but Debian only provides 1.5 so...
+    deprecated=['md5_crypt'],
 )
 
 class res_users(osv.osv):
     _inherit = "res.users"
 
     def _crypt_context(self, cr, uid, id, context=None):
-        """ Passlib PasswordHash (or CryptContext) instance used to encrypt
-        and verify passwords. Can be overridden if technical, legal or
-        political matters require different kdfs than the provided default.
+        """ Passlib CryptContext instance used to encrypt and verify
+        passwords. Can be overridden if technical, legal or political matters
+        require different kdfs than the provided default.
+
+        Requires a CryptContext as deprecation and upgrade notices are used
+        internally
         """
         return default_crypt_context
 
+    def _store_encrypted_password(self, cr, uid, id, encrypted, context=None):
+        """
+        :param uid: id of the current user
+        :param id: id of the user on which the password should be set
+        """
+        cr.execute(
+            "UPDATE res_users SET password='', password_crypt=%s WHERE id=%s",
+            (encrypted, id))
+
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
             encrypted = self._crypt_context(cr, uid, id, context=context)\
                 .encrypt(value)
-            cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
+            self._store_encrypted_password(
+                cr, uid, id, encrypted, context=context)
 
     def get_pw( self, cr, uid, ids, name, args, context ):
         cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
@@ -51,14 +69,17 @@ class res_users(osv.osv):
         if cr.rowcount:
             stored_password, stored_password_crypt = cr.fetchone()
             if stored_password and not stored_password_crypt:
-                stored_password_crypt = self._crypt_context(cr, uid, id).encrypt(stored_password)
-                cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
+                stored_password_crypt = self._crypt_context(cr, uid, uid).encrypt(stored_password)
+                self._store_encrypted_password(cr, uid, uid, stored_password_crypt)
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            # check md5crypt
             if stored_password_crypt:
-                if self._crypt_context(cr, uid, id).verify(password, stored_password_crypt):
+                valid, replacement = self._crypt_context(cr, uid, uid)\
+                        .verify_and_update(password, stored_password_crypt)
+                if replacement:
+                    self._store_encrypted_password(cr, uid, uid, replacement)
+                if valid:
                     return
             # Reraise password incorrect
             raise

From d36f605f58cfa49a0786c7945e8bccf056d88941 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 09:14:21 +0200
Subject: [PATCH 081/137] [IMP] auth_crypt: simplify get_pw

---
 addons/auth_crypt/auth_crypt.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 11537cd4c85..50bda9a8588 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -49,13 +49,7 @@ class res_users(osv.osv):
 
     def get_pw( self, cr, uid, ids, name, args, context ):
         cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
-        stored_pws = cr.fetchall()
-        res = {}
-
-        for id, stored_pw in stored_pws:
-            res[id] = stored_pw
-
-        return res
+        return dict(cr.fetchall())
 
     _columns = {
         'password': fields.function(get_pw, fnct_inv=set_pw, type='char', string='Password', invisible=True, store=True),

From 3b39e5f2ccdcbe9cb90496aebfa57de2d5bbebaa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 09:19:56 +0200
Subject: [PATCH 082/137] [IMP] auth_crypt: variables naming

---
 addons/auth_crypt/auth_crypt.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index 50bda9a8588..eb5728e5e84 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -59,23 +59,23 @@ class res_users(osv.osv):
     def check_credentials(self, cr, uid, password):
         # convert to base_crypt if needed
         cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
-        stored_password_crypt = None
+        encrypted = None
         if cr.rowcount:
-            stored_password, stored_password_crypt = cr.fetchone()
-            if stored_password and not stored_password_crypt:
-                stored_password_crypt = self._crypt_context(cr, uid, uid).encrypt(stored_password)
-                self._store_encrypted_password(cr, uid, uid, stored_password_crypt)
+            stored, encrypted = cr.fetchone()
+            if stored and not encrypted:
+                encrypted = self._crypt_context(cr, uid, uid).encrypt(stored)
+                self._store_encrypted_password(cr, uid, uid, encrypted)
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            if stored_password_crypt:
-                valid, replacement = self._crypt_context(cr, uid, uid)\
-                        .verify_and_update(password, stored_password_crypt)
-                if replacement:
+            if encrypted:
+                valid_pass, replacement = self._crypt_context(cr, uid, uid)\
+                        .verify_and_update(password, encrypted)
+                if replacement is not None:
                     self._store_encrypted_password(cr, uid, uid, replacement)
-                if valid:
+                if valid_pass:
                     return
-            # Reraise password incorrect
+
             raise
 
 

From b07b8a5b1fc0773d4dbbaf13dba4ed0d4a3ae3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 09:33:36 +0200
Subject: [PATCH 083/137] [FIX] website_mail: restored follow JS code that was
 wrongly merged with the mail group follow snippet. Now both widget animation
 exists, the second being more complex and therefore requiring a different
 animation.

---
 addons/website_mail/controllers/main.py       |  3 +-
 addons/website_mail/static/src/js/follow.js   | 68 +++++++++++++++++++
 addons/website_mail/views/website_mail.xml    |  1 +
 .../src/js/website_mail_group.snippet.js      |  8 +--
 addons/website_mail_group/views/snippets.xml  |  4 +-
 5 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 addons/website_mail/static/src/js/follow.js

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 081ba93b8b4..c5896ecd16c 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -94,9 +94,8 @@ class WebsiteMail(http.Controller):
                 values['is_follower'] = len(
                     request.registry['mail.followers'].search(
                         cr, SUPERUSER_ID, [
-                            ('res_model', '=', 'mail.group'),
+                            ('res_model', '=', model),
                             ('res_id', '=', obj_ids[0]),
                             ('partner_id', '=', partner_id.id)
                         ], context=context)) == 1
-
         return values
diff --git a/addons/website_mail/static/src/js/follow.js b/addons/website_mail/static/src/js/follow.js
new file mode 100644
index 00000000000..18c36378328
--- /dev/null
+++ b/addons/website_mail/static/src/js/follow.js
@@ -0,0 +1,68 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
+        selector: ".js_follow",
+        start: function (editable_mode) {
+            var self = this;
+            this.is_user = false;
+
+            openerp.jsonRpc('/website_mail/is_follower', 'call', {
+                model: this.$target.data('object'),
+                id: this.$target.data('id'),
+            }).always(function (data) {
+                self.is_user = data.is_user;
+                self.email = data.email;
+                self.toggle_subscription(data.is_follower, data.email);
+                self.$target.removeClass("hidden");
+            });
+
+            // not if editable mode to allow designer to edit alert field
+            if (!editable_mode) {
+                $('.js_follow > .alert').addClass("hidden");
+                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
+                    event.preventDefault();
+                    self.on_click();
+                });
+            }
+            return;
+        },
+        on_click: function () {
+            var self = this;
+            var $email = this.$target.find(".js_follow_email");
+
+            if ($email.length && !$email.val().match(/.+@.+/)) {
+                this.$target.addClass('has-error');
+                return false;
+            }
+            this.$target.removeClass('has-error');
+
+            openerp.jsonRpc('/website_mail/follow', 'call', {
+                'id': +this.$target.data('id'),
+                'object': this.$target.data('object'),
+                'message_is_follower': this.$target.attr("data-follow") || "off",
+                'email': $email.length ? $email.val() : false,
+            }).then(function (follow) {
+                self.toggle_subscription(follow, self.email);
+            });
+        },
+        toggle_subscription: function(follow, email) {
+            console.log(follow, email);
+            if (follow) {
+                this.$target.find(".js_follow_btn").addClass("hidden");
+                this.$target.find(".js_unfollow_btn").removeClass("hidden");
+            }
+            else {
+                this.$target.find(".js_follow_btn").removeClass("hidden");
+                this.$target.find(".js_unfollow_btn").addClass("hidden");
+            }
+            this.$target.find('input.js_follow_email')
+                .val(email ? email : "")
+                .attr("disabled", follow || (email.length && this.is_user) ? "disabled" : false);
+            this.$target.attr("data-follow", follow ? 'on' : 'off');
+        },
+    });
+})();
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 6202e00342b..3b6d1bb96d6 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -21,6 +21,7 @@
 
 <template id="head" inherit_id="website.layout" name="Mail customization">
     <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script>
         <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>
     </xpath>
 </template>
diff --git a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
index fd6a2d38cfa..8ad4f9ba796 100644
--- a/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
+++ b/addons/website_mail_group/static/src/js/website_mail_group.snippet.js
@@ -3,8 +3,8 @@
 
     var website = openerp.website;
 
-    website.snippet.animationRegistry.follow = website.snippet.Animation.extend({
-        selector: ".js_follow",
+    website.snippet.animationRegistry.follow_alias = website.snippet.Animation.extend({
+        selector: ".js_follow_alias",
         start: function (editable_mode) {
             var self = this;
             this.is_user = false;
@@ -23,8 +23,8 @@
 
             // not if editable mode to allow designer to edit alert field
             if (!editable_mode) {
-                $('.js_follow > .alert').addClass("hidden");
-                $('.js_follow > .input-group-btn.hidden').removeClass("hidden");
+                $('.js_follow_alias > .alert').addClass("hidden");
+                $('.js_follow_alias > .input-group-btn.hidden').removeClass("hidden");
                 this.$target.find('.js_follow_btn, .js_unfollow_btn').on('click', function (event) {
                     event.preventDefault();
                     self.on_click();
diff --git a/addons/website_mail_group/views/snippets.xml b/addons/website_mail_group/views/snippets.xml
index 56ba81d81b3..e3adb6a14cd 100644
--- a/addons/website_mail_group/views/snippets.xml
+++ b/addons/website_mail_group/views/snippets.xml
@@ -11,7 +11,7 @@
                 <span class="oe_snippet_thumbnail_title">Discussion Group</span>
             </div>
 
-            <div class="oe_snippet_body js_follow"
+            <div class="oe_snippet_body js_follow_alias"
                       data-id="0"
                       data-object="mail.group"
                       data-follow="off">
@@ -38,7 +38,7 @@
 
     <xpath expr="//div[@id='snippet_options']" position="inside">
         <div data-snippet-option-id='subscribe'
-            data-selector=".js_follow"
+            data-selector=".js_follow_alias"
             data-selector-siblings="p, h1, h2, h3, blockquote, .well, .panel"
            >
             <li>

From 82f10f4ca22dfa8815255f884e5e96805b089c6a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 09:44:40 +0200
Subject: [PATCH 084/137] [IMP] auth_crypt: port encrypt-at-install from
 f29ff5e

also move utility methods to class bottom to improve reading experience
(hopefully)
---
 addons/auth_crypt/auth_crypt.py | 63 ++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/addons/auth_crypt/auth_crypt.py b/addons/auth_crypt/auth_crypt.py
index eb5728e5e84..6c9deb51e92 100644
--- a/addons/auth_crypt/auth_crypt.py
+++ b/addons/auth_crypt/auth_crypt.py
@@ -21,31 +21,17 @@ default_crypt_context = CryptContext(
 class res_users(osv.osv):
     _inherit = "res.users"
 
-    def _crypt_context(self, cr, uid, id, context=None):
-        """ Passlib CryptContext instance used to encrypt and verify
-        passwords. Can be overridden if technical, legal or political matters
-        require different kdfs than the provided default.
-
-        Requires a CryptContext as deprecation and upgrade notices are used
-        internally
-        """
-        return default_crypt_context
-
-    def _store_encrypted_password(self, cr, uid, id, encrypted, context=None):
-        """
-        :param uid: id of the current user
-        :param id: id of the user on which the password should be set
-        """
-        cr.execute(
-            "UPDATE res_users SET password='', password_crypt=%s WHERE id=%s",
-            (encrypted, id))
+    def init(self, cr):
+        _logger.info("Hashing passwords, may be slow for databases with many users...")
+        cr.execute("SELECT id, password FROM res_users"
+                   " WHERE password IS NOT NULL"
+                   "   AND password != ''")
+        for uid, pwd in cr.fetchall():
+            self._set_password(cr, openerp.SUPERUSER_ID, uid, pwd)
 
     def set_pw(self, cr, uid, id, name, value, args, context):
         if value:
-            encrypted = self._crypt_context(cr, uid, id, context=context)\
-                .encrypt(value)
-            self._store_encrypted_password(
-                cr, uid, id, encrypted, context=context)
+            self._set_password(cr, uid, id, value, context=context)
 
     def get_pw( self, cr, uid, ids, name, args, context ):
         cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
@@ -63,8 +49,7 @@ class res_users(osv.osv):
         if cr.rowcount:
             stored, encrypted = cr.fetchone()
             if stored and not encrypted:
-                encrypted = self._crypt_context(cr, uid, uid).encrypt(stored)
-                self._store_encrypted_password(cr, uid, uid, encrypted)
+                self._set_password(cr, uid, uid, stored)
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
@@ -72,11 +57,39 @@ class res_users(osv.osv):
                 valid_pass, replacement = self._crypt_context(cr, uid, uid)\
                         .verify_and_update(password, encrypted)
                 if replacement is not None:
-                    self._store_encrypted_password(cr, uid, uid, replacement)
+                    self._set_encrypted_password(cr, uid, uid, replacement)
                 if valid_pass:
                     return
 
             raise
 
+    def _set_password(self, cr, uid, id, password, context=None):
+        """ Encrypts then stores the provided plaintext password for the user
+        ``id``
+        """
+        encrypted = self._crypt_context(cr, uid, id, context=context).encrypt(password)
+        self._set_encrypted_password(cr, uid, id, encrypted, context=context)
+
+    def _set_encrypted_password(self, cr, uid, id, encrypted, context=None):
+        """ Store the provided encrypted password to the database, and clears
+        any plaintext password
+
+        :param uid: id of the current user
+        :param id: id of the user on which the password should be set
+        """
+        cr.execute(
+            "UPDATE res_users SET password='', password_crypt=%s WHERE id=%s",
+            (encrypted, id))
+
+    def _crypt_context(self, cr, uid, id, context=None):
+        """ Passlib CryptContext instance used to encrypt and verify
+        passwords. Can be overridden if technical, legal or political matters
+        require different kdfs than the provided default.
+
+        Requires a CryptContext as deprecation and upgrade notices are used
+        internally
+        """
+        return default_crypt_context
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 766cc9c00c4b4e8d37538b00e6e860b47bb53cec Mon Sep 17 00:00:00 2001
From: dreispt <dreis.pt@gmail.com>
Date: Wed, 18 Jun 2014 16:41:51 +0100
Subject: [PATCH 085/137] Fix wrong partner_id refs in Project demo data

---
 addons/project/project_demo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ff225c46e10..bb09e682943 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -50,8 +50,8 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="message_follower_ids" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+                    ref('base.partner_root'),
+                    ref('base.partner_demo')])]"/>
         </record>
 
         <!-- We assign after so that default values applies -->

From df020d883340a4a45ead6d8cfbc9f77a883ce1fe Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 19 Jun 2014 10:22:32 +0200
Subject: [PATCH 086/137] [IMP] Other remarks pull request

---
 addons/stock_account/stock_account_view.xml        |  1 -
 .../wizard/stock_invoice_onshipping.py             | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/addons/stock_account/stock_account_view.xml b/addons/stock_account/stock_account_view.xml
index ff16bf8e680..4f8c2122e55 100644
--- a/addons/stock_account/stock_account_view.xml
+++ b/addons/stock_account/stock_account_view.xml
@@ -33,7 +33,6 @@
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='do_partial_open_barcode']" position="after">
                     <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','2binvoiced')]}" type="action" class="oe_highlight" groups="base.group_user"/>
-                    <!--<button name="%(action_stock_invoice_onshipping)d" string="Refund Invoice" attrs="{'invisible': ['|',('state','&lt;&gt;','done'),('invoice_state','&lt;&gt;','invoiced')]}" type="action" class="oe_highlight" groups="base.group_user" context="{'inv_type': 'out_refund'}"/>-->
                 </xpath>
                 <xpath expr="//field[@name='move_type']" position="after">
                     <field name="invoice_state" groups="account.group_account_invoice"/>
diff --git a/addons/stock_account/wizard/stock_invoice_onshipping.py b/addons/stock_account/wizard/stock_invoice_onshipping.py
index 0f0c56cb5a3..1675275632a 100644
--- a/addons/stock_account/wizard/stock_invoice_onshipping.py
+++ b/addons/stock_account/wizard/stock_invoice_onshipping.py
@@ -99,16 +99,16 @@ class stock_invoice_onshipping(osv.osv_memory):
         inv_type = journal2type.get(data.journal_type) or 'out_invoice'
         data_pool = self.pool.get('ir.model.data')
         if inv_type == "out_invoice":
-            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree1")
+            action_id = data_pool.xmlid_to_res_id(cr, uid, 'account.action_invoice_tree1')
         elif inv_type == "in_invoice":
-            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree2")
+            action_id = data_pool.xmlid_to_res_id(cr, uid, 'account.action_invoice_tree2')
         elif inv_type == "out_refund":
-            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree3")
+            action_id = data_pool.xmlid_to_res_id(cr, uid, 'account.action_invoice_tree3')
         elif inv_type == "in_refund":
-            action_model,action_id = data_pool.get_object_reference(cr, uid, 'account', "action_invoice_tree4")
+            action_id = data_pool.xmlid_to_res_id(cr, uid, 'account.action_invoice_tree4')
 
-        if action_model:
-            action_pool = self.pool[action_model]
+        if action_id:
+            action_pool = self.pool['ir.actions.act_window']
             action = action_pool.read(cr, uid, action_id, context=context)
             action['domain'] = "[('id','in', ["+','.join(map(str,invoice_ids))+"])]"
             return action
@@ -117,7 +117,7 @@ class stock_invoice_onshipping(osv.osv_memory):
     def create_invoice(self, cr, uid, ids, context=None):
         context = context or {}
         picking_pool = self.pool.get('stock.picking')
-        data = self.browse(cr, uid, ids[0])
+        data = self.browse(cr, uid, ids[0], context=context)
         journal2type = {'sale':'out_invoice', 'purchase':'in_invoice', 'sale_refund':'out_refund', 'purchase_refund':'in_refund'}
         context['date_inv'] = data.invoice_date
         acc_journal = self.pool.get("account.journal")

From cd653f1db29db9c886e5f063d3683d7d998b7e71 Mon Sep 17 00:00:00 2001
From: Josse Colpaert <jco@odoo.com>
Date: Thu, 19 Jun 2014 10:36:42 +0200
Subject: [PATCH 087/137] [FIX] run schedulers domain

---
 addons/stock/procurement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/procurement.py b/addons/stock/procurement.py
index 7a835fb2f4d..b8d7a03c9f2 100644
--- a/addons/stock/procurement.py
+++ b/addons/stock/procurement.py
@@ -346,7 +346,7 @@ class procurement_order(osv.osv):
         procurement_obj = self.pool.get('procurement.order')
         offset = 0
         ids = [1]
-        dom = company_id and [('company_id', '=', company_id)] or False
+        dom = company_id and [('company_id', '=', company_id)] or []
         while ids:
             ids = orderpoint_obj.search(cr, uid, dom, offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):

From c8be66739db47e406b69db86613a7e035264a18a Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 19 Jun 2014 10:55:17 +0200
Subject: [PATCH 088/137] [FIX] account_analytic_analysis:
 recurring_create_invoice

If no contract found, just pass, to avoid making the sql request
---
 .../account_analytic_analysis.py              | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index a03329ddf65..dcb078b102f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -745,31 +745,32 @@ class account_analytic_account(osv.osv):
             contract_ids = ids
         else:
             contract_ids = self.search(cr, uid, [('recurring_next_date','<=', current_date), ('state','=', 'open'), ('recurring_invoices','=', True), ('type', '=', 'contract')])
-        cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
-        for company_id, ids in cr.fetchall():
-            for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
-                try:
-                    invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
-                    invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
-                    next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
-                    interval = contract.recurring_interval
-                    if contract.recurring_rule_type == 'daily':
-                        new_date = next_date+relativedelta(days=+interval)
-                    elif contract.recurring_rule_type == 'weekly':
-                        new_date = next_date+relativedelta(weeks=+interval)
-                    elif contract.recurring_rule_type == 'yearly':
-                        new_date = next_date+relativedelta(years=+interval)
-                    else:
-                        new_date = next_date+relativedelta(months=+interval)
-                    self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
-                    if automatic:
-                        cr.commit()
-                except Exception:
-                    if automatic:
-                        cr.rollback()
-                        _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
-                    else:
-                        raise
+        if contract_ids:
+            cr.execute('SELECT company_id, array_agg(id) as ids FROM account_analytic_account WHERE id IN %s GROUP BY company_id', (tuple(contract_ids),))
+            for company_id, ids in cr.fetchall():
+                for contract in self.browse(cr, uid, ids, context=dict(context, company_id=company_id, force_company=company_id)):
+                    try:
+                        invoice_values = self._prepare_invoice(cr, uid, contract, context=context)
+                        invoice_ids.append(self.pool['account.invoice'].create(cr, uid, invoice_values, context=context))
+                        next_date = datetime.datetime.strptime(contract.recurring_next_date or current_date, "%Y-%m-%d")
+                        interval = contract.recurring_interval
+                        if contract.recurring_rule_type == 'daily':
+                            new_date = next_date+relativedelta(days=+interval)
+                        elif contract.recurring_rule_type == 'weekly':
+                            new_date = next_date+relativedelta(weeks=+interval)
+                        elif contract.recurring_rule_type == 'yearly':
+                            new_date = next_date+relativedelta(years=+interval)
+                        else:
+                            new_date = next_date+relativedelta(months=+interval)
+                        self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
+                        if automatic:
+                            cr.commit()
+                    except Exception:
+                        if automatic:
+                            cr.rollback()
+                            _logger.exception('Fail to create recurring invoice for contract %s', contract.code)
+                        else:
+                            raise
         return invoice_ids
 
 class account_analytic_account_summary_user(osv.osv):

From ab1406cd7c100fe121b2ec027e1436be4c8d7355 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 19 Jun 2014 11:39:14 +0200
Subject: [PATCH 089/137] [FIX] website: ignore SVG elements when looking for
 edition events in RTE

---
 addons/website/static/src/js/website.editor.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 6ed5f1145b8..0a4ed5e7d15 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1988,6 +1988,11 @@
         //       a/@href, ...)
         _(mutations).chain()
             .filter(function (m) {
+                // ignore any SVG target, these blokes are like weird mon
+                if (m.target && m.target instanceof SVGElement) {
+                    return false;
+                }
+
                 // ignore any change related to mundane image-edit-button
                 if (m.target && m.target.className
                         && m.target.className.indexOf('image-edit-button') !== -1) {

From 6a4047f47bc3a998ba9b9601557616b0e30be3f0 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Thu, 19 Jun 2014 11:49:49 +0200
Subject: [PATCH 090/137] [REV] ir_actions: Partial revert of
 7d4df0b6b2eea31b6378aab0f97030738bc40f8b

---
 openerp/addons/base/ir/ir_actions.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index 7ae4240cd03..d6d96737ca3 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -336,8 +336,6 @@ class ir_actions_act_window(osv.osv):
                         eval_context = eval(res['context'] or "{}", eval_dict) or {}
                         res['context'] = str(eval_context)
                 except Exception:
-                    _logger.warning("ir_actions: Cannot evaluate context = %s with eval_dict = %s"
-                        % (res['context'] or "{}", eval_dict), exc_info=True)
                     continue
                 if not fields or 'help' in fields:
                     custom_context = dict(context, **eval_context)

From 14e29ce321afa6967892c1a93f39c6caab5081d7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 19 Jun 2014 12:19:30 +0200
Subject: [PATCH 091/137] [FIX] tour.js: clear localStorage before testing; add
 a better log title

---
 addons/web/static/src/js/tour.js         | 4 ++--
 addons/web/views/webclient_templates.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 4705fb80af8..14908e56f5e 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -122,7 +122,7 @@ var Tour = {
         if (tour.steps[index-1] &&
             tour.steps[index-1].popover && tour.steps[index-1].popover.next) {
             var step = {
-                _title: "",
+                _title: "close popover and finish",
                 id: index,
                 waitNot: '.popover.tour.fade.in:visible'
             };
@@ -365,7 +365,7 @@ var Tour = {
                 Tour.registerSteps(state.tour);
                 Tour.nextStep();
             } else {
-                if (state.wait > 10) {
+                if (state.wait >= 10) {
                     Tour.error(state.step, "Tour '"+state.id+"' undefined");
                 }
                 Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 7dc160995e4..08fc3be483d 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -247,6 +247,7 @@
                     <t t-call="web.assets_backend"/>
 
                     <script type="text/javascript" id="qunit_config">
+                        localStorage.clear();
                         QUnit.config.testTimeout = 5 * 60 * 1000;
                         QUnit.moduleDone(function(result) {
                             console.log(result.name + " (" + result.passed + "/" + result.total + " passed tests)");

From 3dcdd2180a044792cfb00a49809abc913266473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 12:26:24 +0200
Subject: [PATCH 092/137] [FIX] web_calendar: check for edit access rights +
 use correct display mode (view or edit) when going into a document form view
 from the calendar.

---
 addons/web_calendar/static/src/js/web_calendar.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index 6db2d97cfeb..ad49ff9a9b1 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -212,7 +212,12 @@ openerp.web_calendar = function(instance) {
                 this.info_fields.push(fv.arch.children[fld].attrs.name);
             }
 
-            return (new instance.web.Model(this.dataset.model))
+            var edit_check = new instance.web.Model(this.dataset.model)
+                .call("check_access_rights", ["write", false])
+                .then(function (write_right) {
+                    self.write_right = write_right;
+                });
+            var init = new instance.web.Model(this.dataset.model)
                 .call("check_access_rights", ["create", false])
                 .then(function (create_right) {
                     self.create_right = create_right;
@@ -222,6 +227,7 @@ openerp.web_calendar = function(instance) {
                         self.ready.resolve();
                     });
                 });
+            return $.when(edit_check, init);
         },
 
         get_fc_init_options: function () {
@@ -834,7 +840,11 @@ openerp.web_calendar = function(instance) {
             if (! this.open_popup_action) {
                 var index = this.dataset.get_id_index(id);
                 this.dataset.index = index;
-                this.do_switch_view('form', null, { mode: "edit" });
+                if (this.write_right) {
+                    this.do_switch_view('form', null, { mode: "edit" });
+                } else {
+                    this.do_switch_view('form', null, { mode: "view" });
+                }
             }
             else {
                 var pop = new instance.web.form.FormOpenPopup(this);

From 3d43f9d454346d11ce9439ce57ec747dc26a8330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 19 Jun 2014 12:43:25 +0200
Subject: [PATCH 093/137] [FIX] fixes searchbar navigation (web client)

the code handling the keydown events was moved, but the variable this
was not adjusted accordingly, resulting in a broken navigation.

It is now possible to press LEFT and RIGHT again to move the focus
between facets.
---
 addons/web/static/src/js/search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index 1f616202c3f..30b381d8738 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -331,11 +331,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
         'keydown .oe_searchview_input, .oe_searchview_facet': function (e) {
             switch(e.which) {
             case $.ui.keyCode.LEFT:
-                this.focusPreceding(this);
+                this.focusPreceding(e.target);
                 e.preventDefault();
                 break;
             case $.ui.keyCode.RIGHT:
-                this.focusFollowing(this);
+                this.focusFollowing(e.target);
                 e.preventDefault();
                 break;
             }

From cb7d43864a4c04af118f934b98f398e1f56cabb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 19 Jun 2014 12:56:46 +0200
Subject: [PATCH 094/137] [FIX] Fix attach icon that was under the upload
 label.

---
 addons/web/static/src/css/base.css  | 2 +-
 addons/web/static/src/css/base.sass | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index d7c40480e11..5f9ecc5e783 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2440,7 +2440,7 @@
 }
 .openerp .oe_fileupload .oe_add button.oe_attach .oe_e {
   position: relative;
-  top: -1px;
+  top: -10px;
   left: -9px;
 }
 .openerp .oe_fileupload .oe_add input.oe_form_binary_file {
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 090cf3de0fe..e63092f6eec 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1984,7 +1984,7 @@ $sheet-padding: 16px
                 text-shadow: none
                 .oe_e
                     position: relative
-                    top: -1px
+                    top: -10px
                     left: -9px                    
             input.oe_form_binary_file
                 display: inline-block

From 788404cd92144667fd4d4e4effcadac6237027a3 Mon Sep 17 00:00:00 2001
From: Pinakin Nayi <pna@openerp.com>
Date: Thu, 19 Jun 2014 14:27:32 +0530
Subject: [PATCH 095/137]  [FIX]Accounting: filter on fiscal year in CoA tree

---
 addons/account/account_move_line.py    | 2 ++
 addons/account/account_view.xml        | 2 +-
 addons/account/wizard/account_chart.py | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 3d8d8302f32..2fa8451da99 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -741,6 +741,8 @@ class account_move_line(osv.osv):
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
+        if context.get('fiscalyear'):
+            args.append(('period_id.fiscalyear_id', '=', context.get('fiscalyear', False)))
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
                 partner = self.list_partners_to_reconcile(cr, uid, context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8afa19a63b0..1d340001c55 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -351,7 +351,7 @@
         <act_window
             id="action_account_items"
             name="Journal Items"
-            context="{'search_default_account_id': [active_id]}"
+            context="{'search_default_account_id': [active_id], 'fiscalyear': context.get('fiscalyear')}"
             res_model="account.move.line"
             src_model="account.account"
             key2="tree_but_open"/>
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index 38df2f7484d..de652a947f0 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -62,9 +62,10 @@ class account_chart(osv.osv_memory):
                                ORDER BY p.date_stop DESC
                                LIMIT 1) AS period_stop''', (fiscalyear_id, fiscalyear_id))
             periods =  [i[0] for i in cr.fetchall()]
-            if periods and len(periods) > 1:
+            if periods:
                 start_period = periods[0]
-                end_period = periods[1]
+                if len(periods) > 1:
+                    end_period = periods[1]
             res['value'] = {'period_from': start_period, 'period_to': end_period}
         else:
             res['value'] = {'period_from': False, 'period_to': False}

From 6618a9a1e5067444eedba4ac3c5c3c843a74798c Mon Sep 17 00:00:00 2001
From: Guillermo Bisheimer <gbisheimer@bys-control.com.ar>
Date: Wed, 18 Jun 2014 10:52:24 -0300
Subject: [PATCH 096/137] wrong domain in action_reception_picking_move in
 addons/stock/stock_view.xml

---
 addons/stock/stock_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 06fabc97e5e..32bc27a0940 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1286,7 +1286,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain" eval="['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.picking_type_id.code','=','outgoing')]"/>
+            <field name="domain" eval="[('picking_id.picking_type_id.code','=','incoming'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context">{'product_receive': True, 'search_default_future': True}</field>
             <field name="help" type="html">

From 5023816c5577b312b06f04355365f1243ed2cdc9 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@openerp.com>
Date: Thu, 19 Jun 2014 14:45:56 +0200
Subject: [PATCH 097/137] [FIX] website: correct selector

The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present.
Patch fix #627
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 7151987143e..e741b805566 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -436,7 +436,7 @@
                     }
                 );
             });
-            menu.on('click', 'a[data-action!=ace]', function (event) {
+            menu.on('click', 'a[data-view-id]', function (event) {
                 var view_id = $(event.currentTarget).data('view-id');
                 openerp.jsonRpc('/website/customize_template_toggle', 'call', {
                     'view_id': view_id

From 78ce1d0eff9073094670faacaa5197ff3436dc1f Mon Sep 17 00:00:00 2001
From: Anand-Dharampuriya <adh@openerp.com>
Date: Thu, 19 Jun 2014 18:19:24 +0530
Subject: [PATCH 098/137] [FIX] From crm_claim remove the checkbox 'Hide when
 empty' on claim stages

---
 addons/crm_claim/crm_claim.py       | 3 ---
 addons/crm_claim/crm_claim_data.xml | 1 -
 addons/crm_claim/crm_claim_view.xml | 1 -
 3 files changed, 5 deletions(-)

diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 641c490cabb..e38bf973cdf 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -45,13 +45,10 @@ class crm_claim_stage(osv.osv):
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
         'case_default': fields.boolean('Common to All Teams',
                         help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
-        'fold': fields.boolean('Hide in Views when Empty',
-                        help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
 
     _defaults = {
         'sequence': lambda *args: 1,
-        'fold': False,
     }
 
 class crm_claim(osv.osv):
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index fca7ac51178..86cf988ff45 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -61,7 +61,6 @@
             <field name="name">Rejected</field>
             <field name="sequence">29</field>
             <field name="case_default" eval="True"/>
-            <field name="fold" eval="True"/>
         </record>
         
 
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 43df3d069bf..6180b85660d 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -51,7 +51,6 @@
                         <field name="name"/>
                         <field name="case_default"/>
                         <field name="sequence"/>
-                        <field name="fold"/>
                     </group>
                 </form>
             </field>

From e7285c6e1d7aa6df8efeb46dbe508265f8c3669f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Najla=C3=A2=20El=20Khayat?= <nel@odoo.com>
Date: Thu, 19 Jun 2014 14:51:32 +0200
Subject: [PATCH 099/137] Production : Source location of the BOM

Use the source location defined on the current MO's routing not directly on the BOM
---
 addons/mrp/mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 2b5d68177f1..e8e1887caf8 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1037,8 +1037,8 @@ class mrp_production(osv.osv):
 
             # Take routing location as a Source Location.
             source_location_id = production.location_src_id.id
-            if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
-                source_location_id = production.bom_id.routing_id.location_id.id
+            if production.routing_id and production.routing_id.location_id:
+                source_location_id = production.routing_id.location_id.id
 
             for line in production.product_lines:
                 consume_move_id = self._make_production_consume_line(cr, uid, line, produce_move_id, source_location_id=source_location_id, context=context)

From 893e4aae9fd6bb1be29b7ee036d608102cef4cb6 Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@odoo.com>
Date: Thu, 19 Jun 2014 14:58:44 +0200
Subject: [PATCH 100/137] [FIX] web: focused field in view editable list

When adding an item to the editable list, the focused field was no longer the first visible field
This is related to revision 4a508885ac043b25465aa5741955082aa66ce949
visible_columns list is not ordered
---
 addons/web/static/src/js/view_list_editable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index b97aef19815..7d2e44263ce 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -251,7 +251,10 @@ openerp.web.list_editable = function (instance) {
                     }, options).then(function () {
                         $recordRow.addClass('oe_edition');
                         self.resize_fields();
-                        var focus_field = options && options.focus_field ? options.focus_field : (self.visible_columns.length ? self.visible_columns[0].name : undefined);
+                        var focus_field = options && options.focus_field ? options.focus_field : undefined;
+                        if (!focus_field){
+                            focus_field = _.find(self.editor.form.fields_order, function(field){ return fields[field] && fields[field].$el.is(':visible:has(input)'); });
+                        }
                         if (focus_field) fields[focus_field].$el.find('input').select();
                         return record.attributes;
                     });

From e59077b0f9b5dfcba4eb9da273c2656f4da29a75 Mon Sep 17 00:00:00 2001
From: Niels Huylebroeck <niels@bubbles-it.be>
Date: Thu, 19 Jun 2014 11:36:59 +0200
Subject: [PATCH 101/137] Fix displaying of minKarma requirements

---
 addons/website_forum/static/src/js/website_forum.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_forum/static/src/js/website_forum.js b/addons/website_forum/static/src/js/website_forum.js
index 0b45d4311c1..3284121d27b 100644
--- a/addons/website_forum/static/src/js/website_forum.js
+++ b/addons/website_forum/static/src/js/website_forum.js
@@ -153,7 +153,7 @@ function IsKarmaValid(eventNumber,minKarma){
         CKEDITOR.tools.callFunction(eventNumber,this);
         return false;
     } else {
-        alert("Sorry you need more than 30 Karma.");
+        alert("Sorry you need more than " + minKarma + " Karma.");
     }
 }
 

From 7814d160468ce3fec86bae271f88a65c9d8312ba Mon Sep 17 00:00:00 2001
From: cod-odoo <cod@openerp.com>
Date: Thu, 19 Jun 2014 16:00:30 +0200
Subject: [PATCH 102/137] [IMP] accounting: add account_anglo_saxon in
 dependencies of l10n_uk l10n_us

---
 addons/l10n_uk/__openerp__.py | 2 +-
 addons/l10n_us/__openerp__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 0590224c364..0556535296f 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -32,7 +32,7 @@ This is the latest UK OpenERP localisation necessary to run OpenERP accounting f
     - a few other adaptations""",
     'author': 'SmartMode LTD',
     'website': 'http://www.smartmode.co.uk',
-    'depends': ['base_iban', 'base_vat', 'account_chart'],
+    'depends': ['base_iban', 'base_vat', 'account_chart', 'account_anglo_saxon'],
     'data': [
         'data/account.account.type.csv',
         'data/account.account.template.csv',
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index 90c0e6fd4ad..ea5792c1dca 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -28,7 +28,7 @@ United States - Chart of accounts.
 ==================================
     """,
     'website': 'http://www.openerp.com',
-    'depends': ['account_chart'],
+    'depends': ['account_chart', 'account_anglo_saxon'],
     'data': [
         'l10n_us_account_type.xml',
         'account_chart_template.xml',

From 148a332b4a4ad30a42b21da617f5fbc0fa0725d2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 19 Jun 2014 17:14:37 +0200
Subject: [PATCH 103/137] [FIX] tour.js: don't throw error in tutorial mode;
 error with multi ajax request (change page, data...)

---
 addons/web/static/src/js/tour.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 14908e56f5e..ba9f71a9a35 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -77,7 +77,7 @@ var Tour = {
         }
         this.time = new Date().getTime();
         if (tour.path && !window.location.href.match(new RegExp("("+Tour.getLang()+")?"+tour.path+"#?$", "i"))) {
-            var href = "/"+Tour.getLang()+tour.path;
+            var href = Tour.getLang()+tour.path;
             console.log("Tour Begin from run method (redirection to "+href+")");
             Tour.saveState(tour.id, mode || tour.mode, -1, 0);
             window.location.href = href;
@@ -87,7 +87,7 @@ var Tour = {
             Tour.running();
         }
     },
-    registerSteps: function (tour) {
+    registerSteps: function (tour, mode) {
         if (tour.register) {
             return;
         }
@@ -130,7 +130,7 @@ var Tour = {
         }
 
         // rendering bootstrap tour and popover
-        if (tour.mode !== "test") {
+        if (mode !== "test") {
             for (var index=0, len=tour.steps.length; index<len; index++) {
                 var step = tour.steps[index];
                 step._title = step._title || step.title;
@@ -287,7 +287,7 @@ var Tour = {
         return typeof QWeb2 !== "undefined" ? openerp.qweb.render('tour.popover', options) : options.title;
     },
     getLang: function () {
-        return $("html").attr("lang").replace(/-/, '_');
+        return $("html").attr("lang") ? "/" + $("html").attr("lang").replace(/-/, '_') : "";
     },
     getState: function () {
         var state = JSON.parse(localStorage.getItem("tour") || 'false') || {};
@@ -322,7 +322,9 @@ var Tour = {
             + "\n localStorage: " + JSON.stringify(localStorage)
             + '\n\n' + $("body").html();
         Tour.reset();
-        throw new Error(message);
+        if (state.mode === "test") {
+            throw new Error(message);
+        }
     },
     lists: function () {
         var tour_ids = [];
@@ -357,20 +359,21 @@ var Tour = {
         function run () {
             var state = Tour.getState();
             if (!state) return;
-            if (!Tour._load_template) {
-                Tour.load_template().then(Tour.running);
-            }
             else if (state.tour) {
+                if (!Tour._load_template) {
+                    Tour.load_template().then(run);
+                    return;
+                }
                 console.log("Tour '"+state.id+"' is running");
-                Tour.registerSteps(state.tour);
+                Tour.registerSteps(state.tour, state.mode);
                 Tour.nextStep();
             } else {
-                if (state.wait >= 10) {
+                if (state.mode === "test" && state.wait >= 10) {
                     Tour.error(state.step, "Tour '"+state.id+"' undefined");
                 }
                 Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
                 console.log("Tour '"+state.id+"' wait for running (tour undefined)");
-                setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
+                setTimeout(run, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
             }
         }
         setTimeout(function () {

From f8b23df55a27f84c29af3788147a24e83496476a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 19 Jun 2014 17:29:39 +0200
Subject: [PATCH 104/137] [FIX] tour.js: fickering of the popover in tutorial
 mode in backend

---
 addons/web/static/src/js/tour.js | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index ba9f71a9a35..54670d8e68e 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -355,18 +355,29 @@ var Tour = {
         clearTimeout(Tour.testtimer);
         Tour.closePopover();
     },
+    _running: false,
     running: function () {
+        Tour._running = false;
         function run () {
+            //if (Tour._running) return;
+            Tour._running = true;
             var state = Tour.getState();
-            if (!state) return;
+            if (!state) {
+                Tour._running = false;
+                return;
+            }
             else if (state.tour) {
                 if (!Tour._load_template) {
-                    Tour.load_template().then(run);
+                    Tour.load_template().then(function () {
+                        Tour._running = false;
+                        run();
+                    });
                     return;
                 }
                 console.log("Tour '"+state.id+"' is running");
                 Tour.registerSteps(state.tour, state.mode);
                 Tour.nextStep();
+                Tour._running = false;
             } else {
                 if (state.mode === "test" && state.wait >= 10) {
                     Tour.error(state.step, "Tour '"+state.id+"' undefined");
@@ -431,7 +442,7 @@ var Tour = {
         step = step || state.step;
         var next = state.tour.steps[step.id+1];
 
-        if (state.number > 3) {
+        if (state.mode === "test" && state.number > 3) {
             Tour.error(next, "Cycling. Can't reach the next step");
         }
         

From 2d686988a4cb88e54dd84a7436bcf7ee65f77517 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 19 Jun 2014 17:52:32 +0200
Subject: [PATCH 105/137] [FIX] tour.js: forgotten backdrop and orphan css

---
 addons/web/static/src/css/base.css        | 33 +++++++++++++++++++++++
 addons/web/static/src/css/base.sass       | 27 +++++++++++++++++++
 addons/website/static/src/css/editor.css  | 33 -----------------------
 addons/website/static/src/css/editor.sass | 28 -------------------
 4 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index b234e2738df..20ed015bb3f 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -3447,6 +3447,39 @@ input[type="radio"], input[type="checkbox"] {
   opacity: 0.6;
 }
 
+/* ---- EDITOR TOUR ---- {{{ */
+div.tour-backdrop {
+  z-index: 2009;
+}
+
+.popover.tour.orphan .arrow {
+  display: none;
+}
+.popover.tour .popover-navigation {
+  padding: 9px 14px;
+}
+.popover.tour .popover-navigation *[data-role="end"] {
+  float: right;
+}
+.popover.tour .popover-navigation *[data-role="next"], .popover.tour .popover-navigation *[data-role="end"] {
+  cursor: pointer;
+}
+
+.popover.fixed {
+  position: fixed;
+}
+
+.tour-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1100;
+  background-color: black;
+  opacity: 0.8;
+}
+
 body {
   overflow: auto;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 093ebf6cb0b..464021fc941 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2799,6 +2799,33 @@ input[type="radio"], input[type="checkbox"]
     background-color: black
     opacity: 0.6000000238418579
 
+/* ---- EDITOR TOUR ---- {{{ */
+
+div.tour-backdrop
+    z-index: 2009
+.popover.tour
+    &.orphan .arrow
+        display: none
+    .popover-navigation
+        padding: 9px 14px
+        *[data-role="end"]
+            float: right
+        *[data-role="next"],*[data-role="end"]
+            cursor: pointer
+.popover.fixed
+    position: fixed
+.tour-backdrop
+    position: fixed
+    top: 0
+    right: 0
+    bottom: 0
+    left: 0
+    z-index: 1100
+    background-color: #000
+    opacity: 0.8
+
+
+// }}}
 
 body
     overflow: auto
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 7d8b1e609e8..a6058d347f2 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -512,36 +512,3 @@ ul.oe_menu_editor .disclose {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0);
   opacity: 0;
 }
-
-/* ---- EDITOR TOUR ---- {{{ */
-div.tour-backdrop {
-  z-index: 2009;
-}
-
-.popover.tour.orphan .arrow {
-  display: none;
-}
-.popover.tour .popover-navigation {
-  padding: 9px 14px;
-}
-.popover.tour .popover-navigation *[data-role="end"] {
-  float: right;
-}
-.popover.tour .popover-navigation *[data-role="next"], .popover.tour .popover-navigation *[data-role="end"] {
-  cursor: pointer;
-}
-
-.popover.fixed {
-  position: fixed;
-}
-
-.tour-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1100;
-  background-color: black;
-  opacity: 0.8;
-}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index d39b6abd453..9ba8ee552f5 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -446,32 +446,4 @@ $editorbar_height: 30px
 
 // }}}
 
-/* ---- EDITOR TOUR ---- {{{ */
-
-div.tour-backdrop
-    z-index: 2009
-.popover.tour
-    &.orphan .arrow
-        display: none
-    .popover-navigation
-        padding: 9px 14px
-        *[data-role="end"]
-            float: right
-        *[data-role="next"],*[data-role="end"]
-            cursor: pointer
-.popover.fixed
-    position: fixed
-.tour-backdrop
-    position: fixed
-    top: 0
-    right: 0
-    bottom: 0
-    left: 0
-    z-index: 1100
-    background-color: #000
-    opacity: 0.8
-
-
-// }}}
-
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker:

From d89c36866e7bab7b963337fe254df10b9c0a3756 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 19 Jun 2014 18:10:38 +0200
Subject: [PATCH 106/137] [IMP] tour.js: less flickering and clean code

---
 addons/web/static/src/js/tour.js | 52 +++++++++++---------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 54670d8e68e..08cbd9d9460 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -80,6 +80,7 @@ var Tour = {
             var href = Tour.getLang()+tour.path;
             console.log("Tour Begin from run method (redirection to "+href+")");
             Tour.saveState(tour.id, mode || tour.mode, -1, 0);
+            $(document).one("ajaxStop", Tour.running);
             window.location.href = href;
         } else {
             console.log("Tour Begin from run method");
@@ -117,6 +118,9 @@ var Tour = {
                 step.element = "body";
                 step.orphan = true;
                 step.backdrop = true;
+            } else {
+                step.popover = step.popover || {};
+                step.popover.arrow = true;
             }
         }
         if (tour.steps[index-1] &&
@@ -355,45 +359,25 @@ var Tour = {
         clearTimeout(Tour.testtimer);
         Tour.closePopover();
     },
-    _running: false,
     running: function () {
-        Tour._running = false;
-        function run () {
-            //if (Tour._running) return;
-            Tour._running = true;
-            var state = Tour.getState();
-            if (!state) {
-                Tour._running = false;
+        var state = Tour.getState();
+        if (!state) return;
+        else if (state.tour) {
+            if (!Tour._load_template) {
+                Tour.load_template().then(Tour.running);
                 return;
             }
-            else if (state.tour) {
-                if (!Tour._load_template) {
-                    Tour.load_template().then(function () {
-                        Tour._running = false;
-                        run();
-                    });
-                    return;
-                }
-                console.log("Tour '"+state.id+"' is running");
-                Tour.registerSteps(state.tour, state.mode);
-                Tour.nextStep();
-                Tour._running = false;
-            } else {
-                if (state.mode === "test" && state.wait >= 10) {
-                    Tour.error(state.step, "Tour '"+state.id+"' undefined");
-                }
-                Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
-                console.log("Tour '"+state.id+"' wait for running (tour undefined)");
-                setTimeout(run, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
+            console.log("Tour '"+state.id+"' is running");
+            Tour.registerSteps(state.tour, state.mode);
+            Tour.nextStep();
+        } else {
+            if (state.mode === "test" && state.wait >= 10) {
+                Tour.error(state.step, "Tour '"+state.id+"' undefined");
             }
+            Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
+            console.log("Tour '"+state.id+"' wait for running (tour undefined)");
+            setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
         }
-        setTimeout(function () {
-            if ($.ajaxBusy) {
-                $(document).ajaxStop(run);
-            } else {
-                run();
-            }
-        },0);
     },
     check: function (step) {
         return (step &&

From 452c1e32dabbdad32510bf867480b5a1120e837e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jun 2014 13:16:14 +0200
Subject: [PATCH 107/137] [IMP] account: removed demo data about unexisting
 field, causing a warning.

---
 addons/account/demo/account_bank_statement.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/demo/account_bank_statement.xml b/addons/account/demo/account_bank_statement.xml
index 52667828cc5..693dbc876b5 100644
--- a/addons/account/demo/account_bank_statement.xml
+++ b/addons/account/demo/account_bank_statement.xml
@@ -7,7 +7,6 @@
             <field name="period_id" ref="account.period_5"/>
             <field name="date" eval="time.strftime('%Y')+'-01-01'"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="reference_type">none</field>
             <field name="name">BNK/2014/001</field>
             <field name="balance_end" eval="2040.0"/>
             <field name="company_id" ref="base.main_company"/>

From 64762086b80240d514017c11f56de61c53f837d0 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 20 Jun 2014 07:52:42 +0200
Subject: [PATCH 108/137] [IMP] unpack a listcomp in a dict passed to an
 update, pass gencomp directly to update

---
 openerp/modules/graph.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/modules/graph.py b/openerp/modules/graph.py
index 76a9f046dc6..b0f6141e78f 100644
--- a/openerp/modules/graph.py
+++ b/openerp/modules/graph.py
@@ -78,7 +78,7 @@ class Graph(dict):
                    )
 
         ## and we update the default values with values from the database
-        additional_data.update(dict([(x.pop('name'), x) for x in cr.dictfetchall()]))
+        additional_data.update((x['name'], x) for x in cr.dictfetchall())
 
         for package in self.values():
             for k, v in additional_data[package.name].items():

From 64ca79cc4c67b778dc576fdf3f03f1b7f15c1440 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 20 Jun 2014 07:54:44 +0200
Subject: [PATCH 109/137] [IMP] remove usage of psycopg1.cursor, implement
 dictfetch* on openerp cursor

---
 openerp/sql_db.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/openerp/sql_db.py b/openerp/sql_db.py
index 3e401347a18..add6cc9655a 100644
--- a/openerp/sql_db.py
+++ b/openerp/sql_db.py
@@ -30,12 +30,11 @@ the ORM does, in fact.
 from contextlib import contextmanager
 from functools import wraps
 import logging
-import time
 import uuid
+import psycopg2.extras
 import psycopg2.extensions
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ
 from psycopg2.pool import PoolError
-from psycopg2.psycopg1 import cursor as psycopg1cursor
 
 psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 
@@ -76,7 +75,7 @@ sql_counter = 0
 class Cursor(object):
     """Represents an open transaction to the PostgreSQL DB backend,
        acting as a lightweight wrapper around psycopg2's
-       ``psycopg1cursor`` objects.
+       ``cursor`` objects.
 
         ``Cursor`` is the object behind the ``cr`` variable used all
         over the OpenERP code.
@@ -175,7 +174,7 @@ class Cursor(object):
         self._serialized = serialized
 
         self._cnx = pool.borrow(dsn(dbname))
-        self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
+        self._obj = self._cnx.cursor()
         if self.sql_log:
             self.__caller = frame_codeinfo(currentframe(),2)
         else:
@@ -188,6 +187,16 @@ class Cursor(object):
 
         self.cache = {}
 
+    def __build_dict(self, row):
+        return { d.name: row[i] for i, d in enumerate(self._obj.description) }
+    def dictfetchone(self):
+        row = self._obj.fetchone()
+        return row and self.__build_dict(row)
+    def dictfetchmany(self, size):
+        return map(self.__build_dict, self._obj.fetchmany(size))
+    def dictfetchall(self):
+        return map(self.__build_dict, self._obj.fetchall())
+
     def __del__(self):
         if not self._closed and not self._cnx.closed:
             # Oops. 'self' has not been closed explicitly.

From c4bc4dc3f590d220e0e5c28f4e49ac8d43cdf8f8 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 2 Jun 2014 02:28:15 +0200
Subject: [PATCH 110/137] [FIX] account: another way to resolve multi currency
 reconciliation on bank statements: show the amount in statement line currency
 instead of converting them into the statement currency. This is needed in
 order to have a balance of 0 in the foreign currency. The only remaining
 thing is to make a foreign currency exchange writeoff automatic at the
 reconciliation time if we reconcile 2 lines having the same currency_id

---
 addons/account/account_bank_statement.py      | 83 ++++++++++++-------
 .../account/static/src/js/account_widgets.js  | 25 +++---
 2 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 75940d2d83d..70c1e48e865 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -414,22 +414,33 @@ class account_bank_statement(osv.osv):
             'domain':[('statement_id','in',ids)],
             'context':ctx,
         }
+        
+    def get_format_currency_js_function(self, cr, uid, id, context=None):
+        """ Returns a string that can be used to instanciate a javascript function.
+            That function formats a number according to the statement line's currency or the statement currency"""
+        company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+        st = id and self.browse(cr, uid, id, context=context)
+        if not st:
+            return
+        statement_currency = st.journal_id.currency or company_currency
+        digits = 2 # TODO : from currency_obj
+        function = "debugger;"
+        done_currencies = []
+        for st_line in st.line_ids:
+            st_line_currency = st_line.currency_id or statement_currency
+            if st_line_currency.id not in done_currencies:
+                if st_line_currency.position == 'after':
+                    return_str = "return amount.toFixed(" + str(digits) + ") + ' " + st_line_currency.symbol + "';"
+                else:
+                    return_str = "return '" + st_line_currency.symbol + " ' + amount.toFixed(" + str(digits) + ");"
+                function += "if (currency_id === " + str(st_line_currency.id) + "){ " + return_str + " }"
+                done_currencies.append(st_line_currency.id)
+        return function
 
     def number_of_lines_reconciled(self, cr, uid, id, context=None):
         bsl_obj = self.pool.get('account.bank.statement.line')
         return bsl_obj.search_count(cr, uid, [('statement_id','=',id), ('journal_entry_id','!=',False)], context=context)
 
-    def get_format_currency_js_function(self, cr, uid, id, context=None):
-        """ Returns a string that can be used to instanciate a javascript function.
-            That function formats a number according to the statement's journal currency """
-        company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
-        currency_obj = id and self.browse(cr, uid, id, context=context).journal_id.currency or company_currency
-        digits = 2 # TODO : from currency_obj
-        if currency_obj.position == 'after':
-            return "return amount.toFixed("+str(digits)+") + ' "+currency_obj.symbol+"';"
-        elif currency_obj.position == 'before':
-            return "return '"+currency_obj.symbol+" ' + amount.toFixed("+str(digits)+");"
-
 class account_bank_statement_line(osv.osv):
 
     def get_data_for_reconciliations(self, cr, uid, ids, context=None):
@@ -457,12 +468,15 @@ class account_bank_statement_line(osv.osv):
         """ Returns the data required by the bank statement reconciliation use case """
         line = self.browse(cr, uid, id, context=context)
         statement_currency = line.journal_id.currency or line.journal_id.company_id.currency_id
+        amount = line.amount
         rml_parser = report_sxw.rml_parse(cr, uid, 'statement_line_widget', context=context)
         amount_str = line.amount > 0 and line.amount or -line.amount
         amount_str = rml_parser.formatLang(amount_str, currency_obj=statement_currency)
         amount_currency_str = ""
         if line.amount_currency and line.currency_id:
-            amount_currency_str = rml_parser.formatLang(line.amount_currency, currency_obj=line.currency_id)
+            amount_currency_str = amount_str
+            amount_str = rml_parser.formatLang(line.amount_currency, currency_obj=line.currency_id)
+            amount = line.amount_currency
 
         dict = {
             'id': line.id,
@@ -470,8 +484,9 @@ class account_bank_statement_line(osv.osv):
             'note': line.note or "",
             'name': line.name,
             'date': line.date,
-            'amount': line.amount,
+            'amount': amount,
             'amount_str': amount_str,
+            'currency_id': line.currency_id.id or statement_currency.id,
             'no_match': self.get_move_lines_counterparts(cr, uid, id, count=True, context=context) == 0 and line.partner_id.id,
             'partner_id': line.partner_id.id,
             'statement_id': line.statement_id.id,
@@ -482,7 +497,7 @@ class account_bank_statement_line(osv.osv):
             'has_no_partner': not line.partner_id.id,
         }
         if line.partner_id.id:
-            if line.amount > 0:
+            if amount > 0:
                 dict['open_balance_account_id'] = line.partner_id.property_account_receivable.id
             else:
                 dict['open_balance_account_id'] = line.partner_id.property_account_payable.id
@@ -596,7 +611,8 @@ class account_bank_statement_line(osv.osv):
                     'journal_name': line.journal_id.name,
                     'amount_currency_str': amount_currency_str,
                 }
-                if statement_currency.id != company_currency.id and line.currency_id and line.currency_id.id == statement_currency.id:
+                st_line_currency = st_line.currency_id or statement_currency
+                if st_line.currency_id and line.currency_id and line.currency_id.id == st_line.currency_id.id:
                     if line.amount_residual_currency < 0:
                         ret_line['debit'] = 0
                         ret_line['credit'] = -line.amount_residual_currency
@@ -613,10 +629,10 @@ class account_bank_statement_line(osv.osv):
                         ret_line['credit'] = line.amount_residual if line.debit != 0 else 0
                     ctx = context.copy()
                     ctx.update({'date': st_line.date})
-                    ret_line['debit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, ret_line['debit'], context=ctx)
-                    ret_line['credit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, ret_line['credit'], context=ctx)
-                ret_line['debit_str'] = rml_parser.formatLang(ret_line['debit'], currency_obj=statement_currency)
-                ret_line['credit_str'] = rml_parser.formatLang(ret_line['credit'], currency_obj=statement_currency)
+                    ret_line['debit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, ret_line['debit'], context=ctx)
+                    ret_line['credit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, ret_line['credit'], context=ctx)
+                ret_line['debit_str'] = rml_parser.formatLang(ret_line['debit'], currency_obj=st_line_currency)
+                ret_line['credit_str'] = rml_parser.formatLang(ret_line['credit'], currency_obj=st_line_currency)
                 ret.append(ret_line)
                 if line.reconcile_partial_id:
                     reconcile_partial_ids.append(line.reconcile_partial_id.id)
@@ -657,14 +673,14 @@ class account_bank_statement_line(osv.osv):
         amount = currency_obj.compute(cr, uid, st_line.statement_id.currency.id, company_currency.id, st_line.amount, context=context)
         bank_st_move_vals = bs_obj._prepare_bank_move_line(cr, uid, st_line, move_id, amount, company_currency.id, context=context)
         aml_obj.create(cr, uid, bank_st_move_vals, context=context)
-        st_line_currency_rate = bank_st_move_vals['amount_currency'] and statement_currency.id == company_currency.id and (bank_st_move_vals['amount_currency'] / st_line.amount) or False
-        st_line_currency = bank_st_move_vals['currency_id']
         # Complete the dicts
         st_line_statement_id = st_line.statement_id.id
         st_line_journal_id = st_line.journal_id.id
         st_line_partner_id = st_line.partner_id.id
         st_line_company_id = st_line.company_id.id
         st_line_period_id = st_line.statement_id.period_id.id
+        st_line_currency = st_line.currency_id or statement_currency
+        st_line_currency_rate = st_line.currency_id and statement_currency.id == company_currency.id and (st_line.amount_currency / st_line.amount) or False
         for mv_line_dict in mv_line_dicts:
             mv_line_dict['ref'] = move_name
             mv_line_dict['move_id'] = move_id
@@ -676,15 +692,24 @@ class account_bank_statement_line(osv.osv):
             if mv_line_dict.get('counterpart_move_line_id'):
                 mv_line = aml_obj.browse(cr, uid, mv_line_dict['counterpart_move_line_id'], context=context)
                 mv_line_dict['account_id'] = mv_line.account_id.id
-            if statement_currency.id != company_currency.id:
+            if st_line_currency.id != company_currency.id:
                 mv_line_dict['amount_currency'] = mv_line_dict['debit'] - mv_line_dict['credit']
-                mv_line_dict['currency_id'] = statement_currency.id
-                mv_line_dict['debit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['debit'])
-                mv_line_dict['credit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['credit'])
-            elif st_line_currency and st_line_currency_rate:
-                mv_line_dict['amount_currency'] = self.pool.get('res.currency').round(cr, uid, st_line.currency_id, (mv_line_dict['debit'] - mv_line_dict['credit']) * st_line_currency_rate) 
-                mv_line_dict['currency_id'] = st_line_currency
-
+                mv_line_dict['currency_id'] = st_line_currency.id
+                if st_line.currency_id and statement_currency.id == company_currency.id and st_line_currency_rate:
+                    mv_line_dict['debit'] = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['debit'] / st_line_currency_rate) 
+                    mv_line_dict['credit'] = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['credit'] / st_line_currency_rate) 
+                else:
+                    mv_line_dict['debit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'])
+                    mv_line_dict['credit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'])
+            #if statement_currency.id != company_currency.id:
+            #    mv_line_dict['amount_currency'] = mv_line_dict['debit'] - mv_line_dict['credit']
+            #    mv_line_dict['currency_id'] = statement_currency.id
+            #    mv_line_dict['debit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['debit'])
+            #    mv_line_dict['credit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['credit'])
+            #elif st_line_currency and st_line_currency_rate:
+            #    mv_line_dict['amount_currency'] = self.pool.get('res.currency').round(cr, uid, st_line.currency_id, (mv_line_dict['debit'] - mv_line_dict['credit']) * st_line_currency_rate) 
+            #    mv_line_dict['currency_id'] = st_line_currency
+        import pdb;pdb.set_trace()
         # Create move lines
         move_line_pairs_to_reconcile = []
         for mv_line_dict in mv_line_dicts:
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index a7e83a2146b..0d696da9501 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -171,7 +171,7 @@ openerp.account = function (instance) {
             deferred_promises.push(self.model_bank_statement
                 .call("get_format_currency_js_function", [self.statement_id])
                 .then(function(data){
-                    self.formatCurrency = new Function("amount", data);
+                    self.formatCurrency = new Function("amount, currency_id", data);
                 })
             );
     
@@ -1099,8 +1099,8 @@ openerp.account = function (instance) {
             } else {
                 self.$(".button_ok").removeClass("oe_highlight");
                 self.$(".button_ok").text("Keep open");
-                var debit = (balance > 0 ? self.formatCurrency(balance) : "");
-                var credit = (balance < 0 ? self.formatCurrency(-1*balance) : "");
+                var debit = (balance > 0 ? self.formatCurrency(balance, self.st_line.currency_id) : "");
+                var credit = (balance < 0 ? self.formatCurrency(-1*balance, self.st_line.currency_id) : "");
                 var $line = $(QWeb.render("bank_statement_reconciliation_line_open_balance", {debit: debit, credit: credit, account_code: self.map_account_id_code[self.st_line.open_balance_account_id]}));
                 self.$(".tbody_open_balance").append($line);
             }
@@ -1198,6 +1198,8 @@ openerp.account = function (instance) {
             var self = this;
             var line_created_being_edited = self.get("line_created_being_edited");
             line_created_being_edited[0][elt.corresponding_property] = val.newValue;
+             
+            line_created_being_edited[0].currency_id = self.st_line.currency_id;
     
             // Specific cases
             if (elt === self.account_id_field)
@@ -1215,7 +1217,7 @@ openerp.account = function (instance) {
                             var tax = data.taxes[0];
                             var tax_account_id = (amount > 0 ? tax.account_collected_id : tax.account_paid_id)
                             line_created_being_edited[0].amount = (data.total.toFixed(3) === amount.toFixed(3) ? amount : data.total);
-                            line_created_being_edited[1] = {id: line_created_being_edited[0].id, account_id: tax_account_id, account_num: self.map_account_id_code[tax_account_id], label: tax.name, amount: tax.amount, no_remove_action: true};
+                            line_created_being_edited[1] = {id: line_created_being_edited[0].id, account_id: tax_account_id, account_num: self.map_account_id_code[tax_account_id], label: tax.name, amount: tax.amount, no_remove_action: true, currency_id: self.st_line.currency_id};
                         }
                     );
                 } else {
@@ -1227,11 +1229,11 @@ openerp.account = function (instance) {
     
             $.when(deferred_tax).then(function(){
                 // Format amounts
+                debugger;
                 if (line_created_being_edited[0].amount)
-                    line_created_being_edited[0].amount_str = self.formatCurrency(Math.abs(line_created_being_edited[0].amount));
+                    line_created_being_edited[0].amount_str = self.formatCurrency(Math.abs(line_created_being_edited[0].amount), line_created_being_edited[0].currency_id);
                 if (line_created_being_edited[1] && line_created_being_edited[1].amount)
-                    line_created_being_edited[1].amount_str = self.formatCurrency(Math.abs(line_created_being_edited[1].amount));
-
+                    line_created_being_edited[1].amount_str = self.formatCurrency(Math.abs(line_created_being_edited[1].amount), line_created_being_edited[0].currency_id);
                 self.set("line_created_being_edited", line_created_being_edited);
                 self.createdLinesChanged(); // TODO For some reason, previous line doesn't trigger change handler
             });
@@ -1268,10 +1270,10 @@ openerp.account = function (instance) {
             line.initial_amount = line.debit !== 0 ? line.debit : -1 * line.credit;
             if (balance < 0) {
                 line.debit -= balance;
-                line.debit_str = self.formatCurrency(line.debit);
+                line.debit_str = self.formatCurrency(line.debit, self.st_line.currency_id);
             } else {
                 line.credit -= balance;
-                line.credit_str = self.formatCurrency(line.credit);
+                line.credit_str = self.formatCurrency(line.credit, self.st_line.currency_id);
             }
             line.propose_partial_reconcile = false;
             line.partial_reconcile = true;
@@ -1291,12 +1293,13 @@ openerp.account = function (instance) {
         },
     
         unpartialReconcileLine: function(line) {
+            var self = this;
             if (line.initial_amount > 0) {
                 line.debit = line.initial_amount;
-                line.debit_str = this.formatCurrency(line.debit);
+                line.debit_str = self.formatCurrency(line.debit, self.st_line.currency_id);
             } else {
                 line.credit = -1 * line.initial_amount;
-                line.credit_str = this.formatCurrency(line.credit);
+                line.credit_str = self.formatCurrency(line.credit, self.st_line.currency_id);
             }
             line.propose_partial_reconcile = true;
             line.partial_reconcile = false;

From 9279a77ab70e6af5bad6fde78ddb75b86fc36753 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 2 Jun 2014 11:54:18 +0200
Subject: [PATCH 111/137] [FIX] account, bank statement reconciliation: post
 automatically an accounting entry of the currency rate difference at
 reconciliation time

---
 addons/account/account_bank_statement.py | 80 ++++++++++++++++--------
 1 file changed, 55 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 70c1e48e865..bdd74a97b37 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -638,12 +638,37 @@ class account_bank_statement_line(osv.osv):
                     reconcile_partial_ids.append(line.reconcile_partial_id.id)
             return ret
 
+    def get_currency_rate_line(self, cr, uid, st_line, currency_diff, move_id, context=None):
+        if currency_diff < 0:
+            account_id = st_line.company_id.expense_currency_exchange_account_id.id
+            if not account_id:
+                raise osv.except_osv(_('Insufficient Configuration!'), _("You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
+        else:
+            account_id = st_line.company_id.income_currency_exchange_account_id.id
+            if not account_id:
+                raise osv.except_osv(_('Insufficient Configuration!'), _("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
+        return {
+            'move_id': move_id,
+            'name': _('change') + ': ' + (st_line.name or '/'),
+            'period_id': st_line.statement_id.period_id.id,
+            'journal_id': st_line.journal_id.id,
+            'partner_id': st_line.partner_id.id,
+            'company_id': st_line.company_id.id,
+            'statement_id': st_line.statement_id.id,
+            'debit': currency_diff < 0 and -currency_diff or 0,
+            'credit': currency_diff > 0 and currency_diff or 0,
+            'date': st_line.date,
+            'account_id': account_id
+            }
+
     def process_reconciliation(self, cr, uid, id, mv_line_dicts, context=None):
         """ Creates a move line for each item of mv_line_dicts and for the statement line. Reconcile a new move line with its counterpart_move_line_id if specified. Finally, mark the statement line as reconciled by putting the newly created move id in the column journal_entry_id.
 
             :param int id: id of the bank statement line
             :param list of dicts mv_line_dicts: move lines to create. If counterpart_move_line_id is specified, reconcile with it
         """
+        if context is None:
+            context = {}
         st_line = self.browse(cr, uid, id, context=context)
         company_currency = st_line.journal_id.company_id.currency_id
         statement_currency = st_line.journal_id.currency or company_currency
@@ -653,7 +678,7 @@ class account_bank_statement_line(osv.osv):
         currency_obj = self.pool.get('res.currency')
 
         # Checks
-        if st_line.journal_entry_id.id != False:
+        if st_line.journal_entry_id.id:
             raise osv.except_osv(_('Error!'), _('The bank statement line was already reconciled.'))
         for mv_line_dict in mv_line_dicts:
             for field in ['debit', 'credit', 'amount_currency']:
@@ -674,21 +699,17 @@ class account_bank_statement_line(osv.osv):
         bank_st_move_vals = bs_obj._prepare_bank_move_line(cr, uid, st_line, move_id, amount, company_currency.id, context=context)
         aml_obj.create(cr, uid, bank_st_move_vals, context=context)
         # Complete the dicts
-        st_line_statement_id = st_line.statement_id.id
-        st_line_journal_id = st_line.journal_id.id
-        st_line_partner_id = st_line.partner_id.id
-        st_line_company_id = st_line.company_id.id
-        st_line_period_id = st_line.statement_id.period_id.id
         st_line_currency = st_line.currency_id or statement_currency
         st_line_currency_rate = st_line.currency_id and statement_currency.id == company_currency.id and (st_line.amount_currency / st_line.amount) or False
+        to_create = []
         for mv_line_dict in mv_line_dicts:
             mv_line_dict['ref'] = move_name
             mv_line_dict['move_id'] = move_id
-            mv_line_dict['period_id'] = st_line_period_id
-            mv_line_dict['journal_id'] = st_line_journal_id
-            mv_line_dict['partner_id'] = st_line_partner_id
-            mv_line_dict['company_id'] = st_line_company_id
-            mv_line_dict['statement_id'] = st_line_statement_id
+            mv_line_dict['period_id'] = st_line.statement_id.period_id.id
+            mv_line_dict['journal_id'] = st_line.journal_id.id
+            mv_line_dict['partner_id'] = st_line.partner_id.id
+            mv_line_dict['company_id'] = st_line.company_id.id
+            mv_line_dict['statement_id'] = st_line.statement_id.id
             if mv_line_dict.get('counterpart_move_line_id'):
                 mv_line = aml_obj.browse(cr, uid, mv_line_dict['counterpart_move_line_id'], context=context)
                 mv_line_dict['account_id'] = mv_line.account_id.id
@@ -696,23 +717,32 @@ class account_bank_statement_line(osv.osv):
                 mv_line_dict['amount_currency'] = mv_line_dict['debit'] - mv_line_dict['credit']
                 mv_line_dict['currency_id'] = st_line_currency.id
                 if st_line.currency_id and statement_currency.id == company_currency.id and st_line_currency_rate:
-                    mv_line_dict['debit'] = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['debit'] / st_line_currency_rate) 
-                    mv_line_dict['credit'] = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['credit'] / st_line_currency_rate) 
+                    debit_at_current_rate = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['debit'] / st_line_currency_rate)
+                    credit_at_current_rate = self.pool.get('res.currency').round(cr, uid, company_currency, mv_line_dict['credit'] / st_line_currency_rate)
                 else:
-                    mv_line_dict['debit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'])
-                    mv_line_dict['credit'] = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'])
-            #if statement_currency.id != company_currency.id:
-            #    mv_line_dict['amount_currency'] = mv_line_dict['debit'] - mv_line_dict['credit']
-            #    mv_line_dict['currency_id'] = statement_currency.id
-            #    mv_line_dict['debit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['debit'])
-            #    mv_line_dict['credit'] = currency_obj.compute(cr, uid, statement_currency.id, company_currency.id, mv_line_dict['credit'])
-            #elif st_line_currency and st_line_currency_rate:
-            #    mv_line_dict['amount_currency'] = self.pool.get('res.currency').round(cr, uid, st_line.currency_id, (mv_line_dict['debit'] - mv_line_dict['credit']) * st_line_currency_rate) 
-            #    mv_line_dict['currency_id'] = st_line_currency
-        import pdb;pdb.set_trace()
+                    debit_at_current_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'], context=context)
+                    credit_at_current_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'], context=context)
+                if mv_line_dict.get('counterpart_move_line_id'):
+                    #post an account line that use the same currency rate than the counterpart (to balance the account) and post the difference in another line
+                    ctx = context.copy()
+                    ctx['date'] = mv_line.date
+                    debit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['debit'], context=ctx)
+                    credit_at_old_rate = currency_obj.compute(cr, uid, st_line_currency.id, company_currency.id, mv_line_dict['credit'], context=ctx)
+                    mv_line_dict['credit'] = credit_at_old_rate
+                    mv_line_dict['debit'] = debit_at_old_rate
+                    if debit_at_old_rate - debit_at_current_rate:
+                        currency_diff = debit_at_current_rate - debit_at_old_rate
+                        to_create.append(self.get_currency_rate_line(cr, uid, st_line, currency_diff, move_id, context=context))
+                    if credit_at_old_rate - credit_at_current_rate:
+                        currency_diff = credit_at_current_rate - credit_at_old_rate
+                        to_create.append(self.get_currency_rate_line(cr, uid, st_line, currency_diff, move_id, context=context))
+                else:
+                    mv_line_dict['debit'] = debit_at_current_rate
+                    mv_line_dict['credit'] = credit_at_current_rate
+            to_create.append(mv_line_dict)
         # Create move lines
         move_line_pairs_to_reconcile = []
-        for mv_line_dict in mv_line_dicts:
+        for mv_line_dict in to_create:
             counterpart_move_line_id = None # NB : this attribute is irrelevant for aml_obj.create() and needs to be removed from the dict
             if mv_line_dict.get('counterpart_move_line_id'):
                 counterpart_move_line_id = mv_line_dict['counterpart_move_line_id']

From 01d642f2d4321250aa6de2bfe23dc25b321b504a Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 16 Jun 2014 10:38:01 +0200
Subject: [PATCH 112/137] [IMP] account, bank statement reconciliation
 improvements: look for structured communication first, if no partner is given
 then propose any unreconciled line, refactoring and bug fixes

---
 addons/account/account_bank_statement.py      | 128 ++++++++++--------
 .../account/static/src/js/account_widgets.js  |   5 +-
 .../account_bank_statement_reconciliation.xml |   2 +-
 addons/l10n_be_coda/__openerp__.py            |  20 +--
 4 files changed, 73 insertions(+), 82 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index bdd74a97b37..004bcd3a018 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -213,11 +213,8 @@ class account_bank_statement(osv.osv):
 
     def _get_counter_part_account(sefl, cr, uid, st_line, context=None):
         """Retrieve the account to use in the counterpart move.
-           This method may be overridden to implement custom move generation (making sure to
-           call super() to establish a clean extension chain).
 
-           :param browse_record st_line: account.bank.statement.line record to
-                  create the move from.
+           :param browse_record st_line: account.bank.statement.line record to create the move from.
            :return: int/long of the account.account to use as counterpart
         """
         if st_line.amount >= 0:
@@ -226,26 +223,19 @@ class account_bank_statement(osv.osv):
 
     def _get_counter_part_partner(sefl, cr, uid, st_line, context=None):
         """Retrieve the partner to use in the counterpart move.
-           This method may be overridden to implement custom move generation (making sure to
-           call super() to establish a clean extension chain).
 
-           :param browse_record st_line: account.bank.statement.line record to
-                  create the move from.
+           :param browse_record st_line: account.bank.statement.line record to create the move from.
            :return: int/long of the res.partner to use as counterpart
         """
         return st_line.partner_id and st_line.partner_id.id or False
 
     def _prepare_bank_move_line(self, cr, uid, st_line, move_id, amount, company_currency_id, context=None):
         """Compute the args to build the dict of values to create the counter part move line from a
-           statement line by calling the _prepare_move_line_vals. This method may be
-           overridden to implement custom move generation (making sure to call super() to
-           establish a clean extension chain).
+           statement line by calling the _prepare_move_line_vals. 
 
-           :param browse_record st_line: account.bank.statement.line record to
-                  create the move from.
+           :param browse_record st_line: account.bank.statement.line record to create the move from.
            :param int/long move_id: ID of the account.move to link the move line
            :param float amount: amount of the move line
-           :param int/long account_id: ID of account to use as counter part
            :param int/long company_currency_id: ID of currency of the concerned company
            :return: dict of value to create() the bank account.move.line
         """
@@ -258,7 +248,6 @@ class account_bank_statement(osv.osv):
         if st_line.statement_id.currency.id != company_currency_id:
             amt_cur = st_line.amount
             cur_id = st_line.currency_id or st_line.statement_id.currency.id
-        # TODO : FIXME the amount should be in the journal currency
         if st_line.currency_id and st_line.amount_currency:
             amt_cur = st_line.amount_currency
             cur_id = st_line.currency_id.id
@@ -269,9 +258,7 @@ class account_bank_statement(osv.osv):
     def _prepare_move_line_vals(self, cr, uid, st_line, move_id, debit, credit, currency_id=False,
                 amount_currency=False, account_id=False, partner_id=False, context=None):
         """Prepare the dict of values to create the move line from a
-           statement line. All non-mandatory args will replace the default computed one.
-           This method may be overridden to implement custom move generation (making sure to
-           call super() to establish a clean extension chain).
+           statement line.
 
            :param browse_record st_line: account.bank.statement.line record to
                   create the move from.
@@ -424,7 +411,7 @@ class account_bank_statement(osv.osv):
             return
         statement_currency = st.journal_id.currency or company_currency
         digits = 2 # TODO : from currency_obj
-        function = "debugger;"
+        function = ""
         done_currencies = []
         for st_line in st.line_ids:
             st_line_currency = st_line.currency_id or statement_currency
@@ -439,7 +426,7 @@ class account_bank_statement(osv.osv):
 
     def number_of_lines_reconciled(self, cr, uid, id, context=None):
         bsl_obj = self.pool.get('account.bank.statement.line')
-        return bsl_obj.search_count(cr, uid, [('statement_id','=',id), ('journal_entry_id','!=',False)], context=context)
+        return bsl_obj.search_count(cr, uid, [('statement_id', '=', id), ('journal_entry_id', '!=', False)], context=context)
 
 class account_bank_statement_line(osv.osv):
 
@@ -455,12 +442,13 @@ class account_bank_statement_line(osv.osv):
             }
             for mv_line in reconciliation_data['reconciliation_proposition']:
                 mv_line_ids_selected.append(mv_line['id'])
-            ret.append(reconciliation_data);
-        
+            ret.append(reconciliation_data)
+
         # Check if, now that 'candidate' move lines were selected, there are moves left for statement lines
         for reconciliation_data in ret:
             if not reconciliation_data['st_line']['has_no_partner']:
-                if self.get_move_lines_counterparts(cr, uid, reconciliation_data['st_line']['id'], excluded_ids=mv_line_ids_selected, count=True, context=context) == 0:
+                st_line = self.browse(cr, uid, reconciliation_data['st_line']['id'], context=context)
+                if self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=mv_line_ids_selected, count=True, context=context) == 0:
                     reconciliation_data['st_line']['no_match'] = True
         return ret
 
@@ -478,7 +466,7 @@ class account_bank_statement_line(osv.osv):
             amount_str = rml_parser.formatLang(line.amount_currency, currency_obj=line.currency_id)
             amount = line.amount_currency
 
-        dict = {
+        data = {
             'id': line.id,
             'ref': line.ref,
             'note': line.note or "",
@@ -487,7 +475,7 @@ class account_bank_statement_line(osv.osv):
             'amount': amount,
             'amount_str': amount_str,
             'currency_id': line.currency_id.id or statement_currency.id,
-            'no_match': self.get_move_lines_counterparts(cr, uid, id, count=True, context=context) == 0 and line.partner_id.id,
+            'no_match': self.get_move_lines_counterparts(cr, uid, line, count=True, context=context) == 0 and line.partner_id.id,
             'partner_id': line.partner_id.id,
             'statement_id': line.statement_id.id,
             'account_code': line.journal_id.default_debit_account_id.code,
@@ -497,11 +485,19 @@ class account_bank_statement_line(osv.osv):
             'has_no_partner': not line.partner_id.id,
         }
         if line.partner_id.id:
+            data['open_balance_account_id'] = line.partner_id.property_account_payable.id
             if amount > 0:
-                dict['open_balance_account_id'] = line.partner_id.property_account_receivable.id
-            else:
-                dict['open_balance_account_id'] = line.partner_id.property_account_payable.id
-        return dict
+                data['open_balance_account_id'] = line.partner_id.property_account_receivable.id
+        return data
+
+    def search_structured_com(self, cr, uid, st_line, context=None):
+        if not st_line.ref:
+            return
+        domain = [('name', '=', st_line.ref)]
+        if st_line.partner_id:
+            domain += [('partner_id', '=', st_line.partner_id.id)]
+        ids = self.pool.get('account.move.line').search(cr, uid, domain, limit=1, context=context)
+        return ids and ids[0] or False
 
     def get_reconciliation_proposition(self, cr, uid, id, excluded_ids=[], context=None):
         """ Returns move lines that constitute the best guess to reconcile a statement line. """
@@ -512,25 +508,28 @@ class account_bank_statement_line(osv.osv):
         # either use the unsigned debit/credit fields or the signed amount_currency field
         sign = 1
         if statement_currency == company_currency:
+            amount_field = 'credit'
             if st_line.amount > 0:
                 amount_field = 'debit'
-            else:
-                amount_field = 'credit'
         else:
             amount_field = 'amount_currency'
             if st_line.amount < 0:
                 sign = -1
 
+        # look for structured communication
+        exact_match_id = self.search_structured_com(cr, uid, st_line, context=context)
+        if exact_match_id:
+            return self.make_counter_part_lines(cr, uid, st_line, [exact_match_id], count=False, context=context)
         # look for exact match
-        exact_match_id = self.get_move_lines_counterparts(cr, uid, id, excluded_ids=excluded_ids, limit=1, additional_domain=[(amount_field,'=',(sign*st_line.amount))])
+        exact_match_id = self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=excluded_ids, limit=1, additional_domain=[(amount_field, '=', (sign * st_line.amount))])
         if exact_match_id:
             return exact_match_id
 
         # select oldest move lines
         if sign == -1:
-            mv_lines = self.get_move_lines_counterparts(cr, uid, id, excluded_ids=excluded_ids, limit=50, additional_domain=[(amount_field,'<',0)])
+            mv_lines = self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=excluded_ids, limit=50, additional_domain=[(amount_field, '<', 0)])
         else:
-            mv_lines = self.get_move_lines_counterparts(cr, uid, id, excluded_ids=excluded_ids, limit=50, additional_domain=[(amount_field,'>',0)])
+            mv_lines = self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=excluded_ids, limit=50, additional_domain=[(amount_field, '>', 0)])
         ret = []
         total = 0
         # get_move_lines_counterparts inverts debit and credit
@@ -539,51 +538,60 @@ class account_bank_statement_line(osv.osv):
             if total + line[amount_field] <= st_line.amount:
                 ret.append(line)
                 total += line[amount_field]
-            else:
+            if total >= st_line.amount:
                 break
-
         return ret
 
-    def get_move_lines_counterparts(self, cr, uid, id, excluded_ids=[], str="", offset=0, limit=None, count=False, additional_domain=[], context=None):
+    def get_move_lines_counterparts_id(self, cr, uid, st_line_id, excluded_ids=[], filter_str="", offset=0, limit=None, count=False, additional_domain=[], context=None):
+        st_line = self.browse(cr, uid, st_line_id, context=context)
+        return self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids, filter_str, offset, limit, count, additional_domain, context=context)
+
+    def get_move_lines_counterparts(self, cr, uid, st_line, excluded_ids=[], filter_str="", offset=0, limit=None, count=False, additional_domain=[], context=None):
         """ Find the move lines that could be used to reconcile a statement line and returns the counterpart that could be created to reconcile them
             If count is true, only returns the count.
 
-            :param integer id: the id of the statement line
+            :param st_line: the browse record of the statement line
             :param integers list excluded_ids: ids of move lines that should not be fetched
-            :param string str: string to filter lines
+            :param string filter_str: string to filter lines
             :param integer offset: offset of the request
             :param integer limit: number of lines to fetch
             :param boolean count: just return the number of records
             :param tuples list domain: additional domain restrictions
         """
-        if context is None:
-            context = {}
-
-        rml_parser = report_sxw.rml_parse(cr, uid, 'statement_line_counterpart_widget', context=context)
-        st_line = self.browse(cr, uid, id, context=context)
-        company_currency = st_line.journal_id.company_id.currency_id
-        statement_currency = st_line.journal_id.currency or company_currency
         mv_line_pool = self.pool.get('account.move.line')
-        currency_obj = self.pool.get('res.currency')
 
         domain = additional_domain + [
-            ('partner_id', '=', st_line.partner_id.id),
             ('reconcile_id', '=', False),
-            ('state','=','valid'),
-            '|',('account_id.type', '=', 'receivable'),
-            ('account_id.type', '=', 'payable'), #Let the front-end warn the user if he tries to mix payable and receivable in the same reconciliation
+            ('state', '=', 'valid'),
         ]
+        if st_line.partner_id.id:
+            domain += [('partner_id', '=', st_line.partner_id.id),
+                '|', ('account_id.type', '=', 'receivable'),
+                ('account_id.type', '=', 'payable'),  # Let the front-end warn the user if he tries to mix payable and receivable in the same reconciliation
+                ]
+        else:
+            domain += [('account_id.reconcile', '=', True)]
+            #domain += [('account_id.reconcile', '=', True), ('account_id.type', '=', 'other')]
         if excluded_ids:
             domain.append(('id', 'not in', excluded_ids))
-        if str:
-            domain += ['|', ('move_id.name', 'ilike', str), ('move_id.ref', 'ilike', str)]
+        if filter_str:
+            domain += ['|', ('move_id.name', 'ilike', filter_str), ('move_id.ref', 'ilike', filter_str)]
+        line_ids = mv_line_pool.search(cr, uid, domain, offset=offset, limit=limit, order="date_maturity asc, id asc", context=context)
+        return self.make_counter_part_lines(cr, uid, st_line, line_ids, count=count, context=context)
+
+    def make_counter_part_lines(self, cr, uid, st_line, line_ids, count=False, context=None):
+        if context is None:
+            context = {}
+        mv_line_pool = self.pool.get('account.move.line')
+        currency_obj = self.pool.get('res.currency')
+        company_currency = st_line.journal_id.company_id.currency_id
+        statement_currency = st_line.journal_id.currency or company_currency
+        rml_parser = report_sxw.rml_parse(cr, uid, 'statement_line_counterpart_widget', context=context)
         #partially reconciled lines can be displayed only once
         reconcile_partial_ids = []
-        ids = mv_line_pool.search(cr, uid, domain, offset=offset, limit=limit, order="date_maturity asc, id asc", context=context)
-
         if count:
             nb_lines = 0
-            for line in mv_line_pool.browse(cr, uid, ids, context=context):
+            for line in mv_line_pool.browse(cr, uid, line_ids, context=context):
                 if line.reconcile_partial_id and line.reconcile_partial_id.id in reconcile_partial_ids:
                     continue
                 nb_lines += 1
@@ -592,7 +600,7 @@ class account_bank_statement_line(osv.osv):
             return nb_lines
         else:
             ret = []
-            for line in mv_line_pool.browse(cr, uid, ids, context=context):
+            for line in mv_line_pool.browse(cr, uid, line_ids, context=context):
                 if line.reconcile_partial_id and line.reconcile_partial_id.id in reconcile_partial_ids:
                     continue
                 amount_currency_str = ""
@@ -610,6 +618,9 @@ class account_bank_statement_line(osv.osv):
                     'period_name': line.period_id.name,
                     'journal_name': line.journal_id.name,
                     'amount_currency_str': amount_currency_str,
+                    'partner_id': line.partner_id.id,
+                    'partner_name': line.partner_id.name,
+                    'has_no_partner': not bool(st_line.partner_id.id),
                 }
                 st_line_currency = st_line.currency_id or statement_currency
                 if st_line.currency_id and line.currency_id and line.currency_id.id == st_line.currency_id.id:
@@ -707,7 +718,6 @@ class account_bank_statement_line(osv.osv):
             mv_line_dict['move_id'] = move_id
             mv_line_dict['period_id'] = st_line.statement_id.period_id.id
             mv_line_dict['journal_id'] = st_line.journal_id.id
-            mv_line_dict['partner_id'] = st_line.partner_id.id
             mv_line_dict['company_id'] = st_line.company_id.id
             mv_line_dict['statement_id'] = st_line.statement_id.id
             if mv_line_dict.get('counterpart_move_line_id'):
@@ -778,7 +788,7 @@ class account_bank_statement_line(osv.osv):
         'bank_account_id': fields.many2one('res.partner.bank','Bank Account'),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', select=True, required=True, ondelete='cascade'),
         'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True),
-        'ref': fields.char('Reference', size=32),
+        'ref': fields.char('Structured Communication'),
         'note': fields.text('Notes'),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of bank statement lines."),
         'company_id': fields.related('statement_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index 0d696da9501..56fdaaff180 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -1229,7 +1229,6 @@ openerp.account = function (instance) {
     
             $.when(deferred_tax).then(function(){
                 // Format amounts
-                debugger;
                 if (line_created_being_edited[0].amount)
                     line_created_being_edited[0].amount_str = self.formatCurrency(Math.abs(line_created_being_edited[0].amount), line_created_being_edited[0].currency_id);
                 if (line_created_being_edited[1] && line_created_being_edited[1].amount)
@@ -1362,7 +1361,7 @@ openerp.account = function (instance) {
             if (limit > 0) {
                 // Load move lines
                 deferred_move_lines = self.model_bank_statement_line
-                    .call("get_move_lines_counterparts", [self.st_line.id, excluded_ids, self.filter, offset, limit])
+                    .call("get_move_lines_counterparts_id", [self.st_line.id, excluded_ids, self.filter, offset, limit])
                     .then(function (lines) {
                         _(lines).each(self.decorateMoveLine.bind(self));
                         move_lines = lines;
@@ -1371,7 +1370,7 @@ openerp.account = function (instance) {
     
             // Fetch the number of move lines corresponding to this statement line and this filter
             var deferred_total_move_lines_num = self.model_bank_statement_line
-                .call("get_move_lines_counterparts", [self.st_line.id, excluded_ids, self.filter, offset, limit, true])
+                .call("get_move_lines_counterparts_id", [self.st_line.id, excluded_ids, self.filter, offset, limit, true])
                 .then(function(num){
                     move_lines_num = num;
                 });
diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
index f311207ad8c..4ea67615e47 100644
--- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
+++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
@@ -128,7 +128,7 @@
             <td><span class="glyphicon glyphicon-add-remove"></span></td>
             <td><t t-esc="line.account_code"/></td>
             <td><t t-esc="line.q_due_date"/></td>
-            <td><t t-esc="line.q_label"/></td>
+            <td><t t-if="line.has_no_partner"><t t-esc="line.partner_name"/>: </t><t t-esc="line.q_label"/></td>
 
             <td><t t-if="line.debit !== 0">
                 <t t-if="line.propose_partial_reconcile" t-call="icon_do_partial_reconciliation"></t>
diff --git a/addons/l10n_be_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
index ea1ce59eb88..6ecdb04f1d6 100644
--- a/addons/l10n_be_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -59,25 +59,7 @@ A removal of one object in the CODA processing results in the removal of the
 associated objects. The removal of a CODA File containing multiple Bank
 Statements will also remove those associated statements.
 
-The following reconciliation logic has been implemented in the CODA processing:
--------------------------------------------------------------------------------
-    1) The Company's Bank Account Number of the CODA statement is compared against
-       the Bank Account Number field of the Company's CODA Bank Account
-       configuration records (whereby bank accounts defined in type='info'
-       configuration records are ignored). If this is the case an 'internal transfer'
-       transaction is generated using the 'Internal Transfer Account' field of the
-       CODA File Import wizard.
-    2) As a second step the 'Structured Communication' field of the CODA transaction
-       line is matched against the reference field of in- and outgoing invoices
-       (supported : Belgian Structured Communication Type).
-    3) When the previous step doesn't find a match, the transaction counterparty is
-       located via the Bank Account Number configured on the OpenERP Customer and
-       Supplier records.
-    4) In case the previous steps are not successful, the transaction is generated
-       by using the 'Default Account for Unrecognized Movement' field of the CODA
-       File Import wizard in order to allow further manual processing.
-
-In stead of a manual adjustment of the generated Bank Statements, you can also
+Instead of a manual adjustment of the generated Bank Statements, you can also
 re-import the CODA after updating the OpenERP database with the information that
 was missing to allow automatic reconciliation.
 

From ffa6df1e4c855127cb28e49f02ab537da893705c Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 16 Jun 2014 13:30:50 +0200
Subject: [PATCH 113/137] [IMP] l10n_be_coda: using the ref field to store the
 structured communication for automatic reconciliation as per new process on
 bank statement

---
 addons/l10n_be_coda/l10n_be_coda_demo.xml     | 22 +++++++
 .../Ontvangen_CODA.2011-01-11-18.59.15.txt    |  2 +-
 .../wizard/account_coda_import.py             | 60 ++-----------------
 3 files changed, 27 insertions(+), 57 deletions(-)

diff --git a/addons/l10n_be_coda/l10n_be_coda_demo.xml b/addons/l10n_be_coda/l10n_be_coda_demo.xml
index 63436a60a92..ce44539a715 100644
--- a/addons/l10n_be_coda/l10n_be_coda_demo.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_demo.xml
@@ -32,5 +32,27 @@
             <field eval="'2011-01-31'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
+
+        <!-- invoice with BBA -->
+        <record id="coda_demo_invoice_1" model="account.invoice">
+            <field name="currency_id" ref="base.EUR"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="journal_id" ref="account.sales_journal"/>
+            <field name="period_id" ref="period_1_2011"/>
+            <field name="state">draft</field>
+            <field name="type">out_invoice</field>
+            <field name="account_id" ref="account.a_recv"/>
+            <field name="partner_id" ref="base.res_partner_9"/>
+            <field name="reference_type">bba</field>
+            <field name="reference">+++240/2838/42818+++</field>
+        </record>
+        <record id="invoice_1_line_1" model="account.invoice.line">
+            <field name="name">Otpez Laptop without OS</field>
+            <field name="invoice_id" ref="coda_demo_invoice_1"/>
+            <field name="price_unit">608.89</field>
+            <field name="quantity">10</field>
+            <field name="account_id" ref="account.a_sale"/>
+        </record>
+        <workflow action="invoice_open" model="account.invoice" ref="coda_demo_invoice_1"/>
     </data> 
 </openerp>
diff --git a/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
index bc3af59e322..3303e940e0c 100644
--- a/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
+++ b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
@@ -4,7 +4,7 @@
 2200010000                                                                                        GKCCBEBB                   1 0
 2300010000BE41063012345610                     PARTNER 1                                                                     0 1
 3100010001OL44483FW SCTOFBIONLO001010001001PARTNER 1                                                                         0 0
-2100020000OL4414AC8BOVSOVSOVERS00000000030444501101110015000002010237                                              11011113501 0
+2100020000OL4414AC8BOVSOVSOVERS000000000304445011011100150001101240283842818                                       11011113501 0
 2200020000                                                                                        BBRUBEBB                   1 0
 2300020000BE61310126985517                     PARTNER 2                                                                     0 1
 3100020001OL4414AC8BOVSOVSOVERS001500001001PARTNER 2                                                                         1 0
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index e50f8537881..ba786e46b59 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -291,62 +291,10 @@ class account_coda_import(osv.osv_memory):
                     if 'counterpartyAddress' in line and line['counterpartyAddress'] != '':
                         note.append(_('Counter Party Address') + ': ' + line['counterpartyAddress'])
                     line['name'] = "\n".join(filter(None, [line['counterpartyName'], line['communication']]))
-                    partner = None
                     partner_id = None
-                    invoice = False
+                    structured_com = ""
                     if line['communication_struct'] and 'communication_type' in line and line['communication_type'] == '101':
-                        ids = self.pool.get('account.invoice').search(cr, uid, [('reference', '=', line['communication']), ('reference_type', '=', 'bba')])
-                        
-# Gère les communications structurées
-# TODO : à faire primer sur resolution_proposition : si la communication indique une facture, on la sélectionne
-                        
-#                        if ids:
-#                            invoice = self.pool.get('account.invoice').browse(cr, uid, ids[0])
-#                            partner = invoice.partner_id
-#                            partner_id = partner.id
-#                            if invoice.type in ['in_invoice', 'in_refund'] and line['debit'] == '1':
-#                                line['transaction_type'] = 'supplier'
-#                            elif invoice.type in ['out_invoice', 'out_refund'] and line['debit'] == '0':
-#                                line['transaction_type'] = 'customer'
-#                            line['account'] = invoice.account_id.id
-#                            line['reconcile'] = False
-#                            if invoice.type in ['in_invoice', 'out_invoice']:
-#                                iml_ids = self.pool.get('account.move.line').search(cr, uid, [('move_id', '=', invoice.move_id.id), ('reconcile_id', '=', False), ('account_id.reconcile', '=', True)])
-#                            if iml_ids:
-#                                line['reconcile'] = iml_ids[0]
-#                            if line['reconcile']:
-#                                voucher_vals = {
-#                                    'type': line['transaction_type'] == 'supplier' and 'payment' or 'receipt',
-#                                    'name': line['name'],
-#                                    'partner_id': partner_id,
-#                                    'journal_id': statement['journal_id'].id,
-#                                    'account_id': statement['journal_id'].default_credit_account_id.id,
-#                                    'company_id': statement['journal_id'].company_id.id,
-#                                    'currency_id': statement['journal_id'].company_id.currency_id.id,
-#                                    'date': line['entryDate'],
-#                                    'amount': abs(line['amount']),
-#                                    'period_id': statement['period_id'],
-#                                    'invoice_id': invoice.id,
-#                                }
-#                                context['invoice_id'] = invoice.id
-#                                voucher_vals.update(self.pool.get('account.voucher').onchange_partner_id(cr, uid, [],
-#                                    partner_id=partner_id,
-#                                    journal_id=statement['journal_id'].id,
-#                                    amount=abs(line['amount']),
-#                                    currency_id=statement['journal_id'].company_id.currency_id.id,
-#                                    ttype=line['transaction_type'] == 'supplier' and 'payment' or 'receipt',
-#                                    date=line['transactionDate'],
-#                                    context=context
-#                                )['value'])
-#                                line_drs = []
-#                                for line_dr in voucher_vals['line_dr_ids']:
-#                                    line_drs.append((0, 0, line_dr))
-#                                voucher_vals['line_dr_ids'] = line_drs
-#                                line_crs = []
-#                                for line_cr in voucher_vals['line_cr_ids']:
-#                                    line_crs.append((0, 0, line_cr))
-#                                voucher_vals['line_cr_ids'] = line_crs
-#                                line['voucher_id'] = self.pool.get('account.voucher').create(cr, uid, voucher_vals, context=context)
+                        structured_com = line['communication']
                     if 'counterpartyNumber' in line and line['counterpartyNumber']:
                         ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))])
                         if ids and len(ids) > 0:
@@ -356,12 +304,12 @@ class account_coda_import(osv.osv_memory):
                         note.append(_('Communication') + ': ' + line['communication'])
                     data = {
                         'name': line['name'],
-                        'note':  "\n".join(note),
+                        'note': "\n".join(note),
                         'date': line['entryDate'],
                         'amount': line['amount'],
                         'partner_id': partner_id,
                         'statement_id': statement['id'],
-                        'ref': line['ref'],
+                        'ref': structured_com,
                         'sequence': line['sequence'],
                         'coda_account_number': line['counterpartyNumber'],
                     }

From 375dee27f69c0f89a19f510fbe06b9d734d72914 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 16 Jun 2014 15:07:14 +0200
Subject: [PATCH 114/137] [FIX] l10n_be_coda: fixed coda file for structured
 communication use case

---
 .../test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
index 3303e940e0c..d0add859663 100644
--- a/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
+++ b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
@@ -4,7 +4,7 @@
 2200010000                                                                                        GKCCBEBB                   1 0
 2300010000BE41063012345610                     PARTNER 1                                                                     0 1
 3100010001OL44483FW SCTOFBIONLO001010001001PARTNER 1                                                                         0 0
-2100020000OL4414AC8BOVSOVSOVERS000000000304445011011100150001101240283842818                                       11011113501 0
+2100020000OL4414AC8BOVSOVSOVERS0000000003044450110111001500001101240283842818                                      11011113501 0
 2200020000                                                                                        BBRUBEBB                   1 0
 2300020000BE61310126985517                     PARTNER 2                                                                     0 1
 3100020001OL4414AC8BOVSOVSOVERS001500001001PARTNER 2                                                                         1 0

From 1546d022ab485c40ba8da0a10e77fd715de55a55 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Mon, 16 Jun 2014 15:13:40 +0200
Subject: [PATCH 115/137] [FIX] account: reconciliation on structured
 communication has to be done on ref field, not move name

---
 addons/account/account_bank_statement.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 004bcd3a018..38ca301d6bd 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -493,7 +493,7 @@ class account_bank_statement_line(osv.osv):
     def search_structured_com(self, cr, uid, st_line, context=None):
         if not st_line.ref:
             return
-        domain = [('name', '=', st_line.ref)]
+        domain = [('ref', '=', st_line.ref)]
         if st_line.partner_id:
             domain += [('partner_id', '=', st_line.partner_id.id)]
         ids = self.pool.get('account.move.line').search(cr, uid, domain, limit=1, context=context)

From cae213974b039ea10c4b4f03a9417e6f891be58a Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 17 Jun 2014 11:29:27 +0200
Subject: [PATCH 116/137] [FIX]account: reconciliation widget, some usability
 features

---
 .../account_bank_statement_reconciliation.css |  6 -----
 ...account_bank_statement_reconciliation.scss | 10 --------
 .../account/static/src/js/account_widgets.js  | 23 +++++++++----------
 .../account_bank_statement_reconciliation.xml |  2 +-
 4 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.css b/addons/account/static/src/css/account_bank_statement_reconciliation.css
index 626d1f32dab..05caeab2655 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.css
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.css
@@ -120,8 +120,6 @@
         cursor: pointer; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_match:not(.no_partner) .toggle_match {
       visibility: hidden !important; }
-    .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_partner .partner_name, .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line.no_partner .line_open_balance {
-      display: none !important; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line > table > tbody > tr:nth-child(1) > td table {
       margin-bottom: 10px; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line table.details td:first-child {
@@ -202,10 +200,6 @@
         cursor: pointer; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view td:nth-child(6) {
       border-left: 1px solid black; }
-    .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.initial_line > td:nth-child(5) {
-      border-top: 1px solid black; }
-    .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .accounting_view tr.initial_line > td:nth-child(6) {
-      border-top: 1px solid black; }
     .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls {
       padding: 0 0 5px 18px; }
       .openerp .oe_bank_statement_reconciliation .oe_bank_statement_reconciliation_line .match .match_controls .filter {
diff --git a/addons/account/static/src/css/account_bank_statement_reconciliation.scss b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
index 3b98689bcbc..248536b7a9b 100644
--- a/addons/account/static/src/css/account_bank_statement_reconciliation.scss
+++ b/addons/account/static/src/css/account_bank_statement_reconciliation.scss
@@ -194,12 +194,6 @@ $initialLineBackground: #f0f0f0;
             }
         }
 
-        &.no_partner {
-            .partner_name, .line_open_balance {
-                display: none !important;
-            }
-        }
-
         /* gap between accounting_view and action view */
         > table > tbody > tr:nth-child(1) > td table {
             margin-bottom: 10px;
@@ -341,10 +335,6 @@ $initialLineBackground: #f0f0f0;
 
             // accounting "T"
             td:nth-child(6) { border-left: $accountingBorder; }
-            tr.initial_line > td {
-                &:nth-child(5) { border-top: $accountingBorder; }
-                &:nth-child(6) { border-top: $accountingBorder; }
-            }
         }
 
 
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index 56fdaaff180..294c2b2a921 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -245,7 +245,7 @@ openerp.account = function (instance) {
     
         keyboardShortcutsHandler: function(e) {
             var self = this;
-            if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
+            if ((e.which === 13 || e.which === 10) && (e.ctrlKey || e.metaKey)) {
                 $.each(self.getChildren(), function(i, o){
                     if (o.is_valid && o.persistAndDestroy()) {
                         self.lines_reconciled_with_ctrl_enter++;
@@ -981,6 +981,7 @@ openerp.account = function (instance) {
         lineOpenBalanceClickHandler: function() {
             var self = this;
             if (self.get("mode") === "create") {
+                self.addLineBeingEdited();
                 self.set("mode", "match");
             } else {
                 self.set("mode", "create");
@@ -1075,7 +1076,7 @@ openerp.account = function (instance) {
         balanceChanged: function() {
             var self = this;
             var balance = self.get("balance");
-    
+            self.$(".tbody_open_balance").empty();
             // Special case hack : no identified partner
             if (self.st_line.has_no_partner) {
                 if (Math.abs(balance).toFixed(3) === "0.000") {
@@ -1088,11 +1089,15 @@ openerp.account = function (instance) {
                     self.$(".button_ok").attr("disabled", "disabled");
                     self.$(".button_ok").text("OK");
                     self.is_valid = false;
+                    var debit = (balance > 0 ? self.formatCurrency(balance, self.st_line.currency_id) : "");
+                    var credit = (balance < 0 ? self.formatCurrency(-1*balance, self.st_line.currency_id) : "");
+                    var $line = $(QWeb.render("bank_statement_reconciliation_line_open_balance", {debit: debit, credit: credit, account_code: self.map_account_id_code[self.st_line.open_balance_account_id]}));
+                    $line.find('.js_open_balance')[0].innerHTML = "Choose counterpart";
+                    self.$(".tbody_open_balance").append($line);
                 }
                 return;
             }
     
-            self.$(".tbody_open_balance").empty();
             if (Math.abs(balance).toFixed(3) === "0.000") {
                 self.$(".button_ok").addClass("oe_highlight");
                 self.$(".button_ok").text("OK");
@@ -1111,21 +1116,15 @@ openerp.account = function (instance) {
     
             self.$(".action_pane.active").removeClass("active");
     
-            // Special case hack : if no_partner, either inactive or create
+            // Special case hack : if no_partner and mode == inactive
             if (self.st_line.has_no_partner) {
                 if (self.get("mode") === "inactive") {
                     self.$(".match").slideUp(self.animation_speed);
                     self.$(".create").slideUp(self.animation_speed);
                     self.$(".toggle_match").removeClass("visible_toggle");
                     self.el.dataset.mode = "inactive";
-                } else {
-                    self.initializeCreateForm();
-                    self.$(".match").slideUp(self.animation_speed);
-                    self.$(".create").slideDown(self.animation_speed);
-                    self.$(".toggle_match").addClass("visible_toggle");
-                    self.el.dataset.mode = "create";
-                }
-                return;
+                    return;
+                } 
             }
     
             if (self.get("mode") === "inactive") {
diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
index 4ea67615e47..b14cc93e0a5 100644
--- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
+++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
@@ -185,7 +185,7 @@
             <td><span class="toggle_create glyphicon glyphicon-play"></span></td>
             <td><t t-esc="account_code"/></td>
             <td></td>
-            <td>Open balance</td>
+            <td class="js_open_balance">Open balance</td>
             <td><t t-esc="debit"/></td>
             <td><t t-esc="credit"/></td>
             <td></td>

From 5e7e7cef41ad5889dca5cd7b9f304ec878ea279a Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Tue, 17 Jun 2014 12:13:54 +0200
Subject: [PATCH 117/137] [IMP] account: learn the res.partner.bank of partners
 in reconciliation process on bank statement + adapted l10n_be

---
 addons/account/account_bank_statement.py      | 10 ++++-
 addons/l10n_be_coda/l10n_be_coda.py           | 42 -------------------
 .../wizard/account_coda_import.py             | 19 +++++++--
 openerp/addons/base/res/res_bank.py           |  3 +-
 4 files changed, 24 insertions(+), 50 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 38ca301d6bd..b24eec5e33f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -329,6 +329,7 @@ class account_bank_statement(osv.osv):
                 move_ids.append(st_line.journal_entry_id.id)
             self.pool.get('account.move').post(cr, uid, move_ids, context=context)
             self.message_post(cr, uid, [st.id], body=_('Statement %s confirmed, journal items were created.') % (st.name,), context=context)
+        self.link_bank_to_partner(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -428,6 +429,12 @@ class account_bank_statement(osv.osv):
         bsl_obj = self.pool.get('account.bank.statement.line')
         return bsl_obj.search_count(cr, uid, [('statement_id', '=', id), ('journal_entry_id', '!=', False)], context=context)
 
+    def link_bank_to_partner(self, cr, uid, ids, context=None):
+        for statement in self.browse(cr, uid, ids, context=context):
+            for st_line in statement.line_ids:
+                if st_line.bank_account_id and st_line.partner_id and st_line.bank_account_id.partner_id.id != st_line.partner_id.id:
+                    self.pool.get('res.partner.bank').write(cr, uid, [st_line.bank_account_id.id], {'partner_id': st_line.partner_id.id}, context=context)
+
 class account_bank_statement_line(osv.osv):
 
     def get_data_for_reconciliations(self, cr, uid, ids, context=None):
@@ -504,7 +511,6 @@ class account_bank_statement_line(osv.osv):
         st_line = self.browse(cr, uid, id, context=context)
         company_currency = st_line.journal_id.company_id.currency_id.id
         statement_currency = st_line.journal_id.currency.id or company_currency
-
         # either use the unsigned debit/credit fields or the signed amount_currency field
         sign = 1
         if statement_currency == company_currency:
@@ -535,7 +541,7 @@ class account_bank_statement_line(osv.osv):
         # get_move_lines_counterparts inverts debit and credit
         amount_field = 'debit' if amount_field == 'credit' else 'credit'
         for line in mv_lines:
-            if total + line[amount_field] <= st_line.amount:
+            if total + line[amount_field] <= abs(st_line.amount):
                 ret.append(line)
                 total += line[amount_field]
             if total >= st_line.amount:
diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
index 0dfa9bf9db4..c4cd8ab7c2b 100644
--- a/addons/l10n_be_coda/l10n_be_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
@@ -28,46 +28,4 @@ class account_bank_statement(osv.osv):
     }
 
 
-class account_bank_statement_line(osv.osv):
-    _inherit = 'account.bank.statement.line'
-    _columns = {
-        'coda_account_number': fields.char('Account Number', help="The Counter Party Account Number")
-    }
-
-    def create(self, cr, uid, data, context=None):
-        """
-            This function creates a Bank Account Number if, for a bank statement line,
-            the partner_id field and the coda_account_number field are set,
-            and the account number does not exist in the database
-        """
-        if 'partner_id' in data and data['partner_id'] and 'coda_account_number' in data and data['coda_account_number']:
-            acc_number_ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', data['coda_account_number'])])
-            if len(acc_number_ids) == 0:
-                try:
-                    type_model, type_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'bank_normal')
-                    type_id = self.pool.get('res.partner.bank.type').browse(cr, uid, type_id, context=context)
-                    self.pool.get('res.partner.bank').create(cr, uid, {'acc_number': data['coda_account_number'], 'partner_id': data['partner_id'], 'state': type_id.code}, context=context)
-                except ValueError:
-                    pass
-        return super(account_bank_statement_line, self).create(cr, uid, data, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        super(account_bank_statement_line, self).write(cr, uid, ids, vals, context)
-        """
-            Same as create function above, but for write function
-        """
-        if 'partner_id' in vals:
-            for line in self.pool.get('account.bank.statement.line').browse(cr, uid, ids, context=context):
-                if line.coda_account_number:
-                    acc_number_ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', line.coda_account_number)])
-                    if len(acc_number_ids) == 0:
-                        try:
-                            type_model, type_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'bank_normal')
-                            type_id = self.pool.get('res.partner.bank.type').browse(cr, uid, type_id, context=context)
-                            self.pool.get('res.partner.bank').create(cr, uid, {'acc_number': line.coda_account_number, 'partner_id': vals['partner_id'], 'state': type_id.code}, context=context)
-                        except ValueError:
-                            pass
-        return True
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index ba786e46b59..cac4cce452c 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -293,13 +293,24 @@ class account_coda_import(osv.osv_memory):
                     line['name'] = "\n".join(filter(None, [line['counterpartyName'], line['communication']]))
                     partner_id = None
                     structured_com = ""
+                    bank_account_id = False
                     if line['communication_struct'] and 'communication_type' in line and line['communication_type'] == '101':
                         structured_com = line['communication']
                     if 'counterpartyNumber' in line and line['counterpartyNumber']:
                         ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', str(line['counterpartyNumber']))])
-                        if ids and len(ids) > 0:
-                            partner = self.pool.get('res.partner.bank').browse(cr, uid, ids[0], context=context).partner_id
-                            partner_id = partner.id
+                        if ids:
+                            bank_account_id = ids[0]
+                            partner_id = self.pool.get('res.partner.bank').browse(cr, uid, bank_account_id, context=context).partner_id.id
+                        else:
+                            #create the bank account, not linked to any partner. The reconciliation will link the partner manually
+                            #chosen at the bank statement final confirmation time.
+                            try:
+                                type_model, type_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'bank_normal')
+                                type_id = self.pool.get('res.partner.bank.type').browse(cr, uid, type_id, context=context)
+                                bank_code = type_id.code
+                            except ValueError:
+                                bank_code = 'bank'
+                            bank_account_id = self.pool.get('res.partner.bank').create(cr, uid, {'acc_number': str(line['counterpartyNumber']), 'state': bank_code}, context=context)
                     if 'communication' in line and line['communication'] != '':
                         note.append(_('Communication') + ': ' + line['communication'])
                     data = {
@@ -311,7 +322,7 @@ class account_coda_import(osv.osv_memory):
                         'statement_id': statement['id'],
                         'ref': structured_com,
                         'sequence': line['sequence'],
-                        'coda_account_number': line['counterpartyNumber'],
+                        'bank_account_id': bank_account_id,
                     }
                     self.pool.get('account.bank.statement.line').create(cr, uid, data, context=context)
             if statement['coda_note'] != '':
diff --git a/openerp/addons/base/res/res_bank.py b/openerp/addons/base/res/res_bank.py
index cc29c50928a..e8477ec18ff 100644
--- a/openerp/addons/base/res/res_bank.py
+++ b/openerp/addons/base/res/res_bank.py
@@ -128,8 +128,7 @@ class res_partner_bank(osv.osv):
             change_default=True, domain="[('country_id','=',country_id)]"),
         'company_id': fields.many2one('res.company', 'Company',
             ondelete='cascade', help="Only if this bank account belong to your company"),
-        'partner_id': fields.many2one('res.partner', 'Account Owner', required=True,
-            ondelete='cascade', select=True),
+        'partner_id': fields.many2one('res.partner', 'Account Owner', ondelete='cascade', select=True),
         'state': fields.selection(_bank_type_get, 'Bank Account Type', required=True,
             change_default=True),
         'sequence': fields.integer('Sequence'),

From b32e3a3f8a94d2beee8d07b531b49f9e7365702b Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Tue, 17 Jun 2014 13:48:52 +0200
Subject: [PATCH 118/137] [FIX] account: allow to cancel a bank statement if
 the option is set on the bank journal

---
 addons/account/account_bank_statement.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index b24eec5e33f..f712acc4b98 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -333,18 +333,25 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
-        done = []
         account_move_obj = self.pool.get('account.move')
+        reconcile_pool = self.pool.get('account.move.reconcile')
+        move_line_pool = self.pool.get('account.move.line')
+        move_ids = []
         for st in self.browse(cr, uid, ids, context=context):
-            if st.state=='draft':
-                continue
-            move_ids = []
             for line in st.line_ids:
-                move_ids += [x.id for x in line.move_ids]
+                if line.journal_entry_id:
+                    move_ids.append(line.journal_entry_id.id)
+                    for aml in line.journal_entry_id.line_id:
+                        if aml.reconcile_id:
+                            move_lines = [l.id for l in aml.reconcile_id.line_id]
+                            move_lines.remove(aml.id)
+                            reconcile_pool.unlink(cr, uid, [aml.reconcile_id.id], context=context)
+                            if len(move_lines) >= 2:
+                                move_line_pool.reconcile_partial(cr, uid, move_lines, 'auto', context=context)
+        if move_ids:
             account_move_obj.button_cancel(cr, uid, move_ids, context=context)
             account_move_obj.unlink(cr, uid, move_ids, context)
-            done.append(st.id)
-        return self.write(cr, uid, done, {'state':'draft'}, context=context)
+        return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
         res = False

From f1d968314728697cf5560c74522af2a403bb2957 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Tue, 17 Jun 2014 16:17:05 +0200
Subject: [PATCH 119/137] [IMP] account, bank statement reconciliation:
 bugfixes related to the use case of clearing accounts where the type is
 'other' but can be reconciled (amount_residual can now be used on these
 accounts)

---
 addons/account/account_bank_statement.py | 18 ++++++++++--------
 addons/account/account_move_line.py      |  4 ++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index f712acc4b98..0a6b14e1e57 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -459,11 +459,11 @@ class account_bank_statement_line(osv.osv):
             ret.append(reconciliation_data)
 
         # Check if, now that 'candidate' move lines were selected, there are moves left for statement lines
-        for reconciliation_data in ret:
-            if not reconciliation_data['st_line']['has_no_partner']:
-                st_line = self.browse(cr, uid, reconciliation_data['st_line']['id'], context=context)
-                if self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=mv_line_ids_selected, count=True, context=context) == 0:
-                    reconciliation_data['st_line']['no_match'] = True
+        #for reconciliation_data in ret:
+        #    if not reconciliation_data['st_line']['has_no_partner']:
+        #        st_line = self.browse(cr, uid, reconciliation_data['st_line']['id'], context=context)
+        #        if not self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=mv_line_ids_selected, count=True, context=context):
+        #            reconciliation_data['st_line']['no_match'] = True
         return ret
 
     def get_statement_line_for_reconciliation(self, cr, uid, id, context=None):
@@ -489,7 +489,7 @@ class account_bank_statement_line(osv.osv):
             'amount': amount,
             'amount_str': amount_str,
             'currency_id': line.currency_id.id or statement_currency.id,
-            'no_match': self.get_move_lines_counterparts(cr, uid, line, count=True, context=context) == 0 and line.partner_id.id,
+            'no_match': self.get_move_lines_counterparts(cr, uid, line, count=True, context=context) == 0,
             'partner_id': line.partner_id.id,
             'statement_id': line.statement_id.id,
             'account_code': line.journal_id.default_debit_account_id.code,
@@ -533,6 +533,9 @@ class account_bank_statement_line(osv.osv):
         exact_match_id = self.search_structured_com(cr, uid, st_line, context=context)
         if exact_match_id:
             return self.make_counter_part_lines(cr, uid, st_line, [exact_match_id], count=False, context=context)
+        #we don't propose anything if there is no partner detected
+        if not st_line.partner_id.id:
+            return []
         # look for exact match
         exact_match_id = self.get_move_lines_counterparts(cr, uid, st_line, excluded_ids=excluded_ids, limit=1, additional_domain=[(amount_field, '=', (sign * st_line.amount))])
         if exact_match_id:
@@ -580,8 +583,7 @@ class account_bank_statement_line(osv.osv):
         if st_line.partner_id.id:
             domain += [('partner_id', '=', st_line.partner_id.id),
                 '|', ('account_id.type', '=', 'receivable'),
-                ('account_id.type', '=', 'payable'),  # Let the front-end warn the user if he tries to mix payable and receivable in the same reconciliation
-                ]
+                ('account_id.type', '=', 'payable')]
         else:
             domain += [('account_id.reconcile', '=', True)]
             #domain += [('account_id.reconcile', '=', True), ('account_id.type', '=', 'other')]
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index de75c7079b3..eb705b42995 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -127,8 +127,8 @@ class account_move_line(osv.osv):
 
             if move_line.reconcile_id:
                 continue
-            if not move_line.account_id.type in ('payable', 'receivable'):
-                #this function does not suport to be used on move lines not related to payable or receivable accounts
+            if not move_line.account_id.reconcile:
+                #this function does not suport to be used on move lines not related to a reconcilable account
                 continue
 
             if move_line.currency_id:

From d59a67ed881520b0c7830392d272cc1658a40563 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 17 Jun 2014 16:18:26 +0200
Subject: [PATCH 120/137] [FIX]account reconciliation: fix pager and filter
 search in widget

---
 addons/account/static/src/js/account_widgets.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index 294c2b2a921..2519c011b7a 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -1039,7 +1039,8 @@ openerp.account = function (instance) {
             var slice_start = self.get("pager_index") * self.max_move_lines_displayed;
             var slice_end = (self.get("pager_index")+1) * self.max_move_lines_displayed;
             _( _.filter(self.mv_lines_deselected, function(o){
-                    return o.name.indexOf(self.filter) !== -1 || o.ref.indexOf(self.filter) !== -1 })
+                    return o.name.indexOf(self.filter) !== -1 || (o.ref && o.ref.indexOf(self.filter) !== -1)
+                })
                 .slice(slice_start, slice_end)).each(function(line){
                 var $line = $(QWeb.render("bank_statement_reconciliation_move_line", {line: line, selected: false}));
                 self.bindPopoverTo($line.find(".line_info_button"));
@@ -1058,7 +1059,6 @@ openerp.account = function (instance) {
     
         updatePagerControls: function() {
             var self = this;
-    
             if (self.get("pager_index") === 0)
                 self.$(".pager_control_left").addClass("disabled");
             else
@@ -1366,10 +1366,9 @@ openerp.account = function (instance) {
                         move_lines = lines;
                     });
             }
-    
             // Fetch the number of move lines corresponding to this statement line and this filter
             var deferred_total_move_lines_num = self.model_bank_statement_line
-                .call("get_move_lines_counterparts_id", [self.st_line.id, excluded_ids, self.filter, offset, limit, true])
+                .call("get_move_lines_counterparts_id", [self.st_line.id, excluded_ids, self.filter, 0, undefined, true])
                 .then(function(num){
                     move_lines_num = num;
                 });

From f133f397b9e39741e8e52ce9f240bb24593bc0b0 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Tue, 17 Jun 2014 17:10:49 +0200
Subject: [PATCH 121/137] [FIX]account reconciliation: filter take partner name
 into account if no partner defined

---
 addons/account/account_bank_statement.py                     | 2 ++
 addons/account/static/src/js/account_widgets.js              | 5 ++++-
 .../static/src/xml/account_bank_statement_reconciliation.xml | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0a6b14e1e57..3bc589eb929 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -590,6 +590,8 @@ class account_bank_statement_line(osv.osv):
         if excluded_ids:
             domain.append(('id', 'not in', excluded_ids))
         if filter_str:
+            if not st_line.partner_id:
+                domain += [ '|', ('partner_id.name', 'ilike', filter_str)]
             domain += ['|', ('move_id.name', 'ilike', filter_str), ('move_id.ref', 'ilike', filter_str)]
         line_ids = mv_line_pool.search(cr, uid, domain, offset=offset, limit=limit, order="date_maturity asc, id asc", context=context)
         return self.make_counter_part_lines(cr, uid, st_line, line_ids, count=count, context=context)
diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js
index 2519c011b7a..8f5786e978f 100644
--- a/addons/account/static/src/js/account_widgets.js
+++ b/addons/account/static/src/js/account_widgets.js
@@ -789,6 +789,9 @@ openerp.account = function (instance) {
             line.q_amount = (line.debit !== 0 ? "- "+line.q_debit : "") + (line.credit !== 0 ? line.q_credit : "");
             line.q_popover = QWeb.render("bank_statement_reconciliation_move_line_details", {line: line});
             line.q_label = line.name;
+            if (line.has_no_partner){
+                line.q_label = line.partner_name + ': ' +line.q_label;
+            }
     
             // WARNING : pretty much of a ugly hack
             // The value of account_move.ref is either the move's communication or it's name without the slashes
@@ -1039,7 +1042,7 @@ openerp.account = function (instance) {
             var slice_start = self.get("pager_index") * self.max_move_lines_displayed;
             var slice_end = (self.get("pager_index")+1) * self.max_move_lines_displayed;
             _( _.filter(self.mv_lines_deselected, function(o){
-                    return o.name.indexOf(self.filter) !== -1 || (o.ref && o.ref.indexOf(self.filter) !== -1)
+                    return o.q_label.indexOf(self.filter) !== -1 || (o.ref && o.ref.indexOf(self.filter) !== -1)
                 })
                 .slice(slice_start, slice_end)).each(function(line){
                 var $line = $(QWeb.render("bank_statement_reconciliation_move_line", {line: line, selected: false}));
diff --git a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
index b14cc93e0a5..b5a8492545d 100644
--- a/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
+++ b/addons/account/static/src/xml/account_bank_statement_reconciliation.xml
@@ -128,7 +128,7 @@
             <td><span class="glyphicon glyphicon-add-remove"></span></td>
             <td><t t-esc="line.account_code"/></td>
             <td><t t-esc="line.q_due_date"/></td>
-            <td><t t-if="line.has_no_partner"><t t-esc="line.partner_name"/>: </t><t t-esc="line.q_label"/></td>
+            <td><t t-esc="line.q_label"/></td>
 
             <td><t t-if="line.debit !== 0">
                 <t t-if="line.propose_partial_reconcile" t-call="icon_do_partial_reconciliation"></t>

From 59b47119c87beaf9e8ade0106c754ae54a527806 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Tue, 17 Jun 2014 17:29:40 +0200
Subject: [PATCH 122/137] [FIX] account: bank statement creation do not confuse
 anymore with default name

---
 addons/account/account_bank_statement.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 3bc589eb929..99a869c6b16 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -26,6 +26,9 @@ from openerp.report import report_sxw
 
 class account_bank_statement(osv.osv):
     def create(self, cr, uid, vals, context=None):
+        if vals.get('name', '/') == '/':
+            journal_id = vals.get('journal_id', self._default_journal_id(cr, uid, context=context))
+            vals['name'] = self._compute_default_statement_name(cr, uid, journal_id, context=context)
         if 'line_ids' in vals:
             for idx, line in enumerate(vals['line_ids']):
                 line[2]['sequence'] = idx + 1
@@ -65,17 +68,14 @@ class account_bank_statement(osv.osv):
             return periods[0]
         return False
 
-    def _compute_default_statement_name(self, cr, uid, context=None):
+    def _compute_default_statement_name(self, cr, uid, journal_id, context=None):
         if context is None:
             context = {}
         obj_seq = self.pool.get('ir.sequence')
-        default_journal_id = self._default_journal_id(cr, uid, context=context)
-        if default_journal_id != False:
-            period = self.pool.get('account.period').browse(cr, uid, self._get_period(cr, uid, context=context), context=context)
-            context['fiscalyear_id'] = period.fiscalyear_id.id
-            journal = self.pool.get('account.journal').browse(cr, uid, default_journal_id, None)
-            return obj_seq.next_by_id(cr, uid, journal.sequence_id.id, context=context)
-        return obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=context)
+        period = self.pool.get('account.period').browse(cr, uid, self._get_period(cr, uid, context=context), context=context)
+        context['fiscalyear_id'] = period.fiscalyear_id.id
+        journal = self.pool.get('account.journal').browse(cr, uid, journal_id, None)
+        return obj_seq.next_by_id(cr, uid, journal.sequence_id.id, context=context)
 
     def _currency(self, cursor, user, ids, name, args, context=None):
         res = {}
@@ -150,7 +150,7 @@ class account_bank_statement(osv.osv):
     }
 
     _defaults = {
-        'name': _compute_default_statement_name,
+        'name': '/', 
         'date': fields.date.context_today,
         'state': 'draft',
         'journal_id': _default_journal_id,

From bc05fe262cb0fce7a5ae772fcb2448725db973b7 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Wed, 18 Jun 2014 14:37:29 +0200
Subject: [PATCH 123/137] [FIX] account: fixed the proposal of reconciliation
 in the bank statement for negative amounts

---
 addons/account/account_bank_statement.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 99a869c6b16..1ddab4bece9 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -409,6 +409,10 @@ class account_bank_statement(osv.osv):
             'domain':[('statement_id','in',ids)],
             'context':ctx,
         }
+
+    def number_of_lines_reconciled(self, cr, uid, id, context=None):
+        bsl_obj = self.pool.get('account.bank.statement.line')
+        return bsl_obj.search_count(cr, uid, [('statement_id', '=', id), ('journal_entry_id', '!=', False)], context=context)
         
     def get_format_currency_js_function(self, cr, uid, id, context=None):
         """ Returns a string that can be used to instanciate a javascript function.
@@ -432,10 +436,6 @@ class account_bank_statement(osv.osv):
                 done_currencies.append(st_line_currency.id)
         return function
 
-    def number_of_lines_reconciled(self, cr, uid, id, context=None):
-        bsl_obj = self.pool.get('account.bank.statement.line')
-        return bsl_obj.search_count(cr, uid, [('statement_id', '=', id), ('journal_entry_id', '!=', False)], context=context)
-
     def link_bank_to_partner(self, cr, uid, ids, context=None):
         for statement in self.browse(cr, uid, ids, context=context):
             for st_line in statement.line_ids:
@@ -554,7 +554,7 @@ class account_bank_statement_line(osv.osv):
             if total + line[amount_field] <= abs(st_line.amount):
                 ret.append(line)
                 total += line[amount_field]
-            if total >= st_line.amount:
+            if total >= abs(st_line.amount):
                 break
         return ret
 

From 3ac8b531f53c61bf39eaa167597bbd04630b6b15 Mon Sep 17 00:00:00 2001
From: qdp-odoo <qdp@openerp.com>
Date: Thu, 19 Jun 2014 11:15:50 +0200
Subject: [PATCH 124/137] [IMP] account: improved demo data for bank statement
 reconciliation

---
 addons/account/demo/account_bank_statement.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/demo/account_bank_statement.xml b/addons/account/demo/account_bank_statement.xml
index 693dbc876b5..b79d8b95cd6 100644
--- a/addons/account/demo/account_bank_statement.xml
+++ b/addons/account/demo/account_bank_statement.xml
@@ -15,7 +15,7 @@
             <field name="balance_end_real" eval="3707.58"/>
         </record>
         <record id="demo_bank_statement_line_1" model="account.bank.statement.line">
-            <field name="ref">001</field>
+            <field name="ref"></field>
             <field name="statement_id" ref="demo_bank_statement_1"/>
             <field name="sequence" eval="1"/>
             <field name="company_id" ref="base.main_company"/>
@@ -26,7 +26,7 @@
             <field name="partner_id" ref="base.res_partner_9"/>
         </record>
         <record id="demo_bank_statement_line_2" model="account.bank.statement.line">
-            <field name="ref">002</field>
+            <field name="ref">SAJ2014002</field>
             <field name="statement_id" ref="demo_bank_statement_1"/>
             <field name="sequence" eval="2"/>
             <field name="company_id" ref="base.main_company"/>
@@ -37,7 +37,7 @@
             <field name="partner_id" ref="base.res_partner_9"/>
         </record>
         <record id="demo_bank_statement_line_3" model="account.bank.statement.line">
-            <field name="ref">003</field>
+            <field name="ref"></field>
             <field name="statement_id" ref="demo_bank_statement_1"/>
             <field name="sequence" eval="3"/>
             <field name="company_id" ref="base.main_company"/>
@@ -47,7 +47,7 @@
             <field name="date" eval="time.strftime('%Y')+'-01-01'"/>
         </record>
         <record id="demo_bank_statement_line_4" model="account.bank.statement.line">
-            <field name="ref">004</field>
+            <field name="ref"></field>
             <field name="statement_id" ref="demo_bank_statement_1"/>
             <field name="sequence" eval="4"/>
             <field name="company_id" ref="base.main_company"/>

From 0da42768385397f63f4a98b33608e97e145a05a5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 20 Jun 2014 10:53:07 +0200
Subject: [PATCH 125/137] [IMP] tour.js: improve log messages

---
 addons/web/static/src/js/tour.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 08cbd9d9460..4e013b3616e 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -78,12 +78,12 @@ var Tour = {
         this.time = new Date().getTime();
         if (tour.path && !window.location.href.match(new RegExp("("+Tour.getLang()+")?"+tour.path+"#?$", "i"))) {
             var href = Tour.getLang()+tour.path;
-            console.log("Tour Begin from run method (redirection to "+href+")");
+            console.log("Tour '"+tour_id+"' Begin from run method (redirection to "+href+")");
             Tour.saveState(tour.id, mode || tour.mode, -1, 0);
             $(document).one("ajaxStop", Tour.running);
             window.location.href = href;
         } else {
-            console.log("Tour Begin from run method");
+            console.log("Tour '"+tour_id+"' Begin from run method");
             Tour.saveState(tour.id, mode || tour.mode, 0, 0);
             Tour.running();
         }
@@ -304,7 +304,7 @@ var Tour = {
                 "step_id": 0
             };
             window.location.hash = "";
-            console.log("Tour Begin from url hash");
+            console.log("Tour '"+state.id+"' Begin from url hash");
             Tour.saveState(state.id, state.mode, state.step_id, 0);
         }
         if (!state.id) {
@@ -433,7 +433,7 @@ var Tour = {
         Tour.saveState(state.id, state.mode, step.id, state.number);
 
         if (step.id !== state.step_id) {
-            console.log("Tour Step: '" + (step._title || step.title) + "' (" + (new Date().getTime() - this.time) + "ms)");
+            console.log("Tour '"+state.id+"' Step: '" + (step._title || step.title) + "' (" + (new Date().getTime() - this.time) + "ms)");
         }
 
         Tour.autoTogglePopover(true);
@@ -465,8 +465,10 @@ var Tour = {
         var test = state.step.id >= state.tour.steps.length-1;
         Tour.reset();
         if (test) {
+            console.log("Tour '"+state.id+"' finish: ok");
             console.log('ok');
         } else {
+            console.log("Tour '"+state.id+"' finish: error");
             console.log('error');
         }
     },

From b4afff3618bda651025d9fcb7e36b3fc0e4a29b7 Mon Sep 17 00:00:00 2001
From: Franck Bret <franckbret@gmail.com>
Date: Fri, 20 Jun 2014 11:25:44 +0200
Subject: [PATCH 126/137] Unify website slugify method behavior with or without
 python-slugify, and add some unit tests

---
 addons/website/models/website.py       | 24 ++++++++++--
 addons/website/tests/test_converter.py | 54 ++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 4cda81c7448..7c9c0295e73 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -8,6 +8,7 @@ import itertools
 import logging
 import math
 import mimetypes
+import unicodedata
 import os
 import re
 import urlparse
@@ -28,6 +29,7 @@ except ImportError:
 import openerp
 from openerp.osv import orm, osv, fields
 from openerp.tools import html_escape as escape
+from openerp.tools import ustr as ustr
 from openerp.tools.safe_eval import safe_eval
 from openerp.addons.web.http import request
 
@@ -85,15 +87,29 @@ def is_multilang_url(local_url, langs=None):
         return False
 
 def slugify(s, max_length=None):
+    """ Transform a string to a slug that can be used in a url path.
+
+    This method will first try to do the job with python-slugify if present.
+    Otherwise it will process string by stripping leading and ending spaces,
+    converting unicode chars to ascii, lowering all chars and replacing spaces
+    and underscore with hyphen "-".
+
+    :param s: str
+    :param max_length: int
+    :rtype: str
+    """
+    s = ustr(s)
     if slugify_lib:
         # There are 2 different libraries only python-slugify is supported
         try:
             return slugify_lib.slugify(s, max_length=max_length)
         except TypeError:
             pass
-    spaceless = re.sub(r'\s+', '-', s)
-    specialless = re.sub(r'[^-_A-Za-z0-9]', '', spaceless)
-    return specialless[:max_length]
+    uni = unicodedata.normalize('NFKD', s).encode('ascii', 'ignore').decode('ascii')
+    slug = re.sub('[\W_]', ' ', uni).strip().lower()
+    slug = re.sub('[-\s]+', '-', slug)
+
+    return slug[:max_length]
 
 def slug(value):
     if isinstance(value, orm.browse_record):
@@ -147,7 +163,7 @@ class website(osv.osv):
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool['ir.model.data'].xmlid_to_res_id(cr, openerp.SUPERUSER_ID, 'base.public_user'),
     }
-    
+
     # cf. Wizard hack in website_views.xml
     def noop(self, *args, **kwargs):
         pass
diff --git a/addons/website/tests/test_converter.py b/addons/website/tests/test_converter.py
index ca72a361ac2..288715b9b26 100644
--- a/addons/website/tests/test_converter.py
+++ b/addons/website/tests/test_converter.py
@@ -9,6 +9,7 @@ from lxml.builder import E
 from openerp.tests import common
 from openerp.addons.base.ir import ir_qweb
 from openerp.addons.website.models.ir_qweb import html_to_text
+from openerp.addons.website.models.website import slugify
 
 impl = getDOMImplementation()
 document = impl.createDocument(None, None, None)
@@ -238,3 +239,56 @@ class TestConvertBack(common.TransactionCase):
             "New content",
             "element edition should have been written directly to the m2o record"
         )
+
+class TestTitleToSlug(unittest2.TestCase):
+    """
+    Those tests should pass with or without python-slugify
+    See website/models/website.py slugify method
+    """
+    def test_spaces(self):
+        self.assertEqual(
+            "spaces",
+            slugify(u"   spaces   ")
+        )
+
+    def test_unicode(self):
+        self.assertEqual(
+            "heterogeneite",
+            slugify(u"hétérogénéité")
+        )
+
+    def test_underscore(self):
+        self.assertEqual(
+            "one-two",
+            slugify(u"one_two")
+        )
+
+    def test_caps(self):
+        self.assertEqual(
+            "camelcase",
+            slugify(u"CamelCase")
+        )
+
+    def test_special_chars(self):
+        self.assertEqual(
+            "o-d-o-o",
+            slugify(u"o!#d{|\o/@~o&%^?")
+        )
+
+    def test_str_to_unicode(self):
+        self.assertEqual(
+            "espana",
+            slugify("España")
+        )
+
+    def test_numbers(self):
+        self.assertEqual(
+            "article-1",
+            slugify(u"Article 1")
+        )
+
+    def test_all(self):
+        self.assertEqual(
+            "do-you-know-martine-a-la-plage",
+            slugify(u"Do YOU know 'Martine à la plage' ?")
+        )

From 6e93af477411f93e431bb789c21981fde737f0f2 Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Wed, 18 Jun 2014 17:08:08 +0200
Subject: [PATCH 127/137] [FIX] survey: display labels in the right order in
 survey reporting views

---
 addons/survey/controllers/main.py | 12 ++++++-----
 addons/survey/survey.py           | 35 ++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 638b2aefed4..c554558b34f 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -318,8 +318,9 @@ class WebsiteSurvey(http.Controller):
                                        'filter_finish': filter_finish
                                        })
 
-    def prepare_result_dict(self,survey, current_filters=[]):
+    def prepare_result_dict(self,survey, current_filters=None):
         """Returns dictionary having values for rendering template"""
+        current_filters = current_filters if current_filters else []
         survey_obj = request.registry['survey.survey']
         result = {'survey':survey, 'page_ids': []}
         for page in survey.page_ids:
@@ -347,8 +348,10 @@ class WebsiteSurvey(http.Controller):
         total = ceil(total_record / float(limit))
         return range(1, int(total + 1))
 
-    def get_graph_data(self, question, current_filters=[]):
+    def get_graph_data(self, question, current_filters=None):
         '''Returns formatted data required by graph library on basis of filter'''
+        # TODO refactor this terrible method and merge it with prepare_result_dict
+        current_filters = current_filters if current_filters else []
         survey_obj = request.registry['survey.survey']
         result = []
         if question.type == 'multiple_choice':
@@ -360,9 +363,8 @@ class WebsiteSurvey(http.Controller):
             data = survey_obj.prepare_result(request.cr, request.uid, question, current_filters, context=request.context)
             for answer in data['answers']:
                 values = []
-                for res in data['result']:
-                    if res[1] == answer:
-                        values.append({'text': data['rows'][res[0]], 'count': data['result'][res]})
+                for row in data['rows']:
+                    values.append({'text': data['rows'].get(row), 'count': data['result'].get((row, answer))})
                 result.append({'key': data['answers'].get(answer), 'values': values})
         return json.dumps(result)
 
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 140e3e97d65..caecd16b7e1 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -26,6 +26,7 @@ from openerp.addons.website.models.website import slug
 from urlparse import urljoin
 from itertools import product
 from collections import Counter
+from collections import OrderedDict
 
 import datetime
 import logging
@@ -289,8 +290,7 @@ class survey_survey(osv.Model):
            :param finished: True for completely filled survey,Falser otherwise.
            :returns list of filtered user_input_ids.
         '''
-        if context is None:
-            context = {}
+        context = context if context else {}
         if filters:
             input_line_obj = self.pool.get('survey.user_input_line')
             domain_filter, choice, filter_display_data = [], [], []
@@ -339,22 +339,27 @@ class survey_survey(osv.Model):
                 filter_display_data.append({'question_text': question.question, 'labels': [label.value for label in labels]})
         return filter_display_data
 
-    def prepare_result(self, cr, uid, question, current_filters=[], context=None):
+    def prepare_result(self, cr, uid, question, current_filters=None, context=None):
         ''' Compute statistical data for questions by counting number of vote per choice on basis of filter '''
-        if context is None:
-            context = {}
+        current_filters = current_filters if current_filters else []
+        context = context if context else {}
+
         #Calculate and return statistics for choice
         if question.type in ['simple_choice', 'multiple_choice']:
-            result_summary = {}
-            [result_summary.update({label.id: {'text': label.value, 'count': 0, 'answer_id': label.id}}) for label in question.labels_ids]
-            for input_line in question.user_input_line_ids:
-                if input_line.answer_type == 'suggestion' and result_summary.get(input_line.value_suggested.id) and (not(current_filters) or input_line.user_input_id.id in current_filters):
-                    result_summary[input_line.value_suggested.id]['count'] += 1
-            result_summary = result_summary.values()
+            result_summary = []
+            for label in question.labels_ids:
+                count = 0
+                for input_line in question.user_input_line_ids:
+                    if input_line.answer_type == 'suggestion' and input_line.value_suggested.id == label.id and (not current_filters or input_line.user_input_id.id in current_filters):
+                        count = count + 1
+                label_summary = {'text': label.value, 'count': count, 'answer_id': label.id}
+                result_summary = result_summary + [label_summary]
 
         #Calculate and return statistics for matrix
         if question.type == 'matrix':
-            rows, answers, res = {}, {}, {}
+            rows = OrderedDict()
+            answers = OrderedDict()
+            res = dict()
             [rows.update({label.id: label.value}) for label in question.labels_ids_2]
             [answers.update({label.id: label.value}) for label in question.labels_ids]
             for cell in product(rows.keys(), answers.keys()):
@@ -386,10 +391,10 @@ class survey_survey(osv.Model):
                                        'most_comman': Counter(all_inputs).most_common(5)})
         return result_summary
 
-    def get_input_summary(self, cr, uid, question, current_filters=[], context=None):
+    def get_input_summary(self, cr, uid, question, current_filters=None, context=None):
         ''' Returns overall summary of question e.g. answered, skipped, total_inputs on basis of filter '''
-        if context is None:
-            context = {}
+        current_filters = current_filters if current_filters else []
+        context = context if context else {}
         result = {}
         if question.survey_id.user_input_ids:
             total_input_ids = current_filters or [input_id.id for input_id in question.survey_id.user_input_ids if input_id.state != 'new']

From 4be9142c117423326203b5812f7ac9d19c673608 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Fri, 20 Jun 2014 12:27:55 +0200
Subject: [PATCH 128/137] [FIX] web: regenerate messed up `base.css` during
 commit 5087612

---
 addons/web/static/src/css/base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 05848a5f1e6..fcab3890140 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -3288,9 +3288,9 @@ body.oe_single_form .oe_single_form_container {
 .openerp_ie ul.oe_form_status li.oe_active > .arrow span, .openerp_ie ul.oe_form_status_clickable li.oe_active > .arrow span {
   background-color: #729fcf !important;
 }
-}
 .openerp_ie .oe_webclient {
   height: auto !important;
+}
 
 @media print {
   .openerp {

From a6b9413a78b46172bf0f6ccdba3d3603029a2e16 Mon Sep 17 00:00:00 2001
From: Mehul Mehta <mme@openerp.com>
Date: Wed, 21 May 2014 17:04:39 +0530
Subject: [PATCH 129/137] [ADD] Add a icon for remove pictures from product and
 partner

---
 addons/web/static/src/css/base.css    | 2 +-
 addons/web/static/src/css/base.sass   | 2 +-
 addons/web/static/src/js/view_form.js | 6 ++++--
 addons/web/static/src/xml/base.xml    | 9 +++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 13626fb5d16..b97a5ba50ab 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2325,7 +2325,7 @@
 .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls {
   position: absolute;
   top: 1px;
-  padding: 4px 0;
+  padding: 6px 0;
   width: 100%;
   display: none;
   text-align: center;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index abeed36b038..dce3401a3ed 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1902,7 +1902,7 @@ $sheet-padding: 16px
             .oe_form_field_image_controls
                 position: absolute
                 top: 1px
-                padding: 4px 0
+                padding: 6px 0
                 width: 100%
                 display: none
                 text-align: center
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index cb0b2e8ea80..3f46c7374ff 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5506,9 +5506,13 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance.
         this._super.apply(this, arguments);
     },
     initialize_content: function() {
+        var self= this;
         this.$el.find('input.oe_form_binary_file').change(this.on_file_change);
         this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as);
         this.$el.find('.oe_form_binary_file_clear').click(this.on_clear);
+        this.$el.find('.oe_form_binary_file_edit').click(function(event){
+            self.$el.find('input.oe_form_binary_file').click();
+        });
     },
     on_file_change: function(e) {
         var self = this;
@@ -5676,8 +5680,6 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
                 return;
             $img.css("max-width", "" + self.options.size[0] + "px");
             $img.css("max-height", "" + self.options.size[1] + "px");
-            $img.css("margin-left", "" + (self.options.size[0] - $img.width()) / 2 + "px");
-            $img.css("margin-top", "" + (self.options.size[1] - $img.height()) / 2 + "px");
         });
         $img.on('error', function() {
             $img.attr('src', self.placeholder);
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fb2fcbf303e..69af5cbe91d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1310,15 +1310,16 @@
 <t t-name="FieldBinaryImage">
     <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style">
         <div class="oe_form_field_image_controls oe_edit_only">
-            <t t-call="HiddenInputFile">
-                <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                Edit 
-            </t>
+            <i class="fa fa-pencil fa-1g pull-left col-md-offset-1 oe_form_binary_file_edit" title="Edit"/>
+            <i class="fa fa-trash-o fa-1g col-md-offset-5 oe_form_binary_file_clear" title="Clear"/>
             <div class="oe_form_binary_progress" style="display: none">
                 <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
                 <b>Uploading ...</b>
             </div>
         </div>
+        <t t-call="HiddenInputFile">
+            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+        </t>
     </span>
 </t>
 <t t-name="FieldBinaryImage-img">

From bccd75796e8ff3c9dee23dd3f9a8ce75274e3289 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@openerp.com>
Date: Fri, 20 Jun 2014 14:04:52 +0200
Subject: [PATCH 130/137] [IMP] web: allow fields in list view to use the attrs
 readonly to dynamically show and hide the fields

---
 addons/web/static/src/css/base.css             | 18 +++++++++++++++---
 addons/web/static/src/css/base.sass            | 13 +++++++++++--
 addons/web/static/src/js/view_form.js          |  7 +++++--
 addons/web/static/src/js/view_list_editable.js | 17 +++++++----------
 4 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 7c2bc81b9e3..2b08a7c06f4 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2815,11 +2815,11 @@
 .openerp .oe_list_editable .oe_list_content td.oe_list_field_cell {
   padding: 4px 6px 3px;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell {
   color: transparent;
   text-shadow: none;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) * {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell * {
   visibility: hidden;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_drop_down_button {
@@ -2835,6 +2835,13 @@
   min-width: 0;
   max-width: none;
 }
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_list_field_handle {
+  color: transparent;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_readonly {
+  padding: 4px 6px 3px;
+  text-align: left;
+}
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea {
   height: 27px;
   -moz-border-radius: 0;
@@ -2846,9 +2853,14 @@
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field select {
   min-width: 0;
 }
-.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float.oe_readonly, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer.oe_readonly {
+  padding: 6px 0px 0px;
   text-align: right;
+  max-width: 100px;
+}
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input {
   width: 100% !important;
+  text-align: right;
 }
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
   width: 100% !important;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 1c02018da9d..bdb358af6a0 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -2218,7 +2218,7 @@ $sheet-padding: 16px
     .oe_list_editable .oe_list_content td.oe_list_field_cell
         padding: 4px 6px 3px
     .oe_list.oe_list_editable.oe_editing
-        .oe_edition .oe_list_field_cell:not(.oe_readonly)
+        .oe_edition .oe_list_field_cell
             *
                 visibility: hidden
             color: transparent
@@ -2230,6 +2230,11 @@ $sheet-padding: 16px
         .oe_input_icon
             margin-top: 5px
         .oe_form_field
+            &.oe_list_field_handle
+                color: transparent
+            &.oe_readonly
+                padding: 4px 6px 3px
+                text-align: left
             min-width: 0
             max-width: none
             input, textarea
@@ -2240,9 +2245,13 @@ $sheet-padding: 16px
             input, textarea, select
                 min-width: 0
             &.oe_form_field_float,&.oe_form_view_integer
-                input
+                &.oe_readonly
+                    padding: 6px 0px 0px
                     text-align: right
+                    max-width: 100px
+                input
                     width: 100% !important
+                    text-align: right
             &.oe_form_field_datetime,&.oe_form_field_date
                 input.oe_datepicker_master
                     width: 100% !important
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index fec7ce10607..cbaf9e6f11e 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2600,7 +2600,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc
     },
     set_dimensions: function (height, width) {
         this._super(height, width);
-        this.datewidget.$input.css('height', height);
+        if (!this.get("effective_readonly")) {
+            this.datewidget.$input.css('height', height);
+        }
     }
 });
 
@@ -3395,7 +3397,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
     },
     set_dimensions: function (height, width) {
         this._super(height, width);
-        this.$input.css('height', height);
+        if (!this.get("effective_readonly") && this.$input)
+            this.$input.css('height', height);
     }
 });
 
diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js
index 7d2e44263ce..f3ee5dbb7ad 100644
--- a/addons/web/static/src/js/view_list_editable.js
+++ b/addons/web/static/src/js/view_list_editable.js
@@ -282,9 +282,7 @@ openerp.web.list_editable = function (instance) {
             if (!this.editor.is_editing()) { return; }
             for(var i=0, len=this.fields_for_resize.length; i<len; ++i) {
                 var item = this.fields_for_resize[i];
-                if (!item.field.get('effective_invisible')) {
-                    this.resize_field(item.field, item.cell);
-                }
+                this.resize_field(item.field, item.cell);
             }
         },
         /**
@@ -303,6 +301,11 @@ openerp.web.list_editable = function (instance) {
                 at: 'left top',
                 of: $cell
             });
+            if (field.get('effective_readonly')) {
+                field.$el.addClass('oe_readonly');
+            }
+            if(field.widget == "handle")
+                field.$el.addClass('oe_list_field_handle');
         },
         /**
          * @return {jQuery.Deferred}
@@ -448,13 +451,7 @@ openerp.web.list_editable = function (instance) {
         setup_events: function () {
             var self = this;
             _.each(this.editor.form.fields, function(field, field_name) {
-                var set_invisible = function() {
-                    field.set({'force_invisible': field.get('effective_readonly')});
-                };
-                field.on("change:effective_readonly", self, set_invisible);
-                set_invisible();
-                field.on('change:effective_invisible', self, function () {
-                    if (field.get('effective_invisible')) { return; }
+                field.on("change:effective_readonly", self, function(){
                     var item = _(self.fields_for_resize).find(function (item) {
                         return item.field === field;
                     });

From 866dff79dfb22f748a1856494874b7b79293b13e Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@openerp.com>
Date: Fri, 20 Jun 2014 14:21:05 +0200
Subject: [PATCH 131/137] [REM] Old .bzrignore file

---
 addons/.bzrignore | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 addons/.bzrignore

diff --git a/addons/.bzrignore b/addons/.bzrignore
deleted file mode 100644
index 8d98f9debde..00000000000
--- a/addons/.bzrignore
+++ /dev/null
@@ -1 +0,0 @@
-.*

From 081487679fb24ff299496011a8df57f7a8fe2def Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 20 Jun 2014 17:27:10 +0200
Subject: [PATCH 132/137] [IMP] tour.js: change delay time for retry to load a
 tour

---
 addons/web/static/src/js/tour.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/tour.js b/addons/web/static/src/js/tour.js
index 08cbd9d9460..dcdc878d4d2 100644
--- a/addons/web/static/src/js/tour.js
+++ b/addons/web/static/src/js/tour.js
@@ -376,7 +376,7 @@ var Tour = {
             }
             Tour.saveState(state.id, state.mode, state.step_id, state.number-1, state.wait+1);
             console.log("Tour '"+state.id+"' wait for running (tour undefined)");
-            setTimeout(Tour.running, state.mode === "test" ? Tour.defaultDelay : Tour.retryRunningDelay);
+            setTimeout(Tour.running, Tour.retryRunningDelay);
         }
     },
     check: function (step) {

From 86c24265551920dd837703a7f058970676e62c24 Mon Sep 17 00:00:00 2001
From: Ruchir Shukla <ruchir@bizzappdev.com>
Date: Fri, 20 Jun 2014 17:36:26 +0200
Subject: [PATCH 133/137] [IMP] module: warning when uninstalling modules

When a module is uninstalled, this will also uninstall modules depending of it. To avoid unexpected loss of data, this patch list the modules that will get impacted during the installation.
This also affects the configuration pages with on change warnings.
---
 openerp/addons/base/module/module.py          |  1 +
 openerp/addons/base/module/module_view.xml    |  3 +-
 .../base/module/wizard/base_module_upgrade.py | 14 +++++++
 .../wizard/base_module_upgrade_view.xml       |  9 +++--
 openerp/addons/base/res/res_config.py         | 38 +++++++++++++++++++
 5 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py
index 6d64abc455b..89285bdbf4f 100644
--- a/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@ -485,6 +485,7 @@ class module(osv.osv):
             'params': {'menu_id': menu_ids and menu_ids[0] or False}
         }
 
+    #TODO remove me in master, not called anymore
     def button_immediate_uninstall(self, cr, uid, ids, context=None):
         """
         Uninstall the selected module(s) immediately and fully,
diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml
index 3923c9de3bd..fb4295cda68 100644
--- a/openerp/addons/base/module/module_view.xml
+++ b/openerp/addons/base/module/module_view.xml
@@ -78,8 +78,7 @@
                         <h2 class="oe_fade"><field name="summary"/></h2>
                         <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="oe_highlight"/>
                         <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="oe_highlight"/>
-                        <button name="button_immediate_uninstall" states="installed" string="Uninstall" type="object"
-                            confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
+                        <button name="button_uninstall" states="installed" string="Uninstall" type="object"/>
                         <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object"/>
                         <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object"/>
                         <button name="button_install_cancel" states="to install" string="Cancel Install" type="object"/>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index b947ba5371f..559931fddc1 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -68,6 +68,20 @@ class base_module_upgrade(osv.osv_memory):
         res = mod_obj.read(cr, uid, ids, ['name','state'], context)
         return {'module_info': '\n'.join(map(lambda x: x['name']+' : '+x['state'], res))}
 
+    def upgrade_module_cancel(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.module.module')
+        to_installed_ids = mod_obj.search(cr, uid, [
+            ('state', 'in', ['to upgrade', 'to remove'])])
+        if to_installed_ids:
+            mod_obj.write(cr, uid, to_installed_ids, {'state': 'installed'}, context=context)
+
+        to_uninstalled_ids = mod_obj.search(cr, uid, [
+            ('state', '=', 'to install')])
+        if to_uninstalled_ids:
+            mod_obj.write(cr, uid, to_uninstalled_ids, {'state': 'uninstalled'}, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
     def upgrade_module(self, cr, uid, ids, context=None):
         ir_module = self.pool.get('ir.module.module')
 
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
index 1a1225befcb..10c023e5148 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
+++ b/openerp/addons/base/module/wizard/base_module_upgrade_view.xml
@@ -7,14 +7,15 @@
             <field name="model">base.module.upgrade</field>
             <field name="arch" type="xml">
                 <form string="System Update" version="7.0">
-                    <div><label string="Your system will be updated."/></div>
-                    <div><label string="Note that this operation might take a few minutes."/></div>
-                    <separator string="Modules to Update"/>
+                    <p>This module will trigger the uninstallation of below modules.</p>
+                    <p><strong>This operation will permanently erase all data currently stored by the modules!</strong></p>
+                    <p>If you wish to cancel the process, press the cancel button below</p>
+                    <separator string="Impacted Modules"/>
                     <field name="module_info"/>
                     <footer>
                         <button name="upgrade_module" string="Update" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
+                        <button string="Cancel" class="oe_link" name="upgrade_module_cancel" type="object"/>
                     </footer>
                 </form>
             </field>
diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py
index 1fa5b7bfe49..42ef4ff4b1f 100644
--- a/openerp/addons/base/res/res_config.py
+++ b/openerp/addons/base/res/res_config.py
@@ -26,6 +26,7 @@ from openerp import SUPERUSER_ID
 from openerp.osv import osv, fields
 from openerp.tools import ustr
 from openerp.tools.translate import _
+from lxml import etree
 
 _logger = logging.getLogger(__name__)
 
@@ -472,6 +473,43 @@ class res_config_settings(osv.osv_memory, res_config_module_installation_mixin):
     def copy(self, cr, uid, id, values, context=None):
         raise osv.except_osv(_("Cannot duplicate configuration!"), "")
 
+    def fields_view_get(self, cr, user, view_id=None, view_type='form',
+                        context=None, toolbar=False, submenu=False):
+        ret_val = super(res_config_settings, self).fields_view_get(
+            cr, user, view_id=view_id, view_type=view_type, context=context,
+            toolbar=toolbar, submenu=submenu)
+
+        doc = etree.XML(ret_val['arch'])
+
+        for field in ret_val['fields']:
+            if not field.startswith("module_"):
+                continue
+            for node in doc.xpath("//field[@name='%s']" % field):
+                if 'on_change' not in node.attrib:
+                    node.set("on_change",
+                    "onchange_module(%s, '%s')" % (field, field))
+
+        ret_val['arch'] = etree.tostring(doc)
+        return ret_val
+
+    def onchange_module(self, cr, uid, ids, field_value, module_name, context={}):
+        module_pool = self.pool.get('ir.module.module')
+        module_ids = module_pool.search(
+            cr, uid, [('name', '=', module_name.replace("module_", '')),
+            ('state','in', ['to install', 'installed', 'to upgrade'])],
+            context=context)
+
+        if module_ids and not field_value:
+            dep_ids = module_pool.downstream_dependencies(cr, uid, module_ids, context=context)
+            dep_name = [x.shortdesc for x  in module_pool.browse(
+                cr, uid, dep_ids + module_ids, context=context)]
+            message = '\n'.join(dep_name)
+            return {'warning': {'title': _('Warning!'),
+                    'message':
+                    _('Disabling this option will also uninstall the following modules \n%s' % message)
+                   }}
+        return {}
+
     def _get_classified_fields(self, cr, uid, context=None):
         """ return a dictionary with the fields classified by category::
 

From 7e85786b8389993fa5bd3a0be68343ad0dbaa187 Mon Sep 17 00:00:00 2001
From: Jacques-Etienne Baudoux <jba@odoo.com>
Date: Fri, 20 Jun 2014 16:10:02 +0200
Subject: [PATCH 134/137] web: do not select the first result if click on
 search more

When searching for a record in a m2o field, if we click on 'search more' we loose the focus on the field and select the first suggestion (which triggers potential on_change). This prevents the selection for this case.
---
 addons/web/static/src/js/view_form.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index cbaf9e6f11e..50ec791b7c7 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -3076,6 +3076,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         this.floating = false;
         this.current_display = null;
         this.is_started = false;
+        this.ignore_focusout = false;
     },
     reinit_value: function(val) {
         this.internal_set_value(val);
@@ -3201,6 +3202,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
         var ed_delay = 200;
         var ed_duration = 15000;
         var anyoneLoosesFocus = function (e) {
+            if (self.ignore_focusout) { return; }
             var used = false;
             if (self.floating) {
                 if (self.last_search.length > 0) {
@@ -3393,7 +3395,12 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
     _search_create_popup: function() {
         this.no_ed = true;
         this.ed_def.reject();
-        return instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments);
+        this.ignore_focusout = true;
+        this.reinit_value(false);
+        var res = instance.web.form.CompletionFieldMixin._search_create_popup.apply(this, arguments);
+        this.ignore_focusout = false;
+        this.no_ed = false;
+        return res;
     },
     set_dimensions: function (height, width) {
         this._super(height, width);

From 4cd699df15c386871a918d4fa5066acfa5a5fda1 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Sun, 22 Jun 2014 11:31:07 +0200
Subject: [PATCH 135/137] [IMP] js testing

- output "error" if any qunit tests failed
- failed js tests are logged as errors
- when running phantomjs considere empty waiting condition or initialisation code as "true"
- lint phantomtest.js file
---
 addons/web/views/webclient_templates.xml |  2 ++
 openerp/modules/module.py                |  5 +++--
 openerp/tests/phantomtest.js             | 23 +++++++++++++----------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 08fc3be483d..9de0d51526e 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -255,6 +255,8 @@
                         QUnit.done(function(result) {
                             if (result.failed === 0) {
                                 console.log('ok');
+                            } else {
+                                console.log('error');
                             }
                         });
                         openerp.web.qweb.add_template("/web/webclient/qweb");
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index 8f34a74f882..cd21e681a8b 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -384,11 +384,12 @@ class TestStream(object):
         if self.r.match(s):
             return
         first = True
-        for c in s.split('\n'):
+        level = logging.ERROR if s.startswith(('ERROR', 'FAIL', 'Traceback')) else logging.INFO
+        for c in s.splitlines():
             if not first:
                 c = '` ' + c
             first = False
-            self.logger.info(c)
+            self.logger.log(level, c)
 
 current_test = None
 
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
index 5a6a9696cc0..84f886c5dbb 100644
--- a/openerp/tests/phantomtest.js
+++ b/openerp/tests/phantomtest.js
@@ -1,14 +1,15 @@
-// Phantomjs openerp helper
+// Phantomjs odoo helper
+// jshint evil: true, loopfunc: true
 
-function waitFor (ready, callback, timeout, timeoutMessageCallback) {
+function waitFor (condition, callback, timeout, timeoutMessageCallback) {
     timeout = timeout || 10000;
-    var start = new Date;
+    var start = new Date();
 
     (function waitLoop() {
-        if(new Date - start > timeout) {
+        if(new Date() - start > timeout) {
             console.log('error', timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms");
             phantom.exit(1);
-        } else if (ready()) {
+        } else if (condition()) {
             callback();
         } else {
             setTimeout(waitLoop, 250);
@@ -44,7 +45,7 @@ function PhantomTest() {
                 }
                 return result.join('');
             }));
-            msg.push('(leaf frame on top)')
+            msg.push('(leaf frame on top)');
         }
         console.log('error', JSON.stringify(msg.join('\n')));
         phantom.exit(1);
@@ -86,9 +87,9 @@ function PhantomTest() {
     };
     setTimeout(function () {
         self.page.evaluate(function () {
-            var message = ("Timeout\nhref: " + window.location.href
-                + "\nreferrer: " + document.referrer
-                + "\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
+            var message = ("Timeout\nhref: " + window.location.href +
+                           "\nreferrer: " + document.referrer +
+                           "\n\n" + (document.body && document.body.innerHTML)).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
             console.log('error', message);
             phantom.exit(1);
         });
@@ -107,6 +108,8 @@ function PhantomTest() {
             url_path = "/login?" + qp.join('&');
         }
         var url = self.origin + url_path;
+        code = code || "true";
+        ready = ready || "true";
         self.page.open(url, function(status) {
             if (status !== 'success') {
                 console.log('error', "failed to load " + url);
@@ -115,7 +118,7 @@ function PhantomTest() {
                 console.log('loaded', url, status);
                 // process ready
                 waitFor(function() {
-                    console.log("PhantomTest.run: wait for condition: " + ready);
+                    console.log("PhantomTest.run: wait for condition:", ready);
                     return self.page.evaluate(function (ready) {
                         var r = false;
                         try {

From 0e595c418612d8236d63ec70c2f8dccb7cff3407 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Sun, 22 Jun 2014 11:44:30 +0200
Subject: [PATCH 136/137] [FIX] werkzeug logging respect "--log-level" setting
 for warn, error and critical levels

---
 openerp/netsvc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 391de55a32e..e6c05bf7298 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -212,9 +212,9 @@ PSEUDOCONFIG_MAPPER = {
     'debug': ['openerp:DEBUG'],
     'debug_sql': ['openerp.sql_db:DEBUG'],
     'info': [],
-    'warn': ['openerp:WARNING'],
-    'error': ['openerp:ERROR'],
-    'critical': ['openerp:CRITICAL'],
+    'warn': ['openerp:WARNING', 'werkzeug:WARNING'],
+    'error': ['openerp:ERROR', 'werkzeug:ERROR'],
+    'critical': ['openerp:CRITICAL', 'werkzeug:CRITICAL'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

From 631e309554eaa43dccfe54c3eab928783e507117 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@odoo.com>
Date: Sun, 22 Jun 2014 13:21:34 +0200
Subject: [PATCH 137/137] [FIX] server: log network errors via logging. ignore
 EPIPE

---
 openerp/service/server.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openerp/service/server.py b/openerp/service/server.py
index 6a87c85e56b..f5fe7723683 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -43,8 +43,15 @@ SLEEP_INTERVAL = 60 # 1 min
 #----------------------------------------------------------
 # Werkzeug WSGI servers patched
 #----------------------------------------------------------
+class LoggingBaseWSGIServerMixIn(object):
+    def handle_error(self, request, client_address):
+        t, e, _ = sys.exc_info()
+        if t == socket.error and e.errno == errno.EPIPE:
+            # broken pipe, ignore error
+            return
+        _logger.exception('Exception happened during processing of request from %s', client_address)
 
-class BaseWSGIServerNoBind(werkzeug.serving.BaseWSGIServer):
+class BaseWSGIServerNoBind(LoggingBaseWSGIServerMixIn, werkzeug.serving.BaseWSGIServer):
     """ werkzeug Base WSGI Server patched to skip socket binding. PreforkServer
     use this class, sets the socket and calls the process_request() manually
     """
@@ -63,7 +70,7 @@ class BaseWSGIServerNoBind(werkzeug.serving.BaseWSGIServer):
 # should also work with systemd socket activation. This is currently untested
 # and not yet used.
 
-class ThreadedWSGIServerReloadable(werkzeug.serving.ThreadedWSGIServer):
+class ThreadedWSGIServerReloadable(LoggingBaseWSGIServerMixIn, werkzeug.serving.ThreadedWSGIServer):
     """ werkzeug Threaded WSGI Server patched to allow reusing a listen socket
     given by the environement, this is used by autoreload to keep the listen
     socket open when a reload happens.