diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index 6438fdd2e34..2b1e489b337 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-11 04:20+0000\n" -"Last-Translator: doingit.cl \n" +"PO-Revision-Date: 2011-06-06 17:53+0000\n" +"Last-Translator: Hector Rojas (doingIT.cl) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-12 04:34+0000\n" +"X-Launchpad-Export-Date: 2011-06-07 04:35+0000\n" "X-Generator: Launchpad (build 12959)\n" #. module: base @@ -58,7 +58,7 @@ msgstr "Metadatos" #: field:ir.ui.view,arch:0 #: field:ir.ui.view.custom,arch:0 msgid "View Architecture" -msgstr "Código vista" +msgstr "Estructura de la vista" #. module: base #: field:base.language.import,code:0 diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py index 02aa8f4a8fe..4092bf35b2f 100644 --- a/openerp/addons/base/ir/ir_translation.py +++ b/openerp/addons/base/ir/ir_translation.py @@ -44,15 +44,10 @@ class ir_translation(osv.osv): _log_access = False def _get_language(self, cr, uid, context): - lang_obj = self.pool.get('res.lang') - lang_ids = lang_obj.search(cr, uid, [('translatable', '=', True)], - context=context) - langs = lang_obj.browse(cr, uid, lang_ids, context=context) - res = [(lang.code, lang.name) for lang in langs] - for lang_dict in tools.scan_languages(): - if lang_dict not in res: - res.append(lang_dict) - return res + lang_model = self.pool.get('res.lang') + lang_ids = lang_model.search(cr, uid, [('translatable', '=', True)], context=context) + lang_data = lang_model.read(cr, uid, lang_ids, ['code', 'name'], context=context) + return [(d['code'], d['name']) for d in lang_data] _columns = { 'name': fields.char('Field Name', size=128, required=True), diff --git a/openerp/addons/base/res/partner/crm.py b/openerp/addons/base/res/partner/crm.py index 22ae27bcaae..d7decade3ca 100644 --- a/openerp/addons/base/res/partner/crm.py +++ b/openerp/addons/base/res/partner/crm.py @@ -20,8 +20,8 @@ ############################################################################## import time -from osv import fields,osv - +from osv import osv +from osv import fields # # Sale/Purchase Canal, Media @@ -31,7 +31,7 @@ class res_partner_canal(osv.osv): _description = "Channels" _order = 'name' _columns = { - 'name': fields.char('Channel Name',size=64, required=True), + 'name': fields.char('Channel Name', size=64, required=True), 'active': fields.boolean('Active'), } _defaults = { @@ -39,16 +39,10 @@ class res_partner_canal(osv.osv): } res_partner_canal() -def _links_get(self, cr, uid, context={}): - obj = self.pool.get('res.request.link') - ids = obj.search(cr, uid, []) - res = obj.read(cr, uid, ids, ['object', 'name'], context) - return [(r['object'], r['name']) for r in res] - class res_partner_event(osv.osv): _name = "res.partner.event" _columns = { - 'name': fields.char('Events',size=64, required=True), + 'name': fields.char('Events', size=64, required=True), 'description': fields.text('Description'), 'partner_id': fields.many2one('res.partner', 'Partner', select=True), 'date': fields.datetime('Date', size=16), @@ -61,5 +55,4 @@ class res_partner_event(osv.osv): } res_partner_event() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/addons/base/res/res_company.py b/openerp/addons/base/res/res_company.py index bb281b9c0ea..a93b4f8d723 100644 --- a/openerp/addons/base/res/res_company.py +++ b/openerp/addons/base/res/res_company.py @@ -188,40 +188,27 @@ class res_company(osv.osv): tools.config['root_path'], '..', 'pixmaps', 'openerp-header.png'), 'rb') .read().encode('base64') - def _get_header3(self,cr,uid,ids): - return """ + _header = """
- + - [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]] + [[ formatLang(time.strftime("%%Y-%%m-%%d"), date=True) ]] [[ time.strftime("%%H:%%M") ]] - [[ company.partner_id.name ]] + [[ company.partner_id.name ]] - 25 550 818 550 + %s - -
""" - def _get_header2(self,cr,uid,ids): - return """ -
- - - - - - - [[ formatLang(time.strftime("%Y-%m-%d"), date=True) ]] [[ time.strftime("%H:%M") ]] - - [[ company.partner_id.name ]] - - 1.0cm 28.1cm 20.1cm 28.1cm - - +
""" + + _header2 = _header % (539, 772, "1.0cm", "28.3cm", "11.1cm", "28.3cm", "1.0cm 28.1cm 20.1cm 28.1cm") + + _header3 = _header % (786, 525, 25, 555, 440, 555, "25 550 818 550") + def _get_header(self,cr,uid,ids): try : header_file = tools.file_open(os.path.join('base', 'report', 'corporate_rml_header.rml')) @@ -267,8 +254,8 @@ class res_company(osv.osv): _defaults = { 'currency_id': _get_euro, 'rml_header':_get_header, - 'rml_header2': _get_header2, - 'rml_header3': _get_header3, + 'rml_header2': _header2, + 'rml_header3': _header3, #'logo':_get_logo } diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py index f9a7bd00dc5..b23180aec0a 100644 --- a/openerp/addons/base/res/res_lang.py +++ b/openerp/addons/base/res/res_lang.py @@ -50,9 +50,9 @@ class lang(osv.osv): if not lang: return False lang_ids = self.search(cr, uid, [('code','=', lang)]) - ir_values_obj = self.pool.get('ir.values') if not lang_ids: - lang_id = self.load_lang(cr, uid, lang) + self.load_lang(cr, uid, lang) + ir_values_obj = self.pool.get('ir.values') default_value = ir_values_obj.get(cr, uid, 'default', False, ['res.partner']) if not default_value: ir_values_obj.set(cr, uid, 'default', False, 'lang', ['res.partner'], lang) diff --git a/openerp/addons/base/res/res_widget.py b/openerp/addons/base/res/res_widget.py index 81be708a331..71bdd85fc21 100644 --- a/openerp/addons/base/res/res_widget.py +++ b/openerp/addons/base/res/res_widget.py @@ -38,7 +38,7 @@ class res_widget_user(osv.osv): _order = "sequence" _columns = { 'sequence': fields.integer('Sequence'), - 'user_id': fields.many2one('res.users','User', select=1), + 'user_id': fields.many2one('res.users','User', select=1, ondelete='cascade'), 'widget_id': fields.many2one('res.widget','Widget',required=True, ondelete='cascade'), } diff --git a/openerp/service/netrpc_server.py b/openerp/service/netrpc_server.py index e3c181d4a8c..ac3cd724a45 100644 --- a/openerp/service/netrpc_server.py +++ b/openerp/service/netrpc_server.py @@ -87,11 +87,15 @@ class TinySocketClientThread(threading.Thread, netsvc.OpenERPDispatcher): tb_s = "".join(traceback.format_exception(*tb)) logging.getLogger('web-services').debug("netrpc: communication-level exception", exc_info=True) ts.mysend(e, exception=True, traceback=tb_s) + break except Exception, ex: #terminate this channel if we can't properly send back the error logging.getLogger('web-services').exception("netrpc: cannot deliver exception message to client") break + self.sock.shutdown(socket.SHUT_RDWR) + self.sock.close() + self.sock = None self.threads.remove(self) self.running = False return True diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 5761ba87cc0..c9f69512264 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -864,7 +864,6 @@ def trans_load_data(cr, fileobj, fileformat, lang, lang_name=None, verbose=True, pool = pooler.get_pool(db_name) lang_obj = pool.get('res.lang') trans_obj = pool.get('ir.translation') - model_data_obj = pool.get('ir.model.data') iso_lang = misc.get_iso_codes(lang) try: uid = 1 diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py index 2b6c0815e0d..ff4029d1f15 100644 --- a/openerp/tools/yaml_import.py +++ b/openerp/tools/yaml_import.py @@ -105,7 +105,7 @@ class TestReport(object): success += self._report[severity][True] failure += self._report[severity][False] res.append("total\t%s\t%s" % (success, failure)) - res.append("end of report (%s assertion(s) checked)" % success + failure) + res.append("end of report (%s assertion(s) checked)" % (success + failure)) return "\n".join(res) class RecordDictWrapper(dict):