addons changes merged

bzr revid: mra@tinyerp.com-20080826082121-0kqg7xdxe1bha0on

6 files changed, 10 insertions, 119 deletions

diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py
index 83bb13644cf..ce512679722 100644
--- a/addons/base_setup/wizard/wizard_base_setup.py
+++ b/addons/base_setup/wizard/wizard_base_setup.py
@@ -62,20 +62,6 @@ view_form_charts = """<?xml version="1.0"?>
     </group>
 </form>"""
 
-view_form_vatcheck = """<?xml version="1.0"?>
-<form string="Setup">
-    <image name="gtk-dialog-info" colspan="2"/>
-    <group>
-        <separator string="Install 'base_vat_check' module" colspan="2"/>
-        <newline/>
-        <field name="vatcheck" align="0.0"/>
-        <newline/>
-        <label string="This module allow you to force the validation of the VAT number. This module is optional but highly recommanded." colspan="2" align="0.0"/>
-        <newline/>
-        <label string="If you don't install it now, you'll be able to install it through the Administration menu." colspan="2" align="0.0"/>
-    </group>
-</form>"""
-
 view_form_company = """<?xml version="1.0"?>
 <form string="Setup">
     <image name="gtk-dialog-info" colspan="2"/>
@@ -111,8 +97,6 @@ view_form_update = """<?xml version="1.0"?>
         <newline/>
         <field name="charts" align="0.0" readonly="1"/>
         <newline/>
-        <field name="vatcheck" align="0.0" readonly="1"/>
-        <newline/>
         <field name="name" align="0.0" readonly="1"/>
     </group>
 </form>
@@ -201,16 +185,12 @@ class wizard_base_setup(wizard.interface):
     def _update(self, cr, uid, data, context):
         pool=pooler.get_pool(cr.dbname)
         form=data['form']
-        module_obj=pool.get('ir.module.module')
-
-        if 'profile' in form and form['profile'] > 0:
-            module_obj.state_update(cr, uid, [form['profile']], 'to install', ['uninstalled'], context)
-        if 'charts' in form and form['charts'] > 0:
-            module_obj.state_update(cr, uid, [form['charts']], 'to install', ['uninstalled'], context)
-        if 'vatcheck' in form and form['vatcheck']:
-            mid = module_obj.search(cr, uid, [('name', '=', 'base_vat_check')], context=context)
-            if mid:
-                module_obj.state_update(cr, uid, mid, 'to install', ['uninstalled'], context)
+        if 'profile' in data['form'] and data['form']['profile'] > 0:
+            module_obj=pool.get('ir.module.module')
+            module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context)
+        if 'charts' in data['form'] and data['form']['charts'] > 0:
+            module_obj=pool.get('ir.module.module')
+            module_obj.state_update(cr, uid, [data['form']['charts']], 'to install', ['uninstalled'], context)
 
         company_obj=pool.get('res.company')
         partner_obj=pool.get('res.partner')
@@ -291,7 +271,7 @@ class wizard_base_setup(wizard.interface):
     def _previous(self, cr, uid, data, context):
         if 'profile' not in data['form'] or data['form']['profile'] <= 0:
             return 'init'
-        return 'vatcheck'
+        return 'charts'
 
     def _config(self, cr, uid, data, context=None):
         users_obj=pooler.get_pool(cr.dbname).get('res.users')
@@ -327,11 +307,6 @@ class wizard_base_setup(wizard.interface):
             'default': -1,
             'required': True,
         },
-        'vatcheck':{
-            'string': "Install 'base_vat_check' module",
-            'type': 'boolean',
-            'default': False,
-        },
         'name':{
             'string': 'Company Name',
             'type': 'char',
@@ -427,15 +402,6 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'result': {'type': 'form', 'arch': view_form_charts, 'fields': fields,
                 'state':[
                     ('init', 'Previous', 'gtk-go-back'),
-                    ('vatcheck', 'Next', 'gtk-go-forward', True)
-                ]
-            }
-        },
-        'vatcheck':{
-            'actions':[],
-            'result': {'type': 'form', 'arch': view_form_vatcheck, 'fields': fields,
-                'state': [
-                    ('charts', 'Previous', 'gtk-go-back'),
                     ('company', 'Next', 'gtk-go-forward', True)
                 ]
             }
@@ -458,7 +424,7 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""",
             'result': {'type': 'form', 'arch': view_form_update, 'fields': fields,
                 'state': [
                     ('company', 'Previous', 'gtk-go-back'),
-                    ('finish', 'Install', 'gtk-save', True)
+                    ('finish', 'Install', 'gtk-ok', True)
                 ]
             }
         },
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 17a3025038f..af7847dfb9d 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-
+import partner
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/base_vat/__terp__.py b/addons/base_vat/__terp__.py
index 1397e504ba1..3b3a6276617 100644
--- a/addons/base_vat/__terp__.py
+++ b/addons/base_vat/__terp__.py
@@ -28,6 +28,7 @@
 ###############################################################################
 {
     "name" : "VAT",
+    "description": "Enable the VAT Number for the partner. Check the validity of that VAT Number (idea and code from Tryton (c2bk)).",
     "version" : "1.0",
     "author" : "Tiny",
     "category" : "Generic Modules/Base",
diff --git a/addons/base_vat_check/partner.py b/addons/base_vat/partner.py
index c5f9010cf91..c5f9010cf91 100644
--- a/addons/base_vat_check/partner.py
+++ b/addons/base_vat/partner.py
diff --git a/addons/base_vat_check/__init__.py b/addons/base_vat_check/__init__.py
deleted file mode 100644
index af7847dfb9d..00000000000
--- a/addons/base_vat_check/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id$
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import partner
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_vat_check/__terp__.py b/addons/base_vat_check/__terp__.py
deleted file mode 100644
index 48200c92fc9..00000000000
--- a/addons/base_vat_check/__terp__.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# $Id$
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-###############################################################################
-{
-    "name": "VAT Check",
-    "description": "Add a check of the VAT Number. Idea and code from Tryton (c2bk)",
-    "version": "1.0",
-    "author": "Tiny",
-    "category": "Generic Modules/Base",
-    "depends": ["base", "base_vat"],
-    "update_xml": [],
-    "active": False,
-    "installable": True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-