From a4f09709728d391962206e6fc1daa6952ea8f6c2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 14:23:57 +0530
Subject: [PATCH 1/6] [IMP]:users:removed menu_tips field

bzr revid: apa@tinyerp.com-20120605085357-i5m58fkr0xq050or
---
 addons/mail/res_users_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 7df155b13c0..7cb98129a3c 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
             <field name="arch" type="xml">
             <data>
-                <field name="menu_tips" position="after">
+                <field name="context_tz" position="after">
                     <field name="notification_email_pref" readonly="0"/>
                 </field>
             </data>
@@ -23,7 +23,7 @@
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
             <data>
-                <field name="menu_tips" position="after">
+                <field name="context_tz" position="after">
                     <field name="notification_email_pref"/>
                 </field>
                 <xpath expr="/form/sheet" position="after">

From 6eb9277f25e9c945bd31fc57ed192fba1846ea83 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 15:50:15 +0530
Subject: [PATCH 2/6] [IMP]:resolved project module.

bzr revid: apa@tinyerp.com-20120605102015-gzsm3ofkga2j9e8i
---
 addons/project/project.py                    |  2 +-
 addons/project/report/project_cumulative.xml | 52 ++++++++++----------
 addons/project/res_partner_view.xml          |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 54e80e79b52..429672d3269 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -818,7 +818,7 @@ class task(base_stage, osv.osv):
     #
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
-
+        if context is None: context = {}
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
         obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 3c04d36feb6..c85b1ba28e5 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -15,7 +15,6 @@
                     <field name="user_id"/>
                     <field name="remaining_hours"/>
                     <field name="kanban_state"/>
-                    <field name="stage_id"/>
                     <field name="state" groups="base.group_no_one"/>
                 </tree>
             </field>
@@ -32,18 +31,21 @@
                 </graph>
             </field>
         </record>
-        <record id="view_task_history_burndown_graph" model="ir.ui.view">
-            <field name="name">project.task.history.burndown.graph</field>
-            <field name="model">project.task.history.burndown</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Burndown Chart of Tasks" type="bar">
-                    <field name="date"/>
-                    <field name="remaining_hours" operator="+"/>
-                    <field name="type_id" group="True"/>
-                </graph>
-            </field>
-        </record>
+        
+        <!-- Where is this object in py file ? -->
+        
+        <!--<record id="view_task_history_burndown_graph" model="ir.ui.view">-->
+        <!--    <field name="name">project.task.history.burndown.graph</field>-->
+        <!--    <field name="model">project.task.history.burndown</field>-->
+        <!--    <field name="type">graph</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <graph string="Burndown Chart of Tasks" type="bar">-->
+        <!--            <field name="date"/>-->
+        <!--            <field name="remaining_hours" operator="+"/>-->
+        <!--            <field name="type_id" group="True"/>-->
+        <!--        </graph>-->
+        <!--    </field>-->
+        <!--</record>-->
 
 
         <record id="view_task_history_search" model="ir.ui.view">
@@ -92,18 +94,18 @@
             parent="project_report_task" />
 
 
-        <record id="action_view_task_history_burndown" model="ir.actions.act_window">
-            <field name="name">Burndown Chart</field>
-            <field name="res_model">project.task.history.cumulative</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="view_id" ref="view_task_history_burndown_graph"/>
-            <field eval="False" name="filter"/>
-            <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>
-        </record>
-        <menuitem action="action_view_task_history_burndown"
-            id="menu_action_view_task_history_burndown"
-            parent="project_report_task" />
+        <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
+        <!--    <field name="name">Burndown Chart</field>-->
+        <!--    <field name="res_model">project.task.history.cumulative</field>-->
+        <!--    <field name="view_type">form</field>-->
+        <!--    <field name="view_mode">graph,tree</field>-->
+        <!--    <field name="view_id" ref="view_task_history_burndown_graph"/>-->
+        <!--    <field eval="False" name="filter"/>-->
+        <!--    <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>-->
+        <!--</record>-->
+        <!--<menuitem action="action_view_task_history_burndown"-->
+        <!--    id="menu_action_view_task_history_burndown"-->
+        <!--    parent="project_report_task" />-->
 
 
     </data>
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 341b086b978..2a648791056 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='History']" position="attributes">
+                <xpath expr="//page[@string='History']" position="attributes">
                    <attribute name="invisible">False</attribute>
                 </xpath>
              </field>

From ccb8d479bbb238d6351f28957539d21f2f0c116e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 16:07:39 +0530
Subject: [PATCH 3/6] [IMP]:crm:removed unused fields from crm

bzr revid: apa@tinyerp.com-20120605103739-afic8hq7x1mmixd4
---
 addons/crm/crm_view.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index c8f019e685b..dacfa5c2946 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -317,11 +317,6 @@
                     <notebook colspan="4">
                         <page string="Sales Purchase">
                             <field name="sales_purchase_active"/>
