Merged

bzr revid: hda@tinyerp.com-20100315063314-ps3trhvtyjn9h1c0

bin/addons/base/rng/view.rng

@@ -128,7 +128,7 @@
             <rng:attribute name="name"/>
         </rng:element>
     </rng:define>
-    
+
     <rng:define name="html">
         <rng:element name="html">
         	<rng:zeroOrMore>
@@ -178,7 +178,7 @@
             <rng:oneOrMore>
                 <rng:optional><rng:ref name="field"/></rng:optional>
             </rng:oneOrMore>
-            <rng:zeroOrMore>                
+            <rng:zeroOrMore>
                 <rng:optional><rng:ref name="html"/></rng:optional>
             </rng:zeroOrMore>
         </rng:element>
@@ -396,6 +396,7 @@
             <rng:optional><rng:attribute name="rowspan"/></rng:optional>
             <rng:optional><rng:attribute name="align"/></rng:optional>
             <rng:optional><rng:attribute name="selection"/></rng:optional>
+            <rng:optional><rng:attribute name="default_focus"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="diagram"/>
@@ -469,7 +470,7 @@
             <rng:oneOrMore>
                 <rng:ref name="field"/>
             </rng:oneOrMore>
-            <rng:zeroOrMore>                
+            <rng:zeroOrMore>
                 <rng:optional><rng:ref name="html"/></rng:optional>
             </rng:zeroOrMore>
         </rng:element>
@@ -482,9 +483,9 @@
             <rng:optional><rng:attribute name="type" /></rng:optional>
             <rng:optional><rng:attribute name="color"/></rng:optional>
             <rng:oneOrMore>
-                <rng:ref name="field"/>               
+                <rng:ref name="field"/>
             </rng:oneOrMore>
-            <rng:zeroOrMore>                
+            <rng:zeroOrMore>
                 <rng:optional><rng:ref name="html"/></rng:optional>
             </rng:zeroOrMore>
         </rng:element>
@@ -509,6 +510,7 @@
             <rng:optional><rng:attribute name="context"/></rng:optional>
             <rng:optional><rng:attribute name="confirm"/></rng:optional>
             <rng:optional><rng:attribute name="help"/></rng:optional>
+            <rng:optional><rng:attribute name="default_focus"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="attribute" />

bin/osv/orm.py

@@ -1514,6 +1514,10 @@ class orm_template(object):
                 'action': resaction,
                 'relate': resrelate
             }
+        if result['type']=='form' and result['arch'].count("default_focus")>1:
+                msg = "Form View contain more than one default_focus attribute"
+                netsvc.Logger().notifyChannel('orm', netsvc.LOG_ERROR, msg)
+                raise except_orm('View Error !',msg)
         return result
 
     _view_look_dom_arch = __view_look_dom_arch