From b4b8caca4fd91355fec2aa3242b2d82b7b56c273 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 19 Jun 2012 17:06:47 +0200 Subject: [PATCH 1/4] [FIX] res.partner.category: use the automatic relation table name (so each _inherit from res.partner can define its own). bzr revid: vmt@openerp.com-20120619150647-yfe3kkxm43opdfr7 --- addons/crm/crm_segmentation.py | 4 ++-- addons/crm_profiling/crm_profiling.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index 690948a8817..9cafe950410 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -61,7 +61,7 @@ added to partners that match the segmentation criterions after computation.'), for categ in categs: if start: if categ['exclusif']: - cr.execute('delete from res_partner_category_rel \ + cr.execute('delete from res_partner_res_partner_category_rel \ where category_id=%s', (categ['categ_id'][0],)) id = categ['id'] @@ -81,7 +81,7 @@ added to partners that match the segmentation criterions after computation.'), partners.remove(pid) for partner_id in partners: - cr.execute('insert into res_partner_category_rel (category_id,partner_id) \ + cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \ values (%s,%s)', (categ['categ_id'][0], partner_id)) self.write(cr, uid, [id], {'state':'not running', 'partner_id':0}) diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index e1ad536f85f..c23636230f2 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -116,7 +116,7 @@ def _recompute_categ(self, cr, uid, pid, answers_ids): ok = [] cr.execute(''' select r.category_id - from res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id) + from res_partner_res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id) where r.partner_id = %s and (s.exclusif = false or s.exclusif is null) ''', (pid,)) for x in cr.fetchall(): @@ -249,7 +249,7 @@ class crm_segmentation(osv.osv): for categ in categs: if start: if categ['exclusif']: - cr.execute('delete from res_partner_category_rel where \ + cr.execute('delete from res_partner_res_partner_category_rel where \ category_id=%s', (categ['categ_id'][0],)) id = categ['id'] @@ -281,7 +281,7 @@ class crm_segmentation(osv.osv): partners.remove(pid) for partner_id in partners: - cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id)) + cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id)) self.write(cr, uid, [id], {'state':'not running', 'partner_id':0}) return True From c5c08808f73152557577a47dd9c3eef19871f116 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 09:41:23 +0200 Subject: [PATCH 2/4] [IMP] Improved topbar dropdown css bzr revid: fme@openerp.com-20120628074123-et65mt93rq9tc9ri --- addons/web/static/src/css/base.css | 1 + addons/web/static/src/css/base.sass | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d06c157696b..543e701b5d9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -779,6 +779,7 @@ border-top: 4px solid white; } .openerp .oe_topbar .oe_dropdown_menu { + top: 32px; background: #333333; background: rgba(37, 37, 37, 0.9); border-color: #999999; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index a0b29b1fc81..018b4088ee0 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -612,6 +612,7 @@ $colour4: #8a89ba .oe_dropdown_arrow:after border-top: 4px solid white .oe_dropdown_menu + top: 32px background: #333 background: rgba(37,37,37,0.9) border-color: #999 From 9b65efb9719daa92ab8cc9b7acf43b373de1e778 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 11:11:01 +0200 Subject: [PATCH 3/4] [FIX] Kanban Create button should be highlighted bzr revid: fme@openerp.com-20120628091101-yi2ql17n7hojwvv6 --- addons/web_kanban/static/src/xml/web_kanban.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 2f6d5780cb3..bbcb87a1d62 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -13,7 +13,7 @@
- From 352efe8a9963410d28fc0ed8089ddbd2330b6518 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Jun 2012 11:47:45 +0200 Subject: [PATCH 4/4] [FIX] Fixed list pager state when Unlimited is selected bzr revid: fme@openerp.com-20120628094745-2rbxz81u1kgka2fc --- addons/web/static/src/js/view_list.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index b5634c3443f..a55a3decf1e 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -373,11 +373,12 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi } var total = dataset.size(); - this.$pager.toggleClass('oe_list_pager_single_page', (total <= this.limit())); + var limit = this.limit() || total; + this.$pager.toggleClass('oe_list_pager_single_page', (total <= limit)); var spager = '-'; if (total) { - var range_start = this.page * this.limit() + 1; - var range_stop = range_start - 1 + this.limit(); + var range_start = this.page * limit + 1; + var range_stop = range_start - 1 + limit; if (range_stop > total) { range_stop = total; }