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

[Merge]

Browse Source 
bzr revid: vir@tinyerp.com-20100720054544-oi87ri6ziqywesdb
This commit is contained in:
Vir (Open ERP)
2010-07-20 11:15:44 +05:30
parent ac016035dd ac2dc5af78
commit 9ad92e78f8
13 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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-07-18 04:33+0000\n"
"PO-Revision-Date: 2010-07-19 04:36+0000\n"
"Last-Translator: Goran Kliska <gkliska@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-07-19 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-07-20 03:46+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-07-18 04:31+0000\n"
"PO-Revision-Date: 2010-07-19 04:32+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-07-19 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-07-20 03:46+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-07-18 04:35+0000\n"
"PO-Revision-Date: 2010-07-19 04:39+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-07-19 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-07-20 03:47+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-07-18 04:28+0000\n"
"PO-Revision-Date: 2010-07-19 04:29+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-07-19 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-07-20 03:47+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-07-18 04:30+0000\n"
"PO-Revision-Date: 2010-07-19 04:31+0000\n"
"Last-Translator: Eleanor Chen <chenyueg@gmail.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-07-19 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-07-20 03:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
bin/addons/base/ir/ir.xml
+13 -13
View File
@@ -386,7 +386,6 @@
<field name="name" select="1"/>
<field name="res_model" select="1"/>
<field name="type" readonly="1"/>
<field name="src_model" select="2"/>
<field name="usage"/>
<field name="menus"/>
@@ -400,7 +399,6 @@
<field name="view_id"/>
<field name="search_view_id"/>
</group>
<group col="2" colspan="2">
<separator string="Filters" colspan="4"/>
<field name="domain"/>
@@ -825,7 +823,7 @@
<field name="view_type">tree</field>
<field name="view_id" ref="view_report_custom_form"/>
</record>
<!--
<menuitem name="Administration/Report/Report Custom" action="action_report_custom"/>
-->
@@ -1143,14 +1141,16 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Menu">
<field name="complete_name" string="Menu"/>
<field name="name" select="1" string="Root Menu"/>
<field name="sequence"/>
<field colspan="4" name="parent_id" select="1"/>
<field name="action"/>
<field colspan="4" name="groups_id"/>
<field name="icon" on_change="onchange_icon(icon)"/>
<field name="icon_pict" widget="picture" nolabel="1"/>
<group col="8">
<field name="name" select="1" string="Menu" />
<field name="parent_id" select="1" colspan="4"/>
<field name="sequence" colspan="2"/>
<field name="complete_name" string="Full Path" colspan="8"/>
<field name="action" colspan="4" />
<field name="icon" on_change="onchange_icon(icon)" colspan="2"/>
<field name="icon_pict" widget="picture" nolabel="1" colspan="2"/>
<field name="groups_id" colspan="8" height="400"/>
</group>
</form>
</field>
</record>
@@ -1506,9 +1506,9 @@
<menuitem id="next_id_11" name="Configuration Wizards" parent="base.menu_config" sequence="1"/>
<wizard id="wizard_configuration" model="ir.module.module" name="module.configuration" string="Start Configuration"/>
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
<menuitem action="act_ir_actions_todo_form" id="menu_ir_actions_todo_form"
parent="next_id_11" groups="base.group_extended" sequence="20"/>
<menuitem
action="wizard_configuration" name="Start Configuration"
id="menu_configurator_module" parent="next_id_11"
bin/addons/base/ir/ir_ui_menu.py
+13
View File
@@ -247,6 +247,16 @@ class ir_ui_menu(osv.osv):
return {}
return {'type': {'icon_pict': 'picture'}, 'value': {'icon_pict': ('stock', (icon,'ICON_SIZE_MENU'))}}
def _check_recursion(self, cr, uid, ids):
level = 100
while len(ids):
cr.execute('select distinct parent_id from ir_ui_menu where id IN %s',(tuple(ids),))
ids = filter(None, map(lambda x:x[0], cr.fetchall()))
if not level:
return False
level -= 1
return True
_columns = {
'name': fields.char('Menu', size=64, required=True, translate=True),
'sequence': fields.integer('Sequence'),
@@ -270,6 +280,9 @@ class ir_ui_menu(osv.osv):
('ir.actions.server', 'ir.actions.server'),
]),
}
_constraints = [
(_check_recursion, 'Error ! You can not create recursive Menu.', ['parent_id'])
]
_defaults = {
'icon' : lambda *a: 'STOCK_OPEN',
'icon_pict': lambda *a: ('stock', ('STOCK_OPEN','ICON_SIZE_MENU')),
bin/addons/base/res/config_pixmaps/1.png
Regular → Executable
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 10 KiB

bin/addons/base/res/config_pixmaps/2.png
Regular → Executable
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

bin/addons/base/res/config_pixmaps/3.png
Regular → Executable
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

bin/addons/base/res/partner/partner.py
+2 -2
View File
@@ -302,9 +302,9 @@ class res_partner_address(osv.osv):
res.append((r['id'], r['partner_id'][1]))
else:
addr = r['name'] or ''
if r['name'] and (r['zip'] or r['country_id']):
if r['name'] and (r['city'] or r['country_id']):
addr += ', '
addr += (r['zip'] or '') + ' ' + (r['city'] or '') + ' ' + (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['street'] or '')
addr += (r['country_id'] and r['country_id'][1] or '') + ' ' + (r['city'] or '') + ' ' + (r['street'] or '')
res.append((r['id'], addr.strip() or '/'))
return res
bin/addons/base/res/res_config.xml
+4 -4
View File
@@ -7,8 +7,8 @@
<field name="arch" type="xml">
<form>
<group colspan="4" col="8">
<group colspan="3" width="200" height="250">
<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
<group colspan="3" width="220" height="250">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
@@ -61,8 +61,8 @@
<field name="arch" type="xml">
<form>
<group colspan="4" col="8">
<group colspan="3" width="200" height="250">
<field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
<group colspan="3" width="220" height="250">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
bin/addons/base/res/res_user.py
+1 -1
View File
@@ -295,7 +295,7 @@ class users(osv.osv):
def _get_email_from(self, cr, uid, ids, context=None):
if not isinstance(ids, list):
ids = [ids]
res = dict.fromkeys(ids)
res = dict.fromkeys(ids, False)
for user in self.browse(cr, uid, ids, context=context):
if user.user_email:
res[user.id] = "%s <%s>" % (user.name, user.user_email)