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

[MERGE] merged with openobjct-addons 

bzr revid: hmo@tinyerp.com-20101001100337-3ztwd6xs39fvg0ww
This commit is contained in:
Harry (OpenERP) 2010-10-01 15:33:37 +05:30
parent 2112d5ae02 5607586667
commit 6bb926d640
16 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bin/addons/base/base_update.xml
View File

@ -114,29 +114,29 @@
<newline/>
<notebook colspan="4">
<page string="User">
<group colspan="1" col="2">
<separator string="Contact" colspan="2"/>
<field name="company_id" required="1"
context="{'user_id': self, 'user_preference': 1}"
on_change="on_change_company_id(company_id)"
groups="base.group_multi_company"
/>
<field name="address_id" select="1"/>
<field name="user_email" widget="email"/>
</group>
<group colspan="1" col="2" groups="base.group_extended">
<separator string="Action" colspan="2"/>
<field name="action_id" required="True"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
<group colspan="1" col="2">
<separator string="Contact" colspan="2"/>
<field name="company_id" required="1"
context="{'user_id': self, 'user_preference': 1}"
on_change="on_change_company_id(company_id)"
groups="base.group_multi_company"
/>
<field name="address_id"/>
<field name="user_email" widget="email"/>
</group>
<group colspan="1" col="2" groups="base.group_extended">
<separator string="Action" colspan="2"/>
<field name="action_id"/>
<field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
</group>
<group colspan="1" col="2">
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<group colspan="2" col="4">
<field name="view" readonly="0"/>
<field name="menu_tips" colspan="2"/>
</group>
<separator string="Preferences" colspan="2"/>
<field name="context_lang"/>
<field name="context_tz"/>
<group colspan="2" col="4">
<field name="view" readonly="0"/>
<field name="menu_tips" colspan="2"/>
</group>
</group>
<newline/>
<group colspan="2" col="2">

6
bin/addons/base/i18n/bs.po
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-09-12 21:46+0000\n"
"Last-Translator: Bojan Markovic <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:03+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-09-29 04:42+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

6
bin/addons/base/i18n/en_GB.po
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-09-11 15:00+0000\n"
"Last-Translator: Martin Hood <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:03+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: English (United Kingdom) <en_GB@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-09-29 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

6
bin/addons/base/i18n/et.po
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-09-21 14:25+0000\n"
"Last-Translator: Tanel Kurvits <Unknown>\n"
"PO-Revision-Date: 2010-09-29 07:51+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-09-29 04:43+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:36+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

6
bin/addons/base/i18n/fr.po
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-09-16 19:03+0000\n"
"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:01+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-09-29 04:43+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

6
bin/addons/base/i18n/it.po
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-09-19 17:45+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:28+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-09-29 04:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

4
bin/addons/base/i18n/mn.po
View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-13 08:00+0000\n"
"PO-Revision-Date: 2010-09-29 08:13+0000\n"
"Last-Translator: ub121 <ubs121@gmail.com>\n"
"Language-Team: Mongolian <mn@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-09-29 04:44+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

42
bin/addons/base/i18n/nl.po
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-09-09 18:36+0000\n"
"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
"PO-Revision-Date: 2010-09-30 12:03+0000\n"
"Last-Translator: Douwe Wullink (Dypalio) <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-09-29 04:42+0000\n"
"X-Launchpad-Export-Date: 2010-10-01 08:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -3366,7 +3366,7 @@ msgstr "U kunt het menu opnieuw laden met (Ctrl+t Ctrl+r)."
#: view:ir.ui.view_sc:0
#: field:res.partner.title,shortcut:0
msgid "Shortcut"
msgstr "Sneltoets"
msgstr "Snelkoppeling"
#. module: base
#: field:ir.model.data,date_init:0
@ -8109,34 +8109,35 @@ msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
#. module: base
#: sql_constraint:ir.model.fields:0
msgid "Size of the field can never be less than 1 !"
msgstr ""
msgstr "De veldlengte kan nooit kleiner dan 1 zijn !"
#. module: base
#: sql_constraint:ir.ui.view_sc:0
msgid "Shortcut for this menu already exists!"
msgstr ""
msgstr "Dit menu heeft al een snelkoppeling!"
#. module: base
#: sql_constraint:ir.model.data:0
msgid ""
"You cannot have multiple records with the same id for the same module !"
msgstr ""
"U kunt niet meer records hebben met dezelfde id voor dezelfde module !"
#. module: base
#: sql_constraint:maintenance.contract:0
msgid "Your maintenance contract is already subscribed in the system !"
msgstr ""
msgstr "Uw onderhoudscontract is al ingeschreven in het systeem !"
#. module: base
#: sql_constraint:ir.module.module:0
#: sql_constraint:ir.module.web:0
msgid "The name of the module must be unique !"
msgstr ""
msgstr "De modulenaam moet uniek zijn !"
#. module: base
#: sql_constraint:ir.module.module:0
msgid "The certificate ID of the module must be unique !"
msgstr ""
msgstr "Het kwaliteitscertificaat id van de module moet uniek zijn !"
#. module: base
#: sql_constraint:res.partner.function:0
@ -8146,38 +8147,38 @@ msgstr ""
#. module: base
#: sql_constraint:res.partner:0
msgid "The name of the Partner must be unique !"
msgstr ""
msgstr "De relatienaam moet uniek zijn !"
#. module: base
#: sql_constraint:res.country:0
msgid "The name of the country must be unique !"
msgstr ""
msgstr "De landnaam moet uniek zijn !"
#. module: base
#: sql_constraint:res.country:0
msgid "The code of the country must be unique !"
msgstr ""
msgstr "De landcode moet uniek zijn !"
#. module: base
#: sql_constraint:res.lang:0
msgid "The name of the language must be unique !"
msgstr ""
msgstr "De taalnaam moet uniek zijn !"
#. module: base
#: sql_constraint:res.lang:0
msgid "The code of the language must be unique !"
msgstr ""
msgstr "De taalcode moet uniek zijn !"
#. module: base
#: sql_constraint:res.groups:0
msgid "The name of the group must be unique !"
msgstr ""
msgstr "De groepsnaam moet uniek zijn !"
#. module: base
#: code:addons/osv/osv.py:0
#, python-format
msgid "Constraint Error"
msgstr ""
msgstr "Voorwaarde Fout"
#. module: base
#: code:addons/osv/osv.py:0
@ -8188,6 +8189,10 @@ msgid ""
"reference it\n"
"- creation/update: a mandatory field is not correctly set"
msgstr ""
"De bewerking kan niet worden afgerond, waarschijnlijk vanwege:\n"
"- verwijdering: u probeert een record te verwijderen terwijl er nog door een "
"ander aan wordt gerefereerd\n"
"- maken/wijzigen: een verplicht veld is niet correct ingevuld"
#. module: base
#: code:addons/osv/osv.py:0
@ -8197,12 +8202,15 @@ msgid ""
"\n"
"[object with reference: %s - %s]"
msgstr ""
"\n"
"\n"
"[object met referentie: %s - %s]"
#. module: base
#: code:addons/osv/osv.py:0
#, python-format
msgid "Integrity Error"
msgstr ""
msgstr "Integriteit Fout"
#~ msgid "Main Company"
#~ msgstr "Moederorganisatie"

