merge

bzr revid: nch@tinyerp.com-20081201045230-0ftwb1vgysz4vmuu

bin/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: OpenERP
-Version: 5.0.0-alpha
+Version: 5.0.0-rc1
 Author: Tiny.be
 Author-email: fp at tiny be
 Maintainer: Tiny.be

bin/addons/base/__terp__.py

@@ -32,7 +32,7 @@
         "base_menu.xml",
         "security/base_security.xml",
         "res/res_security.xml",
-        "maintenance/maintenance_security.xml",
+        #"maintenance/maintenance_security.xml",
     ],
     "demo_xml" : [
         "base_demo.xml",
@@ -60,7 +60,7 @@
         "res/partner/partner_data.xml",
         "res/ir_property_view.xml",
         "security/base_security.xml",
-        "maintenance/maintenance_view.xml",
+        #"maintenance/maintenance_view.xml",
         "security/ir.model.access.csv",
     ],
     "active": True,

bin/addons/base/ir/ir_actions.py

@@ -577,7 +577,7 @@ class ir_actions_todo(osv.osv):
     _name = 'ir.actions.todo'    
     _columns={
         'name':fields.char('Name',size=64,required=True, select=True),
-        'note':fields.text('Text'),
+        'note':fields.text('Text', translate=True),
         'start_date': fields.datetime('Start Date'),
         'end_date': fields.datetime('End Date'),
         'action_id':fields.many2one('ir.actions.act_window', 'Action', select=True,required=True, ondelete='cascade'),

bin/addons/base/maintenance/maintenance.py

@@ -105,7 +105,7 @@ your installed modules.
                 raise osv.except_osv(_('Valid Maintenance Contract !'),('''Your Maintenance Contract is up to date'''))
         return result
 
-maintenance_contract()
+#maintenance_contract()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

bin/addons/base/security/ir.model.access.csv

@@ -127,4 +127,3 @@
 "access_res_config_view_all","res_config_view_all","model_res_config_view",,1,0,0,0
 "access_res_bank_group_partner_manager","res_bank_group_partner_manager","model_res_bank","group_partner_manager",1,1,1,1
 "access_res_bank_user","res_bank user","model_res_bank","group_user",1,0,0,0
-"access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_maintenance_manager",1,1,1,1

bin/addons/base/security/ir.model.access.csv_for_maintenance

@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_maintenance_group_user","maintenance_contract group_user","model_maintenance_contract","group_maintenance_manager",1,1,1,1
+

bin/osv/orm.py

@@ -784,7 +784,9 @@ class orm_template(object):
                     for f in node.childNodes:
                         if f.nodeType == f.ELEMENT_NODE and f.localName in ('form', 'tree', 'graph'):
                             node.removeChild(f)
-                            xarch, xfields = self.pool.get(relation).__view_look_dom_arch(cr, user, f, context)
+                            ctx = context.copy()
+                            ctx['base_model_name'] = self._name
+                            xarch, xfields = self.pool.get(relation).__view_look_dom_arch(cr, user, f, ctx)
                             views[str(f.localName)] = {
                                 'arch': xarch,
                                 'fields': xfields
@@ -823,6 +825,8 @@ class orm_template(object):
             if ('lang' in context) and not result:
                 if node.hasAttribute('string') and node.getAttribute('string'):
                     trans = tools.translate(cr, self._name, 'view', context['lang'], node.getAttribute('string').encode('utf8'))
+                    if not trans and ('base_model_name' in context):
+                        trans = tools.translate(cr, context['base_model_name'], 'view', context['lang'], node.getAttribute('string').encode('utf8'))
                     if trans:
                         node.setAttribute('string', trans.decode('utf8'))
                 if node.hasAttribute('sum') and node.getAttribute('sum'):
@@ -836,8 +840,6 @@ class orm_template(object):
         return fields
 
     def __view_look_dom_arch(self, cr, user, node, context=None):
-        if not context:
-            context = {}
         fields_def = self.__view_look_dom(cr, user, node, context=context)
 
         buttons = xpath.Evaluate('//button', node)

bin/release.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 name = 'openerp-server'
-version = '5.0.0-alpha'
+version = '5.0.0-rc1'
 description = 'OpenERP Server'
 long_desc = '''\
 OpenERP is a complete ERP and CRM. The main features are accounting (analytic
@@ -33,7 +33,7 @@ customizable reports, and SOAP and XML-RPC interfaces.
 '''
 classifiers = """\
 Development Status :: 5 - Production/Stable
-License :: OSI Approved :: GNU General Public License Version 2 (GPL-2)
+License :: OSI Approved :: GNU General Public License Version 3 (GPL-3)
 Programming Language :: Python
 """
 url = 'http://www.openerp.com'

bin/tools/translate.py

@@ -483,7 +483,7 @@ def trans_load(db_name, filename, lang, strict=False, verbose=True):
         return r
     except IOError:
         if verbose:
-            logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read file")
+            logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read translation file %s" % (filename,)) # FIXME translate message
         return None
 
 def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=None, verbose=True):
@@ -604,7 +604,8 @@ def trans_load_data(db_name, fileobj, fileformat, lang, strict=False, lang_name=
             logger.notifyChannel("init", netsvc.LOG_INFO,
                     "translation file loaded succesfully")
     except IOError:
-        logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read file")
+        filename = '[lang: %s][format: %s]' % (lang or 'new', fileformat)
+        logger.notifyChannel("init", netsvc.LOG_ERROR, "couldn't read translation file %s" % (filename,))
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

setup.py

@@ -36,7 +36,9 @@ from stat import ST_MODE
 
 from distutils.core import setup, Command
 from distutils.command.install import install
-#from distutils.command.install_scripts import install_scripts
+from distutils.command.build import build
+from distutils.command.build_scripts import build_scripts
+from distutils.command.install_scripts import install_scripts
 from distutils.file_util import copy_file
 
 if os.name == 'nt':
@@ -148,9 +150,15 @@ def data_files():
 
 check_modules()
 
+f = file('openerp-server','w')
+start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage" """
+f.write(start_script)
+f.close()
 
 class openerp_server_install(install):
     def run(self):
+        from pprint import pprint as pp
+        pp(self.__dict__)
         # create startup script
         start_script = "#!/bin/sh\ncd %s\nexec %s ./openerp-server.py $@\n" % (opj(self.install_libbase, "openerp-server"), sys.executable)
         # write script
@@ -182,7 +190,9 @@ setup(name             = name,
       classifiers      = filter(None, classifiers.split("\n")),
       license          = license,
       data_files       = data_files(),
-      cmdclass         = { 'install' : openerp_server_install },
+      cmdclass         = { 
+            'install' : openerp_server_install,
+      },
       scripts          = ['openerp-server'],
       packages         = ['openerp-server', 
                           'openerp-server.addons',