From 57911141bc9a14087767fe4be2915a5702e4c3e1 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 26 Sep 2011 18:43:23 +0200
Subject: [IMP] Move all installers into base_setup

bzr revid: stw@openerp.com-20110926164323-ob28bw1zgfmaih9c
---
 addons/base_setup/base_setup.py | 194 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 191 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 340c2f93044..5e0b5c7f13b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -24,6 +24,9 @@ import pooler
 import tools
 from osv import fields, osv
 from tools.translate import _
+from lxml import etree
+from osv import fields, osv
+
 
 #Application and feature chooser, this could be done by introspecting ir.modules
 
@@ -89,7 +92,190 @@ class base_setup_installer(osv.osv_memory):
             help="Installs a preselected set of OpenERP "
                  "applications selected to help you manage your auctions "
                  "as well as the business processes around them."),
-        }
+        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
+            help="Allows invoice lines to impact multiple analytic accounts "
+                 "simultaneously."),
+        'account_payment': fields.boolean('Suppliers Payment Management',
+            help="Streamlines invoice payment and creates hooks to plug "
+                 "automated payment systems in."),
+        'account_followup': fields.boolean('Followups Management',
+            help="Helps you generate reminder letters for unpaid invoices, "
+                 "including multiple levels of reminding and customized "
+                 "per-partner policies."),
+        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
+            help="This module will support the Anglo-Saxons accounting methodology by "
+                "changing the accounting logic with stock transactions."),
+        'account_asset': fields.boolean('Assets Management',
+            help="Helps you to manage your assets and their depreciation entries."),
+        # Manufacturing Resource Planning
+        'stock_location': fields.boolean('Advanced Routes',
+            help="Manages product routes and paths within and between "
+                 "locations (e.g. warehouses)."),
+        'mrp_jit': fields.boolean('Just In Time Scheduling',
+            help="Enables Just In Time computation of procurement orders."
+                 "\n\nWhile it's more resource intensive than the default "
+                 "setup, the JIT computer avoids having to wait for the "
+                 "procurement scheduler to run or having to run the "
+                 "procurement scheduler manually."),
+        'mrp_operations': fields.boolean('Manufacturing Operations',
+            help="Enhances production orders with readiness states as well "
+                 "as the start date and end date of execution of the order."),
+        'mrp_subproduct': fields.boolean('MRP Subproducts',
+            help="Enables multiple product output from a single production "
+                 "order: without this, a production order can have only one "
+                 "output product."),
+        'mrp_repair': fields.boolean('Repairs',
+            help="Enables warranty and repair management (and their impact "
+                 "on stocks and invoicing)."),
+        # Knowledge Management
+        'document_ftp':fields.boolean('Shared Repositories (FTP)',
+            help="Provides an FTP access to your OpenERP's "
+                "Document Management System. It lets you access attachments "
+                "and virtual documents through a standard FTP client."),
+        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
+            help="Provides a WebDAV access to your OpenERP's Document "
+                 "Management System. Lets you access attachments and "
+                 "virtual documents through your standard file browser."),
+        'wiki':fields.boolean('Collaborative Content (Wiki)',
+            help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
+        # Content templates
+        'wiki_faq':fields.boolean('Template: Internal FAQ',
+            help="Creates a skeleton internal FAQ pre-filled with "
+                 "documentation about OpenERP's Document Management "
+                 "System."),
+        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
+            help="Creates an example skeleton for a standard quality manual."),
+        # Reporting
+        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
+                                "you can modify in OpenOffice.Once you have modified it you can "
+                                "upload the report using the same wizard."),
+        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
+                                "reports  on several objects. It's a SQL query builder and browser for end users."),
+        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
+        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
+        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
+        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
+        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
+            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
+        'pad': fields.boolean('Collaborative Note Pads',
+            help="This module creates a tighter integration between a Pad "
+                 "instance of your choosing and your OpenERP Web Client by "
+                 "letting you easily link pads to OpenERP objects via "
+                 "OpenERP attachments."),
+        'email_template':fields.boolean('Automated E-Mails',
+            help="Helps you to design templates of emails and integrate them in your different processes."),
+        'marketing_campaign':fields.boolean('Marketing Campaigns',
+            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
+        'crm_profiling':fields.boolean('Profiling Tools',
+            help="Helps you to perform segmentation of partners and design segmentation questionnaires"),
+        # Human Resources Management
+        'hr_holidays': fields.boolean('Leaves Management',
+            help="Tracks employee leaves, allocation requests and planning."),
+        'hr_expense': fields.boolean('Expenses',
+            help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'hr_recruitment': fields.boolean('Recruitment Process',
+            help="Helps you manage and streamline your recruitment process."),
+        'hr_timesheet_sheet':fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendances."),
+        'hr_contract': fields.boolean("Employee's Contracts",
+            help="Extends employee profiles to help manage their contracts."),
+        'hr_evaluation': fields.boolean('Periodic Evaluations',
+            help="Lets you create and manage the periodic evaluation and "
+                 "performance review of employees."),
+        'hr_attendance': fields.boolean('Attendances',
+            help="Simplifies the management of employee's attendances."),
+        'hr_payroll': fields.boolean('Payroll',
+            help="Generic Payroll system."),
+        'hr_payroll_account': fields.boolean('Payroll Accounting',
+            help="Generic Payroll system Integrated with Accountings."),
+        # Project Management
+        'project_long_term': fields.boolean(
+        'Long Term Planning',
+            help="Enables long-term projects tracking, including "
+                 "multiple-phase projects and resource allocation handling."),
+        'hr_timesheet_sheet': fields.boolean('Timesheets',
+            help="Tracks and helps employees encode and validate timesheets "
+                 "and attendances."),
+        'project_timesheet': fields.boolean('Bill Time on Tasks',
+            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
+        'account_budget': fields.boolean('Budgets',
+            help="Helps accountants manage analytic and crossover budgets."),
+        'project_issue': fields.boolean('Issues Tracker',
+            help="Automatically synchronizes project tasks and crm cases."),
+        # Methodologies
+        'project_scrum': fields.boolean('Methodology: SCRUM',
+            help="Implements and tracks the concepts and task types defined "
+                 "in the SCRUM methodology."),
+        'project_gtd': fields.boolean('Methodology: Getting Things Done',
+            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
+        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders."),
+        'delivery': fields.boolean('Delivery Costs', 
+            help="Allows you to compute delivery costs on your quotations."),
+        'sale_journal': fields.boolean('Invoicing journals',
+            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
+        'sale_layout': fields.boolean('Sales Orders Print Layout',
+            help="Provides some features to improve the layout of the Sales Order reports."),
+        'sale_margin': fields.boolean('Margins in Sales Orders',
+            help="Gives the margin of profitability by calculating "
+                 "the difference between Unit Price and Cost Price."),
+        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
+            help="Adds commitment, requested and effective dates on Sales Orders."),
+        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
+                 "automatically re-invoice clients if the expenses are "
+                 "project-related."),
+        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
+        'project_gtd':fields.boolean('Getting Things Done',
+            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
+        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
+                 "to keep track of business knowledge and share it with "
+                 "and  between your employees."),
+        'name': fields.char('Name', size=64),
+        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
+        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
+        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
+        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
+        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
+        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
+        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
+        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
+        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
+        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
+    }
+
+    _defaults = {
+        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
+        'document_ftp':True,
+        'marketing_campaign': lambda *a: 1,
+    }
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        doc = etree.XML(res['arch'])
+        for module in ['project_gtd','hr_expense']:
+            count = 0
+            for node in doc.xpath("//field[@name='%s']" % (module)):
+                count = count + 1
+                if count > 1:
+                    node.set('invisible', '1')
+        res['arch'] = etree.tostring(doc)
+        #Checking sale module is installed or not
+        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
+        count = cr.fetchall()
+        if count:
+            doc = etree.XML(res['arch'])
+            nodes = doc.xpath("//field[@name='sale_crm']")
+            for node in nodes:
+                node.set('invisible', '0')
+                node.set('modifiers', '{}')
+            res['arch'] = etree.tostring(doc)
+        return res
 
     def _if_knowledge(self, cr, uid, ids, context=None):
         if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
@@ -138,6 +324,8 @@ class base_setup_installer(osv.osv_memory):
             self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
         return
 
+
+
 #Migrate data from another application Conf wiz
 
 class migrade_application_installer_modules(osv.osv_memory):
@@ -158,11 +346,11 @@ class product_installer(osv.osv_memory):
     _name = 'product.installer'
     _inherit = 'res.config'
     _columns = {
-                'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
+        'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
 
     }
     _defaults = {
-                 'customers': 'create',
+        'customers': 'create',
     }
 
     def execute(self, cr, uid, ids, context=None):
-- 
cgit v1.2.3


From 14528b600e2a48f8b056d9999a1e9d989bc3b56b Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 27 Sep 2011 17:47:25 +0200
Subject: [IMP] base_setup: add a new wizard

bzr revid: stw@openerp.com-20110927154725-l2tazrlqbjhslm1j
---
 addons/base_setup/base_setup.py | 153 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 152 insertions(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 5e0b5c7f13b..f5b07d83d53 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -20,15 +20,166 @@
 ##############################################################################
 import pytz
 
+import simplejson
+import cgi
 import pooler
 import tools
 from osv import fields, osv
 from tools.translate import _
 from lxml import etree
-from osv import fields, osv
+
+class ir_module_category(osv.osv):
+    _inherit = 'ir.module.category'
+
+    _columns = {
+        'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
+    }
+ir_module_category()
 
 
 #Application and feature chooser, this could be done by introspecting ir.modules
+class base_setup_installer2(osv.osv_memory):
+    _name = 'base.setup.installer2'
+
+    _inherit = 'res.config.installer'
+
+    _columns = {
+        'modules' : fields.text('Modules'),
+    }
+
+    def fields_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        fields = {} #super(base_setup_installer2, self).fields_get(cr, uid, fields, context=context)
+        category_proxy = self.pool.get('ir.module.category')
+        category_ids = category_proxy.search(cr, uid, [], context=context)
+        for category in category_proxy.browse(cr, uid, category_ids, context=context):
+            category_name = 'category_%d' % (category.id,)
+            fields[category_name] = {
+                'type' : 'boolean',
+                'string' : category.name,
+                'name' : category_name,
+            }
+
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            module_name = 'module_%s' % (module.name,)
+            module_is_installed = module.state == 'installed'
+            fields[module_name] = {
+                'type' : 'boolean',
+                'string' : module.shortdesc,
+                'name' : module_name,
+                'help' : module.description,
+            }
+
+        return fields
+
+    def default_get(self, cr, uid, fields=None, context=None):
+        if context is None:
+            context = {}
+        if fields is None:
+            fields = {}
+
+        result = {}
+
+        if 'dont_compute_virtual_attributes' not in context:
+            module_proxy = self.pool.get('ir.module.module')
+            module_ids = module_proxy.search(cr, uid, [], context=context)
+            for module in module_proxy.browse(cr, uid, module_ids, context=context):
+                result['module_%s' % (module.name,)] = module.state == 'installed'
+                category_name = 'category_%d' % (module.category_id.id,)
+                if not result.get('category_name'):
+                    result[category_name] = module.state == 'installed'
+
+        return result
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+        result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+
+        module_category_proxy = self.pool.get('ir.module.category')
+        module_category_ids = module_category_proxy.search(cr, uid, [('name', '!=', 'Base')], context=context, order='name asc')
+        arch = ['<form string="Automatic Base Setup">']
+        arch.append('<separator string="Categories" colspan="4" />')
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            readonly = False
+            for module in module_category.module_ids:
+                if module.state == 'installed':
+                    readonly=True
+
+            if readonly:
+                arch.append("""<field name="category_%d" modifiers='%s'/>""" % (module_category.id, simplejson.dumps({'readonly' : True}),))
+            else:
+                arch.append('<field name="category_%d" />' % (module_category.id,))
+
+
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            if not module_category.module_ids:
+                continue
+
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+                'readonly' : module.state == 'installed',
+            }
+            modifiers = simplejson.dumps(modifiers)
+            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
+            for module in module_category.module_ids: 
+                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+
+        arch.append(
+            '<separator colspan="4" />'
+            '<group colspan="4" col="2">'
+            '<button special="cancel" string="Cancel" icon="gtk-cancel" />'
+            '<button string="Install Modules" type="object" name="apply_cb" icon="gtk-apply" />'
+            '</group>'
+        )
+
+        arch.append('</form>')
+
+        result['arch'] = ''.join(arch)
+
+        from pprint import pprint as pp
+        pp(result['arch'])
+
+        return result
+
+    def write(self, cr, uid, ids, values, context=None):
+        return True
+
+    def create(self, cr, uid, values, context=None):
+        modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
+        values = {
+            'modules' : simplejson.dumps(modules_to_install),
+        }
+        print "values: %r" % (values,)
+        context.update(dont_compute_virtual_attributes=True)
+        return super(base_setup_installer2, self).create(cr, uid, values, context=context)
+
+    def apply_cb(self, cr, uid, ids, context=None): 
+        for installer in self.browse(cr, uid, ids, context=context):
+            modules_to_install = simplejson.loads(installer.modules)
+            proxy = self.pool.get('ir.module.module')
+
+            module_ids = proxy.search(cr, uid, [('name', 'in', modules_to_install)], context=context)
+
+            need_update = False
+            for module in proxy.browse(cr, uid, module_ids, context=context):
+                module.state_update('to install', ['uninstalled'], context=context)
+                need_update = True
+                cr.commit()
+
+            if need_update:
+                self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+
+        if 'html' in context:
+            return {'type' : 'ir.actions.reload'}
+        else:
+            return {'type' : 'ir.actions.act_window_close'}
+
+base_setup_installer2()
 
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
-- 
cgit v1.2.3


From 4380b2044a5b635bbdbbecc8c01705d71a35af36 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 14:35:24 +0200
Subject: [REF] base_setup: Specify the right domain for the
 ir.module.category, needed by the fields_get and fields_view_get methods of
 the super base.setup.installer2

bzr revid: stw@openerp.com-20110929123524-lsw8o8diyj4ljpku
---
 addons/base_setup/base_setup.py | 45 ++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 031e004e804..38edf7accbf 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -53,9 +53,11 @@ class base_setup_installer2(osv.osv_memory):
         if fields is None:
             fields = {}
 
-        fields = {} #super(base_setup_installer2, self).fields_get(cr, uid, fields, context=context)
+        fields = {} 
         category_proxy = self.pool.get('ir.module.category')
-        category_ids = category_proxy.search(cr, uid, [], context=context)
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Localization')]
+        category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
             fields[category_name] = {
@@ -102,9 +104,12 @@ class base_setup_installer2(osv.osv_memory):
         result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
-        module_category_ids = module_category_proxy.search(cr, uid, [], context=context, order='name asc')
-        arch = ['<form string="Automatic Base Setup">']
-        arch.append('<separator string="Categories" colspan="4" />')
+        domain = [('parent_id', '=', False),
+                  ('name', '!=', 'Localization')]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='name asc')
+
+        arch = ['<form string="%s">' % _('Automatic Base Setup')]
+        arch.append('<separator string="%s" colspan="4" />' % _('Categories'))
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
             readonly = False
             for module in module_category.module_ids:
@@ -116,19 +121,19 @@ class base_setup_installer2(osv.osv_memory):
             else:
                 arch.append('<field name="category_%d" />' % (module_category.id,))
 
+        # Compute the module to show
+        for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
+            if not module_category.module_ids:
+                continue
 
-        #for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-        #    if not module_category.module_ids:
-        #        continue
-
-        #    modifiers = {
-        #        'invisible' : [('category_%d' % (module_category.id), '=', False)],
-        #        'readonly' : module.state == 'installed',
-        #    }
-        #    modifiers = simplejson.dumps(modifiers)
-        #    arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-        #    for module in module_category.module_ids: 
-        #        arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+            modifiers = {
+                'invisible' : [('category_%d' % (module_category.id), '=', False)],
+                'readonly' : module.state == 'installed',
+            }
+            modifiers = simplejson.dumps(modifiers)
+            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
+            for module in module_category.module_ids: 
+                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
 
         arch.append(
             '<separator colspan="4" />'
@@ -142,14 +147,8 @@ class base_setup_installer2(osv.osv_memory):
 
         result['arch'] = ''.join(arch)
 
-        from pprint import pprint as pp
-        pp(result['arch'])
-
         return result
 
-    def write(self, cr, uid, ids, values, context=None):
-        return True
-
     def create(self, cr, uid, values, context=None):
         modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
         values = {
-- 
cgit v1.2.3


From c536edf45fb9dcbf4a122c1bf64b6cd3006794e9 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 29 Sep 2011 18:08:17 +0200
Subject: [REF] base_setup: Rewrite the code of fields_view_get [IMP]
 base_setup: Compute the modules to install with the selection from the user

bzr revid: stw@openerp.com-20110929160817-8cjtaznqgyl6110h
---
 addons/base_setup/base_setup.py | 97 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 86 insertions(+), 11 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 38edf7accbf..1bafa7b6b9a 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -70,7 +70,7 @@ class base_setup_installer2(osv.osv_memory):
         module_proxy = self.pool.get('ir.module.module')
         module_ids = module_proxy.search(cr, uid, [], context=context)
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
-            module_name = 'module_%s' % (module.name,)
+            module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             fields[module_name] = {
                 'type' : 'boolean',
@@ -93,7 +93,7 @@ class base_setup_installer2(osv.osv_memory):
             module_proxy = self.pool.get('ir.module.module')
             module_ids = module_proxy.search(cr, uid, [], context=context)
             for module in module_proxy.browse(cr, uid, module_ids, context=context):
-                result['module_%s' % (module.name,)] = module.state == 'installed'
+                result['module_%d' % (module.id,)] = module.state == 'installed'
                 category_name = 'category_%d' % (module.category_id.id,)
                 if not result.get('category_name'):
                     result[category_name] = module.state == 'installed'
@@ -116,10 +116,16 @@ class base_setup_installer2(osv.osv_memory):
                 if module.state == 'installed':
                     readonly=True
 
+
+            attributes = {
+                'name' : 'category_%d' % (module_category.id,),
+                'on_change' : 'on_change_selection("category_%d")' % (module_category.id,),
+            }
             if readonly:
-                arch.append("""<field name="category_%d" modifiers='%s'/>""" % (module_category.id, simplejson.dumps({'readonly' : True}),))
-            else:
-                arch.append('<field name="category_%d" />' % (module_category.id,))
+                attributes['modifiers'] = simplejson.dumps({'readonly' : True})
+
+            arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
+                                                        for key, value in attributes.iteritems()]),))
 
         # Compute the module to show
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
@@ -132,8 +138,8 @@ class base_setup_installer2(osv.osv_memory):
             }
             modifiers = simplejson.dumps(modifiers)
             arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-            for module in module_category.module_ids: 
