odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] account.config.settings: move sale and purchase group fields in their respecive module 

bzr revid: rco@openerp.com-20120329142121-lc5b6d3mcds68p34
This commit is contained in:
Raphael Collet 2012-03-29 16:21:21 +02:00
parent 60be90d2ed
commit 04f33ca7ac
11 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/account/res_config.py
View File

@ -113,12 +113,6 @@ class account_config_settings(osv.osv_memory):
* draw horizontal lines and put page breaks.
This installs the module account_invoice_layout."""),
'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
implied_group='base.group_analytic_account_for_sales',
help="Allows you to specify an analytic account on sale orders."),
'group_analytic_account_for_purchase': fields.boolean('Analytic Accounting for Purchases',
implied_group='base.group_analytic_account_for_purchase',
help="Allows you to specify an analytic account on purchase orders."),
'group_dates_periods': fields.boolean('Allow dates/periods',
implied_group='base.group_dates_periods',
help="Allows you to keep the period same as your invoice date when you validate the invoice."),

5
addons/account/res_config_view.xml
View File

@ -107,10 +107,7 @@
</group>
<group colspan="2">
<separator string="Analytic Accounting" colspan="4"/>
<field name="group_analytic_account_for_sales"/>
<newline/>
<field name="group_analytic_account_for_purchase"/>
<newline/>
<group name="analytic_accounting" colspan="4"/>
<field name="module_account_analytic_plans"/>
<newline/>
<field name="module_account_analytic_default"/>

8
addons/account/security/account_security.xml
View File

@ -16,14 +16,6 @@
<field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
</record>
<record id="base.group_analytic_account_for_sales" model="res.groups">
<field name="name">Analytic Accounting for Sales</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_analytic_account_for_purchase" model="res.groups">
<field name="name">Analytic Accounting for Purchase</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="base.group_dates_periods" model="res.groups">
<field name="name">Dates and Periods</field>
<field name="category_id" ref="base.module_category_hidden"/>

4
addons/purchase/purchase_view.xml
View File

@ -366,7 +366,7 @@
<field name="date_planned" widget="date"/>
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]" />
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
<group colspan="4" col="4" groups="purchase.group_taxes_on_order_line">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"
@ -429,7 +429,7 @@
<field name="date_planned" widget="date" readonly="1"/>
<field name="price_unit"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="account_analytic_id" colspan="4" groups="base.group_analytic_account_for_purchase" domain="[('parent_id','!=',False)]"/>
<field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<group colspan="4" col="4" groups="base.group_extended">
<separator colspan="4" string="Taxes"/>
<field colspan="4" nolabel="1" name="taxes_id"

10
addons/purchase/res_config.py
View File

@ -91,4 +91,14 @@ class purchase_config_settings(osv.osv_memory):
'group_purchase_taxes_on_order_line': tax_policy == 'on_order_line',
}}
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 orders."),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

13
addons/purchase/res_config_view.xml
View File

@ -42,5 +42,18 @@
<menuitem id="menu_purchase_config" name="Purchases" parent="base.menu_config"
sequence="2" 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="type">form</field>
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="arch" type="xml">
<group name="analytic_accounting" position="after">
<field name="group_analytic_account_for_purchases"/>
<newline/>
</group>
</field>
</record>
</data>
</openerp>

5
addons/purchase/security/purchase_security.xml
View File

@ -23,6 +23,11 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting for Purchases</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record model="ir.rule" id="purchase_order_comp_rule">
<field name="name">Purchase Order multi-company</field>
<field name="model_id" ref="model_purchase_order"/>

10
addons/sale/res_config.py
View File

@ -160,4 +160,14 @@ class sale_configuration(osv.osv_memory):
'group_sale_taxes_on_order_line': tax_policy == 'on_order_line',
}}
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 sale orders."),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

13
addons/sale/res_config_view.xml
View File

@ -47,5 +47,18 @@
<menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config" sequence="1" action="base.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="type">form</field>
<field name="inherit_id" ref="account.view_account_config_settings"/>
<field name="arch" type="xml">
<group name="analytic_accounting" position="after">
<field name="group_analytic_account_for_sales"/>
<newline/>
</group>
</field>
</record>
</data>
</openerp>

2
addons/sale/sale_view.xml
View File

@ -120,7 +120,7 @@
<field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
<field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
<field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="base.group_analytic_account_for_sales" domain="[('parent_id','!=',False)]"/>
<field name="project_id" context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
<newline/>
<field colspan="4" name="order_line" nolabel="1" widget="one2many_list">
<form string="Sales Order Lines">

5
addons/sale/security/sale_security.xml
View File

@ -50,6 +50,11 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_analytic_accounting" model="res.groups">
<field name="name">Analytic Accounting for Sales</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record model="res.users" id="base.user_admin">
<field eval="[(4,ref('base.group_partner_manager'))]" name="groups_id"/>
</record>