From f672bb961dce7a8c567364f33abf48eab8b0b9d5 Mon Sep 17 00:00:00 2001
From: "Kirti Savalia (OpenERP)" <ksa@tinyerp.com>
Date: Tue, 3 Jan 2012 18:23:37 +0530
Subject: [PATCH 1/5] [FIX]:duplicate picking create

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

bzr revid: ksa@tinyerp.com-20120103125337-3ef4j8h4yqmrivk9
---
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 6f815413497..06446f2f948 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -111,7 +111,7 @@ class stock_partial_picking(osv.osv_memory):
     def _partial_move_for(self, cr, uid, move):
         partial_move = {
             'product_id' : move.product_id.id,
-            'quantity' : move.state in ('assigned','new') and move.product_qty or 0,
+            'quantity' : move.state in ('assigned','new','confirmed') and move.product_qty or 0,
             'product_uom' : move.product_uom.id,
             'prodlot_id' : move.prodlot_id.id,
             'move_id' : move.id,

From 55bb991f91fad5b8afdb979b90602f957ab2d959 Mon Sep 17 00:00:00 2001
From: "Kirti Savalia (OpenERP)" <ksa@tinyerp.com>
Date: Thu, 5 Jan 2012 17:39:51 +0530
Subject: [PATCH 2/5] [IMP]:when picking is not available we can not process

bzr revid: ksa@tinyerp.com-20120105120951-rw4li4tqmuqjsrl0
---
 addons/stock/stock_view.xml                  | 2 +-
 addons/stock/wizard/stock_partial_picking.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index cbcc1eee4c6..07a7750a4ba 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -682,7 +682,7 @@
                     <field name="invoice_state"/>
                     <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                     <field name="state"/>
-                    <button name="action_process" states="confirmed,assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="action_process" states="assigned" groups="stock.group_stock_user" string="Process" type="object" icon="gtk-go-forward"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 06446f2f948..6f815413497 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -111,7 +111,7 @@ class stock_partial_picking(osv.osv_memory):
     def _partial_move_for(self, cr, uid, move):
         partial_move = {
             'product_id' : move.product_id.id,
-            'quantity' : move.state in ('assigned','new','confirmed') and move.product_qty or 0,
+            'quantity' : move.state in ('assigned','new') and move.product_qty or 0,
             'product_uom' : move.product_uom.id,
             'prodlot_id' : move.prodlot_id.id,
             'move_id' : move.id,

From 83607b97b0352e768e67f7a6df497f47b8b07c24 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Jan 2012 11:45:40 +0100
Subject: [PATCH 3/5] [IMP] Only show formview when record is loaded in order
 to avoid flickering of fields

bzr revid: fme@openerp.com-20120109104540-uetxrrlvga9z9259
---
 addons/web/static/src/js/view_form.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ec92cd2ac52..4505fe671e4 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -136,6 +136,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
 
     do_show: function () {
         var self = this;
+        this.$element.hide();
         return this.has_been_loaded.pipe(function() {
             var result;
             if (self.dataset.index === null) {
@@ -144,7 +145,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
             } else {
                 result = self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded);
             }
-            self.$element.show();
+            result.pipe(function() {
+                self.$element.show();
+            });
             if (self.sidebar) {
                 self.sidebar.$element.show();
             }

From c392fc627690ec5aa0bb394faeaa1270cf1ae3e9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Jan 2012 11:58:32 +0100
Subject: [PATCH 4/5] [IMP] Do not show view manager title in dialogs

bzr revid: fme@openerp.com-20120109105832-ysyoj375lvy63ec4
---
 addons/web/static/src/js/views.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 6a70be5696f..060d12e39b6 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -109,7 +109,8 @@ session.web.ActionManager = session.web.Widget.extend({
             search_view : !popup,
             action_buttons : !popup,
             sidebar : !popup,
-            pager : !popup
+            pager : !popup,
+            display_title : !popup
         }, action.flags || {});
         if (!(type in this)) {
             console.error("Action manager can't handle action of type " + action.type, action);

From 53547e3a7c53e9e62b01cd65957d126c7fef1a79 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 9 Jan 2012 13:11:08 +0100
Subject: [PATCH 5/5] [FIX] Fixed some buggy view_modes with trailing commas

bzr revid: fme@openerp.com-20120109121108-ettcb2wrp7m01yfr
---
 addons/crm/crm_lead_menu.xml      | 2 +-
 addons/crm/crm_phonecall_menu.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index f902123ab7a..777b58ac60a 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -51,7 +51,7 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.lead"
-            view_mode="tree,form,calendar,"
+            view_mode="tree,form,calendar"
             context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
             domain="[('opportunity_id', '=', active_id)]"
             view_type="form"/>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index d192b970cb3..d8d00710420 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -18,7 +18,7 @@
             name="Meetings"
             res_model="crm.meeting"
             src_model="crm.phonecall"
-            view_mode="tree,form,calendar,"
+            view_mode="tree,form,calendar"
             context="{'default_duration': 4.0, 'default_phonecall_id': active_id}"
             domain="[('phonecall_id', '=', active_id)]"
             view_type="form"/-->