-                arch.append("""<field name="module_%s" modifiers='%s' />""" % (module.name, modifiers))
+            for module in module_category.module_ids:
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (module.id, modifiers))
 
         arch.append(
             '<separator colspan="4" />'
@@ -146,24 +152,93 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
+        from pprint import pprint as pp
+        pp(result['arch'])
 
         return result
 
+    def on_change_selection(self, cr, uid, ids, item, context=None):
+        if not isinstance(item, basestring):
+            return {}
+
+        if item.startswith('category_') or item.startswith('module_'):
+            object_name, identifier = item.split('_')
+        else:
+            return {}
+
+        values = {
+        }
+
+        #if object_name == 'category':
+        #    module_ids = self.pool.get('ir.module.module').search(cr, uid, [('category_id', '=', int(identifier))], context=context)
+        #    for module_id in module_ids:
+        #        values['module_%d' % module_id] = 1
+
+        return {'value': values}
+
     def create(self, cr, uid, values, context=None):
-        modules_to_install = [ key[len('module_'):] for key, value in values.iteritems() if value == 1 and key.startswith('module_')]
+        module_ids_to_install = [
+            key.split('_')[1]
+            for key, value in values.iteritems()
+            if value == 1 and key.startswith('module_')
+        ]
+
         values = {
             'modules' : simplejson.dumps(modules_to_install),
         }
-        print "values: %r" % (values,)
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
 
-    def apply_cb(self, cr, uid, ids, context=None): 
+    def _get_modules_to_install(self, cr, uid, selected_modules, context=None):
+        STATES = ('installed',)
+
+        module_proxy = self.pool.get('ir.module.module')
+        module_ids = module_proxy.search(cr, uid, [], context=context)
+
+        modules = {}
+        for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            modules[module.name] = {
+                'state' : module.state,
+                'depends' : module.depends,
+            }
+
+        installed_modules = []
+        for module, info in modules.iteritems():
+            info.setdefault('depends', [] if module == 'base' else ['base',])
+
+            if info['state'] in STATES:
+                installed_modules.append(module)
+                info['counter'] = 0
+            else:
+                info['counter'] = - len(set(info['depends']))
+
+        selected_modules = set(selected_modules + installed_modules) - set(['base'])
+
+        for selected_module in selected_modules:
+            for module, info in modules.iteritems():
+                if info['state'] not in STATES and \
+                   (selected_module in info['depends'] or selected_module == module):
+                    info['counter'] += 1
+
+        to_install_modules = set(module
+                                 for module, info in modules.iteritems()
+                                 if info['counter'] == 0 and
+                                    info['state'] not in STATES)
+
+        return to_install_modules
+
+    def apply_cb(self, cr, uid, ids, context=None):
         for installer in self.browse(cr, uid, ids, context=context):
             modules_to_install = simplejson.loads(installer.modules)
             proxy = self.pool.get('ir.module.module')
 
-            module_ids = proxy.search(cr, uid, [('name', 'in', modules_to_install)], context=context)
+            module_ids = proxy.search(cr, uid, [('id', 'in', modules_to_install)], context=context)
+            modules = set(record['name']
+                          for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
+
+            modules = self._get_modules_to_install(cr, uid, modules, context=context)
+
+            module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
 
             need_update = False
             for module in proxy.browse(cr, uid, module_ids, context=context):
-- 
cgit v1.2.3


From 4705ae93522982f4805bfaf49e253e6c7ffbe906 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 11:09:29 +0200
Subject: [REF] base_setup: Remove the definition of ir_module_category because
 defined in the server [FIX] base_setup: Set the rights variables and
 containers for the algo. [REF] base_setup: Use some code for the development
 of this wizard (sorry)

bzr revid: stw@openerp.com-20110930090929-lqj8lbmivsrkjmbb
---
 addons/base_setup/base_setup.py | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 1bafa7b6b9a..fc5fa1f2603 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -28,15 +28,6 @@ from osv import fields, osv
 from tools.translate import _
 from lxml import etree
 
-class ir_module_category(osv.osv):
-    _inherit = 'ir.module.category'
-
-    _columns = {
-        'module_ids' : fields.one2many('ir.module.module', 'category_id', 'Modules'),
-    }
-ir_module_category()
-
-
 #Application and feature chooser, this could be done by introspecting ir.modules
 class base_setup_installer2(osv.osv_memory):
     _name = 'base.setup.installer2'
@@ -72,9 +63,12 @@ class base_setup_installer2(osv.osv_memory):
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
+            title = "%s (%s)" % (module.shortdesc, module.complexity,)
+            title = "%s (%s)" % (module.name, module.complexity,)
+
             fields[module_name] = {
                 'type' : 'boolean',
-                'string' : module.shortdesc,
+                'string' : title,
                 'name' : module_name,
                 'help' : module.description,
             }
@@ -152,8 +146,8 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
-        from pprint import pprint as pp
-        pp(result['arch'])
+        #from pprint import pprint as pp
+        #pp(result['arch'])
 
         return result
 
@@ -184,7 +178,7 @@ class base_setup_installer2(osv.osv_memory):
         ]
 
         values = {
-            'modules' : simplejson.dumps(modules_to_install),
+            'modules' : simplejson.dumps(module_ids_to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
@@ -197,9 +191,10 @@ class base_setup_installer2(osv.osv_memory):
 
         modules = {}
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
+            depends = [ depend.name for depend in module.dependencies_id ]
             modules[module.name] = {
                 'state' : module.state,
-                'depends' : module.depends,
+                'depends' : depends,
             }
 
         installed_modules = []
@@ -236,9 +231,13 @@ class base_setup_installer2(osv.osv_memory):
             modules = set(record['name']
                           for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
 
-            modules = self._get_modules_to_install(cr, uid, modules, context=context)
+            modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
+
+            module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+
+            print "modules: %r" % (modules,)
 
-            module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+            break
 
             need_update = False
             for module in proxy.browse(cr, uid, module_ids, context=context):
-- 
cgit v1.2.3


From cb13a76208ed763e1ada4cb868ba8fee7fea147d Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 13:51:44 +0200
Subject: [FIX] base_setup: the web client can't parse the literal value in the
 on_change event. We use a workaround to bypass this kind of problem.

bzr revid: stw@openerp.com-20110930115144-nwog9ac6a5dzv1xj
---
 addons/base_setup/base_setup.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index fc5fa1f2603..42fae345959 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -113,7 +113,7 @@ class base_setup_installer2(osv.osv_memory):
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
-                'on_change' : 'on_change_selection("category_%d")' % (module_category.id,),
+                'on_change' : 'on_change_%s_%d(category_%d)' % ('category', module_category.id, module_category.id,),
             }
             if readonly:
                 attributes['modifiers'] = simplejson.dumps({'readonly' : True})
@@ -151,8 +151,17 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
-    def on_change_selection(self, cr, uid, ids, item, context=None):
-        if not isinstance(item, basestring):
+    def __getattr__(self, name):
+        if name.startswith('on_change_category_'):
+            def proxy(cr, uid, ids, value, context=None):
+                item = 'category_%s' % name[len('on_change_category_'):]
+                return self._on_change_selection(cr, uid, ids, item, value, context=context)
+            return proxy
+        return getattr(super(base_setup_installer2, self), name)
+
+    def _on_change_selection(self, cr, uid, ids, item, value, context=None):
+        print "on_change_selection: %r" % (item,) 
+        if not isinstance(item, basestring) or not value:
             return {}
 
         if item.startswith('category_') or item.startswith('module_'):
@@ -208,6 +217,7 @@ class base_setup_installer2(osv.osv_memory):
                 info['counter'] = - len(set(info['depends']))
 
         selected_modules = set(selected_modules + installed_modules) - set(['base'])
+        print "selected_modules: %r" % (selected_modules,)
 
         for selected_module in selected_modules:
             for module, info in modules.iteritems():
@@ -220,6 +230,8 @@ class base_setup_installer2(osv.osv_memory):
                                  if info['counter'] == 0 and
                                     info['state'] not in STATES)
 
+        print "to_install_modules: %r" % (to_install_modules,)
+
         return to_install_modules
 
     def apply_cb(self, cr, uid, ids, context=None):
-- 
cgit v1.2.3


From c4d51e5acba9af43aee437e24b510a05df3137cc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Fri, 30 Sep 2011 17:49:56 +0200
Subject: [IMP] base_setup: Set the default modules to load when the user
 selects a category [IMP] base_setup: Show the expert modules only if the user
 is in the extended group

bzr revid: stw@openerp.com-20110930154956-si1rkeiifhh90tqd
---
 addons/base_setup/base_setup.py | 142 ++++++++++++++++++++++++++++++++--------
 1 file changed, 115 insertions(+), 27 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 42fae345959..cc94e946b0c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -29,13 +29,27 @@ from tools.translate import _
 from lxml import etree
 
 #Application and feature chooser, this could be done by introspecting ir.modules
+DEFAULT_MODULES = {
+    'Customer Relationship Management' : ['crm',],
+    'Sales Management' : ['sale',],
+    'Project Management' : ['project',],
+    'Knowledge Management' : ['document',],
+    'Warehouse Management' : ['stock',],
+    'Manufacturing' : ['mrp',],
+    'Accounting & Finance' : ['account,'],
+    'Purchase Management' : ['purchase,'],
+    'Human Resources' : ['hr',],
+    'Point of Sales' : ['pos',],
+    'Marketing' : ['marketing',],
+}
+
 class base_setup_installer2(osv.osv_memory):
     _name = 'base.setup.installer2'
 
     _inherit = 'res.config.installer'
 
     _columns = {
-        'modules' : fields.text('Modules'),
+        'selection' : fields.text('Selection'),
     }
 
     def fields_get(self, cr, uid, fields=None, context=None):
@@ -47,7 +61,7 @@ class base_setup_installer2(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', '!=', 'Localization')]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools'))]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -64,7 +78,7 @@ class base_setup_installer2(osv.osv_memory):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             title = "%s (%s)" % (module.shortdesc, module.complexity,)
-            title = "%s (%s)" % (module.name, module.complexity,)
+            title = "%s %s (%s)" % (module.shortdesc, module.name, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
@@ -94,22 +108,47 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
+
+        def in_extended_view_group(cr, uid, context=None):
+            try:
+                model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
+            except ValueError:
+                return False
+            return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
+
         result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', '!=', 'Localization')]
-        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='name asc')
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base'))]
+        module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
-        arch.append('<separator string="%s" colspan="4" />' % _('Categories'))
+        arch.append('<separator string="%s" colspan="4" />' % _('Install Applications'))
+        module_proxy = self.pool.get('ir.module.module')
+
+        extended_view = in_extended_view_group(cr, uid, context=context)
+
+        print "extended_view: %r" % (extended_view,)
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            readonly = False
-            for module in module_category.module_ids:
-                if module.state == 'installed':
-                    readonly=True
+            domain = [('installable', '=', True),
+                      ('category_id', '=', module_category.id)]
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            print "domain: %r" % (domain,)
 
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+            if not modules:
+                continue
+
+            readonly = any(module.state == 'installed' for module in modules)
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
@@ -122,18 +161,43 @@ class base_setup_installer2(osv.osv_memory):
                                                         for key, value in attributes.iteritems()]),))
 
         # Compute the module to show
