From 7c0cb3f3656da7e6eee5250a86ca26fc2d0a508e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 17:23:52 +0530
Subject: [PATCH 1/4] [IMP]:account

bzr revid: apa@tinyerp.com-20120605115352-l8haagu60vyxp15s
---
 addons/account/report/account_report.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 555d1ee7c25..59745355c5e 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -91,6 +91,7 @@ class report_aged_receivable(osv.osv):
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ To call the init() method timely
         """
+        if context is None:context = {}
         if not self.called:
             self.init(cr, user)
         self.called = True # To make sure that init doesn't get called multiple times

From b17672cd44b22d5e0ade85db65b8120f71847986 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 17:32:35 +0530
Subject: [PATCH 2/4] [IMP]:mrp

bzr revid: apa@tinyerp.com-20120605120235-6bjlk7mdrqtquovo
---
 addons/mrp/mrp_view.xml | 66 +++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7c8410cad7f..6d27eec1e66 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -891,39 +891,41 @@
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
         </record>
+        
+        <!-- Where is object in py file?-->
 
-        <record id="mrp_production_lot_form_view" model="ir.ui.view">
-            <field name="name">mrp.production.lot.line.form</field>
-            <field name="model">mrp.production.lot.line</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Production Products">
-                    <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>
-                    <field name="name"/>
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="tracking_id"/>
-                </form>
-            </field>
-        </record>
-        <record id="mrp_production_lot_tree_view" model="ir.ui.view">
-            <field name="name">mrp.production.lot.line.tree</field>
-            <field name="model">mrp.production.lot.line</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Production Products Consommation">
-                    <field name="product_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_uom"/>
-                    <field name="product_uos_qty" groups="product.group_uos"/>
-                    <field name="product_uos" groups="product.group_uos"/>
-                    <field name="tracking_id"/>
-                </tree>
-            </field>
-        </record>
+        <!--<record id="mrp_production_lot_form_view" model="ir.ui.view">-->
+        <!--    <field name="name">mrp.production.lot.line.form</field>-->
+        <!--    <field name="model">mrp.production.lot.line</field>-->
+        <!--    <field name="type">form</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <form string="Production Products">-->
+        <!--            <field colspan="4" name="move_id" on_change="onchange_lot_line_id(lot_id)"/>-->
+        <!--            <field name="name"/>-->
+        <!--            <field name="product_id"/>-->
+        <!--            <field name="product_qty"/>-->
+        <!--            <field name="product_uom"/>-->
+        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
+        <!--            <field name="product_uos" groups="product.group_uos"/>-->
+        <!--            <field name="tracking_id"/>-->
+        <!--        </form>-->
+        <!--    </field>-->
+        <!--</record>-->
+        <!--<record id="mrp_production_lot_tree_view" model="ir.ui.view">-->
+        <!--    <field name="name">mrp.production.lot.line.tree</field>-->
+        <!--    <field name="model">mrp.production.lot.line</field>-->
+        <!--    <field name="type">tree</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <tree string="Production Products Consommation">-->
+        <!--            <field name="product_id"/>-->
+        <!--            <field name="product_qty"/>-->
+        <!--            <field name="product_uom"/>-->
+        <!--            <field name="product_uos_qty" groups="product.group_uos"/>-->
+        <!--            <field name="product_uos" groups="product.group_uos"/>-->
+        <!--            <field name="tracking_id"/>-->
+        <!--        </tree>-->
+        <!--    </field>-->
+        <!--</record>-->
 
         <record id="mrp_production_product_form_view" model="ir.ui.view">
             <field name="name">mrp.production.product.line.form</field>

From 1e2ce5afdc6f96d6152582cd070ffc72d7a3d099 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 17:42:35 +0530
Subject: [PATCH 3/4] [IMP]:report_webkit

bzr revid: apa@tinyerp.com-20120605121235-6xheefhrf01y279f
---
 addons/report_webkit/wizard/report_webkit_actions.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index bb2c5312441..521b8e6e812 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -53,6 +53,7 @@ class report_webkit_actions(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view.
         """
+        if context is None:context={}
         res = super(report_webkit_actions, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         record_id = context and context.get('active_id', False) or False
         active_model = context.get('active_model')

From f43fdd060b83e7809e9b74c1fd6fa8c267026043 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 17:59:12 +0530
Subject: [PATCH 4/4] [IMP]:users_ldap

bzr revid: apa@tinyerp.com-20120605122912-2s7r7tk1xe0rs603
---
 addons/users_ldap/users_ldap_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index caece7efe8f..8747609f321 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Configuration']" position="inside">                    
+                <xpath expr="//page[@string='Configuration']" position="inside">                    
                     <field name="ldaps" nolabel="1" colspan="4">
                         <form string="LDAP Configuration">
                             <field name="ldap_server"/>