odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20090529002437-1awxwm8mymp6hpnm
This commit is contained in:
Fabien Pinckaers 2009-05-29 02:24:37 +02:00
parent 0fdb1f7a02 7a561ffcd8
commit 1d42a31a57
34 changed files with 70 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/PKG-INFO
View File

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

2
bin/addons/base/i18n/ar_AR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:14:30+0000\n"
"PO-Revision-Date: 2009-05-20 10:14:30+0000\n"

2
bin/addons/base/i18n/base.pot
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:36:37+0000\n"
"PO-Revision-Date: 2009-05-20 10:36:37+0000\n"

2
bin/addons/base/i18n/bg_BG.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:15:53+0000\n"
"PO-Revision-Date: 2009-05-20 10:15:53+0000\n"

2
bin/addons/base/i18n/bs_BS.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:15:11+0000\n"
"PO-Revision-Date: 2009-05-20 10:15:11+0000\n"

2
bin/addons/base/i18n/ca_ES.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:16:35+0000\n"
"PO-Revision-Date: 2009-05-20 10:16:35+0000\n"

2
bin/addons/base/i18n/cs_CS.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:34:09+0000\n"
"PO-Revision-Date: 2009-05-20 10:34:09+0000\n"

2
bin/addons/base/i18n/cs_CZ.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:19:25+0000\n"
"PO-Revision-Date: 2009-05-20 10:19:25+0000\n"

2
bin/addons/base/i18n/de_DE.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:23:06+0000\n"
"PO-Revision-Date: 2009-05-20 10:23:06+0000\n"

2
bin/addons/base/i18n/es_AR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:30:53+0000\n"
"PO-Revision-Date: 2009-05-20 10:30:53+0000\n"

2
bin/addons/base/i18n/es_ES.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:31:42+0000\n"
"PO-Revision-Date: 2009-05-20 10:31:42+0000\n"

2
bin/addons/base/i18n/et_EE.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:21:36+0000\n"
"PO-Revision-Date: 2009-05-20 10:21:36+0000\n"

2
bin/addons/base/i18n/fr_FR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"

2
bin/addons/base/i18n/hr_HR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:18:42+0000\n"
"PO-Revision-Date: 2009-05-20 10:18:42+0000\n"

2
bin/addons/base/i18n/hu_HU.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:23:52+0000\n"
"PO-Revision-Date: 2009-05-20 10:23:52+0000\n"

2
bin/addons/base/i18n/it_IT.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:24:37+0000\n"
"PO-Revision-Date: 2009-05-20 10:24:37+0000\n"

2
bin/addons/base/i18n/lt_LT.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:25:25+0000\n"
"PO-Revision-Date: 2009-05-20 10:25:25+0000\n"

2
bin/addons/base/i18n/nl_BE.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:20:08+0000\n"
"PO-Revision-Date: 2009-05-20 10:20:08+0000\n"

2
bin/addons/base/i18n/nl_NL.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:20:52+0000\n"
"PO-Revision-Date: 2009-05-20 10:20:52+0000\n"

2
bin/addons/base/i18n/pl_PL.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:26:10+0000\n"
"PO-Revision-Date: 2009-05-20 10:26:10+0000\n"

2
bin/addons/base/i18n/pt_BR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:26:56+0000\n"
"PO-Revision-Date: 2009-05-20 10:26:56+0000\n"

2
bin/addons/base/i18n/pt_PT.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:27:41+0000\n"
"PO-Revision-Date: 2009-05-20 10:27:41+0000\n"

2
bin/addons/base/i18n/ro_RO.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:28:28+0000\n"
"PO-Revision-Date: 2009-05-20 10:28:28+0000\n"

2
bin/addons/base/i18n/ru_RU.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:29:15+0000\n"
"PO-Revision-Date: 2009-05-20 10:29:15+0000\n"

2
bin/addons/base/i18n/sl_SL.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:30:05+0000\n"
"PO-Revision-Date: 2009-05-20 10:30:05+0000\n"