+
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            if not module_category.module_ids:
+            domain = [('installable', '=', True),
+                      ('category_id', '=', module_category.id)]
+
+            if not extended_view:
+                domain.append(('complexity', '!=', 'expert'))
+
+            default_modules = DEFAULT_MODULES.get(module_category.name, False)
+            if default_modules:
+                domain.append(('name', 'not in', default_modules))
+
+            print "domain2: %r" % (domain,)
+
+            modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
+
+            if not modules:
                 continue
 
             modifiers = {
                 'invisible' : [('category_%d' % (module_category.id), '=', False)],
-                'readonly' : module.state == 'installed',
             }
-            modifiers = simplejson.dumps(modifiers)
-            arch.append("""<separator string="%s" colspan="4" modifiers='%s'/>""" % (cgi.escape(module_category.name), modifiers))
-            for module in module_category.module_ids:
-                arch.append("""<field name="module_%d" modifiers='%s' />""" % (module.id, modifiers))
+            module_modifiers = dict(modifiers)
+
+            arch.append("""<separator string="%s Features" colspan="4" modifiers='%s'/>""" % (
+                cgi.escape(module_category.name),
+                simplejson.dumps(modifiers))
+            )
+
+            for module in modules:
+                #module_modifiers['readonly'] = module.state == 'installed'
+                #print "module_modifiers: %r %r" % (module.name, module_modifiers,)
+
+                arch.append("""<field name="module_%d" modifiers='%s' />""" % (
+                    module.id,
+                    simplejson.dumps(module_modifiers))
+                )
 
         arch.append(
             '<separator colspan="4" />'
@@ -160,7 +224,7 @@ class base_setup_installer2(osv.osv_memory):
         return getattr(super(base_setup_installer2, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
-        print "on_change_selection: %r" % (item,) 
+        #print "on_change_selection: %r" % (item,) 
         if not isinstance(item, basestring) or not value:
             return {}
 
@@ -180,14 +244,18 @@ class base_setup_installer2(osv.osv_memory):
         return {'value': values}
 
     def create(self, cr, uid, values, context=None):
-        module_ids_to_install = [
-            key.split('_')[1]
-            for key, value in values.iteritems()
-            if value == 1 and key.startswith('module_')
-        ]
+        to_install = {'categories' : [], 'modules' : []}
+
+        for key, value in values.iteritems():
+            if value == 1 and (key.startswith('module_') or key.startswith('category_')):
+                kind, identifier = key.split('_')
+                if kind == 'category':
+                    to_install['categories'].append(long(identifier))
+                if kind == 'module':
+                    to_install['modules'].append(long(identifier))
 
         values = {
-            'modules' : simplejson.dumps(module_ids_to_install),
+            'selection' : simplejson.dumps(to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
@@ -196,7 +264,7 @@ class base_setup_installer2(osv.osv_memory):
         STATES = ('installed',)
 
         module_proxy = self.pool.get('ir.module.module')
-        module_ids = module_proxy.search(cr, uid, [], context=context)
+        module_ids = module_proxy.search(cr, uid, [('installable', '=', False)], context=context)
 
         modules = {}
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
@@ -235,15 +303,35 @@ class base_setup_installer2(osv.osv_memory):
         return to_install_modules
 
     def apply_cb(self, cr, uid, ids, context=None):
+        category_proxy = self.pool.get('ir.module.category')
         for installer in self.browse(cr, uid, ids, context=context):
-            modules_to_install = simplejson.loads(installer.modules)
+            to_install = simplejson.loads(installer.selection)
+
             proxy = self.pool.get('ir.module.module')
 
-            module_ids = proxy.search(cr, uid, [('id', 'in', modules_to_install)], context=context)
+            module_ids = proxy.search(cr, uid, [('id', 'in', to_install['modules'])], context=context)
             modules = set(record['name']
                           for record in proxy.read(cr, uid, module_ids, ['name'], context=context))
 
-            modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
+            category_ids = category_proxy.search(cr, uid, [('id', 'in', to_install['categories'])], context=context)
+            selected_categories = set(record['name']
+                                      for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
+
+            # Workaround :(
+            # FIXME: Use a workaround, but can do better
+            #import pdb
+            #pdb.set_trace()
+            for category_name, default_modules in DEFAULT_MODULES.iteritems():
+                if category_name in selected_categories:
+                    modules.update(default_modules)
+
+            if 'sale' in modules and 'crm' in modules:
+                modules.add('sale_crm')
+            if 'sale' in modules and 'project' in modules:
+                modules.add('project_mrp')
+
+            # The current code has a bug
+            # modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
 
             module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
 
-- 
cgit v1.2.3


From d9dc20068892a75ce272d40a7c338805467402c1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 22:10:44 +0200
Subject: [IMP] useability views

bzr revid: fp@tinyerp.com-20111001201044-pmttdc810josm8a9
---
 addons/base_setup/base_setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 5717df8681f..efa2f9e023c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -259,7 +259,7 @@ class specify_partner_terminology(osv.osv_memory):
                                  'Choose how to call a Customer', required=True ),
     }
     _defaults={
-               'partner' :'Partner',
+        'partner' :'Customer',
     }
 
     def make_translations(self, cr, uid, ids, name, type, src, value, res_id=0, context=None):
-- 
cgit v1.2.3


From c271931682c7bb22e03619a14b778b1490dbe290 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 1 Oct 2011 23:20:00 +0200
Subject: [IMP] improved views of config wizards

bzr revid: fp@tinyerp.com-20111001212000-koul7fq12hdxbwvw
---
 addons/base_setup/base_setup.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index efa2f9e023c..a87e4e24e39 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -247,16 +247,16 @@ class specify_partner_terminology(osv.osv_memory):
     _name = 'base.setup.terminology'
     _inherit = 'res.config'
     _columns = {
-        'partner': fields.selection([('Customer','Customer'),
-                                  ('Client','Client'),
-                                  ('Member','Member'),
-                                  ('Patient','Patient'),
-                                  ('Partner','Partner'),
-                                  ('Donor','Donor'),
-                                  ('Guest','Guest'),
-                                  ('Tenant','Tenant')
-                                  ],
-                                 'Choose how to call a Customer', required=True ),
+        'partner': fields.selection([
+            ('Customer','Customer'),
+            ('Client','Client'),
+            ('Member','Member'),
+            ('Patient','Patient'),
+            ('Partner','Partner'),
+            ('Donor','Donor'),
+            ('Guest','Guest'),
+            ('Tenant','Tenant')
+        ], 'How do you call a Customer', required=True ),
     }
     _defaults={
         'partner' :'Customer',
-- 
cgit v1.2.3


From b4d9f085c97b3a8f9787d8dc38030ce761f9c232 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 13:57:18 +0200
Subject: [FIX] base_setup: Compute the modules to install

bzr revid: stw@openerp.com-20111003115718-g681jwbp25yotvq7
---
 addons/base_setup/base_setup.py | 102 ++++++++++------------------------------
 1 file changed, 26 insertions(+), 76 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index cc94e946b0c..ddba85c09cf 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -61,7 +61,7 @@ class base_setup_installer2(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools'))]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -78,7 +78,6 @@ class base_setup_installer2(osv.osv_memory):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
             title = "%s (%s)" % (module.shortdesc, module.complexity,)
-            title = "%s %s (%s)" % (module.shortdesc, module.name, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
@@ -110,7 +109,6 @@ class base_setup_installer2(osv.osv_memory):
 
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
-
         def in_extended_view_group(cr, uid, context=None):
             try:
                 model, group_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_extended')
@@ -122,7 +120,7 @@ class base_setup_installer2(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base'))]
+                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
@@ -131,10 +129,8 @@ class base_setup_installer2(osv.osv_memory):
 
         extended_view = in_extended_view_group(cr, uid, context=context)
 
-        print "extended_view: %r" % (extended_view,)
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            domain = [('installable', '=', True),
-                      ('category_id', '=', module_category.id)]
+            domain = [('category_id', '=', module_category.id)]
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
 
@@ -142,8 +138,6 @@ class base_setup_installer2(osv.osv_memory):
             if default_modules:
                 domain.append(('name', 'not in', default_modules))
 
-            print "domain: %r" % (domain,)
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
             if not modules:
                 continue
@@ -163,8 +157,7 @@ class base_setup_installer2(osv.osv_memory):
         # Compute the module to show
 
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
-            domain = [('installable', '=', True),
-                      ('category_id', '=', module_category.id)]
+            domain = [('category_id', '=', module_category.id)]
 
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
@@ -173,8 +166,6 @@ class base_setup_installer2(osv.osv_memory):
             if default_modules:
                 domain.append(('name', 'not in', default_modules))
 
-            print "domain2: %r" % (domain,)
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
 
             if not modules:
@@ -192,7 +183,6 @@ class base_setup_installer2(osv.osv_memory):
 
             for module in modules:
                 #module_modifiers['readonly'] = module.state == 'installed'
-                #print "module_modifiers: %r %r" % (module.name, module_modifiers,)
 
                 arch.append("""<field name="module_%d" modifiers='%s' />""" % (
                     module.id,
@@ -210,9 +200,6 @@ class base_setup_installer2(osv.osv_memory):
         arch.append('</form>')
 
         result['arch'] = ''.join(arch)
-        #from pprint import pprint as pp
-        #pp(result['arch'])
-
         return result
 
     def __getattr__(self, name):
@@ -224,7 +211,6 @@ class base_setup_installer2(osv.osv_memory):
         return getattr(super(base_setup_installer2, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
-        #print "on_change_selection: %r" % (item,) 
         if not isinstance(item, basestring) or not value:
             return {}
 
@@ -260,48 +246,6 @@ class base_setup_installer2(osv.osv_memory):
         context.update(dont_compute_virtual_attributes=True)
         return super(base_setup_installer2, self).create(cr, uid, values, context=context)
 
-    def _get_modules_to_install(self, cr, uid, selected_modules, context=None):
-        STATES = ('installed',)
-
-        module_proxy = self.pool.get('ir.module.module')
-        module_ids = module_proxy.search(cr, uid, [('installable', '=', False)], context=context)
-
-        modules = {}
-        for module in module_proxy.browse(cr, uid, module_ids, context=context):
-            depends = [ depend.name for depend in module.dependencies_id ]
-            modules[module.name] = {
-                'state' : module.state,
-                'depends' : depends,
-            }
-
-        installed_modules = []
-        for module, info in modules.iteritems():
-            info.setdefault('depends', [] if module == 'base' else ['base',])
-
-            if info['state'] in STATES:
-                installed_modules.append(module)
-                info['counter'] = 0
-            else:
-                info['counter'] = - len(set(info['depends']))
-
-        selected_modules = set(selected_modules + installed_modules) - set(['base'])
-        print "selected_modules: %r" % (selected_modules,)
-
-        for selected_module in selected_modules:
-            for module, info in modules.iteritems():
-                if info['state'] not in STATES and \
-                   (selected_module in info['depends'] or selected_module == module):
-                    info['counter'] += 1
-
-        to_install_modules = set(module
-                                 for module, info in modules.iteritems()
-                                 if info['counter'] == 0 and
-                                    info['state'] not in STATES)
-
-        print "to_install_modules: %r" % (to_install_modules,)
-
-        return to_install_modules
-
     def apply_cb(self, cr, uid, ids, context=None):
         category_proxy = self.pool.get('ir.module.category')
         for installer in self.browse(cr, uid, ids, context=context):
@@ -317,35 +261,41 @@ class base_setup_installer2(osv.osv_memory):
             selected_categories = set(record['name']
                                       for record in category_proxy.read(cr, uid, category_ids, ['name'], context=context))
 
-            # Workaround :(
             # FIXME: Use a workaround, but can do better
-            #import pdb
-            #pdb.set_trace()
             for category_name, default_modules in DEFAULT_MODULES.iteritems():
                 if category_name in selected_categories:
                     modules.update(default_modules)
 
-            if 'sale' in modules and 'crm' in modules:
-                modules.add('sale_crm')
+            # Special Cases:
+            # * project_mrp: the dependencies are sale, project, procurement, mrp_jit
             if 'sale' in modules and 'project' in modules:
                 modules.add('project_mrp')
 
-            # The current code has a bug
-            # modules = self._get_modules_to_install(cr, uid, list(modules), context=context)
-
+            need_update = False
             module_ids = proxy.search(cr, uid, [('name', 'in', list(modules))], context=context)
+            if module_ids:
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
+                need_update = True
 
-            print "modules: %r" % (modules,)
-
-            break
-
-            need_update = False
-            for module in proxy.browse(cr, uid, module_ids, context=context):
-                module.state_update('to install', ['uninstalled'], context=context)
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_link')
+            while True and category_id:
+                cr.execute("select id, name from ir_module_module m where category_id = %s \
+                           and (select count(d.id) from ir_module_module_dependency d \
+                           where d.module_id = m.id) = (select count(d.id) from \
+                           ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
+                           where d.module_id=m.id and m2.state in %s ) and state = %s",
+                          (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
+                modules = [name for _, name in cr.fetchall()]
+
+                module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+                if not module_ids:
+                    break
+
+                proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
-                cr.commit()
 
             if need_update:
+                cr.commit()
                 self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
 
         if 'html' in context:
-- 
cgit v1.2.3


From b916762b26a8affc3de592936f335b013de2d48f Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Mon, 3 Oct 2011 14:06:56 +0200
Subject: [REF] Remove old codes

bzr revid: stw@openerp.com-20111003120656-5kje5dgpulhz4a9u
---
 addons/base_setup/base_setup.py | 332 ++++------------------------------------
 1 file changed, 32 insertions(+), 300 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index ddba85c09cf..8d149b522b6 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -43,8 +43,8 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
-class base_setup_installer2(osv.osv_memory):
-    _name = 'base.setup.installer2'
+class base_setup_installer(osv.osv_memory):
+    _name = 'base.setup.installer'
 
     _inherit = 'res.config.installer'
 
@@ -107,7 +107,6 @@ class base_setup_installer2(osv.osv_memory):
 
         return result
 
-
     def fields_view_get(self, cr, uid, view_id=None, view_type='from', context=None, toolbar=False, submenu=False):
         def in_extended_view_group(cr, uid, context=None):
             try:
@@ -116,7 +115,7 @@ class base_setup_installer2(osv.osv_memory):
                 return False
             return group_id in self.pool.get('res.users').read(cr, uid, uid, ['groups_id'], context=context)['groups_id']
 
-        result = super(base_setup_installer2, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
+        result = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
@@ -208,7 +207,7 @@ class base_setup_installer2(osv.osv_memory):
                 item = 'category_%s' % name[len('on_change_category_'):]
                 return self._on_change_selection(cr, uid, ids, item, value, context=context)
             return proxy
-        return getattr(super(base_setup_installer2, self), name)
+        return getattr(super(base_setup_installer, self), name)
 
     def _on_change_selection(self, cr, uid, ids, item, value, context=None):
         if not isinstance(item, basestring) or not value:
@@ -244,7 +243,7 @@ class base_setup_installer2(osv.osv_memory):
             'selection' : simplejson.dumps(to_install),
         }
         context.update(dont_compute_virtual_attributes=True)
-        return super(base_setup_installer2, self).create(cr, uid, values, context=context)
+        return super(base_setup_installer, self).create(cr, uid, values, context=context)
 
     def apply_cb(self, cr, uid, ids, context=None):
         category_proxy = self.pool.get('ir.module.category')
@@ -303,301 +302,34 @@ class base_setup_installer2(osv.osv_memory):
         else:
             return {'type' : 'ir.actions.act_window_close'}
 
-base_setup_installer2()
-
-class base_setup_installer(osv.osv_memory):
-    _name = 'base.setup.installer'
-    _inherit = 'res.config.installer'
-
-    _install_if = {
-        ('sale','crm'): ['sale_crm'],
-        ('sale','project'): ['project_mrp'],
-    }
-    _columns = {
-        # Generic modules
-        'crm':fields.boolean('Customer Relationship Management',
-            help="Helps you track and manage relations with customers such as"
-                 " leads, requests or issues. Can automatically send "
-                 "reminders, escalate requests or trigger business-specific "
-                 "actions based on standard events."),
-        'sale':fields.boolean('Sales Management',
-            help="Helps you handle your quotations, sale orders and invoicing"
-                 "."),
-        'project':fields.boolean('Project Management',
-            help="Helps you manage your projects and tasks by tracking them, "
-                 "generating plannings, etc..."),
-        'knowledge':fields.boolean('Knowledge Management',
-            help="Lets you install addons geared towards sharing knowledge "
-                 "with and between your employees."),
-        'stock':fields.boolean('Warehouse Management',
-            help="Helps you manage your inventory and main stock operations: delivery orders, receptions, etc."),
-        'mrp':fields.boolean('Manufacturing',
-            help="Helps you manage your manufacturing processes and generate "
-                 "reports on those processes."),
-        'account_voucher':fields.boolean('Invoicing & Payments',
-            help="Allows you to create your invoices and track the payments. It is an easier version of the accounting module for managers who are not accountants."),
-        'account_accountant':fields.boolean('Accounting & Finance',
-            help="Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing "),
-        'purchase':fields.boolean('Purchase Management',
-            help="Helps you manage your purchase-related processes such as "
-                 "requests for quotations, supplier invoices, etc..."),
-        'hr':fields.boolean('Human Resources',
-            help="Helps you manage your human resources by encoding your employees structure, generating work sheets, tracking attendance and more."),
-        'point_of_sale':fields.boolean('Point of Sales',
-            help="Helps you get the most out of your points of sales with "
-                 "fast sale encoding, simplified payment mode encoding, "
-                 "automatic picking lists generation and more."),
-        'marketing':fields.boolean('Marketing',
-            help="Helps you manage your marketing campaigns step by step."),
-        'profile_tools':fields.boolean('Extra Tools',
-            help="Lets you install various interesting but non-essential tools "
-                "like Survey, Lunch and Ideas box."),
-        'report_designer':fields.boolean('Advanced Reporting',
-            help="Lets you install various tools to simplify and enhance "
-                 "OpenERP's report creation."),
-        # Vertical modules
-        'product_expiry':fields.boolean('Food Industry',
-            help="Installs a preselected set of OpenERP applications "
-                "which will help you manage your industry."),
-        'association':fields.boolean('Associations',
-            help="Installs a preselected set of OpenERP "
-                 "applications which will help you manage your association "
-                 "more efficiently."),
-        'auction':fields.boolean('Auction Houses',
-            help="Installs a preselected set of OpenERP "
-                 "applications selected to help you manage your auctions "
-                 "as well as the business processes around them."),
-        'account_analytic_plans': fields.boolean('Multiple Analytic Plans',
-            help="Allows invoice lines to impact multiple analytic accounts "
-                 "simultaneously."),
-        'account_payment': fields.boolean('Suppliers Payment Management',
-            help="Streamlines invoice payment and creates hooks to plug "
-                 "automated payment systems in."),
-        'account_followup': fields.boolean('Followups Management',
-            help="Helps you generate reminder letters for unpaid invoices, "
-                 "including multiple levels of reminding and customized "
-                 "per-partner policies."),
-        'account_anglo_saxon': fields.boolean('Anglo-Saxon Accounting',
-            help="This module will support the Anglo-Saxons accounting methodology by "
-                "changing the accounting logic with stock transactions."),
-        'account_asset': fields.boolean('Assets Management',
-            help="Helps you to manage your assets and their depreciation entries."),
-        # Manufacturing Resource Planning
-        'stock_location': fields.boolean('Advanced Routes',
-            help="Manages product routes and paths within and between "
-                 "locations (e.g. warehouses)."),
-        'mrp_jit': fields.boolean('Just In Time Scheduling',
-            help="Enables Just In Time computation of procurement orders."
-                 "\n\nWhile it's more resource intensive than the default "
-                 "setup, the JIT computer avoids having to wait for the "
-                 "procurement scheduler to run or having to run the "
-                 "procurement scheduler manually."),
-        'mrp_operations': fields.boolean('Manufacturing Operations',
-            help="Enhances production orders with readiness states as well "
-                 "as the start date and end date of execution of the order."),
-        'mrp_subproduct': fields.boolean('MRP Subproducts',
-            help="Enables multiple product output from a single production "
-                 "order: without this, a production order can have only one "
-                 "output product."),
-        'mrp_repair': fields.boolean('Repairs',
-            help="Enables warranty and repair management (and their impact "
-                 "on stocks and invoicing)."),
-        # Knowledge Management
-        'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's "
-                "Document Management System. It lets you access attachments "
-                "and virtual documents through a standard FTP client."),
-        'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
-            help="Provides a WebDAV access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through your standard file browser."),
-        'wiki':fields.boolean('Collaborative Content (Wiki)',
-            help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        # Content templates
-        'wiki_faq':fields.boolean('Template: Internal FAQ',
-            help="Creates a skeleton internal FAQ pre-filled with "
-                 "documentation about OpenERP's Document Management "
-                 "System."),
-        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
-            help="Creates an example skeleton for a standard quality manual."),
-        # Reporting
-        'base_report_designer':fields.boolean('OpenOffice Report Designer',help="Adds wizards to Import/Export .SXW report which "
-                                "you can modify in OpenOffice.Once you have modified it you can "
-                                "upload the report using the same wizard."),
-        'base_report_creator':fields.boolean('Query Builder',help="Allows you to create any statistic "
-                                "reports  on several objects. It's a SQL query builder and browser for end users."),
-        'lunch':fields.boolean('Lunch',help='A simple module to help you to manage Lunch orders.'),
-        'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
-        'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
-        'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
-        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
-            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Collaborative Note Pads',
-            help="This module creates a tighter integration between a Pad "
-                 "instance of your choosing and your OpenERP Web Client by "
-                 "letting you easily link pads to OpenERP objects via "
-                 "OpenERP attachments."),
-        'email_template':fields.boolean('Automated E-Mails',
-            help="Helps you to design templates of emails and integrate them in your different processes."),
-        'marketing_campaign':fields.boolean('Marketing Campaigns',
-            help="Helps you to manage marketing campaigns and automate actions and communication steps."),
-        'crm_profiling':fields.boolean('Profiling Tools',
-            help="Helps you to perform segmentation of partners and design segmentation questionnaires"),
-        # Human Resources Management
-        'hr_holidays': fields.boolean('Leaves Management',
-            help="Tracks employee leaves, allocation requests and planning."),
-        'hr_expense': fields.boolean('Expenses',
-            help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'hr_recruitment': fields.boolean('Recruitment Process',
-            help="Helps you manage and streamline your recruitment process."),
-        'hr_timesheet_sheet':fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'hr_contract': fields.boolean("Employee's Contracts",
-            help="Extends employee profiles to help manage their contracts."),
-        'hr_evaluation': fields.boolean('Periodic Evaluations',
-            help="Lets you create and manage the periodic evaluation and "
-                 "performance review of employees."),
-        'hr_attendance': fields.boolean('Attendances',
-            help="Simplifies the management of employee's attendances."),
-        'hr_payroll': fields.boolean('Payroll',
-            help="Generic Payroll system."),
-        'hr_payroll_account': fields.boolean('Payroll Accounting',
-            help="Generic Payroll system Integrated with Accountings."),
-        # Project Management
-        'project_long_term': fields.boolean(
-        'Long Term Planning',
-            help="Enables long-term projects tracking, including "
-                 "multiple-phase projects and resource allocation handling."),
-        'hr_timesheet_sheet': fields.boolean('Timesheets',
-            help="Tracks and helps employees encode and validate timesheets "
-                 "and attendances."),
-        'project_timesheet': fields.boolean('Bill Time on Tasks',
-            help="Helps generate invoices based on time spent on tasks, if activated on the project."),
-        'account_budget': fields.boolean('Budgets',
-            help="Helps accountants manage analytic and crossover budgets."),
-        'project_issue': fields.boolean('Issues Tracker',
-            help="Automatically synchronizes project tasks and crm cases."),
-        # Methodologies
-        'project_scrum': fields.boolean('Methodology: SCRUM',
-            help="Implements and tracks the concepts and task types defined "
-                 "in the SCRUM methodology."),
-        'project_gtd': fields.boolean('Methodology: Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allows you to easily keep track and manage all your purchase orders."),
-        'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders."),
-        'delivery': fields.boolean('Delivery Costs', 
-            help="Allows you to compute delivery costs on your quotations."),
-        'sale_journal': fields.boolean('Invoicing journals',
-            help="Allows you to group and invoice your delivery orders according to different invoicing types: daily, weekly, etc."),
-        'sale_layout': fields.boolean('Sales Orders Print Layout',
-            help="Provides some features to improve the layout of the Sales Order reports."),
-        'sale_margin': fields.boolean('Margins in Sales Orders',
-            help="Gives the margin of profitability by calculating "
-                 "the difference between Unit Price and Cost Price."),
-        'sale_order_dates': fields.boolean('Full Dates on Sales Orders',
-            help="Adds commitment, requested and effective dates on Sales Orders."),
-        'hr_expense':fields.boolean('Resources Management: Expenses Tracking',  help="Tracks and manages employee expenses, and can "
-                 "automatically re-invoice clients if the expenses are "
-                 "project-related."),
-        'event_project':fields.boolean('Event Management: Events', help="Helps you to manage and organize your events."),
-        'project_gtd':fields.boolean('Getting Things Done',
-            help="GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."),
-        'wiki': fields.boolean('Wiki', help="Lets you create wiki pages and page groups in order "
-                 "to keep track of business knowledge and share it with "
-                 "and  between your employees."),
-        'name': fields.char('Name', size=64),
-        'crm_helpdesk': fields.boolean('Helpdesk', help="Manages a Helpdesk service."),
-        'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fundraising process and tracking."),
-        'crm_claim': fields.boolean('Claims', help="Manages the suppliers and customers claims, including your corrective or preventive actions."),
-        'import_sugarcrm': fields.boolean('Import Data from SugarCRM', help="Help you to import and update data from SugarCRM to OpenERP"),
-        'crm_caldav': fields.boolean('Calendar Synchronizing', help="Helps you to synchronize the meetings with other calendar clients and mobiles."),
-        'sale_crm': fields.boolean('Opportunity to Quotation', help="Create a Quotation from an Opportunity."),
-        'fetchmail': fields.boolean('Fetch Emails', help="Allows you to receive E-Mails from POP/IMAP server."),
-        'thunderbird': fields.boolean('Thunderbird Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'outlook': fields.boolean('MS-Outlook Plug-In', help="Allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."),
-        'wiki_sale_faq': fields.boolean('Sale FAQ', help="Helps you manage wiki pages for Frequently Asked Questions on Sales Application."),
-        'import_google': fields.boolean('Google Import', help="Imports contacts and events from your google account."),
-    }
+    # TODO: To implement in this new wizard
+    #def execute(self, cr, uid, ids, context=None):
+    #    module_pool = self.pool.get('ir.module.module')
+    #    modules_selected = []
+    #    datas = self.read(cr, uid, ids, context=context)[0]
+    #    for mod in datas.keys():
+    #        if mod in ('id', 'progress'):
+    #            continue
+    #        if datas[mod] == 1:
+    #            modules_selected.append(mod)
+
+    #    module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
+    #    need_install = False
+    #    for module in module_pool.browse(cr, uid, module_ids, context=context):
+    #        if module.state == 'uninstalled':
+    #            module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
+    #            need_install = True
+    #            cr.commit()
+    #        elif module.state == 'installed':
+    #            cr.execute("update ir_actions_todo set state='open' \
+    #                                from ir_model_data as data where data.res_id = ir_actions_todo.id \
+    #                                and ir_actions_todo.type='special'\
+    #                                and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+    #    if need_install:
+    #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
+    #    return
+base_setup_installer()
 
-    _defaults = {
-        'mrp_jit': lambda self,cr,uid,*a: self.pool.get('res.users').browse(cr, uid, uid).view == 'simple',
-        'document_ftp':True,
-        'marketing_campaign': lambda *a: 1,
-    }
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(base_setup_installer, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu)
-        doc = etree.XML(res['arch'])
-        for module in ['project_gtd','hr_expense']:
-            count = 0
-            for node in doc.xpath("//field[@name='%s']" % (module)):
-                count = count + 1
-                if count > 1:
-                    node.set('invisible', '1')
-        res['arch'] = etree.tostring(doc)
-        #Checking sale module is installed or not
-        cr.execute("SELECT * from ir_module_module where state='installed' and name = 'sale'")
-        count = cr.fetchall()
-        if count:
-            doc = etree.XML(res['arch'])
-            nodes = doc.xpath("//field[@name='sale_crm']")
-            for node in nodes:
-                node.set('invisible', '0')
-                node.set('modifiers', '{}')
-            res['arch'] = etree.tostring(doc)
-        return res
-
-    def _if_knowledge(self, cr, uid, ids, context=None):
-        if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
-               .view == 'simple':
-            return ['document_ftp']
-        return None
-
-    def _if_misc_tools(self, cr, uid, ids, context=None):
-        return ['profile_tools']
-
-    def onchange_moduleselection(self, cr, uid, ids, *args, **kargs):
-        value = {}
-        # Calculate progress
-        closed, total = self.get_current_progress(cr, uid)
-        progress = round(100. * closed / (total + len(filter(None, args))))
-        value.update({'progress':progress})
-        if progress < 10.:
-            progress = 10.
-        
-        return {'value':value}
-
-
-    def execute(self, cr, uid, ids, context=None):
-        module_pool = self.pool.get('ir.module.module')
-        modules_selected = []
-        datas = self.read(cr, uid, ids, context=context)[0]
-        for mod in datas.keys():
-            if mod in ('id', 'progress'):
-                continue
-            if datas[mod] == 1:
-                modules_selected.append(mod)
-
-        module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-        need_install = False
-        for module in module_pool.browse(cr, uid, module_ids, context=context):
-            if module.state == 'uninstalled':
-                module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-                need_install = True
-                cr.commit()
-            elif module.state == 'installed':
-                cr.execute("update ir_actions_todo set state='open' \
-                                    from ir_model_data as data where data.res_id = ir_actions_todo.id \
-                                    and ir_actions_todo.type='special'\
-                                    and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-        if need_install:
-            self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-        return
 
 
 
-- 
cgit v1.2.3


From 3fe0d0877272ad6d24d9e774fe0130d907d23293 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 01:18:32 +0200
Subject: [FIX] some catgories and complexity

bzr revid: al@openerp.com-20111004231832-8hx5233nm031nuhs
---
 addons/base_setup/base_setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index fa251719509..33837b5553b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -43,6 +43,8 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
+HIDDEN_CATEGORIES = ('Tools', 'System', 'Localization', 'Link', 'Uncategorized')
+
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
 
@@ -61,7 +63,7 @@ class base_setup_installer(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES )]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -119,7 +121,7 @@ class base_setup_installer(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', ('Localization', 'Others', 'Tools', 'Base', 'Link'))]
+                  ('name', 'not in', HIDDEN_CATEGORIES)]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
-- 
cgit v1.2.3


From edf0e5730538b7f764371197c70d8acd4f97c0fc Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Wed, 5 Oct 2011 16:19:32 +0200
Subject: [FIX] base_setup: Use a new flag of the ir.module.category object for
 the listing of applications

bzr revid: stw@openerp.com-20111005141932-mw8n1ccs1msino92
---
 addons/base_setup/base_setup.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 33837b5553b..9efc82f2d62 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -35,7 +35,7 @@ DEFAULT_MODULES = {
     'Project Management' : ['project',],
     'Knowledge Management' : ['document',],
     'Warehouse Management' : ['stock',],
-    'Manufacturing' : ['mrp',],
+    'Manufacturing' : ['mrp', 'procurement'],
     'Accounting & Finance' : ['account,'],
     'Purchase Management' : ['purchase,'],
     'Human Resources' : ['hr',],
@@ -43,8 +43,6 @@ DEFAULT_MODULES = {
     'Marketing' : ['marketing',],
 }
 
-HIDDEN_CATEGORIES = ('Tools', 'System', 'Localization', 'Link', 'Uncategorized')
-
 class base_setup_installer(osv.osv_memory):
     _name = 'base.setup.installer'
 
@@ -63,7 +61,8 @@ class base_setup_installer(osv.osv_memory):
         fields = {} 
         category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', HIDDEN_CATEGORIES )]
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
         category_ids = category_proxy.search(cr, uid, domain, context=context)
         for category in category_proxy.browse(cr, uid, category_ids, context=context):
             category_name = 'category_%d' % (category.id,)
@@ -79,11 +78,10 @@ class base_setup_installer(osv.osv_memory):
         for module in module_proxy.browse(cr, uid, module_ids, context=context):
             module_name = 'module_%d' % (module.id,)
             module_is_installed = module.state == 'installed'
-            title = "%s (%s)" % (module.shortdesc, module.complexity,)
 
             fields[module_name] = {
                 'type' : 'boolean',
-                'string' : title,
+                'string' : module.shortdesc,
                 'name' : module_name,
                 'help' : module.description,
             }
@@ -105,7 +103,8 @@ class base_setup_installer(osv.osv_memory):
                 result['module_%d' % (module.id,)] = module.state == 'installed'
                 category_name = 'category_%d' % (module.category_id.id,)
                 if not result.get('category_name'):
-                    result[category_name] = module.state == 'installed'
+                    result[category_name] = module.state == 'installed' and \
+                            module.category_id.name in DEFAULT_MODULES
 
         return result
 
@@ -121,7 +120,8 @@ class base_setup_installer(osv.osv_memory):
 
         module_category_proxy = self.pool.get('ir.module.category')
         domain = [('parent_id', '=', False),
-                  ('name', 'not in', HIDDEN_CATEGORIES)]
+                  ('name', '!=', 'Uncategorized'),
+                  ('visible', '=', True)]
         module_category_ids = module_category_proxy.search(cr, uid, domain, context=context, order='sequence asc')
 
         arch = ['<form string="%s">' % _('Automatic Base Setup')]
-- 
cgit v1.2.3


From d72bf86b594065de21f8eea82f3924981ef75392 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Oct 2011 18:52:02 +0200
Subject: [FIX] category selection

bzr revid: al@openerp.com-20111005165202-s3jv23v7n5py4mx1
---
 addons/base_setup/base_setup.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 9efc82f2d62..312e20c0ffd 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -101,10 +101,13 @@ class base_setup_installer(osv.osv_memory):
             module_ids = module_proxy.search(cr, uid, [], context=context)
             for module in module_proxy.browse(cr, uid, module_ids, context=context):
                 result['module_%d' % (module.id,)] = module.state == 'installed'
-                category_name = 'category_%d' % (module.category_id.id,)
-                if not result.get('category_name'):
-                    result[category_name] = module.state == 'installed' and \
-                            module.category_id.name in DEFAULT_MODULES
+
+            cat_proxy = self.pool.get('ir.module.category')
+            cat_ids = cat_proxy.search(cr, uid, [], context=context)
+            for cat in cat_proxy.browse(cr, uid, cat_ids, context=context):
+                m = DEFAULT_MODULES.get(cat.name,[])
+                r = module_proxy.search(cr, uid, [('state','=','installed'),('name','in',m)])
+                result['category_%d' % (cat.id,)] = bool(r)
 
         return result
 
@@ -330,10 +333,6 @@ class base_setup_installer(osv.osv_memory):
     #    if need_install:
     #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
     #    return
-base_setup_installer()
-
-
-
 
 #Migrate data from another application Conf wiz
 
@@ -356,7 +355,6 @@ class product_installer(osv.osv_memory):
     _inherit = 'res.config'
     _columns = {
         'customers': fields.selection([('create','Create'), ('import','Import')], 'Customers', size=32, required=True, help="Import or create customers"),
-
     }
     _defaults = {
         'customers': 'create',
-- 
cgit v1.2.3


From 253467dfe254e9f67a4209ad25042feed85960f3 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 14:03:38 +0200
Subject: [FIX] base_setup: Fix a problem with categories to show

bzr revid: stw@openerp.com-20111006120338-9zetw1glf0rdxo27
---
 addons/base_setup/base_setup.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 312e20c0ffd..9519644675b 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -138,15 +138,13 @@ class base_setup_installer(osv.osv_memory):
             if not extended_view:
                 domain.append(('complexity', '!=', 'expert'))
 
-            default_modules = DEFAULT_MODULES.get(module_category.name, False)
-            if default_modules:
-                domain.append(('name', 'not in', default_modules))
-
             modules = module_proxy.browse(cr, uid, module_proxy.search(cr, uid, domain, context=context), context=context)
             if not modules:
                 continue
 
-            readonly = any(module.state == 'installed' for module in modules)
+            m = DEFAULT_MODULES.get(module_category.name, [])
+            r = module_proxy.search(cr, uid, [('state', '=', 'installed'),('name', 'in', m)], context=context)
+            readonly = bool(r)
 
             attributes = {
                 'name' : 'category_%d' % (module_category.id,),
@@ -158,8 +156,7 @@ class base_setup_installer(osv.osv_memory):
             arch.append("""<field %s />""" % (" ".join(["%s='%s'" % (key, value,)
                                                         for key, value in attributes.iteritems()]),))
 
-        # Compute the module to show
-
+        # Compute the modules to show
         for module_category in module_category_proxy.browse(cr, uid, module_category_ids, context=context):
             domain = [('category_id', '=', module_category.id)]
 
-- 
cgit v1.2.3


From eab1356855f10bd1c87ba49304ef5b9e5d729d58 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 15:09:09 +0200
Subject: [FIX] base_setup: Set the right modules of the category

bzr revid: stw@openerp.com-20111006130909-9sqjw6mgnldeammf
---
 addons/base_setup/base_setup.py | 46 ++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 9519644675b..4178a5140a8 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -36,8 +36,8 @@ DEFAULT_MODULES = {
     'Knowledge Management' : ['document',],
     'Warehouse Management' : ['stock',],
     'Manufacturing' : ['mrp', 'procurement'],
-    'Accounting & Finance' : ['account,'],
-    'Purchase Management' : ['purchase,'],
+    'Accounting & Finance' : ['account'],
+    'Purchase Management' : ['purchase'],
     'Human Resources' : ['hr',],
     'Point of Sales' : ['pos',],
     'Marketing' : ['marketing',],
@@ -286,15 +286,26 @@ class base_setup_installer(osv.osv_memory):
                            ir_module_module_dependency d inner join ir_module_module m2 on d.name = m2.name \
                            where d.module_id=m.id and m2.state in %s ) and state = %s",
                           (category_id[1], ('installed', 'to install', 'to upgrade', ), 'uninstalled',))
-                modules = [name for _, name in cr.fetchall()]
+                inner_modules = [name for _, name in cr.fetchall()]
 
-                module_ids = proxy.search(cr, uid, [('name', 'in', modules)], context=context)
+                module_ids = proxy.search(cr, uid, [('name', 'in', inner_modules)], context=context)
                 if not module_ids:
                     break
 
+                modules = modules + set(inner_modules)
+
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
 
+
+            domain = [('name', 'in', list(modules)),
+                      ('state', '=', 'installed')]
+            for module in proxy.browse(cr, uid, proxy.search(cr, uid, domain, context=context), context):
+                cr.execute("update ir_actions_todo set state='open' \
+                           from ir_model_data as data where data.res_id = ir_actions_todo.id \
+                           and ir_actions_todo.type='special'\
+                           and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
+
             if need_update:
                 cr.commit()
                 self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
@@ -304,33 +315,6 @@ class base_setup_installer(osv.osv_memory):
         else:
             return {'type' : 'ir.actions.act_window_close'}
 
-    # TODO: To implement in this new wizard
-    #def execute(self, cr, uid, ids, context=None):
-    #    module_pool = self.pool.get('ir.module.module')
-    #    modules_selected = []
-    #    datas = self.read(cr, uid, ids, context=context)[0]
-    #    for mod in datas.keys():
-    #        if mod in ('id', 'progress'):
-    #            continue
-    #        if datas[mod] == 1:
-    #            modules_selected.append(mod)
-
-    #    module_ids = module_pool.search(cr, uid, [('name', 'in', modules_selected)], context=context)
-    #    need_install = False
-    #    for module in module_pool.browse(cr, uid, module_ids, context=context):
-    #        if module.state == 'uninstalled':
-    #            module_pool.state_update(cr, uid, [module.id], 'to install', ['uninstalled'], context)
-    #            need_install = True
-    #            cr.commit()
-    #        elif module.state == 'installed':
-    #            cr.execute("update ir_actions_todo set state='open' \
-    #                                from ir_model_data as data where data.res_id = ir_actions_todo.id \
-    #                                and ir_actions_todo.type='special'\
-    #                                and data.model = 'ir.actions.todo' and data.module=%s", (module.name, ))
-    #    if need_install:
-    #        self.pool = pooler.restart_pool(cr.dbname, update_module=True)[1]
-    #    return
-
 #Migrate data from another application Conf wiz
 
 class migrade_application_installer_modules(osv.osv_memory):
-- 
cgit v1.2.3


From 2d817dfaa10d39d7b53ce16392a79dbba457265a Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 6 Oct 2011 16:31:37 +0200
Subject: [FIX] base_setup: Set the right xml_id for the hidden/link category

bzr revid: stw@openerp.com-20111006143137-vj6y3pczx7euy13i
---
 addons/base_setup/base_setup.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/base_setup/base_setup.py')

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 4178a5140a8..3610c227142 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -278,7 +278,7 @@ class base_setup_installer(osv.osv_memory):
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
 
-            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_link')
+            category_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'module_category_hidden_link')
             while True and category_id:
                 cr.execute("select id, name from ir_module_module m where category_id = %s \
                            and (select count(d.id) from ir_module_module_dependency d \
@@ -292,7 +292,7 @@ class base_setup_installer(osv.osv_memory):
                 if not module_ids:
                     break
 
-                modules = modules + set(inner_modules)
+                modules.update(inner_modules)
 
                 proxy.state_update(cr, uid, module_ids, 'to install', ['uninstalled'], context=context)
                 need_update = True
-- 
cgit v1.2.3