[MERGE] merged with main server

bzr revid: bde@tinyerp.com-20121025110526-px4l6quqgszdmsf8

openerp/addons/base/ir/ir_attachment.py

@@ -57,7 +57,7 @@ class ir_attachment(osv.osv):
     def _search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False, access_rights_uid=None):
         ids = super(ir_attachment, self)._search(cr, uid, args, offset=offset,
                                                  limit=limit, order=order,
-                                                 context=context, count=count,
+                                                 context=context, count=False,
                                                  access_rights_uid=access_rights_uid)
         if not ids:
             if count:

openerp/addons/base/module/module.py

@@ -418,13 +418,12 @@ class module(osv.osv):
         _, pool = pooler.restart_pool(cr.dbname, update_module=True)
 
         config = pool.get('res.config').next(cr, uid, [], context=context) or {}
-        if config.get('type') not in ('ir.actions.reload', 'ir.actions.act_window_close'):
+        if config.get('type') not in ('ir.actions.act_window_close',):
             return config
 
         # reload the client; open the first available root menu
         menu_obj = self.pool.get('ir.ui.menu')
         menu_ids = menu_obj.search(cr, uid, [('parent_id', '=', False)], context=context)
-
         return {
             'type' : 'ir.actions.client',
             'tag' : 'reload',

openerp/addons/base/res/res_partner.py

@@ -186,7 +186,7 @@ class res_partner(osv.osv, format_address):
         'name': fields.char('Name', size=128, required=True, select=True),
         'date': fields.date('Date', select=1),
         'title': fields.many2one('res.partner.title', 'Title'),
-        'parent_id': fields.many2one('res.partner', 'Company'),
+        'parent_id': fields.many2one('res.partner', 'Related Company'),
         'child_ids': fields.one2many('res.partner', 'parent_id', 'Contacts'),
         'ref': fields.char('Reference', size=64, select=1),
         'lang': fields.selection(_lang_get, 'Language',
@@ -229,7 +229,7 @@ class res_partner(osv.osv, format_address):
         'fax': fields.char('Fax', size=64),
         'mobile': fields.char('Mobile', size=64),
         'birthdate': fields.char('Birthdate', size=64),
-        'is_company': fields.boolean('Company', help="Check if the contact is a company, otherwise it is a person"),
+        'is_company': fields.boolean('Is a Company', help="Check if the contact is a company, otherwise it is a person"),
         'use_parent_address': fields.boolean('Use Company Address', help="Select this if you want to set company's address information  for this contact"),
         # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",

openerp/addons/base/res/res_users.py

@@ -487,6 +487,13 @@ class res_users(osv.osv):
             'tag': 'reload',
         }
 
+    def preference_change_password(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'change_password',
+            'target': 'new',
+        }
+
     def has_group(self, cr, uid, group_ext_id):
         """Checks whether user belongs to given group.
 

openerp/addons/base/res/res_users_view.xml

@@ -213,7 +213,8 @@
                         <field name="signature" readonly="0"/>
                     </group>
                     <footer>
-                        <button name="preference_save" type="object" class="oe_highlight" string="Save"/>
+                        <button name="preference_change_password" type="object" string="Change password"/>
+                        <button name="preference_save" type="object" string="Save"/>
                         or
                         <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
                     </footer>

openerp/tools/misc.py

@@ -597,7 +597,7 @@ def get_iso_codes(lang):
 
 ALL_LANGUAGES = {
         'ab_RU': u'Abkhazian / аҧсуа',
-        'ar_AR': u'Arabic / الْعَرَبيّة',
+        'ar_SY': u'Arabic / الْعَرَبيّة',
         'bg_BG': u'Bulgarian / български език',
         'bs_BS': u'Bosnian / bosanski jezik',
         'ca_ES': u'Catalan / Català',