From e6164ad8e8d58bbf86d611e4ec92f6c16fb5ae7d Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 09:56:57 +0200 Subject: [PATCH 1/7] [IMP] modules kanban view: make icon non-clickable bzr revid: rco@openerp.com-20120619075657-wahos7ymsnnp3fnr --- openerp/addons/base/module/module_view.xml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index d9d71cf880d..da345ea3fb6 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -69,8 +69,7 @@ ir.module.module kanban - - + @@ -78,22 +77,19 @@
- - - +


- - + +
- - + From 204882916a07523d49ca7687a67a12144f910c07 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:00:17 +0200 Subject: [PATCH 2/7] [IMP] modules view: rename title to 'Install a Module' bzr revid: rco@openerp.com-20120619080017-4xw8vwx3sckzasni --- openerp/addons/base/module/module_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index da345ea3fb6..2fe4ff4a9df 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -191,7 +191,7 @@ - Modules + Install a Module ir.module.module form kanban,tree,form @@ -199,7 +199,8 @@ You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade". - + From f02c8858b34d9062517a2bb03d68926458b51862 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:10:05 +0200 Subject: [PATCH 3/7] [IMP] translations: rename 'Load an Official Translation' to 'Load a Translation' bzr revid: rco@openerp.com-20120619081005-uqx5e9add4k2ufvr --- .../base/module/wizard/base_language_install_view.xml | 10 +++++----- openerp/addons/base/res/res_users.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml index d7afd223303..0ebe9256a52 100644 --- a/openerp/addons/base/module/wizard/base_language_install_view.xml +++ b/openerp/addons/base/module/wizard/base_language_install_view.xml @@ -3,11 +3,11 @@ - Load Official Translation + Load a Translation base.language.install form -
+ @@ -19,7 +19,7 @@ - + @@ -46,7 +46,7 @@ You must change the preferences of the user and open a new menu to view the chan - Load Official Translation + Load a Translation ir.actions.act_window base.language.install form @@ -55,7 +55,7 @@ You must change the preferences of the user and open a new menu to view the chan diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 8f424e534b0..e22b5addf48 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -226,7 +226,7 @@ class users(osv.osv): 'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'), 'context_lang': fields.selection(_lang_get, 'Language', required=True, - help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load an Official Translation' wizard available from the 'Administration' menu."), + help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."), 'context_tz': fields.selection(_tz_get, 'Timezone', size=64, help="The user's timezone, used to output proper date and time values inside printed reports. " "It is important to set a value for this field. You should use the same timezone " From 55e32e992b5352728ed3f9b1c099037ed49eda5d Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:37:32 +0200 Subject: [PATCH 4/7] [IMP] Settings: hide menus 'Companies', 'Users' and 'OpenERP Enterprise' by restricting to group_no_one bzr revid: rco@openerp.com-20120619083732-fet0psn4wksbujbx --- openerp/addons/base/base_menu.xml | 2 +- .../addons/base/publisher_warranty/publisher_warranty_view.xml | 3 ++- openerp/addons/base/res/res_company_view.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 8dddc0c60a3..abba27b7ed7 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -8,7 +8,7 @@ - + diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index 5130fa878f2..7820aeb6f62 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -1,7 +1,8 @@ - + publisher_warranty.contract.tree diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index e5e2480d4af..8c7c05d0451 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -1,7 +1,8 @@ - + From a8922e5dde982a15e4d62bbf615fca70695da7f2 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 20 Jun 2012 10:08:14 +0200 Subject: [PATCH 5/7] [IMP] restyle buttons of some wizards bzr revid: rco@openerp.com-20120620080814-ynha15jlkyhrbyba --- openerp/addons/base/res/res_config.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml index e043afb0b7e..d9cc5414e69 100644 --- a/openerp/addons/base/res/res_config.xml +++ b/openerp/addons/base/res/res_config.xml @@ -7,12 +7,12 @@
-
- + @@ -24,8 +24,8 @@
-
@@ -39,10 +39,10 @@
-
From d8839589d924484e5e84dbe3484f987aa4ce76cb Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 20 Jun 2012 11:47:14 +0200 Subject: [PATCH 6/7] [IMP] res_partner: reintroduce filters 'Customers' and 'Suppliers' in search form bzr revid: rco@openerp.com-20120620094714-jexi93e701ui4d8q --- openerp/addons/base/res/res_partner_view.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index e4f6b164e2f..e2041b28ffa 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -262,6 +262,9 @@ + + +
From 03450a0fc8507eeb1e76e8f2a580c37d12574d69 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 20 Jun 2012 11:58:12 +0200 Subject: [PATCH 7/7] [FIX] name_get of res.partner and res.partner.category, to accept an int as ids bzr revid: rco@openerp.com-20120620095812-6kl28dcry2fx8op6 --- openerp/addons/base/res/res_partner.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 1dbad434ed6..14acbceb91c 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -50,6 +50,8 @@ class res_partner_category(osv.osv): context = {} if context.get('partner_category_display') == 'short': return super(res_partner_category, self).name_get(cr, uid, ids, context=context) + if isinstance(ids, (int, long)): + ids = [ids] reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) res = [] for record in reads: @@ -285,7 +287,9 @@ class res_partner(osv.osv): def name_get(self, cr, uid, ids, context=None): if context is None: context = {} - if not len(ids): + if isinstance(ids, (int, long)): + ids = [ids] + if not ids: return [] if context.get('show_ref'): rec_name = 'ref'