From 0cc3c5ce1f83ee94e8c8d751424d7fc370a60af3 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Thu, 16 Sep 2010 15:08:25 +0530
Subject: [PATCH] [IMP] purchase: Improve the form view of order_line

bzr revid: sbh@tinyerp.com-20100916093825-1jju5nlti7gld94k
---
 addons/purchase/purchase_view.xml              | 14 +++++++-------
 addons/purchase/wizard/purchase_order_group.py |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index eeec28637bd..5144ed45ffc 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -264,19 +264,19 @@
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                             </group>
                         </page>
-                        <page string="Notes">
-                            <field colspan="4" name="notes" nolabel="1"/>
-                        </page>
-                        <page string="History" groups="base.group_extended">
-                               <separator colspan="4" string="Stock Moves"/>
-                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
-                        </page>
                         <page string="Invoicing" groups="base.group_extended">
                             <separator colspan="4" string="Manual Invoices"/>
                             <field name="invoiced"/>
                             <newline/>
                             <field colspan="4" name="invoice_lines" nolabel="1" widget="many2many"/>
                         </page>
+           				<page string="Notes">
+                            <field colspan="4" name="notes" nolabel="1"/>
+                        </page>
+                        <page string="History" groups="base.group_extended">
+                               <separator colspan="4" string="Stock Moves"/>
+                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                        </page>                        
                     </notebook>
                 </form>
             </field>
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 08b2ee5c4ed..dbcd89dbc44 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -46,6 +46,7 @@ class purchase_order_group(osv.osv_memory):
         if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
             raise osv.except_osv(_('Warning'),
             _('Please select multiple order inventories to merge in the list view.'))
+        return res
     def merge_orders(self, cr, uid, ids, context):
         """
              To merge similar type of purchase orders.