From f5cad0242de49dd4b9010674b147d3d330180442 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 27 Mar 2012 11:23:45 +0200 Subject: [PATCH 1/8] [imp] desactivated rng check for views bzr revid: nicolas.vanhoren@openerp.com-20120327092345-06bhhik1suy3td6p --- openerp/addons/base/ir/ir_ui_view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 8fcb794b08e..00a485e8ec1 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -89,7 +89,8 @@ class view(osv.osv): return True _constraints = [ - (_check_xml, 'Invalid XML for View Architecture!', ['arch']) + # desactivate to test the new form views + #(_check_xml, 'Invalid XML for View Architecture!', ['arch']) ] def _auto_init(self, cr, context=None): From 4a9d892e43ecff107bd03cab45f6b29c025db8f2 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 10 Apr 2012 09:42:18 +0200 Subject: [PATCH 2/8] [FIX] limit on name_search on partners bzr revid: fp@tinyerp.com-20120410074218-pj4iyn0zjxgo0gbr --- openerp/addons/base/res/res_partner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 6f04c3483cd..699fb778fcb 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -310,12 +310,14 @@ class res_partner(osv.osv): cr.execute('''SELECT partner.id FROM res_partner partner LEFT JOIN res_partner company ON partner.parent_id = company.id WHERE partner.name || ' (' || COALESCE(company.name,'') || ')' - ''' + operator + ''' %s ''', (name2,)) + ''' + operator + ''' %s limit '''+str(limit), (name2,)) ids = map(lambda x: x[0], cr.fetchall()) if args: ids = self.search(cr, uid, [('id', 'in', ids)] + args, limit=limit, context=context) if ids: + print 'ICI', ids return self.name_get(cr, uid, ids, context) + print 'LA' return super(res_partner,self).name_search(cr, uid, name, args, operator=operator, context=context, limit=limit) def _email_send(self, cr, uid, ids, email_from, subject, body, on_error=None): From e485c73d152dd6e2ce4964214d83cf1cca0cbf24 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 10 Apr 2012 15:10:52 +0200 Subject: [PATCH 3/8] [IMP] base: new form view of res.partner bzr revid: qdp-launchpad@openerp.com-20120410131052-8zj77cfa2ulkhiup --- openerp/addons/base/res/res_partner_view.xml | 91 ++++++++++++++++---- 1 file changed, 75 insertions(+), 16 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index ffbbca3eb74..156abbabe85 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -333,25 +333,22 @@
- - - - - - + + + + +

+ + + - - - - - @@ -372,7 +369,6 @@ - @@ -381,7 +377,69 @@ - + + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + +
+

+
+

+ +
+
+
+
+ + 		+ +
+
+
+
+ + + + + +
+
+
+
+
+
+ + + @@ -404,7 +462,7 @@ - + @@ -452,6 +510,7 @@ + From ee747dc954bf369673f5590b995ea0a8f5cf18f7 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 10 Apr 2012 15:48:13 +0200 Subject: [PATCH 4/8] embbded kanban view bzr revid: al@openerp.com-20120410134813-c0potdev7a1i63tf --- openerp/osv/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index c94a8a51e26..313c96a9fb4 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1651,7 +1651,7 @@ class BaseModel(object): children = False views = {} for f in node: - if f.tag in ('form', 'tree', 'graph'): + if f.tag in ('form', 'tree', 'graph', 'kanban'): node.remove(f) ctx = context.copy() ctx['base_model_name'] = self._name From e6a10c0825d077b2af5318d6e4c40ef176f9a8d5 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 10 Apr 2012 16:29:33 +0200 Subject: [PATCH 5/8] [IMP] base: form view of res.partner bzr revid: qdp-launchpad@openerp.com-20120410142933-uwcbibbaz5qyo6g7 --- openerp/addons/base/res/res_partner_view.xml | 31 ++++++-------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 156abbabe85..ee8789f534e 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -377,7 +377,7 @@ - + @@ -401,39 +401,26 @@
- +
-
-

-
-

- -
-
-
-
- +

+
+
+ + + +
-
-
- - - - - -
-
-
From 9d4d95013bf883e704db8e55f0d5c5b2ab5e052a Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 10 Apr 2012 16:47:21 +0200 Subject: [PATCH 6/8] [IMP] base: form view of res.partner bzr revid: qdp-launchpad@openerp.com-20120410144721-fq7jo6fgci8krlms --- openerp/addons/base/res/res_partner_view.xml | 164 ++++++------------- 1 file changed, 49 insertions(+), 115 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index ee8789f534e..05ab1c0a945 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -378,121 +378,55 @@ - - - - - - - - - - - - - - - - - - - - -
-
- - - -
-
- - - - - -
-

-
-
- 		- - - - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +
+
+ + + +
+
+ + + + + +
+

+
+
+ 		+ + + +
+
+
+
+
+ + + +
From 8b83ecaaee5fafb3788c9e444c62fbc90b128fd4 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Tue, 10 Apr 2012 17:10:54 +0200 Subject: [PATCH 7/8] [IMP] temporary improvement of form view of partner bzr revid: qdp-launchpad@openerp.com-20120410151054-4g6ex2v7o9llt2e2 --- 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 05ab1c0a945..f2861b7786f 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -401,7 +401,7 @@
- +
From c8c4e6252ad50a42ebb41aeb6ff9a5310eb91be8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 11 Apr 2012 00:10:13 +0200 Subject: [PATCH 8/8] res_partner fix kanabn bzr revid: al@openerp.com-20120410221013-k98x87b58pzd8tc0 --- openerp/addons/base/res/res_partner_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index f2861b7786f..b0ab232aeba 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -513,7 +513,7 @@
-
+
@@ -521,7 +521,7 @@

-
+