diff options
| author | Nicolas Martinelli <nim@odoo.com> | 2015-10-08 14:19:50 +0200 |
|---|---|---|
| committer | Nicolas Martinelli <nim@odoo.com> | 2015-10-13 10:17:27 +0200 |
| commit | 2277b8955dfee9e9aafdcb631c69aa334797ecdb (patch) | |
| tree | ea72e486b1aca38e73b5afcc79a62c1c7e640a71 /addons | |
| parent | 27761dcc9bf7b633dbab34daebdcba8e84986579 (diff) | |
[REM] sale, purchase: useless groups
Remove useless groups group_analytic_account_for_purchases and
group_analytic_account_for_sales.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/account/views/res_config_view.xml | 8 | ||||
| -rw-r--r-- | addons/purchase/res_config.py | 9 | ||||
| -rw-r--r-- | addons/purchase/res_config_view.xml | 21 | ||||
| -rw-r--r-- | addons/sale/res_config.py | 9 | ||||
| -rw-r--r-- | addons/sale/res_config_view.xml | 20 |
5 files changed, 0 insertions, 67 deletions
diff --git a/addons/account/views/res_config_view.xml b/addons/account/views/res_config_view.xml index 25de6aed4e4..0f46c0b4e01 100644 --- a/addons/account/views/res_config_view.xml +++ b/addons/account/views/res_config_view.xml @@ -230,14 +230,6 @@ </div> </div> </group> - <!-- Invisible section which is inherited in other modules --> - <separator name="analytic_account" string="Analytic Accounting" invisible="1"/> - <group name="analytic_account_sale" invisible="1"> - <label for="id" string="Sale"/> - </group> - <group name="analytic_account_purchase" invisible="1"> - <label for="id" string="Purchase"/> - </group> </form> </field> </record> diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index d2ef7967e01..3c60d04a31a 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -52,12 +52,3 @@ class purchase_config_settings(osv.osv_memory): ], "Vendor Price", implied_group="purchase.group_manage_vendor_price"), } - - -class account_config_settings(osv.osv_memory): - _inherit = 'account.config.settings' - _columns = { - 'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases', - implied_group='purchase.group_analytic_accounting', - help="Allows you to specify an analytic account on purchase order lines."), - } diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml index 6aae2feaad3..b524125708c 100644 --- a/addons/purchase/res_config_view.xml +++ b/addons/purchase/res_config_view.xml @@ -48,26 +48,5 @@ <menuitem id="menu_purchase_general_settings" name="Settings" parent="menu_purchase_config" sequence="0" action="action_purchase_configuration"/> - - <record id="view_account_config" model="ir.ui.view"> - <field name="name">account settings</field> - <field name="model">account.config.settings</field> - <field name="inherit_id" ref="account.view_account_config_settings"/> - <field name="priority" eval="18"/> - <field name="arch" type="xml"> - <separator name="analytic_account" position="attributes"> - <attribute name="invisible">0</attribute> - </separator> - <group name="analytic_account_purchase" position="attributes"> - <attribute name="invisible">0</attribute> - </group> - <xpath expr="//group[@name='analytic_account_purchase']" position="inside"> - <div> - <field name="group_analytic_account_for_purchases" class="oe_inline"/> - <label for="group_analytic_account_for_purchases"/> - </div> - </xpath> - </field> - </record> </data> </openerp> diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index b2f2c51e552..ac9bd85992d 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -99,12 +99,3 @@ class sale_configuration(osv.TransientModel): if sale_pricelist_setting == 'formula': return {'value': {'group_pricelist_item': True, 'group_sale_pricelist': True, 'group_product_pricelist': False}} return {'value': {'group_pricelist_item': False, 'group_sale_pricelist': False, 'group_product_pricelist': False}} - - -class account_config_settings(osv.osv_memory): - _inherit = 'account.config.settings' - _columns = { - 'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales', - implied_group='sale.group_analytic_accounting', - help="Allows you to specify an analytic account on sales orders."), - } diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 3ff132e5986..cb5778ae05e 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -53,25 +53,5 @@ <menuitem id="base.menu_sale_general_settings" name="Settings" parent="base.menu_sale_config" sequence="0" action="base_setup.action_sale_config"/> - <record id="view_account_config" model="ir.ui.view"> - <field name="name">account settings</field> - <field name="model">account.config.settings</field> - <field name="inherit_id" ref="account.view_account_config_settings"/> - <field name="priority" eval="16"/> - <field name="arch" type="xml"> - <separator name="analytic_account" position="attributes"> - <attribute name="invisible">0</attribute> - </separator> - <group name="analytic_account_sale" position="attributes"> - <attribute name="invisible">0</attribute> - </group> - <xpath expr="//group[@name='analytic_account_sale']" position="inside"> - <div> - <field name="group_analytic_account_for_sales" class="oe_inline"/> - <label for="group_analytic_account_for_sales"/> - </div> - </xpath> - </field> - </record> </data> </openerp> |
