From 7488a675b4d9a8e99cf2b9b25c194e114babcafb Mon Sep 17 00:00:00 2001
From: "Ravish Murari (OpenERP)" <rmu@tinyerp.com>
Date: Mon, 23 Jul 2012 16:56:17 +0530
Subject: [PATCH 1/2] [FIX] removed rest of the base_group_extended group from
 addons

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

bzr revid: rmu@tinyerp.com-20120723112617-h7um6wkj22martms
---
 addons/account/account_view.xml                 | 2 +-
 addons/crm_fundraising/crm_fundraising_view.xml | 2 +-
 addons/point_of_sale/point_of_sale_view.xml     | 2 +-
 addons/purchase/report/purchase_report_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 1e1f7b91851..e117d31212a 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2593,7 +2593,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 9e67a4001a7..961ba2d6d3e 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -66,7 +66,7 @@
                     <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
                     <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
                     <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6b1b9132344..e95c293344f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -1043,7 +1043,7 @@
                     <field name="date_order"/>
                     <field name="session_id"/>
                     <newline/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 4cf91053666..62b49cbeba0 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -89,7 +89,7 @@
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>

From 1d8007f03c5de0f3a660b4eb61542b1582f8eebd Mon Sep 17 00:00:00 2001
From: Antonin Bourguignon <abo@openerp.com>
Date: Mon, 17 Sep 2012 14:28:21 +0200
Subject: [PATCH 2/2] [FIX] an error from the last merge

bzr revid: abo@openerp.com-20120917122821-0kfcipo5nw5gps08
---
 .../crm_fundraising_view.xml.THIS             | 224 ------------------
 .../project_timesheet_data.xml.THIS           |  20 --
 2 files changed, 244 deletions(-)
 delete mode 100644 addons/crm_fundraising/crm_fundraising_view.xml.THIS
 delete mode 100644 addons/project_timesheet/project_timesheet_data.xml.THIS

