[MERGE] merged from sbh local branch

bzr revid: hmo@tinyerp.com-20101207102753-085jlu3mln64dc73
This commit is contained in:
Harry (OpenERP)
2010-12-07 15:57:53 +05:30
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -316,7 +316,7 @@
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
</page>
<page string="History" groups="base.group_extended">
<page string="History" groups="base.group_extended" invisible="True">
</page>
<page string="Notes">
<field colspan="4" name="comment" nolabel="1"/>
+1
View File
@@ -311,6 +311,7 @@
<rng:optional><rng:attribute name="string"/></rng:optional>
<rng:optional><rng:attribute name="name"/></rng:optional>
<rng:optional><rng:attribute name="attrs"/></rng:optional>
<rng:optional><rng:attribute name="invisible"/></rng:optional>
<rng:zeroOrMore>
<rng:choice>
<rng:element name="newline"><rng:empty/></rng:element>