From dc02b190452ded83946a7970abe3f869819e42cf Mon Sep 17 00:00:00 2001 From: vishmita Date: Fri, 11 May 2012 15:27:07 +0530 Subject: [PATCH 001/340] [FIX]when discard modification and click on next record from pager again it gives warning. lp bug: https://launchpad.net/bugs/997468 fixed bzr revid: vja@vja-desktop-20120511095707-jsqixg5c87u7itd4 --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 27606a564be..4506005d822 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -546,6 +546,7 @@ instance.web.FormView = instance.web.View.extend(_.extend({}, instance.web.form. }, on_button_cancel: function(event) { if (this.can_be_discarded()) { + this.on_record_loaded(this.datarecord); this.set({mode: "view"}); } return false; From 5b134f13b5f3a28dc4fb358d966495b75871a626 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 17 May 2012 11:14:51 +0530 Subject: [PATCH 002/340] [IMP]purchase: added a groups on filed and set topbar of state and improve a menutip bzr revid: mma@tinyerp.com-20120517054451-o3g0c8b62ug4k19m --- addons/purchase/purchase_view.xml | 42 +++++++++++-------- .../purchase/security/purchase_security.xml | 5 +++ addons/stock/stock_view.xml | 16 +++---- .../wizard/stock_partial_picking_view.xml | 4 +- 4 files changed, 39 insertions(+), 28 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 9743fb58a7b..3a88f18ca40 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -130,11 +130,26 @@ purchase.order form -
+ +
+
+ - + @@ -164,23 +179,11 @@ - + + - - + From 204882916a07523d49ca7687a67a12144f910c07 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:00:17 +0200 Subject: [PATCH 253/340] [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 254/340] [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 255/340] [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 4bf0b0b0596122b868af08e39f6924c8989136c1 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:38:30 +0200 Subject: [PATCH 256/340] [IMP] base_setup: show hidden menus 'Companies', 'Users' and 'OpenERP Enterprise' in Settings bzr revid: rco@openerp.com-20120619083830-7qqhikd1qaes3bm9 --- addons/base_setup/base_setup_views.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 1dceb87d621..e4b9b9dadb2 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + Specify Your Terminology From 29a2df163c7ab9a11adada7bace1a278dfdc9a66 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 19 Jun 2012 10:56:09 +0200 Subject: [PATCH 257/340] [REF] Change the CSS classes bzr revid: stw@openerp.com-20120619085609-s5l0jpce8srcncdq --- openerp/addons/base/ir/ir.xml | 2 +- openerp/addons/base/module/module_view.xml | 14 +++++----- openerp/addons/base/res/res_bank_view.xml | 4 +-- openerp/addons/base/res/res_company_view.xml | 12 ++++----- openerp/addons/base/res/res_partner_view.xml | 28 ++++++++++---------- openerp/addons/base/res/res_users_view.xml | 18 ++++++------- 6 files changed, 39 insertions(+), 39 deletions(-) diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml index 3e95399093f..661dde11aa0 100644 --- a/openerp/addons/base/ir/ir.xml +++ b/openerp/addons/base/ir/ir.xml @@ -35,7 +35,7 @@ -