pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PROJECT : bugfix and better layout

Browse Source 
bzr revid: bch-09c4abdedf4600babdc9347a2467889f2f8f7b79
This commit is contained in:
bch
2007-05-11 13:08:35 +00:00
parent dc28620227
commit b595666f82
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project.py
+1 -1
View File
@@ -228,7 +228,7 @@ class task(osv.osv):
tasks = self.browse(cr, uid, ids)
for task in tasks:
project = task.project_id
if project.warn_manager and project.manager.id and (project.manager.id != uid):
if project and project.warn_manager and project.manager.id and (project.manager.id != uid):
request.create(cr, uid, {
'name': "Task '%s' reopened" % task.name,
'state': 'waiting',
addons/project/project_view.xml
+9 -9
View File
@@ -73,15 +73,15 @@
<field name="effective_hours"/>
<separator string="Description" colspan="4"/>
<field name="description" colspan="4" nolabel="1"/>
<field name="state" select="1"/>
<group colspan="2" col="4">
<button string="Finish" name="%(wizard_close_task)d" states="open,progress" type="action"/>
<button string="Re-open" name="do_reopen" states="done,cancel" type="object"/>
<button string="Cancel" name="do_cancel" states="open,progress" type="object"/>
<button string="Open task" name="do_open" states="draft" type="object"/>
<button string="Set to draft" name="do_draft" states="open" type="object"/>
<button string="Start of work" name="do_start" states="open" type="object"/>
<button string="End of work" name="do_end" states="progress" type="object"/>
<group col="11" colspan="4">
<field name="state" select="1"/>
<button name="do_draft" string="Set to draft" states="open" type="object"/>
<button name="do_open" string="Open task" states="pending,draft" type="object"/>
<button name="do_reopen" string="Re-open" states="done,cancelled" type="object"/>
<button name="do_pending" states="open" string="Set pending" type="object"/>
<button name="%(wizard_close_task)d" states="pending,open" string="Done" type="action"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
</group>
</page>
<page string="Work done">
addons/project/wizard/close_task.py
+1 -1
View File
@@ -69,7 +69,7 @@ def email_send(cr, uid, ids, to_adr, description, context={}):
class wizard_close(wizard.interface):
def _check_complete(self, cr, uid, data, context):
task = pooler.get_pool(cr.dbname).get('project.task').browse(cr, uid, data['ids'])[0]
if not task.project_id.warn_customer:
if not (task.project_id and task.project_id.warn_customer):
return 'close'
return 'mail_ask'