pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Upstream merge.

Browse Source 
bzr revid: jth@openerp.com-20100402143151-23zxvth1lar0l3vl
bzr revid: jth@openerp.com-20100404211011-zbb72zc1pxmrm1rs
This commit is contained in:
Julien Thewys
2010-04-04 23:10:11 +02:00
parent 790f32d9d0 ed2c762bc7
commit 65e5fc06c2
9 changed files with 97 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/i18n/bg.po
+8
View File
@@ -8,20 +8,28 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:19+0000\n"
=======
"PO-Revision-Date: 2010-03-31 08:05+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:11+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/hr.po
+16
View File
@@ -8,20 +8,36 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:36+0000\n"
=======
"PO-Revision-Date: 2010-03-31 06:01+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:15+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-03 04:32+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: goranc <goranc@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
bin/addons/base/i18n/ja.po
+16
View File
@@ -9,20 +9,36 @@ msgstr ""
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:24+0000\n"
=======
"PO-Revision-Date: 2010-03-31 05:47+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:13+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-03 04:34+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
"Language-Team: Japanese <ja@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-04 03:51+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/sv.po
+16
View File
@@ -8,20 +8,36 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:18+0000\n"
=======
"PO-Revision-Date: 2010-03-31 04:49+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:09+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-03 04:28+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/uk.po
+16
View File
@@ -8,20 +8,36 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:37+0000\n"
=======
"PO-Revision-Date: 2010-03-31 05:27+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:14+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-03 04:31+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_CN.po
+16
View File
@@ -8,20 +8,36 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"PO-Revision-Date: 2010-03-30 04:19+0000\n"
=======
"PO-Revision-Date: 2010-03-31 05:03+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-01 04:12+0000\n"
>>>>>>> MERGE-SOURCE
=======
"PO-Revision-Date: 2010-04-03 04:30+0000\n"
>>>>>>> MERGE-SOURCE
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
<<<<<<< TREE
<<<<<<< TREE
<<<<<<< TREE
"X-Launchpad-Export-Date: 2010-03-31 03:54+0000\n"
=======
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
>>>>>>> MERGE-SOURCE
=======
"X-Launchpad-Export-Date: 2010-04-04 03:52+0000\n"
>>>>>>> MERGE-SOURCE
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/osv/fields.py
+5 -1
View File
@@ -699,7 +699,11 @@ class function(_column):
if self._type == "integer":
for r in res.keys():
# Converting value into string so that it does not affect XML-RPC Limits
res[r] = str(res[r])
if isinstance(res[r],dict): # To treat integer values with _multi attribute
for record in res[r].keys():
res[r][record] = str(res[r][record])
else:
res[r] = str(res[r])
return res
get_memory = get
bin/osv/orm.py
+2 -1
View File
@@ -1879,7 +1879,8 @@ class orm(orm_template):
def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None):
groupby_list = groupby
groupby = groupby[0]
if isinstance(groupby, list):
groupby = groupby[0]
context = context or {}
self.pool.get('ir.model.access').check(cr, uid, self._name, 'read', context=context)
if not fields:
bin/report/render/rml2pdf/trml2pdf.py
+2 -2
View File
@@ -636,9 +636,9 @@ class _rml_flowable(object):
styles = reportlab.lib.styles.getSampleStyleSheet()
style = styles['Title']
return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'})))
elif re.match('^h([1-9]+[0-9]*)$', (node.text or '')):
elif re.match('^h([1-9]+[0-9]*)$', (node.tag or '')):
styles = reportlab.lib.styles.getSampleStyleSheet()
style = styles['Heading'+str(node.get[1:])]
style = styles['Heading'+str(node.tag[1:])]
return platypus.Paragraph(self._textual(node), style, **(utils.attr_get(node, [], {'bulletText':'str'})))
elif node.tag=='image':
if not node.get('file'):