From af1df4d5cd44a176b1ea933c18963bd8b36f0db9 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Tue, 11 Sep 2012 14:09:19 +0530 Subject: [PATCH 01/20] [FIX]product:search method added for searching products by category bzr revid: kbh@tinyerp.com-20120911083919-cwenu6oum79oa7do --- addons/product/product.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/product/product.py b/addons/product/product.py index c9345a22103..ac62ef129c4 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -743,6 +743,14 @@ class product_product(osv.osv): else: return super(product_product, self).copy(cr, uid, id, default=default, context=context) + + def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): + if context is None: + context = {} + if context and context.get('search_default_categ_id', False): + args.append((('categ_id', 'child_of', context['search_default_categ_id']))) + return super(product_product, self).search(cr, uid, args, offset, limit, order, context, count) + product_product() class product_packaging(osv.osv): From 6fca7f4abef5e4a54b77de1ec49a2c351ca8f63e Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Tue, 11 Sep 2012 18:57:24 +0530 Subject: [PATCH 02/20] [IMP] improve the placeholder text bzr revid: rma@tinyerp.com-20120911132724-nc201qmgoicvknmt --- openerp/addons/base/res/res_partner_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index a79610b7a18..6b8354214bf 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -216,7 +216,7 @@ - + From 573cad0c9f0447442cae68778d043dc0a79070e5 Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Tue, 18 Sep 2012 16:55:03 +0530 Subject: [PATCH 03/20] [IMP]:demo and data for product category bzr revid: apa@tinyerp.com-20120918112503-q82c8ry6omoj8uyq --- addons/product/product_data.xml | 6 +++++- addons/product/product_demo.xml | 6 +----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index 5ae76a87695..9808fa732e9 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -7,7 +7,11 @@ All products - + + + Saleable + + Unit diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index 97d6e03205c..6676a79dfe6 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -9,11 +9,7 @@ - - - - Saleable - + Internal From c3a5df8eacd4a8c270bf096ec3bb45a30c9352bd Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Tue, 18 Sep 2012 16:59:41 +0530 Subject: [PATCH 04/20] [IMP]:improved code bzr revid: apa@tinyerp.com-20120918112941-7k31spiybf37ulb1 --- addons/product/product_demo.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml index 6676a79dfe6..66b86fc7b63 100644 --- a/addons/product/product_demo.xml +++ b/addons/product/product_demo.xml @@ -19,27 +19,27 @@ Other Products - + Computers - + Services - + External Devices - + Accessories - + Components - + Softwares From c8d64b61d7a2ae5fe43c2081579158fb2dec60ec Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Wed, 26 Sep 2012 11:50:04 +0200 Subject: [PATCH 05/20] [IMP] web: add methods show_error() and hide_error() in instance.web.Login bzr revid: rco@openerp.com-20120926095004-bl7xsg9d376uhwop --- addons/web/static/src/js/chrome.js | 13 ++++++++++--- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b4ba5404a49..e9185429993 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -579,7 +579,7 @@ instance.web.Login = instance.web.Widget.extend({ */ do_login: function (db, login, password) { var self = this; - this.$el.removeClass('oe_login_invalid'); + self.hide_error(); self.$(".oe_login_pane").fadeOut("slow"); return this.session.session_authenticate(db, login, password).pipe(function() { if (self.has_local_storage) { @@ -596,12 +596,19 @@ instance.web.Login = instance.web.Widget.extend({ } } self.trigger('login_successful'); - },function () { + }, function () { self.$(".oe_login_pane").fadeIn("fast", function() { - self.$el.addClass("oe_login_invalid"); + self.show_error("Invalid username or password"); }); }); }, + show_error: function(message) { + this.$el.addClass("oe_login_invalid"); + this.$(".oe_login_error_message").text(message); + }, + hide_error: function() { + this.$el.removeClass('oe_login_invalid'); + }, }); instance.web.client_actions.add("login", "instance.web.Login"); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f0b9d624607..b02fa62e12a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -61,7 +61,7 @@