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

[MERGE] merged latest fixes from 6.0 - up to rev 3399 

bzr revid: odo@openerp.com-20110411101327-dxkwvwstjf9xc58s
This commit is contained in:
Olivier Dony 2011-04-11 12:13:27 +02:00
parent bc82a989f2 c8e48449b3
commit f59ac0d6b1
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openerp/addons/base/i18n/nl.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n" "Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-21 08:40+0000\n" "PO-Revision-Date: 2011-04-10 19:20+0000\n"
"Last-Translator: Niels Huylebroeck <Unknown>\n" "Last-Translator: Mustufa Rangwala (Open ERP) <mra@tinyerp.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-02-22 14:26+0000\n" "X-Launchpad-Export-Date: 2011-04-11 05:42+0000\n"
"X-Generator: Launchpad (build 12351)\n" "X-Generator: Launchpad (build 12735)\n"
#. module: base #. module: base
#: view:ir.filters:0 #: view:ir.filters:0
@ -918,7 +918,7 @@ msgstr "Toegang verwijderen"
#. module: base #. module: base
#: model:res.country,name:base.ne #: model:res.country,name:base.ne
msgid "Niger" msgid "Niger"
msgstr "Nigeria" msgstr "Niger"
#. module: base #. module: base
#: selection:base.language.install,lang:0 #: selection:base.language.install,lang:0

22
openerp/addons/base/i18n/ro.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n" "Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n" "Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-24 12:16+0000\n" "PO-Revision-Date: 2011-04-07 04:09+0000\n"
"Last-Translator: Dorin <dhongu@gmail.com>\n" "Last-Translator: Dorin <dhongu@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-25 06:13+0000\n" "X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
"X-Generator: Launchpad (build 12559)\n" "X-Generator: Launchpad (build 12735)\n"
#. module: base #. module: base
#: view:ir.filters:0 #: view:ir.filters:0
@ -47,6 +47,8 @@ msgid ""
"The second argument of the many2many field %s must be a SQL table !You used " "The second argument of the many2many field %s must be a SQL table !You used "
"%s, which is not a valid SQL table name." "%s, which is not a valid SQL table name."
msgstr "" msgstr ""
"Al doilea parametru a câmpului many2many %s trebuie să fie o tabelă SQL ! %s "
"utilizat nu este o tabelă SQL validă."
#. module: base #. module: base
#: view:ir.values:0 #: view:ir.values:0
@ -117,6 +119,8 @@ msgid ""
"You can not write in this document (%s) ! Be sure your user belongs to one " "You can not write in this document (%s) ! Be sure your user belongs to one "
"of these groups: %s." "of these groups: %s."
msgstr "" msgstr ""
"Nu puteți scrie în acest document (%s) ! Asigurați-vă că utilizatorul "
"aparține grupului: %s."
#. module: base #. module: base
#: help:ir.model.fields,domain:0 #: help:ir.model.fields,domain:0
@ -125,6 +129,8 @@ msgid ""
"specified as a Python expression defining a list of triplets. For example: " "specified as a Python expression defining a list of triplets. For example: "
"[('color','=','red')]" "[('color','=','red')]"
msgstr "" msgstr ""
"Domeniu opțional pentru a restricționa valorile pentru câmpul de relație, "
"specificat ca o listă Python. De exemplu: [('color','=','red')]"
#. module: base #. module: base
#: field:res.partner,ref:0 #: field:res.partner,ref:0
@ -437,7 +443,7 @@ msgstr "Planificare actualizare"
#: code:addons/orm.py:838 #: code:addons/orm.py:838
#, python-format #, python-format
msgid "Key/value '%s' not found in selection field '%s'" msgid "Key/value '%s' not found in selection field '%s'"
msgstr "" msgstr "Cheia/valoarea '%s' nu este găsită în selecția câmpului '%s'"
#. module: base #. module: base
#: help:res.country,code:0 #: help:res.country,code:0
@ -784,7 +790,7 @@ msgstr "Categorii subordonate"
#. module: base #. module: base
#: model:ir.model,name:base.model_ir_config_parameter #: model:ir.model,name:base.model_ir_config_parameter
msgid "ir.config_parameter" msgid "ir.config_parameter"
msgstr "" msgstr "ir.config_parameter"
#. module: base #. module: base
#: selection:base.language.export,format:0 #: selection:base.language.export,format:0
@ -868,7 +874,7 @@ msgstr "Tranzitii"
#: code:addons/orm.py:4020 #: code:addons/orm.py:4020
#, python-format #, python-format
msgid "Record #%d of %s not found, cannot copy!" msgid "Record #%d of %s not found, cannot copy!"
msgstr "" msgstr "Înregistrarea #%d a %s negăsită, nu se poate face copia!"
#. module: base #. module: base
#: field:ir.module.module,contributors:0 #: field:ir.module.module,contributors:0
@ -2150,7 +2156,7 @@ msgstr ""
#. module: base #. module: base
#: model:ir.model,name:base.model_ir_module_module_dependency #: model:ir.model,name:base.model_ir_module_module_dependency
msgid "Module dependency" msgid "Module dependency"
msgstr "Dependinţele modulului" msgstr "Dependenţele modulului"
#. module: base #. module: base
#: selection:publisher_warranty.contract.wizard,state:0 #: selection:publisher_warranty.contract.wizard,state:0
@ -2193,7 +2199,7 @@ msgstr ""
#: view:ir.module.module:0 #: view:ir.module.module:0
#: field:ir.module.module,dependencies_id:0 #: field:ir.module.module,dependencies_id:0
msgid "Dependencies" msgid "Dependencies"
msgstr "Dependinţe" msgstr "Dependențe"
#. module: base #. module: base
#: field:multi_company.default,company_id:0 #: field:multi_company.default,company_id:0

1
openerp/osv/orm.py
View File

@ -2172,6 +2172,7 @@ class orm(orm_template):
if fget[groupby]['type'] in ('date', 'datetime'): if fget[groupby]['type'] in ('date', 'datetime'):
flist = "to_char(%s,'yyyy-mm') as %s " % (qualified_groupby_field, groupby) flist = "to_char(%s,'yyyy-mm') as %s " % (qualified_groupby_field, groupby)
groupby = "to_char(%s,'yyyy-mm')" % (qualified_groupby_field) groupby = "to_char(%s,'yyyy-mm')" % (qualified_groupby_field)
qualified_groupby_field = groupby
else: else:
flist = qualified_groupby_field flist = qualified_groupby_field
else: else:

1
openerp/release.py
View File

@ -1,4 +1,3 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*- # -*- encoding: utf-8 -*-
############################################################################## ##############################################################################
# #

0
openerp/tools/graph.py Normal file → Executable file
View File

0
openerp/tools/which.py Normal file → Executable file
View File