6
bin/addons/base/i18n/pl.po
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-09-26 10:02+0000\n"
"Last-Translator: Michał Węgrzynek <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:34+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-09-29 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

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

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-09 18:12+0000\n"
"PO-Revision-Date: 2010-09-29 08:12+0000\n"
"Last-Translator: Anup (OpenERP) <ach@tinyerp.com>\n"
"Language-Team: <pt@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-09-29 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

6
bin/addons/base/i18n/sv.po
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-09-27 12:19+0000\n"
"Last-Translator: Daniel Stenlöv (XCLUDE) <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:22+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-09-29 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:37+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

11
bin/addons/base/res/res_user.py
View File

@ -288,15 +288,7 @@ class users(osv.osv):
result = override_password(result)
else:
result = map(override_password, result)
if isinstance(result, list):
for rec in result:
if not rec.get('action_id',True):
rec['action_id'] = (self._get_menu(cr, uid),'Menu')
else:
if not result.get('action_id',True):
result['action_id'] = (self._get_menu(cr, uid),'Menu')
return result
@ -357,7 +349,6 @@ class users(osv.osv):
'context_lang': lambda *args: 'en_US',
'active' : lambda *a: True,
'menu_id': _get_menu,
'action_id': _get_menu,
'company_id': _get_company,
'company_ids': _get_companies,
'groups_id': _get_group,

4
bin/osv/orm.py
View File

@ -914,7 +914,7 @@ class orm_template(object):
nbrmax = max(nbrmax, max2)
warning = warning + w2
reduce(lambda x, y: x and y, newrow)
row[field] = (reduce(lambda x, y: x or y, newrow.values()) and \
row[field] = newrow and (reduce(lambda x, y: x or y, newrow.values()) and \
[(0, 0, newrow)]) or []
i = max2
while (position+i) < len(datas):
@ -929,7 +929,7 @@ class orm_template(object):
(newrow, max2, w2, translate2, data_id2, data_res_id2) = process_liness(
self, datas, prefix+[field], current_module, relation_obj._name, newfd, position+i)
warning = warning + w2
if reduce(lambda x, y: x or y, newrow.values()):
if newrow and reduce(lambda x, y: x or y, newrow.values()):
row[field].append((0, 0, newrow))
i += max2
nbrmax = max(nbrmax, i)

1
bin/report/printscreen/ps_list.py
View File

@ -98,6 +98,7 @@ class report_printscreen_list(report_int):
continue
child_ids = model.search(cr, uid, inner_domain)
res = model.read(cr, uid, child_ids, result['fields'].keys(), context)
res.sort(lambda x,y: cmp(ids.index(x['id']), ids.index(y['id'])))
rows.extend(res)
dom = [('id','in',ids)]
if self.groupby_no_leaf and len(ids) and not ids[0]:

6
debian/po/ko.po vendored
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-08-24 22:41+0300\n"
"PO-Revision-Date: 2010-09-15 02:58+0000\n"
"Last-Translator: barge <Unknown>\n"
"PO-Revision-Date: 2010-09-29 08:30+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Korean <ko@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-09-29 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string

4
debian/po/mn.po vendored
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-08-24 22:41+0300\n"
"PO-Revision-Date: 2010-09-10 03:13+0000\n"
"PO-Revision-Date: 2010-09-29 08:02+0000\n"
"Last-Translator: ub121 <ubs121@gmail.com>\n"
"Language-Team: Mongolian <mn@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-09-29 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string