diff options
| author | Antonin Bourguignon <abo@openerp.com> | 2012-09-17 14:43:23 +0200 |
|---|---|---|
| committer | Antonin Bourguignon <abo@openerp.com> | 2012-09-17 14:43:23 +0200 |
| commit | 4294ecb446c14d083f19d7fe90110fb7eb2fcae3 (patch) | |
| tree | 8d1b1697913d70fe69766b1a67699b1289f5da89 | |
| parent | 84094e0c39bf20499aefccc6c78143aeb2227d18 (diff) | |
| parent | 1d8007f03c5de0f3a660b4eb61542b1582f8eebd (diff) | |
[MERGE] trunk-bug-1027875-rmu: remove deprecated groups="base.group_extended" from several views
also remove conflict file project_timesheet/project_timesheet_data.xml.THIS
lp bug: https://launchpad.net/bugs/1027875 fixed
bzr revid: abo@openerp.com-20120917124323-8lcufmjrj668e8c6
| -rw-r--r-- | addons/account/account_view.xml | 2 | ||||
| -rw-r--r-- | addons/point_of_sale/point_of_sale_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_timesheet/project_timesheet_data.xml.THIS | 20 | ||||
| -rw-r--r-- | addons/purchase/report/purchase_report_view.xml | 2 |
4 files changed, 3 insertions, 23 deletions
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d1b19910365..4ddeaf2f3b4 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2537,7 +2537,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/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 80abb5444db..bc2ad8ab160 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -1035,7 +1035,7 @@ <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/> <field name="user_id"/> <field name="session_id"/> - <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/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> diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 842de65b68e..80685249849 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -72,7 +72,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'}"/> |