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

[MERGE]: Merged with nco branch 

bzr revid: atp@tinyerp.com-20120615060732-sytrq9wpy7p0ipon
This commit is contained in:
Atul Patel (OpenERP) 2012-06-15 11:37:32 +05:30
parent 8e2bafd022 b3394e64d1
commit f970df9762
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/res_config_view.xml
View File

@ -21,7 +21,7 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet>
<group string="Accounting Details of Company" col="4">
<group string="Accounting Details of Company" col="4" groups="base.group_multi_company">
<field name="has_default_company" invisible="1" />
<field name="has_chart_of_accounts" invisible="1"/>
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"
@ -29,7 +29,7 @@
<field name="expects_chart_of_accounts"/>
</group>
<group string="Select a Chart of Accounts to Install" col="4" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<group string="Select a Chart of Accounts to Install" col="4" groups="base.group_multi_company" attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
<button string="Install More Chart Templates" icon="gtk-go-forward"
name="%(open_account_charts_modules)d" type="action"/>

2
addons/project/res_config.py
View File

@ -58,7 +58,7 @@ class project_configuration(osv.osv_memory):
'group_time_work_estimation_tasks': fields.boolean("Time Estimation on Tasks",
implied_group='project.group_time_work_estimation_tasks',
help="Allows you to compute Time Estimation on tasks."),
'group_manage_delegation_task': fields.boolean("Manage Taks Delegation",
'group_manage_delegation_task': fields.boolean("Manage Task Delegation",
implied_group='project.group_delegate_task',
help="Allows you to delegate tasks to other users."),
}

2
addons/project/res_config_view.xml
View File

@ -12,7 +12,7 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet>
<group>
<group colspan="4" col="4">
<separator string="Project" colspan="4"/>
<field name="group_time_work_estimation_tasks"/>
<field name="group_tasks_work_on_tasks"/>

2
addons/project_issue/res_config.py
View File

@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
_inherit = ['project.config.settings', 'fetchmail.config.settings']
_columns = {
'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails", readonly=True,
'fetchmail_issue': fields.boolean("Create Issues from Incoming Mails",
fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
}

5
addons/project_issue/res_config_view.xml
View File

@ -9,8 +9,11 @@
<field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml">
<group name="support" position="after">
<newline/>
<field name="fetchmail_issue"/>
<button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
<group attrs="{'invisible': [('fetchmail_issue','=',False)]}">
<button colspan="2" type="object" name="configure_fetchmail_issue" string="Configure" icon="gtk-execute"/>
</group>
</group>
</field>
</record>