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

modifs 

bzr revid: fp@tinyerp.com-20081022203205-0bo70put3r6wmtto
This commit is contained in:
Fabien Pinckaers 2008-10-22 22:32:05 +02:00
parent 6938193800
commit e7a262ab36
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/addons/base/ir/workflow/workflow_view.xml
View File

@ -43,13 +43,13 @@
<field name="view_id" ref="view_workflow_tree"/>
</record>
<menuitem action="action_workflow_form" id="menu_workflow" parent="base.menu_workflow_root"/>
<!--
================================
Activities
================================
-->
================================
Activities
================================
-->
<record id="view_workflow_activity_form" model="ir.ui.view">
<field name="name">workflow.activity.form</field>
<field name="model">workflow.activity</field>
@ -59,9 +59,9 @@
<field colspan="4" name="name" select="1"/>
<field name="wkf_id" select="1"/>
<field name="kind" select="1"/>
<field name="action" select="1"/>
<field name="action_id" select="1"/>
<field name="subflow_id"/>
<field name="action_id" select="1" colspan="4"/>
<field name="action" select="1" colspan="4" attrs="{'readonly':[('kind','=','dummy')]}"/>
<field name="subflow_id" attrs="{'readonly':[('kind','&lt;&gt;','subflow')]}"/>
<field name="signal_send"/>
<newline/>
<field name="flow_start"/>
@ -77,9 +77,7 @@
<field name="condition"/>
<field name="trigger_model"/>
<field name="trigger_expr_id"/>
</tree>
</field>
<separator colspan="4" string="Incoming transitions"/>
<field colspan="4" name="in_transitions" nolabel="1">

4
bin/osv/osv.py
View File

@ -158,11 +158,9 @@ class osv_pool(netsvc.Service):
module = module.split('.')[0][2:]
self.module_object_list.setdefault(module, []).append(obj_inst)
# Return False if object does not exist
def get(self, name):
obj = self.obj_pool.get(name, None)
# We cannot uncomment this line because it breaks initialisation since objects do not initialize
# in the correct order and the ORM doesnt support correctly when some objets do not exist yet
# assert obj, "object %s does not exist !" % name
return obj
#TODO: pass a list of modules to load