Merge branch 'official-trunk' into deb-scripts

bzr revid: xrg@openerp.com-20110117111022-qmkv7jpo448iwvyh

bin/addons/base/res/partner/partner_view.xml

@@ -108,7 +108,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.address</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_customer":1,"search_default_partner_id":self}</field>
+            <field name="context">{"search_default_customer":1}</field>
             <field name="search_view_id" ref="view_res_partner_address_filter"/>
             <field name="help">Customers (also called Partners in other areas of the system) helps you manage your address book of companies whether they are prospects, customers and/or suppliers. The partner form allows you to track and record all the necessary information to interact with your partners from the company address to their contacts as well as pricelists, and much more. If you installed the CRM, with the history tab, you can track all the interactions with a partner such as opportunities, emails, or sales orders issued.</field>
         </record>

bin/addons/base/res/res_company.py

@@ -81,9 +81,9 @@ class res_company(osv.osv):
         'rml_header1': fields.char('Report Header', size=200),
         'rml_footer1': fields.char('Report Footer 1', size=200),
         'rml_footer2': fields.char('Report Footer 2', size=200),
-        'rml_header' : fields.text('RML Header'),
-        'rml_header2' : fields.text('RML Internal Header'),
-        'rml_header3' : fields.text('RML Internal Header'),
+        'rml_header' : fields.text('RML Header', required=True),
+        'rml_header2' : fields.text('RML Internal Header', required=True),
+        'rml_header3' : fields.text('RML Internal Header', required=True),
         'logo' : fields.binary('Logo'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'currency_ids': fields.one2many('res.currency', 'company_id', 'Currency'),

bin/osv/osv.py

@@ -340,7 +340,12 @@ class osv(osv_base, orm.orm):
                                 exist = False
                                 for c2 in range(len(new)):
                                      #For _constraints, we should check field and methods as well
-                                     if new[c2][2]==c[2] and new[c2][0]==c[0]:
+                                     if new[c2][2]==c[2] and (new[c2][0] == c[0] \
+                                            or getattr(new[c2][0],'__name__', True) == \
+                                                getattr(c[0],'__name__', False)):
+                                        # If new class defines a constraint with
+                                        # same function name, we let it override
+                                        # the old one.
                                         new[c2] = c
                                         exist = True
                                         break