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

[IMP] new form views 

bzr revid: fp@tinyerp.com-20120604212913-v4ys62ho3od0i8h3
This commit is contained in:
Fabien Pinckaers 2012-06-04 23:29:13 +02:00
parent 6e38414fe9
commit 4f9dfbd40b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/base_setup/base_setup_views.xml
View File

@ -45,25 +45,25 @@
<field name="model">sale.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Configure Sales" layout="manual">
<form string="Configure Sales">
<header>
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<sheet>
<group>
<group name="config_sale" colspan="4"/>
<!-- this part is necessary to allow the plugins to extend the view -->
<field name="module_crm" invisible="1"/>
<group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
<group name="config_fetchmail" colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm" colspan="4"/>
<group name="config_crm" colspan="2"/>
</group>
</sheet>
</form>

28
addons/base_setup/res_config_view.xml
View File

@ -6,24 +6,26 @@
<field name="model">base.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="General Settings" layout="manual">
<form string="General Settings">
<header>
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<separator string="Company Settings" colspan="4"/>
<field name="module_multi_company"/>
<group>
<group string="Company Settings">
<field name="module_multi_company"/>
</group>
<separator string="Others" colspan="4"/>
<label string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
<newline/>
<field name="module_share"/>
<newline/>
<field name="module_portal"/>
</sheet>
<group string="Others">
<label string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute"/>
</group>
<group string="External Accesses">
<field name="module_share"/>
<field name="module_portal"/>
</group>
</group>
</form>
</field>
</record>

2
addons/project/project.py
View File

@ -923,7 +923,6 @@ class task(base_stage, osv.osv):
def case_close(self, cr, uid, ids, context=None):
""" Closes Task """
request = self.pool.get('res.request')
if not isinstance(ids, list): ids = [ids]
for task in self.browse(cr, uid, ids, context=context):
vals = {}
@ -956,7 +955,6 @@ class task(base_stage, osv.osv):
return self.case_cancel(cr, uid, ids, context=context)
def case_cancel(self, cr, uid, ids, context=None):
request = self.pool.get('res.request')
tasks = self.browse(cr, uid, ids, context=context)
self._check_child_task(cr, uid, ids, context=context)
for task in tasks: