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

Merged

Browse Source 
bzr revid: hda@tinyerp.com-20100427095953-82gxycwl5ujmmbri
bzr revid: hda@tinyerp.com-20100428103027-z4f2i24lymfmv64a
This commit is contained in:
HDA (OpenERP)
2010-04-28 16:00:27 +05:30
parent 02119487be 33a7b33730
commit 39388d4b22
10 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/i18n/fr.po
+9 -6
View File
@@ -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: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-01-21 05:27+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"PO-Revision-Date: 2010-04-25 04:24+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Launchpad-Export-Date: 2010-04-26 03:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@@ -614,7 +614,7 @@ msgstr "Vous devrez réinstaller quelques packs de langue."
#. module: base
#: field:res.partner.address,mobile:0
msgid "Mobile"
msgstr "Téléphone mobile"
msgstr "Port."
#. module: base
#: model:res.country,name:base.om
@@ -1121,6 +1121,9 @@ msgid ""
"consider the present one as void. Do not hesitate to contact our accounting "
"department at (+32).81.81.37.00."
msgstr ""
"Veuillez ne pas prendre en considération ce mail si votre paiement a été "
"effectué après que nous vous l'ayons adressé. N'hésitez pas à contacter "
"notre service comptable au (+ 32).81.81.37.00."
#. module: base
#: selection:ir.ui.menu,icon:0
@@ -3472,7 +3475,7 @@ msgstr "Configuration de l'action client"
#: model:ir.ui.menu,name:base.menu_partner_address_form
#: view:res.partner.address:0
msgid "Partner Addresses"
msgstr "Adresses des partenaires"
msgstr "Carnet d'adresses"
#. module: base
#: selection:module.lang.install,init,lang:0
@@ -7421,7 +7424,7 @@ msgstr "Salvador"
#: field:res.bank,phone:0
#: field:res.partner.address,phone:0
msgid "Phone"
msgstr "Numéro de téléphone"
msgstr "Tél."
#. module: base
#: field:res.groups,menu_access:0
bin/addons/base/i18n/hr.po
+2 -2
View File
@@ -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: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-21 04:38+0000\n"
"PO-Revision-Date: 2010-04-27 04:11+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
bin/addons/base/i18n/ja.po
+2 -2
View File
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-21 04:43+0000\n"
"PO-Revision-Date: 2010-04-27 04:09+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-28 03:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/sv.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-21 04:48+0000\n"
"PO-Revision-Date: 2010-04-27 04:13+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/uk.po
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-21 04:41+0000\n"
"PO-Revision-Date: 2010-04-27 04:11+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/i18n/zh_CN.po
+2 -2
View File
@@ -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: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-21 04:46+0000\n"
"PO-Revision-Date: 2010-04-27 04:13+0000\n"
"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"
"X-Launchpad-Export-Date: 2010-04-22 03:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-28 03:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/res/res_currency.py
+3 -1
View File
@@ -79,7 +79,9 @@ class res_currency(osv.osv):
if currency.rounding == 0:
return 0.0
else:
return round(amount / currency.rounding,6) * currency.rounding
# /!\ First member below must be rounded to full unit!
# Do not pass a rounding digits value to round()
return round(amount / currency.rounding) * currency.rounding
def is_zero(self, cr, uid, currency, amount):
return abs(self.round(cr, uid, currency, amount)) < currency.rounding
bin/addons/module_graph.py
+12 -1
View File
@@ -26,6 +26,17 @@ import os
import sys
import glob
def load_information_from_description_file(module):
"""
:param module: The name of the module (sale, purchase, ...)
"""
for filename in ['__openerp__.py', '__terp__.py']:
description_file = os.path.join(module, filename)
if os.path.isfile(description_file):
return eval(file(description_file).read())
return {}
if len(sys.argv) == 2 and (sys.argv[1] in ['-h', '--help']):
print >>sys.stderr, 'Usage: module_graph.py [module1 module2 module3]\n\tWhen no module is specified, all modules in current directory are used'
sys.exit(1)
@@ -41,7 +52,7 @@ print 'digraph G {'
while len(modules):
f = modules.pop(0)
done.append(f)
info = addons.load_information_from_description_file(f)
info = load_information_from_description_file(f)
if info.get('installable', True):
for name in info['depends']:
if name not in done+modules:
bin/osv/orm.py
+3 -11
View File
@@ -3281,8 +3281,8 @@ class orm(orm_template):
del vals[self._inherits[table]]
record_id = tocreate[table].pop('id', None)
if record_id is None:
if record_id is None or not record_id:
record_id = self.pool.get(table).create(cr, user, tocreate[table], context=context)
else:
self.pool.get(table).write(cr, user, [record_id], tocreate[table], context=context)
@@ -3356,15 +3356,7 @@ class orm(orm_template):
upd1 += ',%s,now()'
upd2.append(user)
cr.execute('insert into "'+self._table+'" (id'+upd0+") values ("+str(id_new)+upd1+')', tuple(upd2))
d1, d2, tables = self.pool.get('ir.rule').domain_get(cr, user, self._name, 'create', context=context)
if d1:
d1 = ' AND '+' AND '.join(d1)
cr.execute('SELECT '+self._table+'.id FROM '+','.join(tables)+' ' \
'WHERE '+self._table+'.id = ' +str(id_new)+d1,d2)
if not cr.rowcount:
raise except_orm(_('AccessError'),
_('You try to bypass an access rule to create (Document type: %s).') \
% self._name)
self.check_access_rule(cr, user, [id_new], 'create', context=context)
upd_todo.sort(lambda x, y: self._columns[x].priority-self._columns[y].priority)
if self._parent_store:
bin/service/websrv_lib.py
+1 -1
View File
@@ -295,7 +295,7 @@ class MultiHTTPHandler(FixSendError,BaseHTTPRequestHandler):
elif not words:
return False
else:
self.send_error(400, "Bad request syntax (%r)" % requestline)
#self.send_error(400, "Bad request syntax (%r)" % requestline)
return False
self.request_version = version
self.command, self.path, self.version = command, path, version