diff --git a/addons/crm_fundraising/crm_fundraising_view.xml.THIS b/addons/crm_fundraising/crm_fundraising_view.xml.THIS
deleted file mode 100644
index 961ba2d6d3e..00000000000
--- a/addons/crm_fundraising/crm_fundraising_view.xml.THIS
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-           <!-- Fund Raising Configuration Menu -->
-        <menuitem id="menu_config_fundrising" name="Fund Raising"
-            groups="base.group_no_one"
-            parent="base.menu_base_config" sequence="65" />
-
-        <!-- Fund Raising Categories Form View -->
-
-        <record id="crm_fund_categ_action" model="ir.actions.act_window">
-            <field name="name">Fundraising Categories</field>
-            <field name="res_model">crm.case.categ</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_categ_tree-view"/>
-            <field name="domain">[('object_id.model', '=', 'crm.fundraising')]</field>
-            <field name="context" eval="{'object_id': ref('model_crm_fundraising')}"/>
-            <field name="help">Manage and define the fund raising categories you want to be maintained in the system.</field>
-        </record>
-
-        <menuitem action="crm_fund_categ_action" name="Categories"
-            id="menu_crm_case_fundraising-act" groups="base.group_no_one"
-            parent="menu_config_fundrising" />
-
-        <!-- Fund Stage Form View -->
-
-        <record id="crm_fundraising_stage_act" model="ir.actions.act_window">
-            <field name="name">Fundraising Stages</field>
-            <field name="res_model">crm.case.stage</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="crm.crm_case_stage_tree"/>
-            <field name="context">{'search_default_fundraising':1}</field>
-            <field name="help">Create and manage fund raising activity categories you want to be maintained in the system.</field>
-        </record>
-
-        <!-- Fund Raising Tree View -->
-
-        <record model="ir.ui.view" id="crm_case_tree_view_fund">
-            <field name="name">CRM - Funds Tree</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Funds Tree"
-                    colors="blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="name" string="Fund Description" />
-                    <field name="categ_id" />
-                    <field name="type_id" string="Payment Mode" />
-                    <field name="planned_cost" string="Amount" />
-                    <field name="probability" />
-                    <field name="user_id" />
-                    <field name="state" />
-                    <field name="partner_id" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <!-- Fund Raising Form View -->
-
-        <record model="ir.ui.view" id="crm_case_form_view_fund">
-            <field name="name">CRM - Funds Form</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form version="7.0">
-                <header>
-                    <button name="case_close" string="Done" states="open,pending" type="object" class="oe_highlight"/>
-                    <button name="case_open" string="Open" states="draft,pending" type="object" class="oe_highlight"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
-                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                </header>
-                <sheet string="Funds Form">
-                    <label for="name" class="oe_edit_only"/>
-                    <h1>
-                        <field name="name"/>
-                    </h1>
-                    <label for="categ_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]" class="oe_inline"/>
-                    </h2>
-                    <group>
-                        <group>
-                            <field name="user_id" string="Responsible"/>
-                            <field name="section_id" colspan="1" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="date"/>
-                            <field name="type_id" string="Payment Mode" widget="selection"/>
-                            <field name="priority" string="Priority"/>
-                        </group>
-                    </group>
-                    <notebook>
-                        <page string="Funds">
-                            <group>
-                                <group>
-                                    <field name="partner_id"
-                                        on_change="onchange_partner_id(partner_id, email_from)"
-                                        />
-                                    <field name="email_from"/>
-                                </group>
-                                <group>
-                                    <field name="planned_cost"/>
-                                    <field name="planned_revenue"/>
-                                    <field name="probability"/>
-                                </group>
-                            </group>
-                            <separator colspan="4" string="Notes"/>
-                            <field name="description" placeholder="Add a note..."/>
-                        </page>
-                        <page string="Extra Info">
-                            <group>
-                                <group string="Misc">
-                                    <field name="active"/>
-                                    <field name="id"/>
-                                </group>
-                                <group groups="base.group_no_one" string="Dates">
-                                    <field name="create_date"/>
-                                    <field name="date_closed"/>
-                                    <field name="duration"/>
-                                </group>
-                                <group string="References">
-                                    <field name="ref"/>
-                                    <field name="ref2"/>
-                                </group>
-                            </group>
-                        </page>
-                    </notebook>
-                </sheet>
-                <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- Fund Raising Calendar View -->
-
-        <record model="ir.ui.view" id="crm_case_calendar_view_fund">
-            <field name="name">CRM - Funds Calendar</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">calendar</field>
-            <field name="priority" eval="2"/>
-            <field name="arch" type="xml">
-                <calendar string="Funds" date_start="date" color="user_id" date_delay="duration">
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                </calendar>
-            </field>
-        </record>
-
-        <!-- Fund Raising Graph View -->
-
-        <record model="ir.ui.view" id="crm_case_graph_view_fund">
-            <field name="name">CRM - Funds Graph</field>
-            <field name="model">crm.fundraising</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Funds by Categories" type="bar" orientation="horizontal">
-                    <field name="categ_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="state" group="True"/>
-                </graph>
-            </field>
-        </record>
-
-        <!-- Fund Raising Search View -->
-        <record id="view_crm_case_fund_filter" model="ir.ui.view">
-                <field name="name">CRM - Funds Search</field>
-                <field name="model">crm.fundraising</field>
-                <field name="type">search</field>
-                <field name="arch" type="xml">
-                    <search string="Search Funds">
-                        <group>
-                            <field name="name" string="Fund Description"/>
-                            <separator orientation="vertical" />
-                            <filter icon="terp-check" string="New"
-                                domain="[('state','=','draft')]" name="current"
-                                help="New Funds" />
-                            <filter icon="terp-camera_test" string="Open"
-                                domain="[('state','=','open')]"
-                                help="Open Funds" />
-                            <filter icon="terp-gtk-media-pause"
-                                string="Pending"
-                                domain="[('state','=','pending')]"
-                                help="Pending Funds" />
-                            <separator orientation="vertical" />
-                            <filter string="Unassigned"
-                                    icon="terp-personal-"
-                                    domain="[('user_id','=', False)]"
-                                    help="Unassigned" />
-                            <filter string="Assigned to Me or to My Sales Team(s)" 
-                                    icon="terp-personal+"
-                                    domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
-                                    help="Fund Raisings that are assigned to me or to one of the sale teams I manage" />
-                            <separator orientation="vertical" />
-                            <field name="state"/>
-                            <field name="user_id" 
-                                widget="selection"/>
-                            <field name="section_id" widget="selection" string="Sales Team"/>
-                        </group>
-                        <newline/>
-                        <group expand="0" string="Group By...">
-                            <filter string="Partner" icon="terp-partner"
-                                domain="[]"
-                                context="{'group_by':'partner_id'}" />
-                            <filter string="Responsible" icon="terp-personal"
-                                domain="[]"
-                                context="{'group_by':'user_id'}" />
-                            <filter string="Category" help="Fund Category"
-                                icon="terp-stock_symbol-selection" domain="[]"
-                                context="{'group_by':'categ_id'}" />
-                            <filter string="Payment Mode" help="Payment Mode"
-                                icon="terp-dolar" domain="[]"
-                                context="{'group_by':'type_id'}" />
-                            <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]"
-                                context="{'group_by':'state'}" />
-                        </group>
-                    </search>
-                </field>
-            </record>
-    </data>
-</openerp>
diff --git a/addons/project_timesheet/project_timesheet_data.xml.THIS b/addons/project_timesheet/project_timesheet_data.xml.THIS
deleted file mode 100644
index fc6597595ae..00000000000
--- a/addons/project_timesheet/project_timesheet_data.xml.THIS
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-
-      <!--   <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
-            <field name="name">Time Tracking</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_main_pm"/>
-        </record>
-
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
-        </record> -->
-
-    </data>
-</openerp>