Merge lp:~openerp-dev/openobject-server/trunk-dev-framework into lp:openobject-server

[Harry (OpenERP)]

[Olivier Dony (Odoo) (odo-openerp)]

This is incorrect because it breaks the translation (and will never work):
  _('Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages)
it should be for example:
  _('Following modules are not installed or unknown: %s') % ('\n\n'+'\n'.join(unmet_packages))

For the creation of users, instead of overriding create() we should simple use _defaults, shouldn't we? The orm will automatically add _defaults in addition to provided values when create() is called, even if the client does not pass them. Wouldn't that work and be cleaner?

The rest is good, thanks!

review: Needs Fixing

[lp:~openerp-dev/openobject-server/trunk-dev-framework]

2260. By Harry (OpenERP) on 2010-11-04

[FIX] base: correct warning messages

2261. By Harry (OpenERP) on 2010-11-04

[FIX] base: remove override create method of res.users object.

[Harry (OpenERP) (hmo-tinyerp)]

> This is incorrect because it breaks the translation (and will never work):
> _('Following modules are uninstalled or unknown.
> \n\n'+'\n'.join(unmet_packages)
> it should be for example:
> _('Following modules are not installed or unknown: %s') %
> ('\n\n'+'\n'.join(unmet_packages))
Yes. thanks to notice.

>
> For the creation of users, instead of overriding create() we should simple use
> _defaults, shouldn't we? The orm will automatically add _defaults in addition
> to provided values when create() is called, even if the client does not pass
> them. Wouldn't that work and be cleaner?

Before defaults was not working, but now it seem work. so I removed overriding create() method.
Thanks

>
> The rest is good, thanks!

[lp:~openerp-dev/openobject-server/trunk-dev-framework]

2262. By Harry (OpenERP) on 2010-11-19

[MERGE]

=== modified file 'bin/addons/__init__.py'
--- bin/addons/__init__.py	2010-11-17 12:39:28 +0000
+++ bin/addons/__init__.py	2010-11-19 07:30:44 +0000
@@ -30,7 +30,7 @@
 import tools.osutil
 from tools.safe_eval import safe_eval as eval
 import pooler
-
+from tools.translate import _
 
 import netsvc
 
@@ -806,7 +806,7 @@
         graph = create_graph(cr, ['base'], force)
         if not graph:
             logger.notifyChannel('init', netsvc.LOG_CRITICAL, 'module base cannot be loaded! (hint: verify addons-path)')
-            raise osv.osv.except_osv('Could not load base module', 'module base cannot be loaded! (hint: verify addons-path)')
+            raise osv.osv.except_osv(_('Could not load base module'), _('module base cannot be loaded! (hint: verify addons-path)'))
         has_updates = load_module_graph(cr, graph, status, perform_checks=(not update_module), report=report)
 
         if update_module:

=== modified file 'bin/addons/base/i18n/base.pot'
--- bin/addons/base/i18n/base.pot	2010-11-18 16:28:37 +0000
+++ bin/addons/base/i18n/base.pot	2010-11-19 07:30:44 +0000
@@ -4392,6 +4392,7 @@
 #: code:addons/base/module/module.py:0
 #: code:addons/base/res/res_currency.py:0
 #: code:addons/base/res/res_user.py:0
+#: code:addons/base/res/ir_property.py:0
 #, python-format
 msgid "Error"
 msgstr ""
@@ -5858,6 +5859,7 @@
 
 #. module: base
 #: code:addons/base/module/wizard/base_module_import.py:0
+#: code:addons/base/ir/ir_values.py:
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -8956,3 +8958,51 @@
 msgid "Russian / русский язык"
 msgstr ""
 
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:0
+#, python-format
+msgid "Unmet dependency !"
+msgstr ""
+
+#. module: base
+#: code:addons/base/module/wizard/base_module_upgrade.py:0
+#, python-format
+msgid "Following modules are not installed or unknown: %s"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "Invalid search criterions"
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_model.py:0
+#, python-format
+msgid "The osv_memory field can only be compared with = and != operator."
+msgstr ""
+
+#. module: base
+#: code:addons/base/ir/ir_values.py:0
+#, python-format
+msgid "You do not have the permission to perform this operation !!!"
+msgstr ""
+
+#. module: base
+#: code:addons/base/res/ir_property.py:0
+#, python-format
+msgid "Invalid type"
+msgstr ""
+
+#. module: base
+#: code:addons/__init__.py:0
+#, python-format
+msgid "Could not load base module"
+msgstr ""
+
+#. module: base
+#: code:addons/__init__.py:0
+#, python-format
+msgid "module base cannot be loaded! (hint: verify addons-path)"
+msgstr ""
+

=== modified file 'bin/addons/base/ir/ir_actions.py'
--- bin/addons/base/ir/ir_actions.py	2010-10-22 07:59:35 +0000
+++ bin/addons/base/ir/ir_actions.py	2010-11-19 07:30:44 +0000
@@ -485,7 +485,7 @@
         for field in fields:
             try:
                 obj = getattr(obj, field)
-            except Exception,e :
+            except Exception:
                 logger.notifyChannel('Workflow', netsvc.LOG_ERROR, 'Failed to parse : %s' % (field))
 
         return obj
@@ -506,7 +506,7 @@
         for field in fields:
             try:
                 obj = getattr(obj, field)
-            except Exception,e :
+            except Exception:
                 logger.notifyChannel('Workflow', netsvc.LOG_ERROR, 'Failed to parse : %s' % (field))
 
         return obj
@@ -514,7 +514,6 @@
     def merge_message(self, cr, uid, keystr, action, context=None):
         if context is None:
             context = {}
-        logger = netsvc.Logger()
         def merge(match):
             obj_pool = self.pool.get(action.model_id.model)
             id = context.get('active_id')

=== modified file 'bin/addons/base/ir/ir_model.py'
--- bin/addons/base/ir/ir_model.py	2010-10-20 17:17:39 +0000
+++ bin/addons/base/ir/ir_model.py	2010-11-19 07:30:44 +0000
@@ -57,7 +57,7 @@
             return []
         field, operator, value = domain[0]
         if operator not in ['=', '!=']:
-            raise osv.except_osv('Invalid search criterions','The osv_memory field can only be compared with = and != operator.')
+            raise osv.except_osv(_('Invalid search criterions'), _('The osv_memory field can only be compared with = and != operator.'))
         value = bool(value) if operator == '=' else not bool(value)
         all_model_ids = self.search(cr, uid, [], context=context)
         is_osv_mem = self._is_osv_memory(cr, uid, all_model_ids, 'osv_memory', arg=None, context=context)

=== modified file 'bin/addons/base/module/wizard/base_module_upgrade.py'
--- bin/addons/base/module/wizard/base_module_upgrade.py	2010-10-04 14:33:36 +0000
+++ bin/addons/base/module/wizard/base_module_upgrade.py	2010-11-19 07:30:44 +0000
@@ -93,7 +93,7 @@
                 if dep_mod.state in ('unknown','uninstalled'):
                     unmet_packages.append(dep_mod.name)
         if len(unmet_packages):
-            raise osv.except_osv('Unmet dependency !', 'Following modules are uninstalled or unknown. \n\n'+'\n'.join(unmet_packages))
+            raise osv.except_osv(_('Unmet dependency !'), _('Following modules are not installed or unknown: %s') % ('\n\n' + '\n'.join(unmet_packages)))
         mod_obj.download(cr, uid, ids, context=context)
         cr.commit()
         _, pool = pooler.restart_pool(cr.dbname, update_module=True)

=== modified file 'bin/addons/base/res/partner/partner.py'
--- bin/addons/base/res/partner/partner.py	2010-10-18 13:26:58 +0000
+++ bin/addons/base/res/partner/partner.py	2010-11-19 07:30:44 +0000
@@ -23,7 +23,6 @@
 
 from osv import fields,osv
 import tools
-import ir
 import pooler
 from tools.translate import _
 

=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2010-11-16 12:53:38 +0000
+++ bin/addons/base/res/res_user.py	2010-11-19 07:30:44 +0000
@@ -265,7 +265,7 @@
     ]
 
     _sql_constraints = [
-        ('login_key', 'UNIQUE (login)',  _('You can not have two users with the same login !'))
+        ('login_key', 'UNIQUE (login)',  'You can not have two users with the same login !')
     ]
 
     def _get_email_from(self, cr, uid, ids, context=None):

=== modified file 'bin/report/printscreen/ps_list.py'
--- bin/report/printscreen/ps_list.py	2010-10-04 13:55:30 +0000
+++ bin/report/printscreen/ps_list.py	2010-11-19 07:30:44 +0000
@@ -139,7 +139,6 @@
         _append_node('header-date', str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")))
         l = []
         t = 0
-        rowcount = 0;
         strmax = (pageSize[0]-40) * 2.8346
         temp = []
         tsum = []

=== modified file 'bin/report/report_sxw.py'
--- bin/report/report_sxw.py	2010-11-02 08:22:50 +0000
+++ bin/report/report_sxw.py	2010-11-19 07:30:44 +0000
@@ -204,13 +204,10 @@
                 return res['datas']
             else :
                 return ''
-        except Exception,e:
+        except Exception:
             return ''
 
     def setLang(self, lang):
-        if not lang or self.default_lang.has_key(lang):
-            if not lang:
-                key = 'en_US'
         self.localcontext['lang'] = lang
         self.lang_dict_called = False
         for obj in self.objects:
@@ -519,7 +516,6 @@
                               xml_declaration=True)
 
         rml_dom =  etree.XML(rml)
-        body = rml_dom[-1]
         elements = []
         key1 = rml_parser.localcontext['name_space']["text"]+"p"
         key2 = rml_parser.localcontext['name_space']["text"]+"drop-down"