[MERGE]merge with lp:openobject-server

bzr revid: mma@tinyerp.com-20120523051840-a80t8z0fkfg127h4

openerp/addons/base/publisher_warranty/publisher_warranty.py

@@ -230,7 +230,7 @@ class publisher_warranty_contract(osv.osv):
         'date_stop' : fields.date('Ending Date', readonly=True),
         'state' : fields.selection([('unvalidated', 'Unvalidated'), ('valid', 'Valid')
                             , ('terminated', 'Terminated'), ('canceled', 'Canceled')], string="State", readonly=True),
-        'kind' : fields.char('Kind', size=64, readonly=True),
+        'kind' : fields.char('Contract Category', size=64, readonly=True),
         "check_support": fields.boolean("Support Level 1", readonly=True),
         "check_opw": fields.boolean("OPW", readonly=True, help="Checked if this is an OpenERP Publisher's Warranty contract (versus older contract types"),
     }

openerp/addons/base/res/res_partner.py

@@ -159,7 +159,7 @@ class res_partner(osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
+        'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
         'country_id': fields.many2one('res.country', 'Country'),
         'country': fields.related('country_id', type='many2one', relation='res.country', string='Country'),   # for backward compatibility
         'email': fields.char('E-Mail', size=240),

openerp/addons/base/res/res_partner_view.xml

@@ -502,7 +502,7 @@
                                             <table class="oe_kanban_table">
                                                 <tr>
                                                     <td class="oe_kanban_title1" align="left" valign="middle">
-                                                        <h4><a type="edit"><field name="name"/></a>
+                                                        <h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a>
                                                             <div t-if="record.parent_id.raw_value"><field name="parent_id"/></div>
                                                         </h4>
                                                             <i><div t-if="record.contact_address.raw_value"><field name="contact_address"/><br/></div>
@@ -545,7 +545,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{"search_default_customer":1}</field>
             <field name="search_view_id" ref="view_res_partner_filter"/>
             <field name="help">A customer is an entity you do business with, like a company or an organization. A customer can have several contacts or addresses which are the people working for this company. You can use the history tab, to follow all transactions related to a customer: sales order, emails, opportunities, claims, etc. If you use the email gateway, the Outlook or the Thunderbird plugin, don't forget to register emails to each contact so that the gateway will automatically attach incoming emails to the right partner.</field>
@@ -586,6 +586,7 @@
             <field name="res_model">res.partner</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{'search_default_supplier': 1,'default_customer': 0,'default_supplier': 1}</field>
             <field name="filter" eval="True"/>
             <field name="help">You can access all information regarding your suppliers from the supplier form: accounting data, history of emails, meetings, purchases, etc. You can uncheck the 'Suppliers' filter button in order to search in all your partners, including customers and prospects.</field>