From 3c2ca3d71c0c972beefd808fd5ad1d7dd4194fec Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 14:54:46 +0530 Subject: [PATCH 1/9] [IMP]base:Remove a configure interface Wizard bzr revid: mma@tinyerp.com-20110726092446-0yrf3cjeqqv7uem2 --- openerp/addons/base/base_update.xml | 54 ----------------------------- 1 file changed, 54 deletions(-) diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml index 1820c8df9f3..dc39e14f1cf 100644 --- a/openerp/addons/base/base_update.xml +++ b/openerp/addons/base/base_update.xml @@ -257,59 +257,5 @@ - - Configure Your Interface - res.config.view - form - - - -
- Configure Your Interface -
- - If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences. - - - Configure Your Interface - - - - 12 - - - - - - - -
-
-
- - - Configure Your Interface - ir.actions.act_window - res.config.view - form - - form - new - - - - Administration - 1 - - - - - - special - 1 - skip - - From 2a97be835cc7666fa733b13aff14f432179510d9 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 16:23:30 +0530 Subject: [PATCH 2/9] [IMP]base:Remove a config view in py bzr revid: mma@tinyerp.com-20110726105330-qm2ao4s2x4n5l66z --- openerp/addons/base/res/res_user.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/openerp/addons/base/res/res_user.py b/openerp/addons/base/res/res_user.py index f3c0f635d14..ae301efa4d9 100644 --- a/openerp/addons/base/res/res_user.py +++ b/openerp/addons/base/res/res_user.py @@ -534,24 +534,4 @@ class groups2(osv.osv): ##FIXME: Is there a reason to inherit this object ? groups2() -class res_config_view(osv.osv_memory): - _name = 'res.config.view' - _inherit = 'res.config' - _columns = { - 'name':fields.char('Name', size=64), - 'view': fields.selection([('simple','Simplified'), - ('extended','Extended')], - 'Interface', required=True ), - } - _defaults={ - 'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple', - } - - def execute(self, cr, uid, ids, context=None): - res = self.read(cr, uid, ids)[0] - self.pool.get('res.users').write(cr, uid, [uid], - {'view':res['view']}, context=context) - -res_config_view() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 8b5eab09814d16944a579a8f0317cc58515ec9c6 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 26 Jul 2011 16:48:24 +0530 Subject: [PATCH 3/9] [IMP]base:add a demo data in some partner bzr revid: mma@tinyerp.com-20110726111824-icen9nmgln92ep21 --- .../addons/base/res/partner/partner_demo.xml | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml index c98ae837088..22db92e0c43 100644 --- a/openerp/addons/base/res/partner/partner_demo.xml +++ b/openerp/addons/base/res/partner/partner_demo.xml @@ -104,6 +104,7 @@ Camptocamp 1 + http://www.syleam.fr @@ -166,6 +167,7 @@ 1 + http://mediapole.net @@ -430,17 +432,29 @@ default + Paris + 75016 + + 1 rue Rockfeller Centrale d'achats 1 default Shop 1 + Liege + 6985 + + 2 Impasse de la Soif default Shop 2 + Shanghai + 4785552 + + 52 Chop Suey street @@ -455,6 +469,48 @@ Université de Liège + + Liege + Karine Lesbrouffe + 6985 + +33 (0) 2 33 31 22 10 + + 2 Impasse de la Soif + default + + + + Shanghai + seagate + 4785552 + +33 (0) 2 33 31 22 10 + + 52 Chop Suey street + default + + + + Alencon + Sebastien Thymbra + 61000 + contact@syleam.fr + 1 place de l'Église + +33 (0) 2 33 31 22 10 + + default + + + + Liege + Karine Lesbrouffe + 6985 + contact@tiny.bl + +33 (0) 2 33 31 22 10 + + 2 Impasse de la Soif + default + + - Bruxelles - Michael Schwessinger + Brussels 1000 - info@balmerinc.be (+32)2 211 34 83 Rue des Palais 51, bte 33 default @@ -319,7 +317,6 @@ Mediapole sprl 1348 - info@mediapole.net (+32).10.45.17.73 Rue Croisette, 9 default @@ -344,7 +341,7 @@ - Bruxelles + Brussels Etienne Lacarte 2365 @@ -472,11 +469,11 @@ Lausanne - Camptocamp SA + Luc Maurer 1015 +41 21 619 10 04 - Luc Maurer PSE-A, EPFL + PSE-A, EPFL default From a4b733ef4f88c2a4e623fd07746568ba91f6a6c7 Mon Sep 17 00:00:00 2001 From: "Rucha (Open ERP)" Date: Thu, 28 Jul 2011 12:32:54 +0530 Subject: [PATCH 9/9] [REVERT]: Reverted changes of existing partner addresses bzr revid: rpa@tinyerp.com-20110728070254-zumdex7hxbrvxsqd --- .../addons/base/res/partner/partner_demo.xml | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/openerp/addons/base/res/partner/partner_demo.xml b/openerp/addons/base/res/partner/partner_demo.xml index 846aaad1f8e..e8d8d540422 100644 --- a/openerp/addons/base/res/partner/partner_demo.xml +++ b/openerp/addons/base/res/partner/partner_demo.xml @@ -283,9 +283,11 @@ --> - Brussels + Bruxelles + Michel Schumacher 1000 + info@balmerinc.be (+32)2 211 34 83 Rue des Palais 51, bte 33 default @@ -314,12 +316,11 @@ Louvain-la-Neuve - Mediapole sprl + Thomas Passot 1348 (+32).10.45.17.73 - Rue Croisette, 9 - default + Rue de l'Angelique, 1 @@ -430,29 +431,17 @@ default - Hong Kong - 75016 - - 8 Finance Street - Centrale d'achats + Centrale d'achats 1 default - Magazin BML - Beijing - 100140 - - 7 Financial Street, Xicheng District + Shop 1 default - Leclerc - La Hulpe - 1310 - - Avenue Reine Astrid 92 + Shop 2 @@ -645,3 +634,4 @@ +