diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index a262dc5eb7f..a9de51c3afb 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -8,13 +8,13 @@
- Accounting Modules Configuration + Accounting Application Configuration
- Configure Your Accounting System + Configure Your Accounting Chart - Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account. + The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default. Configure @@ -66,13 +66,17 @@
- Accounting Modules Configuration + Accounting Application Configuration
- Extra Accounting Modules + Configure Your Accounting Application + - From this screen, you can install extra accounting modules in your accounting system. Select the modules to directly install them. If you do not think you need any of these right now, you can easily install them later. + Add extra Accounting Addons to the ones already installed. Remember you can always install them at a later stage. + + + Configure @@ -100,7 +104,7 @@ - Accounting Modules Installation + Accounting Application Configuration ir.actions.act_window account.installer.modules diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index bcd5d8b233b..3d82e27b8ce 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2375,11 +2375,11 @@
- Generate Chart of Accounts from a Chart Template + Accounting Application Configuration
Generate Chart of Accounts from a Chart Template + >Generate Your Accounting Chart from a Chart Template This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template diff --git a/addons/account/installer.py b/addons/account/installer.py index 415879e6de8..e2f2ca423b6 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -73,6 +73,21 @@ class account_installer(osv.osv_memory): return user.company_id.id return False + def _get_default_charts(self, cr, uid, context={}): + module_name = False + company_id = self._default_company(cr, uid, context=context) + company = self.pool.get('res.company').browse(cr, uid, company_id) + address_id = self.pool.get('res.partner').address_get(cr, uid, [company.partner_id.id]) + if address_id['default']: + address = self.pool.get('res.partner.address').browse(cr, uid, address_id['default']) + code = address.country_id.code + module_name = (code and 'l10n_' + code.lower()) or False + if module_name: + module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', module_name)]) + if module_id: + return module_name + return 'configurable' + _defaults = { 'date_start': lambda *a: time.strftime('%Y-01-01'), 'date_stop': lambda *a: time.strftime('%Y-12-31'), @@ -80,7 +95,8 @@ class account_installer(osv.osv_memory): 'sale_tax':lambda *a:0.0, 'purchase_tax':lambda *a:0.0, 'company_id': _default_company, - 'bank_accounts_id':_get_default_accounts + 'bank_accounts_id':_get_default_accounts, + 'charts': _get_default_charts } def on_change_tax(self, cr, uid, id, tax): diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index a149cfb0952..8460cfa6cc9 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -2,21 +2,21 @@ - Association Profile : Install extra modules + Association Application Configuration profile.association.config.install_modules_wizard form
- Association Profile Configuration + Association Application Configuration
- Install more modules. A few modules are proposed according to the Association Profile you selected. You will be able to install them based on our requirements. + Here are specific applications related to the Association Profile you selected. Configure @@ -37,7 +37,7 @@ - Association Profile : Install Extra Modules + Association Application Configuration ir.actions.act_window profile.association.config.install_modules_wizard diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py index 31cebb61ba5..4f4e2b2896c 100644 --- a/addons/base_contact/base_contact_installer.py +++ b/addons/base_contact/base_contact_installer.py @@ -29,7 +29,6 @@ class base_contact_installer(osv.osv_memory): _columns = { 'name': fields.char('Name', size=64), 'migrate': fields.boolean('Migrate', help="If you select this, all addresses will be migrated."), - 'nomigrate': fields.boolean('NoMigrate', help="If you select this, all addresses will not be migrated."), } def execute(self, cr, uid, ids, context=None): @@ -54,15 +53,12 @@ class base_contact_installer(osv.osv_memory): END; $contactjob$ LANGUAGE plpgsql; CREATE TRIGGER contactjob AFTER INSERT ON res_partner_contact FOR EACH ROW EXECUTE PROCEDURE add_to_job();""") - cr.commit() cr.execute("INSERT into res_partner_contact (name, title, email, first_name, website) (SELECT coalesce(name, 'Noname'), title, email, function , to_char(id, '99999999') from res_partner_address)") - cr.commit() cr.execute("DROP TRIGGER IF EXISTS contactjob on res_partner_contact") cr.execute("DROP LANGUAGE IF EXISTS plpgsql CASCADE;") cr.execute("DROP FUNCTION IF EXISTS add_to_job()") - cr.commit() base_contact_installer() diff --git a/addons/base_contact/base_contact_installer_view.xml b/addons/base_contact/base_contact_installer_view.xml index 87a8033d837..672c43745fb 100644 --- a/addons/base_contact/base_contact_installer_view.xml +++ b/addons/base_contact/base_contact_installer_view.xml @@ -31,9 +31,7 @@ diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml index db890c2dfdf..4245f3da206 100644 --- a/addons/base_setup/base_setup_installer.xml +++ b/addons/base_setup/base_setup_installer.xml @@ -8,38 +8,41 @@
- Install OpenERP Modules + Install Applications
- - Select applications you want to install. If you don't think you need any of these right now, you can easily install them later. + + Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later. 15 + + Install + - Install Generic Modules + Install Applications + - - - - - - - - - - - + + + + + + + + + + + - Base Setup Modules Installation + Install Applications ir.actions.act_window base.setup.installer diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 59543200076..8151442855b 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -1,20 +1,20 @@ - Setup company information + Company Configuration base.setup.company form
- Main Company Setup + Company Configuration
- Information of your company will be used to customize your documents like Invoices, Sale Orders and many more. + Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more. - Configure Your Company + Configure Your Company Information 25 @@ -55,7 +55,7 @@ - Setup company information + Company Configuration ir.actions.act_window base.setup.company diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py index 5da836d7f80..77303336ab7 100644 --- a/addons/base_setup/installer.py +++ b/addons/base_setup/installer.py @@ -66,13 +66,12 @@ class base_setup_installer(osv.osv_memory): "automatic picking lists generation and more."), 'marketing':fields.boolean('Marketing', help="Helps you manage your marketing campaigns step by step."), - 'profile_tools':fields.boolean('Miscellaneous Tools', + '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."), - 'thunderbird' :fields.boolean('Thunderbird'), # Vertical modules 'product_expiry':fields.boolean('Food Industry', help="Installs a preselected set of OpenERP applications " @@ -108,11 +107,13 @@ class base_setup_installer(osv.osv_memory): return ['account_voucher'] return None - def onchange_moduleselection(self, cr, uid, ids, *args): + 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':{'progress':progress}} + return {'value':value} base_setup_installer() diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index 94f3d977842..dc7fef3ca70 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -84,6 +84,7 @@ Create dashboard for CRM that includes: 'wizard/crm_partner_to_opportunity_view.xml', 'wizard/crm_send_email_view.xml', + 'wizard/crm_add_note_view.xml', 'wizard/crm_forward_to_partner_view.xml', 'wizard/crm_merge_opportunities_view.xml', diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 1ee2f295778..a16f749323d 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -499,10 +499,14 @@ class crm_case_section(osv.osv): _name = "crm.case.section" _description = "Sales Teams" - _order = "parent_id, name" + _order = "complete_name" + + def get_full_name(self, cr, uid, ids, field_name, arg, context={}): + return dict(self.name_get(cr, uid, ids, context)) _columns = { 'name': fields.char('Sales Team', size=64, required=True, translate=True), + 'complete_name': fields.function(get_full_name, method=True, type='char', size=256, readonly=True, store=True), 'code': fields.char('Code', size=8), 'active': fields.boolean('Active', help="If the active field is set to "\ "true, it will allow you to hide the sales team without removing it."), diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 6805131155a..f7df076e24d 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -96,7 +96,8 @@ this if you want the rule to send an email to the partner."), res_count = True if action.trg_max_history: res_count = False - if len(obj.message_ids) <= action.trg_max_history: + history_ids = filter(lambda x: x.history, obj.message_ids) + if len(history_ids) <= action.trg_max_history: res_count = True ok = ok and res_count return ok @@ -120,7 +121,11 @@ this if you want the rule to send an email to the partner."), write['email_cc'] = obj.email_cc+','+obj.act_email_cc else: write['email_cc'] = obj.act_email_cc - + + # Put state change by rule in communication history + if hasattr(obj, 'state') and action.act_state: + model_obj._history(cr, uid, [obj], _(action.act_state)) + model_obj.write(cr, uid, [obj.id], write, context) emails = [] diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml index 5599eeff5d9..5fad3f41a3d 100644 --- a/addons/crm/crm_installer_view.xml +++ b/addons/crm/crm_installer_view.xml @@ -8,15 +8,15 @@
- CRM Modules Configuration + CRM Application Configuration
- Configure Your CRM System + Configure Your CRM Application - You can enhance OpenERP's basic CRM support with a few additional OpenERP applications + Enhance your CRM basic Application with additional Addons. 13 @@ -49,7 +49,7 @@ - CRM Modules Installation + CRM Application Configuration ir.actions.act_window crm.installer diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 6e1b851f52a..95f81e0d813 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -174,6 +174,7 @@ +