-                            <separator colspan="4" string="State of Mind Computation"/>
-                            <field name="som_interval"/>
-                            <field name="som_interval_max"/>
-                            <field name="som_interval_decrease"/>
-                            <field name="som_interval_default"/>
                             <separator colspan="4" string="Segmentation Test"/>
                             <field colspan="4" name="segmentation_line" widget="one2many_list" nolabel="1"/>
                         </page>

From ffcd8f105e03d97ba1e4c560c8a48d358771294b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 16:20:33 +0530
Subject: [PATCH 4/6] [IMP]:resolved account module

bzr revid: apa@tinyerp.com-20120605105033-ses82h9j15f94yht
---
 .../account/wizard/account_invoice_refund.py  |  1 +
 addons/account/wizard/account_move_journal.py | 95 ++++++++++---------
 .../account/wizard/account_report_common.py   |  1 +
 3 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index fea020b5c4b..98c32eda7ee 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -60,6 +60,7 @@ class account_invoice_refund(osv.osv_memory):
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if context is None:context = {}
         journal_obj = self.pool.get('account.journal')
         user_obj = self.pool.get('res.users')
         # remove the entry with key 'form_view_ref', otherwise fields_view_get crashes
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 6756e0d06c6..a7d4f36916b 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -77,56 +77,57 @@ class account_move_journal(osv.osv_memory):
 
         @return: Returns a dict that contains definition for fields, views, and toolbars
         """
-
+        if context is None:context = {}
         res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
 
-        if not view_id:
-            return res
-
-        period_pool = self.pool.get('account.period')
-        journal_pool = self.pool.get('account.journal')
-
-        journal_id = self._get_journal(cr, uid, context)
-        period_id = self._get_period(cr, uid, context)
-
-        journal = False
-        if journal_id:
-            journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
-            journal_string = _("Journal: %s") % tools.ustr(journal)
-        else:
-            journal_string = _("Journal: All")
-
-        period = False
-        if period_id:
-            period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
-            period_string = _("Period: %s") % tools.ustr(period)
-
-        separator_string = _("Open Journal Items !")
-        cancel_string = _("Cancel")
-        open_string = _("Open")
-        view = """<?xml version="1.0" encoding="utf-8"?>
-        <form string="Standard entries">
-            <separator string="%s" colspan="4"/>
-            <field name="target_move" />
-            <newline/>
-            <group colspan="4" >
-                <label width="300" string="%s"/>
+        if context:
+            if not view_id:
+                return res
+    
+            period_pool = self.pool.get('account.period')
+            journal_pool = self.pool.get('account.journal')
+    
+            journal_id = self._get_journal(cr, uid, context)
+            period_id = self._get_period(cr, uid, context)
+    
+            journal = False
+            if journal_id:
+                journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+                journal_string = _("Journal: %s") % tools.ustr(journal)
+            else:
+                journal_string = _("Journal: All")
+    
+            period = False
+            if period_id:
+                period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+                period_string = _("Period: %s") % tools.ustr(period)
+    
+            separator_string = _("Open Journal Items !")
+            cancel_string = _("Cancel")
+            open_string = _("Open")
+            view = """<?xml version="1.0" encoding="utf-8"?>
+            <form string="Standard entries">
+                <separator string="%s" colspan="4"/>
+                <field name="target_move" />
                 <newline/>
-                <label width="300" string="%s"/>
-            </group>
-            <group colspan="4" col="4">
-                <label string ="" colspan="2"/>
-                <button icon="gtk-cancel" special="cancel" string="%s"/>
-                <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
-            </group>
-        </form>""" % (separator_string, journal_string, period_string, cancel_string, open_string)
-
-        view = etree.fromstring(view.encode('utf8'))
-        xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
-        view = xarch
-        res.update({
-            'arch': view
-        })
+                <group colspan="4" >
+                    <label width="300" string="%s"/>
+                    <newline/>
+                    <label width="300" string="%s"/>
+                </group>
+                <group colspan="4" col="4">
+                    <label string ="" colspan="2"/>
+                    <button icon="gtk-cancel" special="cancel" string="%s"/>
+                    <button icon="terp-gtk-go-back-rtl" string="%s" name="action_open_window" default_focus="1" type="object"/>
+                </group>
+            </form>""" % (separator_string, journal_string, period_string, cancel_string, open_string)
+    
+            view = etree.fromstring(view.encode('utf8'))
+            xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
+            view = xarch
+            res.update({
+                'arch': view
+            })
         return res
 
     def action_open_window(self, cr, uid, ids, context=None):
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index b7d143eb740..fa3c195cfb7 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -67,6 +67,7 @@ class account_common_report(osv.osv_memory):
 
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:context = {}
         res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
         if context.get('active_model', False) == 'account.account' and view_id:
             doc = etree.XML(res['arch'])

From 771a5927491d4c748c8a60fa916363d3744fddc0 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 16:22:43 +0530
Subject: [PATCH 5/6] typo

bzr revid: apa@tinyerp.com-20120605105243-yzi0ex8lybbtwaor
---
 addons/account/account_invoice_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index cbd02175536..bc18aa72f4b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -297,7 +297,7 @@
                         <field name="state" class="oe_form_inline"/>
                         <field name="number"/>
                     </h1>
-                    <label string"Concerns" for="name" class="oe_form_readonly_hidden"/>
+                    <label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
                     <h2>
                         <field name="name" placeholder="Project XYZ"/>
                     </h2>

From de21ac07e38f8f7bb9a0de0cd6080a9dc53fba65 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 5 Jun 2012 16:29:44 +0530
Subject: [PATCH 6/6] [IMP]:resolved account/project module

bzr revid: apa@tinyerp.com-20120605105944-5fnf4y9b16au0a1y
---
 addons/account/project/project_view.xml | 132 ++++++++++++------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 8c9a7eb4087..931b01ce7e1 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -393,74 +393,74 @@
             id="account_analytic_journal_print" parent="account.next_id_40"/>
 
         #
-        # Statistics
+        # Statistics [where is this object in py file ?]
         #
 
-        <record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.form</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Analytic Entries Stats">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="account_id"/>
-                        <field name="journal_id"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-
-        <record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.tree</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Analytic Entries Stats">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="account_id"/>
-                    <field name="journal_id"/>
-                    <field name="quantity"/>
-                    <field name="revenue"/>
-                    <field name="cost"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.graph</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Entries Stats" type="bar">
-                    <field name="name"/>
-                    <field name="month"/>
-                    <field name="cost" operator="+"/>
-                    <field name="revenue" operator="+"/>
-                    <field group="True" name="journal_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">
-            <field name="name">report.hr.timesheet.invoice.journal.search</field>
-            <field name="model">report.hr.timesheet.invoice.journal</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Analytic Entries Stats">
-                    <group>
-                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-                           <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-                           <separator orientation="vertical"/>
-                        <field name="name"/>
-                           <field name="month"/>
-                        <field name="account_id"/>
-                    </group>
-                </search>
-            </field>
-        </record>
+        <!--<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">-->
+        <!--    <field name="name">report.hr.timesheet.invoice.journal.form</field>-->
+        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
+        <!--    <field name="type">form</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <form string="Analytic Entries Stats">-->
+        <!--            <group col="4">-->
+        <!--                <field name="name"/>-->
+        <!--                <field name="account_id"/>-->
+        <!--                <field name="journal_id"/>-->
+        <!--            </group>-->
+        <!--        </form>-->
+        <!--    </field>-->
+        <!--</record>-->
+        <!---->
+        <!---->
+        <!--<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">-->
+        <!--    <field name="name">report.hr.timesheet.invoice.journal.tree</field>-->
+        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
+        <!--    <field name="type">tree</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <tree string="Analytic Entries Stats">-->
+        <!--            <field name="name"/>-->
+        <!--            <field name="month"/>-->
+        <!--            <field name="account_id"/>-->
+        <!--            <field name="journal_id"/>-->
+        <!--            <field name="quantity"/>-->
+        <!--            <field name="revenue"/>-->
+        <!--            <field name="cost"/>-->
+        <!--        </tree>-->
+        <!--    </field>-->
+        <!--</record>-->
+        <!---->
+        <!--<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">-->
+        <!--    <field name="name">report.hr.timesheet.invoice.journal.graph</field>-->
+        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
+        <!--    <field name="type">graph</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <graph string="Analytic Entries Stats" type="bar">-->
+        <!--            <field name="name"/>-->
+        <!--            <field name="month"/>-->
+        <!--            <field name="cost" operator="+"/>-->
+        <!--            <field name="revenue" operator="+"/>-->
+        <!--            <field group="True" name="journal_id"/>-->
+        <!--        </graph>-->
+        <!--    </field>-->
+        <!--</record>-->
+        <!---->
+        <!--<record id="report_hr_timesheet_invoice_journal_search" model="ir.ui.view">-->
+        <!--    <field name="name">report.hr.timesheet.invoice.journal.search</field>-->
+        <!--    <field name="model">report.hr.timesheet.invoice.journal</field>-->
+        <!--    <field name="type">search</field>-->
+        <!--    <field name="arch" type="xml">-->
+        <!--        <search string="Analytic Entries Stats">-->
+        <!--            <group>-->
+        <!--                <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>-->
+        <!--                   <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>-->
+        <!--                   <separator orientation="vertical"/>-->
+        <!--                <field name="name"/>-->
+        <!--                   <field name="month"/>-->
+        <!--                <field name="account_id"/>-->
+        <!--            </group>-->
+        <!--        </search>-->
+        <!--    </field>-->
+        <!--</record>-->
 
         <act_window
             context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_account_id': active_id}"