2
bin/addons/base/i18n/sv_SE.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:32:30+0000\n"
"PO-Revision-Date: 2009-05-20 10:32:30+0000\n"

2
bin/addons/base/i18n/sv_SV.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:34:58+0000\n"
"PO-Revision-Date: 2009-05-20 10:34:58+0000\n"

2
bin/addons/base/i18n/tr_TR.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:33:21+0000\n"
"PO-Revision-Date: 2009-05-20 10:33:21+0000\n"

2
bin/addons/base/i18n/uk_UK.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:35:47+0000\n"
"PO-Revision-Date: 2009-05-20 10:35:47+0000\n"

2
bin/addons/base/i18n/zh_CN.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:17:16+0000\n"
"PO-Revision-Date: 2009-05-20 10:17:16+0000\n"

2
bin/addons/base/i18n/zh_TW.po
View File

@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Project-Id-Version: OpenERP Server 5.0.1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-05-19 14:18:00+0000\n"
"PO-Revision-Date: 2009-05-20 10:18:00+0000\n"

2
bin/osv/expression.py
View File

@ -251,7 +251,7 @@ class expression(object):
query = '(%s.%s %s (%s))' % (table._table, left, operator, instr)
if check_nulls:
query = '(%s OR %s IS NULL)' % (query, left)
query = '(%s OR %s.%s IS NULL)' % (query, table._table, left)
else:
params = []

4
bin/release.py
View File

@ -22,8 +22,8 @@
##############################################################################
name = 'openerp-server'
version = '5.0.0'
release = '3'
version = '5.0.1'
release = '0'
major_version = '5.0'
description = 'OpenERP Server'
long_desc = '''\

51
bin/tools/misc.py
View File

@ -305,6 +305,7 @@ def reverse_enumerate(l):
#----------------------------------------------------------
def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
attach=None, tinycrm=False, ssl=False, debug=False, subtype='plain', x_headers=None):
"""Send an email."""
import smtplib
from email.MIMEText import MIMEText
@ -314,6 +315,7 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
from email.Utils import formatdate, COMMASPACE
from email.Utils import formatdate, COMMASPACE
from email import Encoders
import netsvc
if x_headers is None:
x_headers = {}
@ -369,29 +371,48 @@ def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=Non
Encoders.encode_base64(part)
part.add_header('Content-Disposition', 'attachment; filename="%s"' % (fname,))
msg.attach(part)
class WriteToLogger(object):
def __init__(self):
self.logger = netsvc.Logger()
def write(self, s):
self.logger.notifyChannel('email_send', netsvc.LOG_DEBUG, s)
try:
oldstderr = smtplib.stderr
s = smtplib.SMTP()
try:
# in case of debug, the messages are printed to stderr.
if debug:
smtplib.stderr = WriteToLogger()
if debug:
s.debuglevel = 5
s.connect(config['smtp_server'], config['smtp_port'])
if ssl:
s.ehlo()
s.starttls()
s.ehlo()
s.set_debuglevel(int(bool(debug))) # 0 or 1
s.connect(config['smtp_server'], config['smtp_port'])
if ssl:
s.ehlo()
s.starttls()
s.ehlo()
if config['smtp_user'] or config['smtp_password']:
s.login(config['smtp_user'], config['smtp_password'])
if config['smtp_user'] or config['smtp_password']:
s.login(config['smtp_user'], config['smtp_password'])
s.sendmail(email_from,
flatten([email_to, email_cc, email_bcc]),
msg.as_string()
)
finally:
s.quit()
if debug:
smtplib.stderr = oldstderr
s.sendmail(email_from,
flatten([email_to, email_cc, email_bcc]),
msg.as_string()
)
s.quit()
except Exception, e:
import netsvc
netsvc.Logger().notifyChannel('email_send', netsvc.LOG_ERROR, e)
return False
return True
#----------------------------------------------------------