[IMP]: confliction solved
bzr revid: han@tinyerp.com-20110726072552-fmu0a40ohew417qf
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
<field name="arch" type="xml">
|
||||
<form string="mailgate message">
|
||||
<group colspan="4" col="6">
|
||||
<field name="name" string="Subject" required="1" select="1" widget="char" size="512"/>
|
||||
<field name="name" string="Subject" select="1" widget="char" size="512"/>
|
||||
<field name="date" required="1" select="1"/>
|
||||
<field name="user_id" string="Owner" select="1"/>
|
||||
<field name="partner_id" readonly="1" />
|
||||
|
||||
Reference in New Issue
Block a user